knife-essentials 1.5.1 → 1.5.2

data/lib/chef/knife/converge_essentials.rb

@@ -1,4 +1,5 @@
 require 'chef_fs/knife'
+require 'chef/application/client'
 
 class Chef
   class Knife
@@ -10,10 +11,11 @@ class Chef
       deps do
         require 'chef'
         require 'chef/log'
-        require 'chef/application/client'
         require 'chef_fs/file_system'
       end
 
+      options.merge!(Chef::Application::Client.options)
+
       option :port,
         :short => '-p',
         :long => '--port=PORT',
@@ -28,6 +30,8 @@ class Chef
           ui.output "Using config file #{config[:config_file]} ..."
         end
 
+        Chef::Config.merge!(config)
+
         self.exit_code = 0
       end
 
@@ -51,6 +55,7 @@ class Chef
           end
         end
         client = Chef::Application::Client.new
+        client.config = config
         if run_list != ''
           client.config[:override_runlist] = run_list
         end

data/lib/chef_fs/knife.rb

@@ -34,22 +34,25 @@ module ChefFS
 
     def self.inherited(c)
       super
+
       # Ensure we always get to do our includes, whether subclass calls deps or not
       c.deps do
       end
 
-      option :repo_mode,
-        :long => '--repo-mode MODE',
-        :description => "Specifies the local repository layout.  Values: static, everything, hosted_everything.  Default: everything/hosted_everything"
+      c.options.merge!(options)
+    end
+
+    option :repo_mode,
+      :long => '--repo-mode MODE',
+      :description => "Specifies the local repository layout.  Values: static, everything, hosted_everything.  Default: everything/hosted_everything"
 
-      option :chef_repo_path,
-        :long => '--chef-repo-path PATH',
-        :description => 'Overrides the location of chef repo. Default is specified by chef_repo_path in the config'
+    option :chef_repo_path,
+      :long => '--chef-repo-path PATH',
+      :description => 'Overrides the location of chef repo. Default is specified by chef_repo_path in the config'
 
-      option :concurrency,
-        :long => '--concurrency THREADS',
-        :description => 'Maximum number of simultaneous requests to send (default: 10)'
-    end
+    option :concurrency,
+      :long => '--concurrency THREADS',
+      :description => 'Maximum number of simultaneous requests to send (default: 10)'
 
     def configure_chef
       super

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors: