knife-container 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 179841a21b19d595e367e8bb8d0e209260afa8be
-  data.tar.gz: 192f7ab139054268e518921c79048fc531523e5f
+  metadata.gz: 80850e4057f993db9ecb2f81135a9c201cab57bc
+  data.tar.gz: 33813a502452bd26fb2f004977e31b618ad6490d
 SHA512:
-  metadata.gz: 254c57e611869bcdea9976bb7358e5aadbfe3e664a700ef3adae92fc8b7c6a5f8d4f1ca8d87eba16fdcab63afa31c06fa8892cc3aabbe8de18e64cd18a475b87
-  data.tar.gz: 6ae48b0ca06bab72e4b6bff896a45961aef335251bf5a3c6484ffbeedb52fe7ca181642b1ca1d61106baec313ac8ced8f846bfb92b5f4ab6000b9e8f20dc032a
+  metadata.gz: d90cbb6aaec8406ed47061c633b6930373dbfd42e7ce3caf2851727b1721bd9eb76306c733aefaee6edfde807f285e0b59e085a0aa62fcfb0f6b9b7f45ddbdc0
+  data.tar.gz: 3447e0aee997c6ca6de715f227ede41e2886668890303223943ffb6d37c19f653a259d7cb851522720ce3c3c327f6f24774fc306ec1a5deb6228e2a516c617cc

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Knife Container Changelog
 
+## v0.2.2 (2014-09-08)
+* [GH-34] Update gemspec to support Chef12.
+
 ## v0.2.1 (2014-08-15)
 * [GH23] Specify hostname during knife container build
 

data/knife-container.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "chef", "~> 11.0"
+  spec.add_dependency "chef", ">= 11.0"
   spec.add_dependency "mixlib-config", "~> 2.0"
   spec.add_dependency "json", ">= 1.4.4", "<=  1.8.1"
 

data/lib/chef/knife/container_docker_build.rb

@@ -37,6 +37,10 @@ class Chef
         :default => true,
         :boolean => true
 
+      option :berks_config,
+        :long => "--berks-config CONFIG",
+        :description => "Use the specified Berkshelf configuration"
+
       option :cleanup,
         :long => "--[no-]cleanup",
         :description => "Cleanup Chef and Docker artifacts",
@@ -80,6 +84,13 @@ class Chef
         if config[:run_berks]
           ver = shell_out("berks -v")
           config[:run_berks] = ver.stdout.match(/\d+\.\d+\.\d+/) ? true : false
+
+          if config[:berks_config]
+            unless File.exists?(config[:berks_config])
+              ui.fatal("No Berksfile configuration found at #{config[:berks_config]}")
+              exit 1
+            end
+          end
         end
       end
 
@@ -155,11 +166,10 @@ class Chef
       #
       def run_berks_upload
         run_berks_install
-        if config[:force_build]
-          run_command("berks upload --force")
-        else
-          run_command("berks upload")
-        end
+        berks_upload_cmd = "berks upload"
+        berks_upload_cmd << " --force" if config[:force_build]
+        berks_upload_cmd << " --config=#{File.expand_path(config[:berks_config])}" if config[:berks_config]
+        run_command(berks_upload_cmd)
       end
 
       #

data/lib/knife-container/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Container
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/unit/container_docker_build_spec.rb

@@ -129,6 +129,21 @@ describe Chef::Knife::ContainerDockerBuild do
         end
       end
     end
+
+    context "--berks-config was passed" do
+      let(:argv) { %w[ docker/demo --berks-config my_berkshelf/config.json ] }
+
+      context "and configuration file does not exist" do
+        before do
+          File.stub(:exists?).with('my_berkshelf/config.json').and_return(false)
+        end
+
+        it 'should exit immediately' do
+          expect(knife.ui).to receive(:fatal)
+          expect { knife.run }.to raise_error(SystemExit)
+        end
+      end
+    end
   end
 
   describe '#setup_config_defaults' do
@@ -297,6 +312,33 @@ describe Chef::Knife::ContainerDockerBuild do
         knife.run_berks_upload
       end
     end
+
+    context "when berks-config is specified" do
+      before do
+        knife.config[:berks_config] = 'my_berkshelf/config.json'
+        File.stub(:exists?).with('my_berkshelf/config.json').and_return(true)
+        File.stub(:expand_path).with('my_berkshelf/config.json').and_return('/home/my_berkshelf/config.json')
+      end
+
+      it "should run berks upload with specified config file" do
+        expect(knife).to receive(:run_command).with("berks upload --config=/home/my_berkshelf/config.json")
+        knife.run_berks_upload
+      end
+    end
+
+    context "when berks-config _and_ force-build is specified" do
+      before do
+        knife.config[:force_build] = true
+        knife.config[:berks_config] = 'my_berkshelf/config.json'
+        File.stub(:exists?).with('my_berkshelf/config.json').and_return(true)
+        File.stub(:expand_path).with('my_berkshelf/config.json').and_return('/home/my_berkshelf/config.json')
+      end
+
+      it "should run berks upload with specified config file _and_ force flag" do
+        expect(knife).to receive(:run_command).with("berks upload --force --config=/home/my_berkshelf/config.json")
+        knife.run_berks_upload
+      end
+    end
   end
 
   describe "#docker_build_command" do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: knife-container
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
@@ -231,3 +231,4 @@ test_files:
 - spec/unit/fixtures/nodes/demo.json
 - spec/unit/fixtures/roles/base.json
 - spec/unit/fixtures/site-cookbooks/apt/metadata.rb
+has_rdoc: