knife-container 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80850e4057f993db9ecb2f81135a9c201cab57bc
-  data.tar.gz: 33813a502452bd26fb2f004977e31b618ad6490d
+  metadata.gz: 0762801f48d47bf6fb8b384271b12fa76d542b7e
+  data.tar.gz: c5d67630c01a71288b938f4141f62d992f04b04e
 SHA512:
-  metadata.gz: d90cbb6aaec8406ed47061c633b6930373dbfd42e7ce3caf2851727b1721bd9eb76306c733aefaee6edfde807f285e0b59e085a0aa62fcfb0f6b9b7f45ddbdc0
-  data.tar.gz: 3447e0aee997c6ca6de715f227ede41e2886668890303223943ffb6d37c19f653a259d7cb851522720ce3c3c327f6f24774fc306ec1a5deb6228e2a516c617cc
+  metadata.gz: 40ee4022ad4c32d3cddb1afdf63284be14e77dc1b5d4ac97dc9f634af4062472f64b75538a02531a3fe223dc4b34054549bf9b74081bd0fe68893749a383647b
+  data.tar.gz: 9a90f07e168ecb9895338660600fe710583dd6bba3b0ef17d4b6a6487ec883facffc77b3084fb655d1aca5d38392d7d844012a5db5f7f23f392475b1b0bdaf34

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Knife Container Changelog
 
+## v0.2.4 (2014-09-19)
+* Fast followup fix to v0.2.3 - fix `--dockerfiles-path` parameter for build.
+
+## v0.2.3 (2014-09-19)
+* [GH-39] Fixed `--dockerfiles-path` parameter which did not properly accept input.
+* [GH-38] Fixed issue where cookbooks would appear more than once in the Berksfile.
+
 ## v0.2.2 (2014-09-08)
 * [GH-34] Update gemspec to support Chef12.
 

data/lib/chef/knife/container_docker_build.rb

@@ -55,8 +55,7 @@ class Chef
       option :dockerfiles_path,
         :short => "-d PATH",
         :long => "--dockerfiles-path PATH",
-        :description => "Path to the directory where Docker contexts are kept",
-        :proc => Proc.new { |d| Chef::Config[:knife][:dockerfiles_path] = d }
+        :description => "Path to the directory where Docker contexts are kept"
 
       #
       # Run the plugin
@@ -98,8 +97,7 @@ class Chef
       # Set defaults for configuration values
       #
       def setup_config_defaults
-        Chef::Config[:knife][:dockerfiles_path] ||= File.join(Chef::Config[:chef_repo_path], "dockerfiles")
-        config[:dockerfiles_path] = Chef::Config[:knife][:dockerfiles_path]
+        config[:dockerfiles_path] ||= Chef::Config[:knife][:dockerfiles_path] || File.join(Chef::Config[:chef_repo_path], 'dockerfiles')
 
         # Determine if we are running local or server mode
         case

data/lib/chef/knife/container_docker_init.rb

@@ -108,8 +108,7 @@ class Chef
       option :dockerfiles_path,
         :short => "-d PATH",
         :long => "--dockerfiles-path PATH",
-        :description => "Path to the directory where Docker contexts are kept",
-        :proc => Proc.new { |d| Chef::Config[:knife][:dockerfiles_path] = d }
+        :description => "Path to the directory where Docker contexts are kept"
 
       #
       # Run the plugin
@@ -175,8 +174,7 @@ class Chef
 
         config[:run_list] ||= []
 
-        Chef::Config[:knife][:dockerfiles_path] ||= File.join(Chef::Config[:chef_repo_path], "dockerfiles")
-        config[:dockerfiles_path] = Chef::Config[:knife][:dockerfiles_path]
+        config[:dockerfiles_path] ||= Chef::Config[:knife][:dockerfiles_path] || File.join(Chef::Config[:chef_repo_path], 'dockerfiles')
       end
 
       #

data/lib/knife-container/skeletons/knife_container/recipes/docker_init.rb

@@ -71,13 +71,11 @@ run_list_items.each do |item|
 end
 
 # Generate Berksfile from runlist
-unless context.run_list.empty?
-  template File.join(dockerfile_dir, "Berksfile") do
-    source "berksfile.erb"
-    variables :cookbooks => cookbooks
-    helpers(KnifeContainer::Generator::TemplateHelper)
-    only_if { context.generate_berksfile }
-  end
+template File.join(dockerfile_dir, 'Berksfile') do
+  source 'berksfile.erb'
+  variables :cookbooks => cookbooks.uniq
+  helpers(KnifeContainer::Generator::TemplateHelper)
+  only_if { context.generate_berksfile }
 end
 
 # Copy over the necessary directories into the temp chef-repo (if local-mode)

data/lib/knife-container/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-container
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Container support for Chef's Knife Command