berkshelf 2.0.15 → 2.0.16

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/CHANGELOG.md +4 -0
  3. data/berkshelf.gemspec +1 -1
  4. data/features/install_command.feature +2 -2
  5. data/features/json_formatter.feature +3 -3
  6. data/lib/berkshelf.rb +1 -0
  7. data/lib/berkshelf/version.rb +1 -1
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1ff4a5766d16b96da07677a64a30460529722748
4
- data.tar.gz: a16d469fec7f94974e990bb85ec66f4a2a9b2a80
3
+ metadata.gz: f2aff91918198bd7d6473d3617e2ecb7dd752307
4
+ data.tar.gz: ca38034da3fb93aed5690336b53fe4e8b9706746
5
5
  SHA512:
6
- metadata.gz: 708813255bb22b1d7d575600a937902da34ca79c6350006743d6dbd772cf4dd0052c0b297f7682bb22fb1873ef2d53716b65c918437e9f82eb079d26e5e49dd5
7
- data.tar.gz: 9579bb00d7e14f7ffd68889554c015e2d862ed2c0ec4c31890a4c7bfb1a766b0923c8848777644036f92796e643fb7c2c68efddbdea9680953f44e009a8372b0
6
+ metadata.gz: fce308d0bebaa52f13694432fb89eb1bf0e223f2550e888f3c05d262c841270c48d4ec218bb63043da3b38d4087a8fa6403ff59999e2e2aebe23e508d14f9ba0
7
+ data.tar.gz: 8373246fcea14fbd2e07f0e3b5a49cf6758cab6c16b9831b074bd0a159d32de54cc9ff789cebdc9156a4189d74e13ff2be34c301c4e79899257859118a836453
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 2.0.16
2
+
3
+ * Update constraint on Ridley
4
+
1
5
  # 2.0.14
2
6
 
3
7
  * Backport changes from master to allow detecting cookbooks by metadata.json
data/berkshelf.gemspec CHANGED
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
38
38
  s.add_dependency 'hashie', '>= 2.0.2'
39
39
  s.add_dependency 'minitar', '~> 0.5.4'
40
40
  s.add_dependency 'retryable', '~> 1.3.3'
41
- s.add_dependency 'ridley', '~> 1.5.0'
41
+ s.add_dependency 'ridley', '~> 1.7.0'
42
42
  s.add_dependency 'solve', '~> 0.8.2'
43
43
  s.add_dependency 'thor', '~> 0.18.0'
44
44
  s.add_dependency 'rbzip2', '~> 0.2.0'
data/features/install_command.feature CHANGED
@@ -237,7 +237,7 @@ Feature: install cookbooks from a Berksfile
237
237
  """
238
238
  When I cd to "sparkle_motion"
239
239
  And I successfully run `berks install`
240
- Then the output should contain exactly:
240
+ Then the stdout should contain exactly:
241
241
  """
242
242
  Using sparkle_motion (0.0.0) from metadata
243
243
 
@@ -251,7 +251,7 @@ Feature: install cookbooks from a Berksfile
251
251
  metadata path: './fake'
252
252
  """
253
253
  When I successfully run `berks install`
254
- Then the output should contain exactly:
254
+ Then the stdout should contain exactly:
255
255
  """
256
256
  Using fake (0.0.0) from metadata at './fake'
257
257
 
data/features/json_formatter.feature CHANGED
@@ -9,7 +9,7 @@ Feature: --format json
9
9
  cookbook 'berkshelf-cookbook-fixture', '1.0.0'
10
10
  """
11
11
  When I successfully run `berks install --format json`
12
- Then the output should contain JSON:
12
+ Then the stdout should contain JSON:
13
13
  """
14
14
  {
15
15
  "cookbooks": [
@@ -36,7 +36,7 @@ Feature: --format json
36
36
  cookbook 'berkshelf-cookbook-fixture', '1.0.0'
37
37
  """
38
38
  When I successfully run `berks install --format json`
39
- Then the output should contain JSON:
39
+ Then the stdout should contain JSON:
40
40
  """
41
41
  {
42
42
  "cookbooks": [
@@ -61,7 +61,7 @@ Feature: --format json
61
61
  And the Chef server does not have the cookbooks:
62
62
  | example_cookbook | 0.5.0 |
63
63
  When I successfully run `berks upload --format json`
64
- Then the output should contain JSON:
64
+ Then the stdout should contain JSON:
65
65
  """
66
66
  {
67
67
  "cookbooks": [
data/lib/berkshelf.rb CHANGED
@@ -146,3 +146,4 @@ require_relative 'berkshelf/version'
146
146
 
147
147
  Ridley.logger = Berkshelf.logger = Logger.new(STDOUT)
148
148
  Berkshelf.logger.level = Logger::WARN
149
+ Celluloid.logger.level = Logger::FATAL if defined?(Celluloid)
data/lib/berkshelf/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Berkshelf
2
- VERSION = "2.0.15"
2
+ VERSION = "2.0.16"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: berkshelf
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.15
4
+ version: 2.0.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2014-04-14 00:00:00.000000000 Z
15
+ date: 2014-04-22 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: activesupport
@@ -132,14 +132,14 @@ dependencies:
132
132
  requirements:
133
133
  - - ~>
134
134
  - !ruby/object:Gem::Version
135
- version: 1.5.0
135
+ version: 1.7.0
136
136
  type: :runtime
137
137
  prerelease: false
138
138
  version_requirements: !ruby/object:Gem::Requirement
139
139
  requirements:
140
140
  - - ~>
141
141
  - !ruby/object:Gem::Version
142
- version: 1.5.0
142
+ version: 1.7.0
143
143
  - !ruby/object:Gem::Dependency
144
144
  name: solve
145
145
  requirement: !ruby/object:Gem::Requirement