builderator 1.0.4 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +32 -116
  3. data/VERSION +1 -1
  4. data/builderator.gemspec +3 -2
  5. data/lib/builderator/patch/berkshelf.rb +9 -4
  6. data/rvm.env +4 -4
  7. data/template/Vagrantfile.erb +2 -0
  8. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f3e86363e1868924b2a5cc8d3730dea204c6c4ef
4
- data.tar.gz: a0602bf3e7a92a9d6ca8d509af5de9e4f4b3ee73
3
+ metadata.gz: 1165e5306fde1228d9bca1afa98531042ef08d29
4
+ data.tar.gz: b31a626d1c14bbc717022174b1cfa802c4caa222
5
5
  SHA512:
6
- metadata.gz: f1ce3210066f2867b546715e857fa6f9508a481f68514a5eb6409e6ab7129617b759782a4ba4ef5449627618811f0875400d386e61d6b004ea11583cc5d2643e
7
- data.tar.gz: 503bfe61a2fb5cd4b542661c8f8393d5a93fb86f7575f210866edfcb6c8093c9f0deb5483e21cb242a481b830d0fddc333115ad3b6995c0e13c90f36fe7dfb2e
6
+ metadata.gz: bdd44c1a386da6ae63c130828443c7140a56b404eaa10e034267e9ae43eac8d7b9e88a8802aa7655698333b8c38b5c3eb8c902518afabfb3a3c50909729f3948
7
+ data.tar.gz: a5fa532a17692961048d13695465e4ffa09e5214fbdce58014ed678fc10785202ab4aef90095168a09e69959e23f9328fcbb030ce7b3ebdd37c2a6c02c9c25c8
data/Gemfile.lock CHANGED
@@ -3,8 +3,8 @@ PATH
3
3
  specs:
4
4
  builderator (0.0.1)
5
5
  aws-sdk (~> 2.0)
6
- berkshelf (~> 3.2)
7
- chef (~> 12.0)
6
+ berkshelf (~> 4.3)
7
+ dep_selector (~> 1.0)
8
8
  faraday_middleware (~> 0.10.0)
9
9
  ignorefile
10
10
  thor (~> 0.19.0)
@@ -12,7 +12,7 @@ PATH
12
12
  GEM
13
13
  remote: https://rubygems.org/
14
14
  specs:
15
- addressable (2.3.8)
15
+ addressable (2.4.0)
16
16
  ast (2.2.0)
17
17
  aws-sdk (2.2.35)
18
18
  aws-sdk-resources (= 2.2.35)
@@ -20,26 +20,27 @@ GEM
20
20
  jmespath (~> 1.0)
21
21
  aws-sdk-resources (2.2.35)
22
22
  aws-sdk-core (= 2.2.35)
23
- berkshelf (3.3.0)
24
- addressable (~> 2.3.4)
25
- berkshelf-api-client (~> 1.2)
23
+ berkshelf (4.3.2)
24
+ addressable (~> 2.3, >= 2.3.4)
25
+ berkshelf-api-client (~> 2.0, >= 2.0.2)
26
26
  buff-config (~> 1.0)
27
27
  buff-extensions (~> 1.0)
28
28
  buff-shell_out (~> 0.1)
29
- celluloid (~> 0.16.0)
29
+ celluloid (= 0.16.0)
30
30
  celluloid-io (~> 0.16.1)
31
31
  cleanroom (~> 1.0)
32
- faraday (~> 0.9.0)
33
- httpclient (~> 2.6.0)
34
- minitar (~> 0.5.4)
35
- octokit (~> 3.0)
32
+ faraday (~> 0.9)
33
+ httpclient (~> 2.7)
34
+ minitar (~> 0.5, >= 0.5.4)
35
+ octokit (~> 4.0)
36
36
  retryable (~> 2.0)
37
- ridley (~> 4.0)
38
- solve (~> 1.1)
37
+ ridley (~> 4.5)
38
+ solve (~> 2.0)
39
39
  thor (~> 0.19)
40
- berkshelf-api-client (1.4.0)
40
+ berkshelf-api-client (2.0.2)
41
41
  faraday (~> 0.9.1)
42
- httpclient (~> 2.6.0)
42
+ httpclient (~> 2.7.0)
43
+ ridley (~> 4.5)
43
44
  buff-config (1.0.1)
44
45
  buff-extensions (~> 1.0)
45
46
  varia_model (~> 0.4)
@@ -48,46 +49,16 @@ GEM
48
49
  buff-ruby_engine (0.1.0)
49
50
  buff-shell_out (0.2.0)
50
51
  buff-ruby_engine (~> 0.1.0)
51
- builder (3.2.2)
52
52
  celluloid (0.16.0)
53
53
  timers (~> 4.0.0)
54
54
  celluloid-io (0.16.2)
55
55
  celluloid (>= 0.16.0)
56
56
  nio4r (>= 1.1.0)
57
- chef (12.4.0)
58
- chef-config (= 12.4.0)
59
- chef-zero (~> 4.2, >= 4.2.2)
60
- diff-lcs (~> 1.2, >= 1.2.4)
61
- erubis (~> 2.7)
62
- ffi-yajl (~> 2.2)
63
- highline (~> 1.6, >= 1.6.9)
64
- mixlib-authentication (~> 1.3)
65
- mixlib-cli (~> 1.4)
66
- mixlib-log (~> 1.3)
67
- mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
68
- net-ssh (~> 2.6)
69
- net-ssh-multi (~> 1.1)
70
- ohai (~> 8.0)
71
- plist (~> 3.1.0)
72
- pry (~> 0.9)
73
- rspec-core (~> 3.2)
74
- rspec-expectations (~> 3.2)
75
- rspec-mocks (~> 3.2)
76
- rspec_junit_formatter (~> 0.2.0)
77
- serverspec (~> 2.7)
78
- specinfra (~> 2.10)
79
- syslog-logger (~> 1.6)
80
- chef-config (12.4.0)
57
+ chef-config (12.9.38)
58
+ fuzzyurl (~> 0.8.0)
81
59
  mixlib-config (~> 2.0)
82
60
  mixlib-shellout (~> 2.0)
83
- chef-zero (4.6.1)
84
- ffi-yajl (~> 2.2)
85
- hashie (>= 2.0, < 4.0)
86
- mixlib-log (~> 1.3)
87
- rack
88
- uuidtools (~> 2.1)
89
61
  cleanroom (1.0.0)
90
- coderay (1.1.1)
91
62
  dep-selector-libgecode (1.2.0)
92
63
  dep_selector (1.0.3)
93
64
  dep-selector-libgecode (~> 1.0)
@@ -99,70 +70,36 @@ GEM
99
70
  faraday_middleware (0.10.0)
100
71
  faraday (>= 0.7.4, < 0.10)
101
72
  ffi (1.9.10)
102
- ffi-yajl (2.2.3)
103
- libyajl2 (~> 1.2)
73
+ fuzzyurl (0.8.0)
104
74
  hashie (3.4.3)
105
- highline (1.7.8)
106
75
  hitimes (1.2.3)
107
- httpclient (2.6.0.1)
76
+ httpclient (2.7.1)
108
77
  ignorefile (1.1.0)
109
- ipaddress (0.8.3)
110
78
  jmespath (1.2.4)
111
79
  json_pure (>= 1.8.1)
112
80
  json (1.8.3)
113
81
  json_pure (1.8.3)
114
- libyajl2 (1.2.0)
115
- method_source (0.8.2)
116
- mime-types (2.99.1)
117
82
  minitar (0.5.4)
118
83
  mixlib-authentication (1.4.0)
119
84
  mixlib-log
120
85
  rspec-core (~> 3.2)
121
86
  rspec-expectations (~> 3.2)
122
87
  rspec-mocks (~> 3.2)
123
- mixlib-cli (1.5.0)
124
88
  mixlib-config (2.2.1)
125
89
  mixlib-log (1.6.0)
126
90
  mixlib-shellout (2.2.6)
127
- multi_json (1.11.2)
91
+ molinillo (0.4.4)
128
92
  multipart-post (2.0.0)
129
- net-scp (1.2.1)
130
- net-ssh (>= 2.6.5)
131
- net-ssh (2.9.4)
132
- net-ssh-gateway (1.2.0)
133
- net-ssh (>= 2.6.5)
134
- net-ssh-multi (1.2.1)
135
- net-ssh (>= 2.6.5)
136
- net-ssh-gateway (>= 1.2.0)
137
- net-telnet (0.1.1)
138
93
  nio4r (1.2.1)
139
- octokit (3.8.0)
140
- sawyer (~> 0.6.0, >= 0.5.3)
141
- ohai (8.5.1)
142
- ffi (~> 1.9)
143
- ffi-yajl (~> 2.2)
144
- ipaddress
145
- mime-types (~> 2.0)
146
- mixlib-cli
147
- mixlib-config (~> 2.0)
148
- mixlib-log
149
- mixlib-shellout (~> 2.0)
150
- rake (~> 10.1)
151
- systemu (~> 2.6.4)
152
- wmi-lite (~> 1.0)
94
+ octokit (4.3.0)
95
+ sawyer (~> 0.7.0, >= 0.5.3)
153
96
  parser (2.3.0.7)
154
97
  ast (~> 2.2)
155
- plist (3.1.0)
156
98
  powerpack (0.1.1)
157
- pry (0.10.3)
158
- coderay (~> 1.1.0)
159
- method_source (~> 0.8.1)
160
- slop (~> 3.4)
161
- rack (1.6.4)
162
99
  rainbow (2.1.0)
163
100
  rake (10.5.0)
164
101
  retryable (2.0.3)
165
- ridley (4.3.0)
102
+ ridley (4.5.0)
166
103
  addressable
167
104
  buff-config (~> 1.0)
168
105
  buff-extensions (~> 1.0)
@@ -170,15 +107,16 @@ GEM
170
107
  buff-shell_out (~> 0.1)
171
108
  celluloid (~> 0.16.0)
172
109
  celluloid-io (~> 0.16.1)
110
+ chef-config (>= 12.5.0)
173
111
  erubis
174
112
  faraday (~> 0.9.0)
175
113
  hashie (>= 2.0.2, < 4.0.0)
176
- httpclient (~> 2.6)
114
+ httpclient (~> 2.7)
177
115
  json (>= 1.7.7)
178
116
  mixlib-authentication (>= 1.3.0)
179
117
  retryable (~> 2.0)
180
118
  semverse (~> 1.1)
181
- varia_model (~> 0.4)
119
+ varia_model (~> 0.4.0)
182
120
  rspec (3.4.0)
183
121
  rspec-core (~> 3.4.0)
184
122
  rspec-expectations (~> 3.4.0)
@@ -188,16 +126,10 @@ GEM
188
126
  rspec-expectations (3.4.0)
189
127
  diff-lcs (>= 1.2.0, < 2.0)
190
128
  rspec-support (~> 3.4.0)
191
- rspec-its (1.2.0)
192
- rspec-core (>= 3.0.0)
193
- rspec-expectations (>= 3.0.0)
194
129
  rspec-mocks (3.4.1)
195
130
  diff-lcs (>= 1.2.0, < 2.0)
196
131
  rspec-support (~> 3.4.0)
197
132
  rspec-support (3.4.1)
198
- rspec_junit_formatter (0.2.3)
199
- builder (< 4)
200
- rspec-core (>= 2, < 4, != 2.12.0)
201
133
  rubocop (0.39.0)
202
134
  parser (>= 2.3.0.7, < 3.0)
203
135
  powerpack (~> 0.1)
@@ -205,27 +137,13 @@ GEM
205
137
  ruby-progressbar (~> 1.7)
206
138
  unicode-display_width (~> 1.0, >= 1.0.1)
207
139
  ruby-progressbar (1.7.5)
208
- sawyer (0.6.0)
209
- addressable (~> 2.3.5)
140
+ sawyer (0.7.0)
141
+ addressable (>= 2.3.5, < 2.5)
210
142
  faraday (~> 0.8, < 0.10)
211
143
  semverse (1.2.1)
212
- serverspec (2.31.1)
213
- multi_json
214
- rspec (~> 3.0)
215
- rspec-its
216
- specinfra (~> 2.53)
217
- sfl (2.2)
218
- slop (3.6.0)
219
- solve (1.2.1)
220
- dep_selector (~> 1.0)
144
+ solve (2.0.3)
145
+ molinillo (~> 0.4.2)
221
146
  semverse (~> 1.1)
222
- specinfra (2.56.1)
223
- net-scp
224
- net-ssh (>= 2.7, < 4.0)
225
- net-telnet
226
- sfl
227
- syslog-logger (1.6.8)
228
- systemu (2.6.5)
229
147
  thor (0.19.1)
230
148
  thor-scmversion (1.7.0)
231
149
  mixlib-shellout
@@ -233,11 +151,9 @@ GEM
233
151
  timers (4.0.4)
234
152
  hitimes
235
153
  unicode-display_width (1.0.3)
236
- uuidtools (2.1.5)
237
- varia_model (0.5.0)
154
+ varia_model (0.4.1)
238
155
  buff-extensions (~> 1.0)
239
156
  hashie (>= 2.0.2, < 4.0.0)
240
- wmi-lite (1.0.0)
241
157
 
242
158
  PLATFORMS
243
159
  ruby
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.4
1
+ 1.1.0
data/builderator.gemspec CHANGED
@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
24
24
  spec.add_development_dependency 'thor-scmversion', '1.7.0'
25
25
 
26
26
  spec.add_dependency 'aws-sdk', '~> 2.0'
27
- spec.add_dependency 'berkshelf', '~> 3.2'
28
- spec.add_dependency 'chef', '~> 12.0'
27
+ spec.add_dependency 'berkshelf', '~> 4.3'
28
+ spec.add_dependency 'dep_selector', '~> 1.0'
29
+ # spec.add_dependency 'chef', '~> 12.5'
29
30
  spec.add_dependency 'faraday_middleware', '~> 0.10.0'
30
31
  spec.add_dependency 'ignorefile'
31
32
  spec.add_dependency 'thor', '~> 0.19.0'
data/lib/builderator/patch/berkshelf.rb CHANGED
@@ -1,10 +1,10 @@
1
+ # Monkey patch to handle the case where Content-Type headers returned by servers
2
+ # say "gzip" by the resulting message body isn't in gzip format.
3
+ # TODO Remove this when we upgrade Berkshelf and the gzip response goes away.
4
+ # https://github.com/berkshelf/berkshelf-api-client/blob/v1.3.0/lib/berkshelf/api_client/connection.rb#L37
1
5
  require 'faraday_middleware'
2
6
 
3
7
  module FaradayMiddleware
4
- # Monkey patch to handle the case where Content-Type headers returned by servers
5
- # say "gzip" by the resulting message body isn't in gzip format.
6
- # TODO Remove this when we upgrade Berkshelf and the gzip response goes away.
7
- # https://github.com/berkshelf/berkshelf-api-client/blob/v1.3.0/lib/berkshelf/api_client/connection.rb#L37
8
8
  class Gzip
9
9
  alias_method :__uncompress_gzip__, :uncompress_gzip
10
10
  def uncompress_gzip(body)
@@ -16,3 +16,8 @@ module FaradayMiddleware
16
16
  end
17
17
 
18
18
  Faraday::Response.register_middleware :gzip => FaradayMiddleware::Gzip
19
+
20
+ # Force Berkshelf to use the gecode dependency solver
21
+ require 'solve'
22
+
23
+ Solve.engine = :gecode
data/rvm.env CHANGED
@@ -1,14 +1,14 @@
1
- declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1"
2
- declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
1
+ declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3"
2
+ declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
3
3
  declare -x HOME="/home/jenkins"
4
- declare -x HUDSON_COOKIE="87715455-4b48-40e3-af8b-a730b3387d3a"
4
+ declare -x HUDSON_COOKIE="dfc084f6-1a14-4b8c-8779-4ebe178fd701"
5
5
  declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
6
6
  declare -x LANG="en_US.UTF-8"
7
7
  declare -x LC_ALL="en_US.UTF-8"
8
8
  declare -x MY_RUBY_HOME="/home/jenkins/.rvm/rubies/ruby-2.1.5"
9
9
  declare -x NLSPATH="/usr/dt/lib/nls/msg/%L/%N.cat"
10
10
  declare -x OLDPWD
11
- declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-1/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
11
+ declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
12
12
  declare -x PWD="/home/jenkins/workspace/gem-public-builderator-master"
13
13
  declare -x RUBY_VERSION="ruby-2.1.5"
14
14
  declare -x SHLVL="1"
data/template/Vagrantfile.erb CHANGED
@@ -2,6 +2,8 @@
2
2
  # vi: set ft=ruby :
3
3
 
4
4
  Vagrant.configure('2') do |config|
5
+ config.berkshelf.enabled = false if Vagrant.has_plugin? 'vagrant-berkshelf'
6
+
5
7
  config.vm.hostname = 'builderator-<%= build_name %>'
6
8
 
7
9
  ## Local Provider
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: builderator
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Manero
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-19 00:00:00.000000000 Z
11
+ date: 2016-04-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -86,28 +86,28 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '3.2'
89
+ version: '4.3'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '3.2'
96
+ version: '4.3'
97
97
  - !ruby/object:Gem::Dependency
98
- name: chef
98
+ name: dep_selector
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '12.0'
103
+ version: '1.0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '12.0'
110
+ version: '1.0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: faraday_middleware
113
113
  requirement: !ruby/object:Gem::Requirement