knife-windows 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed600d9a1b420d45bc08d7eb66179a9cf83c64434a40b5fed4f54e90d9d286c
-  data.tar.gz: cdf15fe2cd5359009344941b2506fbd8cddc40d1075e8aaa8da56b3206c97626
+  metadata.gz: d6ad3aa608039eef25bb00b733c3b56bbcec806951dbc84e5f0c36f4641d9084
+  data.tar.gz: 3b283e4025e05d7105435e6a052449d5e6a47dea17ed8ef20d66aedf64d67f4a
 SHA512:
-  metadata.gz: 4d0bf4cbbeb4a9d24a6a029e8a8e65f8f40e453379ab2552c1694a60c48c130836eafdaa6c4cdc9c2839e0722caf118a1abd26b8ddbcfc72a7cdede4e4a30cd6
-  data.tar.gz: 940797a147aebee7dab7c95f1a9a4ae4ee34b1c4c8888079dbccabf9783383c3a4cd5a75d0ab9527df6e06324d74e015d844d4e20f2f6fc5c740eafc94903db2
+  metadata.gz: 319ef1eb49599cb8d6d361edf352a936e0b32363e05f4bd8b369902fa85d3327b4ef345d124845bf78da10882e9e52771db1ba4ae78363dd3a7deef9a2257af0
+  data.tar.gz: 621ff09213f84fc5bd21b856d5a989589e3255ddfe51e25fe01c33b4f068b303dfcfa5082f04937f7243563a65b7ba9e71c187aa1c7a454ebe8565fc5d1166f6

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -17,8 +17,6 @@
 #
 
 require "chef/knife"
-require "chef/knife/bootstrap"
-require "chef/encrypted_data_bag_item"
 require_relative "knife_windows_base"
 require "chef/util/path_helper"
 
@@ -35,6 +33,8 @@ class Chef
         includer.class_eval do
 
           deps do
+            require "chef/knife/bootstrap"
+            require "chef/encrypted_data_bag_item"
             require "readline"
             require "chef/json_compat"
           end

data/lib/chef/knife/bootstrap_windows_ssh.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "chef/knife"
 require_relative "bootstrap_windows_base"
 
 class Chef

data/lib/chef/knife/bootstrap_windows_winrm.rb

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
+require "chef/knife"
 require_relative "bootstrap_windows_base"
-require_relative "winrm"
 require_relative "winrm_base"
-require_relative "winrm_knife_base"
+require_relative "winrm_knife_base" # WinrmCommandSharedFunctions
 
 class Chef
   class Knife
@@ -30,6 +30,7 @@ class Chef
       include Chef::Knife::WinrmCommandSharedFunctions
 
       deps do
+        require_relative "winrm"
         require "chef/json_compat"
         require "tempfile"
         Chef::Knife::Winrm.load_deps

data/lib/chef/knife/knife_windows_base.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require "chef/knife"
+
 class Chef
   class Knife
     module KnifeWindowsBase

data/lib/chef/knife/windows_cert_generate.rb

@@ -17,8 +17,6 @@
 
 require "chef/knife"
 require_relative "winrm_base"
-require "openssl"
-require "socket"
 
 class Chef
   class Knife
@@ -28,6 +26,11 @@ class Chef
 
       banner "knife windows cert generate FILE_PATH (options)"
 
+      deps do
+        require "openssl"
+        require "socket"
+      end
+
       option :hostname,
         short: "-H HOSTNAME",
         long: "--hostname HOSTNAME",

data/lib/chef/knife/windows_helper.rb

@@ -17,19 +17,13 @@
 #
 
 require "chef/knife"
-require_relative "winrm"
-require_relative "bootstrap_windows_ssh"
-require_relative "bootstrap_windows_winrm"
-require_relative "wsman_test"
-
 class Chef
   class Knife
     class WindowsHelper < Knife
-
-      banner "#{BootstrapWindowsWinrm.banner}\n" +
-        "#{BootstrapWindowsSsh.banner}\n" +
-        "#{Winrm.banner}\n" +
-        "#{WsmanTest.banner}"
+      banner "#{BootstrapWindowsWinrm.banner}\n" \
+             "#{BootstrapWindowsSsh.banner}\n" \
+             "#{Winrm.banner}\n" \
+             "#{WsmanTest.banner}"
     end
   end
 end

data/lib/chef/knife/windows_listener_create.rb

@@ -17,11 +17,13 @@
 
 require "chef/knife"
 require_relative "winrm_base"
-require "openssl"
 
 class Chef
   class Knife
     class WindowsListenerCreate < Knife
+      deps do
+        require "openssl"
+      end
 
       banner "knife windows listener create (options)"
 

data/lib/chef/knife/winrm.rb

@@ -17,10 +17,7 @@
 #
 
 require "chef/knife"
-require_relative "winrm_knife_base"
-require_relative "windows_cert_generate"
-require_relative "windows_cert_install"
-require_relative "windows_listener_create"
+require_relative "winrm_knife_base" # WinrmCommandSharedFunctions
 require_relative "winrm_session"
 require_relative "knife_windows_base"
 
@@ -32,6 +29,9 @@ class Chef
       include Chef::Knife::KnifeWindowsBase
 
       deps do
+        require_relative "windows_cert_generate"
+        require_relative "windows_cert_install"
+        require_relative "windows_listener_create"
         require "readline"
         require "chef/search/query"
       end

data/lib/chef/knife/winrm_base.rb

@@ -17,8 +17,6 @@
 #
 
 require "chef/knife"
-require "chef/encrypted_data_bag_item"
-require "kconv"
 
 class Chef
   class Knife
@@ -34,6 +32,8 @@ class Chef
         includer.class_eval do
 
           deps do
+            require "chef/encrypted_data_bag_item"
+            require "kconv"
             require "readline"
             require "chef/json_compat"
           end

data/lib/chef/knife/winrm_session.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "chef/knife"
 require "chef/application"
 require "winrm"
 require "winrm-elevated"

data/lib/chef/knife/winrm_shared_options.rb

@@ -17,9 +17,6 @@
 #
 
 require "chef/knife"
-require "chef/encrypted_data_bag_item"
-require "kconv"
-
 class Chef
   class Knife
     module WinrmSharedOptions

data/lib/chef/knife/wsman_test.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require "httpclient"
 require "chef/knife"
 require_relative "winrm_knife_base"
 require_relative "wsman_endpoint"
@@ -28,6 +27,7 @@ class Chef
       include Chef::Knife::WinrmCommandSharedFunctions
 
       deps do
+        require "httpclient"
         require "chef/search/query"
       end
 

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "3.0.11".freeze
+    VERSION = "3.0.12".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/spec_helper.rb

@@ -17,9 +17,6 @@
 # limitations under the License.
 #
 
-require_relative "../lib/chef/knife/winrm"
-require_relative "../lib/chef/knife/wsman_test"
-
 def sample_data(file_name)
   file = File.expand_path(File.dirname("spec/assets/*")) + "/#{file_name}"
   File.read(file)

data/spec/unit/knife/windows_cert_generate_spec.rb

@@ -18,7 +18,6 @@
 
 require "spec_helper"
 require "chef/knife/windows_cert_generate"
-require "openssl"
 
 describe Chef::Knife::WindowsCertGenerate do
   before(:all) do

data/spec/unit/knife/winrm_session_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+require_relative "../../../lib/chef/knife/winrm"
 require "dummy_winrm_connection"
 
 Chef::Knife::Winrm.load_deps

data/spec/unit/knife/winrm_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+require_relative "../../../lib/chef/knife/winrm"
 require "dummy_winrm_connection"
 
 Chef::Knife::Winrm.load_deps

data/spec/unit/knife/wsman_test_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+require_relative "../../../lib/chef/knife/wsman_test"
 
 describe Chef::Knife::WsmanTest do
   let(:http_client_mock) { HTTPClient.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef