librarian-puppet 2.2.3 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YzJmOGM3Zjc4MzY3YTU2MTZjNDg5YzE2ZTlkM2QwMjMyNDQ0YjdlNA==
5
- data.tar.gz: !binary |-
6
- N2Q3YTkxNGUxN2NhYzBiYWFlMTE3MTc4YWVkNzIxZjdmYTMyNDQ0OA==
2
+ SHA256:
3
+ metadata.gz: 178cdf6e6befe908c192269b7cbdb083634fb4614a041262ea1cf01a7159749b
4
+ data.tar.gz: 5d22740a5a509be15df114e1247d2ecc2b1864898e6daa0c29128d5d37677a8e
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ODdiMGNjOTJjYTYyYzg3YzA1Nzg0ODIyODAyMTg3MzFlMmExYWQ4OTZkZWU1
10
- ZmNhODQ1M2I5M2IyNmQyOWU3ZGNmOGI4ZGJjNzI1ODAyYWZiODllMGMyNDZj
11
- YzQyMDI4NWNiZmVjMjNlM2IzMDBjM2MwODc3MGMzZjU3MTZlZjE=
12
- data.tar.gz: !binary |-
13
- N2NlOTAyZTIxNTlkMGEzNTU0YzNlY2E3YTgyZTZiZWQ1MDc4ODBiMWI0ZDBh
14
- Yjc4ZTczMmVmOGExYjU2MDk5ZjkzNWZjNGVhMzQzZmJhMzBjODJkYThlNjAz
15
- NWQzZDk5M2EwZDVkNDY2MTIwODExZDJkZDdhMzdmNGQwZGNhYmQ=
6
+ metadata.gz: 4e20811276f5f1f2957531d71b3d98d542e7f01f8d4d6fea9dadd9cbf1b19ed42cc6bd2ecb12fbbdb2876ec76c5ccf8bd207fb61e59b6ef8ad943074a259e568
7
+ data.tar.gz: b17f917b603ea86faf24a898a31081ca32ced00f49e4fcfe8026d4bb3a6a83923af0cc5dcd81aa711ceb818980047117096da8e21ea07b00a70191419735d48d
data/.gitignore CHANGED
@@ -2,3 +2,4 @@ pkg/
2
2
  Gemfile.lock
3
3
  tmp/
4
4
  coverage/
5
+ *.gem
data/README.md CHANGED
@@ -6,11 +6,11 @@
6
6
 
7
7
  Librarian-puppet is a bundler for your puppet infrastructure. You can use
8
8
  librarian-puppet to manage the puppet modules your infrastructure depends on,
9
- whether the modules come from the [Puppet Forge](https://forge.puppetlabs.com/),
9
+ whether the modules come from the [Puppet Forge](https://forge.puppet.com/),
10
10
  Git repositories or just a path.
11
11
 
12
12
  * Librarian-puppet can reuse the dependencies listed in your `Modulefile` or `metadata.json`
13
- * Forge modules can be installed from [Puppetlabs Forge](https://forge.puppetlabs.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/)
13
+ * Forge modules can be installed from [Puppetlabs Forge](https://forge.puppet.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/)
14
14
  * Git modules can be installed from a branch, tag or specific commit, optionally using a path inside the repository
15
15
  * Modules can be installed from GitHub using tarballs, without needing Git installed
16
16
  * Modules can be installed from a filesystem path
@@ -31,8 +31,9 @@ and isolate a project's dependencies.
31
31
 
32
32
  ## Versions
33
33
 
34
- Librarian-puppet >= 2.0 (as well as 1.1, 1.2 and 1.3) requires Ruby 1.9 and uses the Puppet Forge API v3.
35
- Versions < 2.0 work on Ruby 1.8.
34
+ Librarian-Puppet 3.0.0 and newer requires Ruby >= 2.0. Use version 2.2.4 if you need support for Puppet 3.7 or earlier, or Ruby 1.9 or earlier. Note that [Puppet 4.10 and newer require Ruby 2.1](https://puppet.com/docs/puppet/4.10/system_requirements.html#prerequisites) or newer.
35
+
36
+ Librarian-Puppet 2.0.0 and newer requires Ruby >= 1.9 and uses Puppet Forge API v3. For Ruby 1.8 use 1.5.0.
36
37
 
37
38
  See the [Changelog](Changelog.md) for more details.
38
39
 
@@ -129,6 +130,11 @@ This includes any branch name, tag name, SHA, or SHA unique prefix. If we use a
129
130
  branch, we can later ask Librarian-puppet to update the module by fetching the
130
131
  most recent version of the module from that same branch.
131
132
 
133
+ Note that Librarian-puppet recognizes the [r10k Puppetfile's](https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd) additional
134
+ options, `:tag`, `:commit`, and `:branch`, but only as aliases for `:ref`.
135
+ That is, there is no implementation of r10k's optimizations around fetching
136
+ these different types of git objects.
137
+
132
138
  The Git source also supports a `:path =>` option. If we use the path option,
133
139
  Librarian-puppet will navigate down into the Git repository and only use the
134
140
  specified subdirectory. Some people have the habit of having a single repository
@@ -158,7 +158,8 @@ module Librarian
158
158
  @repo ||= {}
159
159
 
160
160
  unless @repo[name]
161
- # if we are using the official Forge then use API v3, otherwise stick to v1 for now
161
+ # If we are using the official Forge then use API v3, otherwise use the preferred api
162
+ # as defined by the CLI option use_v1_api
162
163
  if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
163
164
  @repo[name] = RepoV3.new(self, name)
164
165
  else
@@ -87,7 +87,7 @@ module Librarian
87
87
  target = vendored?(name, version) ? vendored_path(name, version).to_s : name
88
88
 
89
89
  # can't pass the default v3 forge url (http://forgeapi.puppetlabs.com)
90
- # to clients that use the v1 API (https://forge.puppetlabs.com)
90
+ # to clients that use the v1 API (https://forge.puppet.com)
91
91
  # nor the other way around
92
92
  module_repository = source.to_s
93
93
 
@@ -11,10 +11,10 @@ module Librarian
11
11
  def initialize(source, name)
12
12
  super(source, name)
13
13
  # API returned data for this module including all versions and dependencies, indexed by module name
14
- # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}
14
+ # from https://forge.puppetlabs.com/api/v1/releases.json?module=#{name}
15
15
  @api_data = nil
16
16
  # API returned data for this module and a specific version, indexed by version
17
- # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version}
17
+ # from https://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version}
18
18
  @api_version_data = {}
19
19
  end
20
20
 
@@ -26,7 +26,21 @@ module Librarian
26
26
  # If the rsync configuration parameter is set, use rsync instead of FileUtils
27
27
  def cp_r(src, dest)
28
28
  if rsync?
29
- Rsync.run(File.join(src, "/"), dest, ['-avz', '--delete'])
29
+ if Gem.win_platform?
30
+ src_clean = "#{src}".gsub(/^([a-z])\:/i,'/cygdrive/\1')
31
+ dest_clean = "#{dest}".gsub(/^([a-z])\:/i,'/cygdrive/\1')
32
+ else
33
+ src_clean = src
34
+ dest_clean = dest
35
+ end
36
+ debug { "Copying #{src_clean}/ to #{dest_clean}/ with rsync -avz --delete" }
37
+ result = Rsync.run(File.join(src_clean, "/"), File.join(dest_clean, "/"), ['-avz', '--delete'])
38
+ if result.success?
39
+ debug { "Rsync from #{src_clean}/ to #{dest_clean}/ successfull" }
40
+ else
41
+ msg = "Failed to rsync from #{src_clean}/ to #{dest_clean}/: " + result.error
42
+ raise Error, msg
43
+ end
30
44
  else
31
45
  begin
32
46
  FileUtils.cp_r(src, dest, :preserve => true)
@@ -1,5 +1,5 @@
1
1
  module Librarian
2
2
  module Puppet
3
- VERSION = "2.2.3"
3
+ VERSION = "3.0.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: librarian-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.3
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tim Sharpe
@@ -9,164 +9,166 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-04-21 00:00:00.000000000 Z
12
+ date: 2018-01-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: librarianp
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ! '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: 0.6.3
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ! '>='
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
27
  version: 0.6.3
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rsync
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ! '>='
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: '0'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ! '>='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: puppet_forge
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '2.1'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: '2.1'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: rake
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ! '>='
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: '0'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - ! '>='
67
+ - - ">="
68
68
  - !ruby/object:Gem::Version
69
69
  version: '0'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - ! '>='
74
+ - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - ! '>='
81
+ - - ">="
82
82
  - !ruby/object:Gem::Version
83
83
  version: '0'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: cucumber
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - ! '>='
88
+ - - "<"
89
89
  - !ruby/object:Gem::Version
90
- version: '0'
90
+ version: 3.0.0
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - ! '>='
95
+ - - "<"
96
96
  - !ruby/object:Gem::Version
97
- version: '0'
97
+ version: 3.0.0
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: aruba
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - <
102
+ - - "<"
103
103
  - !ruby/object:Gem::Version
104
104
  version: 0.8.0
105
105
  type: :development
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - <
109
+ - - "<"
110
110
  - !ruby/object:Gem::Version
111
111
  version: 0.8.0
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: puppet
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - ~>
116
+ - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: 4.1.0
118
+ version: 5.2.0
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - ~>
123
+ - - "~>"
124
124
  - !ruby/object:Gem::Version
125
- version: 4.1.0
125
+ version: 5.2.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: minitest
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - ~>
130
+ - - "~>"
131
131
  - !ruby/object:Gem::Version
132
132
  version: '5'
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - ~>
137
+ - - "~>"
138
138
  - !ruby/object:Gem::Version
139
139
  version: '5'
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: mocha
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - ! '>='
144
+ - - ">="
145
145
  - !ruby/object:Gem::Version
146
146
  version: '0'
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - ! '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: '0'
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: simplecov
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - ! '>='
158
+ - - ">="
159
159
  - !ruby/object:Gem::Version
160
160
  version: 0.9.0
161
161
  type: :development
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - ! '>='
165
+ - - ">="
166
166
  - !ruby/object:Gem::Version
167
167
  version: 0.9.0
168
- description: ! "Simplify deployment of your Puppet infrastructure by\n automatically
169
- pulling in modules from the forge and git repositories with\n a single command."
168
+ description: |-
169
+ Simplify deployment of your Puppet infrastructure by
170
+ automatically pulling in modules from the forge and git repositories with
171
+ a single command.
170
172
  email:
171
173
  - tim@sharpe.id.au
172
174
  - carlos@apache.org
@@ -175,7 +177,7 @@ executables:
175
177
  extensions: []
176
178
  extra_rdoc_files: []
177
179
  files:
178
- - .gitignore
180
+ - ".gitignore"
179
181
  - LICENSE
180
182
  - README.md
181
183
  - bin/librarian-puppet
@@ -213,17 +215,17 @@ require_paths:
213
215
  - lib
214
216
  required_ruby_version: !ruby/object:Gem::Requirement
215
217
  requirements:
216
- - - ! '>='
218
+ - - ">="
217
219
  - !ruby/object:Gem::Version
218
- version: 1.9.0
220
+ version: 2.0.0
219
221
  required_rubygems_version: !ruby/object:Gem::Requirement
220
222
  requirements:
221
- - - ! '>='
223
+ - - ">="
222
224
  - !ruby/object:Gem::Version
223
225
  version: '0'
224
226
  requirements: []
225
227
  rubyforge_project:
226
- rubygems_version: 2.4.5
228
+ rubygems_version: 2.7.4
227
229
  signing_key:
228
230
  specification_version: 4
229
231
  summary: Bundler for your Puppet modules