berkshelf 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2aff91918198bd7d6473d3617e2ecb7dd752307
-  data.tar.gz: ca38034da3fb93aed5690336b53fe4e8b9706746
+  metadata.gz: 035b73ca9d93250f44face7e14fa87e16f37a721
+  data.tar.gz: c8a993b85d430f63c52ed12c9ac9f822ac09e5cf
 SHA512:
-  metadata.gz: fce308d0bebaa52f13694432fb89eb1bf0e223f2550e888f3c05d262c841270c48d4ec218bb63043da3b38d4087a8fa6403ff59999e2e2aebe23e508d14f9ba0
-  data.tar.gz: 8373246fcea14fbd2e07f0e3b5a49cf6758cab6c16b9831b074bd0a159d32de54cc9ff789cebdc9156a4189d74e13ff2be34c301c4e79899257859118a836453
+  metadata.gz: 5d5a6e17179a2583624cd8e4bb36a71989a978826df47f392173cf41d59314d5a0a24e49491a1ab3a37731b6badc1f820d3e490f0abffe5b3e0ea375fffa1910
+  data.tar.gz: b3a28330ba65f165f4058af6b2fe4f8eacec5a4bb6519bd2331ef2dcab97d833f4a4e0173392b1bb5aa32476b944cbcd2b217a56d0a52b4d0b1796794479247e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.17
+
+* Fix constraint on Hashie
+
 # 2.0.16
 
 * Update constraint on Ridley

data/berkshelf.gemspec

@@ -34,15 +34,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable',       '~> 2.3.4'
   s.add_dependency 'buff-shell_out',    '~> 0.1'
   s.add_dependency 'chozo',             '>= 0.6.1'
-  s.add_dependency 'faraday',           '~> 0.8.5'
-  s.add_dependency 'hashie',            '>= 2.0.2'
+  s.add_dependency 'hashie',            '~> 2.0'
   s.add_dependency 'minitar',           '~> 0.5.4'
   s.add_dependency 'retryable',         '~> 1.3.3'
   s.add_dependency 'ridley',            '~> 1.7.0'
   s.add_dependency 'solve',             '~> 0.8.2'
   s.add_dependency 'thor',              '~> 0.18.0'
   s.add_dependency 'rbzip2',            '~> 0.2.0'
-  s.add_dependency 'faraday',           '~> 0.8.0' # lock tranisitive dependency of Ridley
+  s.add_dependency 'faraday',           '~> 0.8.5' # lock tranisitive dependency of Ridley
 
   s.add_development_dependency 'aruba',         '~> 0.5'
   s.add_development_dependency 'cane',          '~> 2.5'

data/lib/berkshelf/berksfile.rb

@@ -564,9 +564,20 @@ module Berkshelf
     #
     # @raise [EnvironmentNotFound] if the target environment was not found
     # @raise [ChefConnectionError] if you are locking cookbooks with an invalid or not-specified client configuration
+    # @raise [EnvironmentFileNotFound] if you are uploading environment from local file
     def apply(environment_name, options = {})
       conn        = ridley_connection(options)
-      environment = conn.environment.find(environment_name)
+
+      if options[:from_file]
+        environment_path = options[:from_file]
+        begin
+          environment = conn.environment.from_file(environment_path)
+        rescue # Ridley::Errors::RidleyError => ex
+          raise EnvironmentFileNotFound, "Local environment file #{environment_path} not found."
+        end
+      else
+        environment = conn.environment.find(environment_name)
+      end
 
       if environment
         install

data/lib/berkshelf/cli.rb

@@ -240,6 +240,11 @@ module Berkshelf
       type: :boolean,
       default: nil,
       desc: 'Disable/Enable SSL verification when locking cookbooks.'
+    method_option :from_file,
+      type: :string,
+      desc: 'overwrite environment attributes when using apply using local environment file',
+      aliases: '-f',
+      banner: 'PATH'
     desc 'apply ENVIRONMENT', 'Apply the cookbook version locks from Berksfile.lock to a Chef environment'
     def apply(environment_name)
       berksfile    = ::Berkshelf::Berksfile.from_file(options[:berksfile])

data/lib/berkshelf/errors.rb

@@ -294,6 +294,8 @@ module Berkshelf
     end
   end
 
+  class EnvironmentFileNotFound < BerkshelfError; status_code(137); end
+
   class ChefConnectionError < BerkshelfError
     status_code(130)
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.16"
+  VERSION = "2.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,33 +71,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +174,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement