Skip to content
This repository was archived by the owner on Sep 2, 2020. It is now read-only.

Commit f91247d

Browse files
author
Carlos Sanchez
committed
Use librarian for specs and bump version
1 parent fb1c575 commit f91247d

File tree

9 files changed

+80
-33
lines changed

9 files changed

+80
-33
lines changed

‎.fixtures.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
fixtures:
2-
repositories:
3-
wget: http://github.com/maestrodev/puppet-wget.git
42
symlinks:
53
ant: "#{source_dir}"

‎.gitignore‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
/.idea
2-
/doc
3-
/.rvmrc
4-
/.project
5-
/spec/fixtures/
1+
.idea
2+
.rvmrc
3+
.project
4+
.librarian/
5+
.tmp/
6+
pkg/
7+
doc/
8+
spec/fixtures/
9+
modules/

‎Gemfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ group :rake do
66
gem 'rake', '>=0.9.2.2'
77
gem 'puppet-lint', '~>0.1.12'
88
gem 'puppetlabs_spec_helper'
9+
gem 'puppet-blacksmith', '>=1.0.0'
10+
gem 'librarian-puppet-maestrodev', '>=0.9.7.5'
911
end

‎Gemfile.lock‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,53 @@ GEM
22
remote: http://rubygems.org/
33
specs:
44
diff-lcs (1.1.3)
5-
facter (1.6.11)
5+
facter (1.6.17)
6+
json (1.7.6)
7+
librarian-puppet-maestrodev (0.9.7.5)
8+
json
9+
puppet
10+
thor (~> 0.15)
611
metaclass (0.0.1)
7-
mocha (0.12.3)
12+
mime-types (1.21)
13+
mocha (0.13.2)
814
metaclass (~> 0.0.1)
9-
puppet (2.7.18)
15+
nokogiri (1.5.6)
16+
puppet (2.7.20)
1017
facter (~> 1.5)
18+
puppet-blacksmith (1.0.4)
19+
nokogiri
20+
puppet (>= 2.7.16)
21+
puppetlabs_spec_helper (>= 0.3.0)
22+
rake
23+
rest-client
1124
puppet-lint (0.1.13)
12-
puppetlabs_spec_helper (0.3.0)
25+
puppetlabs_spec_helper (0.4.1)
1326
mocha (>= 0.10.5)
1427
rake
1528
rspec (>= 2.9.0)
1629
rspec-puppet (>= 0.1.1)
17-
rake (0.9.2.2)
18-
rspec (2.11.0)
19-
rspec-core (~> 2.11.0)
20-
rspec-expectations (~> 2.11.0)
21-
rspec-mocks (~> 2.11.0)
22-
rspec-core (2.11.1)
23-
rspec-expectations (2.11.2)
30+
rake (10.0.3)
31+
rest-client (1.6.7)
32+
mime-types (>= 1.16)
33+
rspec (2.12.0)
34+
rspec-core (~> 2.12.0)
35+
rspec-expectations (~> 2.12.0)
36+
rspec-mocks (~> 2.12.0)
37+
rspec-core (2.12.2)
38+
rspec-expectations (2.12.1)
2439
diff-lcs (~> 1.1.3)
25-
rspec-mocks (2.11.2)
26-
rspec-puppet (0.1.4)
40+
rspec-mocks (2.12.2)
41+
rspec-puppet (0.1.6)
2742
rspec
43+
thor (0.17.0)
2844

2945
PLATFORMS
3046
ruby
3147

3248
DEPENDENCIES
49+
librarian-puppet-maestrodev (>= 0.9.7.5)
3350
puppet (~> 2.7.17)
51+
puppet-blacksmith (>= 1.0.0)
3452
puppet-lint (~> 0.1.12)
3553
puppetlabs_spec_helper
3654
rake (>= 0.9.2.2)

‎Modulefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name 'maestrodev-ant'
2-
version '1.0.3'
2+
version '1.0.4'
33
source 'http://github.com/maestrodev/puppet-ant.git'
44
author 'maestrodev'
55
license 'Apache License, Version 2.0'

‎Puppetfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
forge 'http://forge.puppetlabs.com'
2+
3+
mod 'maestrodev/wget', '>=0.0.1'

‎Puppetfile.lock‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FORGE
2+
remote: http://forge.puppetlabs.com
3+
specs:
4+
maestrodev/wget (1.1.0)
5+
6+
DEPENDENCIES
7+
maestrodev/wget (>= 0.0.1)
8+

‎README.md‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,17 @@ maven-ant-tasks-2.1.3.jar file under the Ant lib directory.
3030

3131
License
3232
-------
33-
```
34-
Copyright 2011-2012 MaestroDev
33+
Copyright 2011-2013 MaestroDev
3534

36-
Licensed under the Apache License, Version 2.0 (the "License");
37-
you may not use this file except in compliance with the License.
38-
You may obtain a copy of the License at
35+
Licensed under the Apache License, Version 2.0 (the "License");
36+
you may not use this file except in compliance with the License.
37+
You may obtain a copy of the License at
3938

40-
http://www.apache.org/licenses/LICENSE-2.0
39+
http://www.apache.org/licenses/LICENSE-2.0
4140

42-
Unless required by applicable law or agreed to in writing, software
43-
distributed under the License is distributed on an "AS IS" BASIS,
44-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
45-
See the License for the specific language governing permissions and
46-
limitations under the License.
47-
```
41+
Unless required by applicable law or agreed to in writing, software
42+
distributed under the License is distributed on an "AS IS" BASIS,
43+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
44+
See the License for the specific language governing permissions and
45+
limitations under the License.
4846

‎Rakefile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
require 'bundler'
22
Bundler.require(:rake)
3+
require 'rake/clean'
4+
5+
CLEAN.include('spec/fixtures/', 'doc', 'pkg')
6+
CLOBBER.include('.tmp', '.librarian')
37

48
require 'puppetlabs_spec_helper/rake_tasks'
9+
require 'puppet_blacksmith/rake_tasks'
510

611
PuppetLint.configuration.send("disable_80chars")
12+
13+
# use librarian-puppet to manage fixtures instead of .fixtures.yml
14+
# offers more possibilities like explicit version management, forge downloads,...
15+
task :librarian_spec_prep do
16+
sh "librarian-puppet install --path=spec/fixtures/modules/"
17+
end
18+
task :spec_prep => :librarian_spec_prep
19+
20+
task :default => [:clean, :spec]
21+
22+
task :release => [:clean, 'module:tag', 'module:push', 'module:bump_commit']

0 commit comments

Comments
 (0)