berkshelf 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb91a34f310e2a87c08b695287aef0b37d2f8571
-  data.tar.gz: dc98b00aa2af23be7e9083870834a8fb0b73d2d1
+  metadata.gz: 9edf31296dfa910235ff1d4f00fc9a56e9bed2db
+  data.tar.gz: aa922a7527312fb21d32f0d80bb600837f4178c0
 SHA512:
-  metadata.gz: 3c5abb9d31d18ff11d18f994b1bfee07e596a2be29da3f5ae0608f41898bf62c350899cd1fea50a57099fbae1dd4bd1a2581eb5764e57dffc7fc6be9b65c0fd0
-  data.tar.gz: ddd2e9b0dfd7a6a602c3f69c73a7a78ef8a492db9f0d2ed5eea65eb7f5e5b7ac41d5e8d22b095867cd9681e30e3a85ca294c1169bc43edc790ef188c88507172
+  metadata.gz: 0bcb121c3d06aa8869b6956ff6e0eac85e2c2910cca013a0542d7c39bb17062171bd2de49eecf8622d7b696b63ef0aed3fe2a16f49482ea1613a7e27da52b955
+  data.tar.gz: 7a158f6ba5045ef1ea2d4810bfba7bb0a0eaae3475a573f75184bd9293fb9ea2b99552ae1011de52a9c1d871b04f8bb825b57d3aaf7fc829a8c8a7cc1059c2ab

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [4.1.1](https://github.com/berkshelf/berkshelf/tree/4.1.1) (2016-02-11)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.1.0...4.1.1)
+## [4.2.0](https://github.com/berkshelf/berkshelf/tree/4.2.0) (2016-02-18)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.1.1...4.2.0)
+
+**Closed issues:**
+
+- Allow one to "berks apply" to a json environment file [\#875](https://github.com/berkshelf/berkshelf/issues/875)
+
+**Merged pull requests:**
+
+- Update the chef-config pin to 12.7.2 [\#1516](https://github.com/berkshelf/berkshelf/pull/1516) ([jaym](https://github.com/jaym))
+- Apply locks to local json environment file [\#1512](https://github.com/berkshelf/berkshelf/pull/1512) ([louis-gounot](https://github.com/louis-gounot))
+
+## [v4.1.1](https://github.com/berkshelf/berkshelf/tree/v4.1.1) (2016-02-11)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.1.0...v4.1.1)
 
 **Merged pull requests:**
 
@@ -2313,4 +2325,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (4.1.1)
+    berkshelf (4.2.0)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 2.0)
       buff-config (~> 1.0)
@@ -77,7 +77,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.6.0)
+    chef-config (12.7.2)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.5.0)

data/lib/berkshelf/cli.rb

@@ -208,6 +208,10 @@ module Berkshelf
       berksfile.upload(names, options.symbolize_keys)
     end
 
+    method_option :envfile,
+      type: :string,
+      desc: 'Path to a JSON environment file to update.',
+      aliases: '-f'
     method_option :lockfile,
       type: :string,
       default: Berkshelf::Lockfile::DEFAULT_FILENAME,

data/lib/berkshelf/errors.rb

@@ -537,6 +537,18 @@ module Berkshelf
     end
   end
 
+  # Raised when envFile provided to apply -f is not found
+  class EnvironmentFileNotFound < EnvironmentNotFound
+    set_status_code(150)
+
+    def intialize(environment_file)
+      @environment_file = environment_file
+    end
+  
+    def to_s
+      "Could not find environment file #{@environment_file}"
+    end
+  end
 
   # Git errors
   # ------------------------------

data/lib/berkshelf/lockfile.rb

@@ -194,6 +194,8 @@ module Berkshelf
     #
     # @option options [Hash] :ssl_verify (true)
     #   Disable/Enable SSL verification during uploads
+    # @option options [String] :envfile
+    #   Environment file to update
     #
     # @raise [EnvironmentNotFound]
     #   if the target environment was not found on the remote Chef Server
@@ -201,18 +203,22 @@ module Berkshelf
     #   if you are locking cookbooks with an invalid or not-specified client
     #   configuration
     def apply(name, options = {})
-      Berkshelf.ridley_connection(options) do |connection|
-        environment = connection.environment.find(name)
+      locks = graph.locks.inject({}) do |hash, (name, dependency)|
+         hash[name] = "= #{dependency.locked_version.to_s}"
+         hash
+      end
+
+      if options[:envfile]
+        update_environment_file(options[:envfile], locks) if options[:envfile]
+      else
+        Berkshelf.ridley_connection(options) do |connection|
+          environment = connection.environment.find(name)
 
-        raise EnvironmentNotFound.new(name) if environment.nil?
+          raise EnvironmentNotFound.new(name) if environment.nil?
 
-        locks = graph.locks.inject({}) do |hash, (name, dependency)|
-          hash[name] = "= #{dependency.locked_version.to_s}"
-          hash
+          environment.cookbook_versions = locks
+          environment.save unless options[:envfile]
         end
-
-        environment.cookbook_versions = locks
-        environment.save
       end
     end
 
@@ -297,6 +303,32 @@ module Berkshelf
       locked.cached_cookbook
     end
 
+    # Update local environment file
+    #
+    # @param [String] environment_file
+    #   path to the envfile to update
+    #
+    # @param [Hash] locks
+    #   A hash of cookbooks and versions to update the environment with
+    #
+    # @raise [EnvironmentFileNotFound]
+    #   If environment file doesn't exist
+    def update_environment_file(environment_file, locks)
+      unless File.exists?(environment_file)
+        raise EnvironmentFileNotFound.new(environment_file)
+      end
+
+      json_environment = JSON.parse(File.read(environment_file))
+
+      json_environment['cookbook_versions'] = locks
+
+      json = JSON.pretty_generate(json_environment)
+
+      File.open(environment_file, 'w'){ |f| f.puts(json) }
+
+      Berkshelf.log.info "Updated environment file #{environment_file}"
+    end
+
     # Replace the list of dependencies.
     #
     # @param [Array<Berkshelf::Dependency>] dependencies

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -208,35 +208,52 @@ describe Berkshelf::Lockfile do
   end
 
   describe '#apply' do
-    let(:connection) { double('connection') }
-
     before do
-      allow(Berkshelf).to receive(:ridley_connection).and_yield(connection)
+        apt = double(name: 'apt', locked_version: '1.0.0')
+        jenkins = double(name: 'jenkins', locked_version: '1.4.5')
+        allow(subject.graph).to receive(:locks).and_return('apt' => apt, 'jenkins' => jenkins)
     end
 
-    context 'when the Chef environment does not exist' do
-      it 'raises an exception' do
-        allow(connection).to receive(:environment).and_return(double(find: nil))
-        expect {
-          subject.apply('production')
-        }.to raise_error(Berkshelf::EnvironmentNotFound)
+    describe 'when :envfile option is not used' do
+      let(:connection) { double('connection') }
+
+      before do
+        allow(Berkshelf).to receive(:ridley_connection).and_yield(connection)
       end
-    end
 
-    it 'locks the environment cookbook versions' do
-      apt = double(name: 'apt', locked_version: '1.0.0')
-      jenkins = double(name: 'jenkins', locked_version: '1.4.5')
-      allow(subject.graph).to receive(:locks).and_return('apt' => apt, 'jenkins' => jenkins)
+      context 'when the Chef environment does not exist' do
+        it 'raises an exception' do
+          allow(connection).to receive(:environment).and_return(double(find: nil))
+          expect {
+            subject.apply('production')
+          }.to raise_error(Berkshelf::EnvironmentNotFound)
+        end
+      end
 
-      environment = double('environment', :cookbook_versions= => nil, save: true)
-      allow(connection).to receive(:environment).and_return(double(find: environment))
+      it 'locks the environment cookbook versions on chef server' do
+        environment = double('environment', :cookbook_versions= => nil, save: true)
+        allow(connection).to receive(:environment).and_return(double(find: environment))
 
-      expect(environment).to receive(:cookbook_versions=).with(
-        'apt' => '= 1.0.0',
-        'jenkins' => '= 1.4.5',
-      )
+        expect(environment).to receive(:cookbook_versions=).with(
+          'apt' => '= 1.0.0',
+          'jenkins' => '= 1.4.5',
+        )
 
-      subject.apply('production')
+        subject.apply('production')
+      end
+    end
+    
+    describe 'when :envfile option is used' do
+      it 'locks the environment cookbook version into envfile' do
+        locks = { 
+          'apt' => '= 1.0.0', 
+          'jenkins' => '= 1.4.5' 
+        } 
+
+        expect(subject).to receive(:update_environment_file).with('/working/path', locks) 
+ 
+	subject.apply('production', envfile: '/working/path') 
+      end
     end
   end
 
@@ -273,6 +290,35 @@ describe Berkshelf::Lockfile do
     end
   end
 
+  describe '#update_environment_file' do  
+    it 'raises an exception when environment file does not exist' do  
+      allow(File).to receive(:exists?).and_return(false)  
+      expect {  
+        subject.update_environment_file('/broken/path', nil)  
+      }.to raise_error(Berkshelf::EnvironmentFileNotFound)  
+    end  
+  
+    it 'updates the environment file with cookbook versions' do  
+      file = instance_spy('File')  
+      locks = {  
+        'apt' => '1.0.0',  
+        'jenkins' => '1.4.5'  
+      }  
+  
+      allow(File).to receive(:exists?).and_return(true)  
+      allow(File).to receive(:read).and_return("{}")  
+      allow(File).to receive(:open).and_yield(file)  
+  
+      subject.update_environment_file('/working/path.json', locks)  
+  
+      expect(file).to have_received(:puts) do |arg|  
+        expect(JSON.parse(arg)).to eq({  
+          'cookbook_versions' => locks  
+        })  
+      end  
+    end  
+  end  
+
   describe '#update' do
     it 'resets the dependencies' do
       subject.update([])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -625,7 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies