knife-winops 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 648376fc535d37911fdea961d4f4758a81ddf710
-  data.tar.gz: a32ca4bc1c8d4e5b6a270aeee69ab6ce984e7339
+SHA256:
+  metadata.gz: 81311adb8994d58d394aeacf0c1664f3208ae70cf3aaed942aa424ebf91f209b
+  data.tar.gz: 89e50b1242e5315c71a5443955db88e5bb63bb3c2b0a5584f018b7c87b1ee31b
 SHA512:
-  metadata.gz: 706a95e9b891e3a4a106ba5ff3c679911401f64910908fb73de9675acb57a8e2c458cbcb3436b9916bb72b1360affb812f17d0b631af946ee5edcb68a2c6536c
-  data.tar.gz: 2dcd08392c81b238dc788ef989bb0c87d8205e3bed182448f88eedacb93305a5481cf09d044024ed4b398e1174e37bc35cfd2169d9a6b471ecf6b10aff75d029
+  metadata.gz: 2065d5f93af00dc0b68c0f9b9b32c174db7807cf8efeb2ba711e7e53ad47d6eb34f80279f1a031d04775f96fb30f24fdf8ceb3465895b5fade2bc88f572547ca
+  data.tar.gz: 610d84f4bb62f1702de378cafcb2dbfe6d0d8e86d6c9b0e836230d4a890c7fd99e3a192d43cc56ded3e7096a2950eae98e6eecadb6732cd21609070f974590a5

data/lib/chef/knife/{bootstrap_windows_base.rb → winops_bootstrap_windows_base.rb}

@@ -19,16 +19,16 @@
 require 'chef/knife'
 require 'chef/knife/bootstrap'
 require 'chef/encrypted_data_bag_item'
-require 'chef/knife/core/windows_bootstrap_context'
-require 'chef/knife/knife_windows_base'
+require 'chef/knife/winops_core/windows_bootstrap_context'
+require 'chef/knife/winops_knife_windows_base'
 # Chef 11 PathHelper doesn't have #home
 #require 'chef/util/path_helper'
 
 class Chef
   class Knife
-    module BootstrapWindowsBase
+    module BootstrapWindowsCore
 
-      include Chef::Knife::KnifeWindowsBase
+      include Chef::Knife::KnifeWindowsCore
 
       # :nodoc:
       # Would prefer to do this in a rational way, but can't be done b/c of
@@ -231,7 +231,7 @@ class Chef
       end
 
       def default_bootstrap_template
-        "windows-chef-client-msi"
+        "windows-bootstrap-template"
       end
 
       def bootstrap_template
@@ -258,7 +258,7 @@ class Chef
         bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap/templates', "#{template}.erb")
         bootstrap_files << File.join(Knife.chef_config_dir, "bootstrap", "#{template}.erb") if Chef::Knife.chef_config_dir
         ::Knife::Windows::PathHelper.all_homes('.chef', 'bootstrap', "#{template}.erb") { |p| bootstrap_files << p }
-        bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{template}.erb"))
+        bootstrap_files << Gem.find_files(File.join("chef","knife","winops_bootstrap","#{template}.erb"))
         bootstrap_files.flatten!
 
         template = Array(bootstrap_files).find do |bootstrap_template|
@@ -277,7 +277,7 @@ class Chef
       end
 
       def bootstrap_context
-        @bootstrap_context ||= Knife::Core::WindowsBootstrapContext.new(config, config[:run_list], Chef::Config)
+        @bootstrap_context ||= Knife::Core::WinBootstrapContext.new(config, config[:run_list], Chef::Config)
       end
 
       def load_correct_secret

data/lib/chef/knife/{bootstrap_windows_ssh.rb → winops_bootstrap_windows_ssh.rb}

@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require 'chef/knife/bootstrap_windows_base'
+require 'chef/knife/winops_bootstrap_windows_base'
 
 class Chef
   class Knife
-    class BootstrapWindowsSsh < Bootstrap
+    class BootstrapWindowsSSH < Bootstrap
 
-      include Chef::Knife::BootstrapWindowsBase
+      include Chef::Knife::BootstrapWindowsCore
 
       deps do
-        require 'chef/knife/core/windows_bootstrap_context'
+        require 'chef/knife/winops_core/windows_bootstrap_context'
         require 'chef/json_compat'
         require 'tempfile'
         require 'highline'

data/lib/chef/knife/{bootstrap_windows_winrm.rb → winops_bootstrap_windows_winrm.rb}

@@ -16,22 +16,22 @@
 # limitations under the License.
 #
 
-require 'chef/knife/bootstrap_windows_base'
-require 'chef/knife/winrm'
-require 'chef/knife/winrm_base'
-require 'chef/knife/winrm_knife_base'
+require 'chef/knife/winops_bootstrap_windows_base'
+require 'chef/knife/winops_winrm'
+require 'chef/knife/winops_winrm_base'
+require 'chef/knife/winops_winrm_knife_base'
 
 
 class Chef
   class Knife
-    class BootstrapWindowsWinrm < Bootstrap
+    class BootstrapWindowsWinRM < Bootstrap
 
-      include Chef::Knife::BootstrapWindowsBase
-      include Chef::Knife::WinrmBase
-      include Chef::Knife::WinrmCommandSharedFunctions
+      include Chef::Knife::BootstrapWindowsCore
+      include Chef::Knife::WinrmCore
+      include Chef::Knife::WinrmCommandCommon
 
       deps do
-        require 'chef/knife/core/windows_bootstrap_context'
+        require 'chef/knife/winops_core/windows_bootstrap_context'
         require 'chef/json_compat'
         require 'tempfile'
         Chef::Knife::Winrm.load_deps

data/lib/chef/knife/{core → winops_core}/windows_bootstrap_context.rb

@@ -20,7 +20,7 @@ require 'chef/knife/core/bootstrap_context'
 # Chef::Util::PathHelper in Chef 11 is a bit juvenile still
 require 'knife-winops/path_helper'
 # require 'chef/util/path_helper'
-require 'chef/knife/core/windows_bootstrap_context'
+require 'chef/knife/winops_core/windows_bootstrap_context'
 
 class Chef
   class Knife
@@ -31,7 +31,7 @@ class Chef
       # * @config   - a hash of knife's config values
       # * @run_list - the run list for the node to boostrap
       #
-      class WindowsBootstrapContext < BootstrapContext
+      class WinBootstrapContext < BootstrapContext
         PathHelper = ::Knife::Windows::PathHelper
 
         attr_accessor :client_pem
@@ -224,23 +224,23 @@ filename_in_envvar
         end
 
         def win_cmd_tail(target_filename)
-          cmd_tail_file = Gem.find_files(File.join('chef', 'knife', 'bootstrap', 'tail.cmd')).first
+          cmd_tail_file = Gem.find_files(File.join('chef', 'knife', 'winops_bootstrap', 'tail.cmd')).first
           cmd_tail_content = IO.read(cmd_tail_file)
           win_parse_file_content(cmd_tail_content, target_filename)
         end
 
         def bootstrap_context
-          @bootstrap_context ||= Knife::Core::WindowsBootstrapContext.new(@config, @config[:run_list], Chef::Config)
+          @bootstrap_context ||= Knife::Core::WinBootstrapContext.new(@config, @config[:run_list], Chef::Config)
         end
 
         def win_ps_bootstrap(target_filename)
-          ps_bootstrap_file = Gem.find_files(File.join('chef', 'knife', 'bootstrap', 'bootstrap.ps1')).first
+          ps_bootstrap_file = Gem.find_files(File.join('chef', 'knife', 'winops_bootstrap', 'bootstrap.ps1')).first
           ps_bootstrap_content = IO.read(ps_bootstrap_file)
           win_parse_file_content(ps_bootstrap_content, target_filename)
         end
 
         def win_schedtask_xml(target_filename)
-          sched_xml_file = Gem.find_files(File.join('chef', 'knife', 'bootstrap', 'Chef_bootstrap.erb')).first
+          sched_xml_file = Gem.find_files(File.join('chef', 'knife', 'winops_bootstrap', 'Chef_bootstrap.erb')).first
           sched_xml_file_content = IO.read(sched_xml_file).chomp
           win_parse_file_content(Erubis::Eruby.new(sched_xml_file_content).evaluate(bootstrap_context), target_filename)
         end

data/lib/chef/knife/{knife_windows_base.rb → winops_knife_windows_base.rb}

@@ -18,7 +18,7 @@
 
 class Chef
   class Knife
-    module KnifeWindowsBase
+    module KnifeWindowsCore
 
       def locate_config_value(key)
         key = key.to_sym

data/lib/chef/knife/{windows_cert_generate.rb → winops_windows_cert_generate.rb}

@@ -16,7 +16,7 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/winrm_base'
+require 'chef/knife/winops_winrm_base'
 require 'openssl'
 require 'socket'
 

data/lib/chef/knife/{windows_cert_install.rb → winops_windows_cert_install.rb}

@@ -16,7 +16,7 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/winrm_base'
+require 'chef/knife/winops_winrm_base'
 
 class Chef
   class Knife

data/lib/chef/knife/{windows_helper.rb → winops_windows_helper.rb}

@@ -17,17 +17,17 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/winrm'
-require 'chef/knife/bootstrap_windows_ssh'
-require 'chef/knife/bootstrap_windows_winrm'
-require 'chef/knife/wsman_test'
+require 'chef/knife/winops_winrm'
+require 'chef/knife/winops_bootstrap_windows_ssh'
+require 'chef/knife/winops_bootstrap_windows_winrm'
+require 'chef/knife/winops_wsman_test'
 
 class Chef
   class Knife
     class WindowsHelper < Knife
 
-      banner "#{BootstrapWindowsWinrm.banner}\n" +
-              "#{BootstrapWindowsSsh.banner}\n" +
+      banner "#{BootstrapWindowsWinRM.banner}\n" +
+              "#{BootstrapWindowsSSH.banner}\n" +
               "#{Winrm.banner}\n" +
               "#{WsmanTest.banner}"
     end

data/lib/chef/knife/{windows_listener_create.rb → winops_windows_listener_create.rb}

@@ -16,7 +16,7 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/winrm_base'
+require 'chef/knife/winops_winrm_base'
 require 'openssl'
 
 class Chef

data/lib/chef/knife/{winrm.rb → winops_winrm.rb}

@@ -17,19 +17,19 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/winrm_knife_base'
-require 'chef/knife/windows_cert_generate'
-require 'chef/knife/windows_cert_install'
-require 'chef/knife/windows_listener_create'
-require 'chef/knife/winrm_session'
-require 'chef/knife/knife_windows_base'
+require 'chef/knife/winops_winrm_knife_base'
+require 'chef/knife/winops_windows_cert_generate'
+require 'chef/knife/winops_windows_cert_install'
+require 'chef/knife/winops_windows_listener_create'
+require 'chef/knife/winops_winrm_session'
+require 'chef/knife/winops_knife_windows_base'
 
 class Chef
   class Knife
     class Winrm < Knife
 
-      include Chef::Knife::WinrmCommandSharedFunctions
-      include Chef::Knife::KnifeWindowsBase
+      include Chef::Knife::WinrmCommandCommon
+      include Chef::Knife::KnifeWindowsCore
 
       deps do
         require 'readline'

data/lib/chef/knife/{winrm_base.rb → winops_winrm_base.rb}

@@ -22,7 +22,7 @@ require 'kconv'
 
 class Chef
   class Knife
-    module WinrmBase
+    module WinrmCore
 
       # It includes supported WinRM authentication protocol.
       WINRM_AUTH_PROTOCOL_LIST ||= %w{basic negotiate kerberos}

data/lib/chef/knife/{winrm_knife_base.rb → winops_winrm_knife_base.rb}

@@ -18,13 +18,13 @@
 
 
 require 'chef/knife'
-require 'chef/knife/winrm_base'
-require 'chef/knife/winrm_shared_options'
-require 'chef/knife/knife_windows_base'
+require 'chef/knife/winops_winrm_base'
+require 'chef/knife/winops_winrm_shared_options'
+require 'chef/knife/winops_knife_windows_base'
 
 class Chef
   class Knife
-    module WinrmCommandSharedFunctions
+    module WinrmCommandCommon
 
       FAILED_BASIC_HINT ||= "Hint: Please check winrm configuration 'winrm get winrm/config/service' AllowUnencrypted flag on remote server."
       FAILED_NOT_BASIC_HINT ||= <<-eos.gsub /^\s+/, ""
@@ -38,16 +38,16 @@ class Chef
 
           @@ssl_warning_given = false
 
-          include Chef::Knife::WinrmBase
-          include Chef::Knife::WinrmSharedOptions
-          include Chef::Knife::KnifeWindowsBase
+          include Chef::Knife::WinrmCore
+          include Chef::Knife::WinrmOptions
+          include Chef::Knife::KnifeWindowsCore
 
           def validate_winrm_options!
             winrm_auth_protocol = locate_config_value(:winrm_authentication_protocol)
 
-            if ! Chef::Knife::WinrmBase::WINRM_AUTH_PROTOCOL_LIST.include?(winrm_auth_protocol)
+            if ! Chef::Knife::WinrmCore::WINRM_AUTH_PROTOCOL_LIST.include?(winrm_auth_protocol)
               ui.error "Invalid value '#{winrm_auth_protocol}' for --winrm-authentication-protocol option."
-              ui.info "Valid values are #{Chef::Knife::WinrmBase::WINRM_AUTH_PROTOCOL_LIST.join(",")}."
+              ui.info "Valid values are #{Chef::Knife::WinrmCore::WINRM_AUTH_PROTOCOL_LIST.join(",")}."
               exit 1
             end
 

data/lib/chef/knife/{winrm_shared_options.rb → winops_winrm_shared_options.rb}

@@ -22,7 +22,7 @@ require 'kconv'
 
 class Chef
   class Knife
-    module WinrmSharedOptions
+    module WinrmOptions
 
       # Shared command line options for knife winrm and knife wsman test
       def self.included(includer)

data/lib/chef/knife/{wsman_test.rb → winops_wsman_test.rb}

@@ -18,14 +18,14 @@
 
 require 'httpclient'
 require 'chef/knife'
-require 'chef/knife/winrm_knife_base'
-require 'chef/knife/wsman_endpoint'
+require 'chef/knife/winops_winrm_knife_base'
+require 'chef/knife/winops_wsman_endpoint'
 
 class Chef
   class Knife
     class WsmanTest < Knife
 
-      include Chef::Knife::WinrmCommandSharedFunctions
+      include Chef::Knife::WinrmCommandCommon
 
       deps do
         require 'chef/search/query'

data/lib/knife-winops/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/assets/fake_trusted_certs/excluded.txt

@@ -1,2 +1,2 @@
 This file should be excluded in the output of 
-Chef::Knife::Core::WindowsBootstrapContext#trusted_certs_script
+Chef::Knife::Core::WinBootstrapContext#trusted_certs_script

data/spec/functional/bootstrap_download_spec.rb

@@ -53,7 +53,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     @local_file_download_destination = "#{@temp_directory}/chef-client-latest.msi"
 
     source_code_directory = File.dirname(__FILE__)
-    @template_file_path ="#{source_code_directory}/../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+    @template_file_path ="#{source_code_directory}/../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
   end
 
   after(:all) do
@@ -64,7 +64,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
   end
 
   describe "running on any version of the Windows OS", :windows_only do
-    let(:mock_bootstrap_context) { Chef::Knife::Core::WindowsBootstrapContext.new({ }, nil, { :knife => {} }) }
+    let(:mock_bootstrap_context) { Chef::Knife::Core::WinBootstrapContext.new({ }, nil, { :knife => {} }) }
     let(:mock_winrm) { Chef::Knife::Winrm.new }
 
     before do
@@ -86,7 +86,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
       allow(mock_winrm.ui).to receive(:ask).and_return(nil)
       allow(Chef::Knife::Winrm).to receive(:new).and_return(mock_winrm)
 
-      allow(Chef::Knife::Core::WindowsBootstrapContext).to receive(:new).and_return(mock_bootstrap_context)
+      allow(Chef::Knife::Core::WinBootstrapContext).to receive(:new).and_return(mock_bootstrap_context)
       Chef::Config[:knife] = {:winrm_transport => 'plaintext', :chef_node_name => 'foo.example.com', :winrm_authentication_protocol => 'negotiate'}
     end
 
@@ -95,7 +95,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     end
 
     context "when provided a custom msi_url to fetch from" do
-      let(:mock_bootstrap_context) { Chef::Knife::Core::WindowsBootstrapContext.new(
+      let(:mock_bootstrap_context) { Chef::Knife::Core::WinBootstrapContext.new(
         { :msi_url => "file:///C:/Windows/System32/xcopy.exe" }, nil, { :knife => {} }) }
       it "downloads the chef-client MSI from a custom path during winrm bootstrap" do
         run_download_scenario
@@ -103,7 +103,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     end
 
      context "when provided a custom msi_url with space in path to fetch from" do
-      let(:mock_bootstrap_context) { Chef::Knife::Core::WindowsBootstrapContext.new(
+      let(:mock_bootstrap_context) { Chef::Knife::Core::WinBootstrapContext.new(
         { :msi_url => "file:///C:/Program Files/Windows NT/Accessories/wordpad.exe" }, nil, { :knife => {} }) }
       it "downloads the chef-client MSI from a custom path with spaces during winrm bootstrap" do
         run_download_scenario
@@ -125,7 +125,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
   def run_download_scenario
     clean_test_case
 
-    winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
+    winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinRM.new([ "127.0.0.1" ])
     winrm_bootstrapper.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
 
     allow(WinRM::Connection).to receive(:new).and_return(Dummy::Connection.new)
@@ -148,9 +148,9 @@ end
 
 describe "bootstrap_install_command functionality through WinRM protocol" do
   context "bootstrap_install_command option is not specified" do
-    let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new([]) }
+    let(:bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new([]) }
     before do
-      @template_file_path ="../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+      @template_file_path ="../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
       @template_input = sample_data(@template_file_path)
     end
 
@@ -172,10 +172,10 @@ describe "bootstrap_install_command functionality through WinRM protocol" do
   end
 
   context "bootstrap_install_command option is specified" do
-    let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new(['--bootstrap-install-command', 'chef-client -o recipe[cbk1::rec2]']) }
+    let(:bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new(['--bootstrap-install-command', 'chef-client -o recipe[cbk1::rec2]']) }
     before do
       bootstrap.config[:bootstrap_install_command] = "chef-client -o recipe[cbk1::rec2]"
-	  @template_file_path ="../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+	  @template_file_path ="../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
       @template_input = sample_data(@template_file_path)
     end
 
@@ -198,9 +198,9 @@ end
 
 describe "bootstrap_install_command functionality through SSH protocol", :chef_lt_12_5_only => true do
   context "bootstrap_install_command option is not specified" do
-    let(:bootstrap) { Chef::Knife::BootstrapWindowsSsh.new([]) }
+    let(:bootstrap) { Chef::Knife::BootstrapWindowsSSH.new([]) }
     before do
-      @template_file_path ="../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+      @template_file_path ="../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
       @template_input = sample_data(@template_file_path)
     end
 
@@ -210,10 +210,10 @@ describe "bootstrap_install_command functionality through SSH protocol", :chef_l
   end
 
   context "bootstrap_install_command option is specified" do
-    let(:bootstrap) { Chef::Knife::BootstrapWindowsSsh.new(['--bootstrap-install-command', 'chef-client -o recipe[cbk1::rec2]']) }
+    let(:bootstrap) { Chef::Knife::BootstrapWindowsSSH.new(['--bootstrap-install-command', 'chef-client -o recipe[cbk1::rec2]']) }
     before do
       bootstrap.config[:bootstrap_install_command] = "chef-client -o recipe[cbk1::rec2]"
-      @template_file_path ="../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+      @template_file_path ="../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
       @template_input = sample_data(@template_file_path)
     end
 

data/spec/spec_helper.rb

@@ -21,9 +21,9 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-require_relative '../lib/chef/knife/core/windows_bootstrap_context'
-require_relative '../lib/chef/knife/bootstrap_windows_winrm'
-require_relative '../lib/chef/knife/bootstrap_windows_ssh'
+require_relative '../lib/chef/knife/winops_core/windows_bootstrap_context'
+require_relative '../lib/chef/knife/winops_bootstrap_windows_winrm'
+require_relative '../lib/chef/knife/winops_bootstrap_windows_ssh'
 require_relative '../lib/chef/knife/wsman_test'
 
 if windows?

data/spec/unit/knife/bootstrap_options_spec.rb

@@ -68,8 +68,8 @@ expected: #{expected}
     end
   end
 
-  context 'when compared to BootstrapWindowsWinrm' do
-    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new }
+  context 'when compared to BootstrapWindowsWinRM' do
+    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new }
 
     # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
     #   ignored for these.
@@ -126,8 +126,8 @@ expected: #{expected}
     include_examples 'compare_options'
   end
 
-  context 'when compared to BootstrapWindowsSsh' do
-    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsSsh.new }
+  context 'when compared to BootstrapWindowsSSH' do
+    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsSSH.new }
 
     # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
     #   ignored for these.

data/spec/unit/knife/bootstrap_template_spec.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 
 
-TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/winops_bootstrap/windows-chef-client-msi.erb"
 
 require 'spec_helper'
 
-describe Chef::Knife::BootstrapWindowsWinrm do
+describe Chef::Knife::BootstrapWindowsWinRM do
   let(:template_file) { TEMPLATE_FILE }
   let(:options) { [] }
   let(:rendered_template) do
@@ -44,7 +44,7 @@ describe Chef::Knife::BootstrapWindowsWinrm do
 
   before(:each) do
     Chef::Log.logger = Logger.new(StringIO.new)
-    @knife = Chef::Knife::BootstrapWindowsWinrm.new
+    @knife = Chef::Knife::BootstrapWindowsWinRM.new
     # Merge default settings in.
     @knife.merge_configs
     @knife.config[:template_file] = template_file

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -21,7 +21,7 @@ require 'winrm/output'
 
 Chef::Knife::Winrm.load_deps
 
-describe Chef::Knife::BootstrapWindowsWinrm do
+describe Chef::Knife::BootstrapWindowsWinRM do
   before do
     Chef::Config.reset
     bootstrap.config[:run_list] = []
@@ -45,7 +45,7 @@ describe Chef::Knife::BootstrapWindowsWinrm do
       host: "localhost"
     }
   end
-  let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new(['winrm', '-d', 'windows-chef-client-msi',  '-x', session_opts[:user], '-P', session_opts[:password], session_opts[:host]]) }
+  let(:bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new(['winrm', '-d', 'windows-chef-client-msi',  '-x', session_opts[:user], '-P', session_opts[:password], session_opts[:host]]) }
   let(:session) { Chef::Knife::WinrmSession.new(session_opts) }
   let(:arch_session_result) {
     o = WinRM::Output.new

data/spec/unit/knife/core/windows_bootstrap_context_spec.rb

@@ -17,12 +17,12 @@
 #
 
 require 'spec_helper'
-require 'chef/knife/core/windows_bootstrap_context'
-describe Chef::Knife::Core::WindowsBootstrapContext do
-  let(:mock_bootstrap_context) { Chef::Knife::Core::WindowsBootstrapContext.new({ }, nil, { :knife => {} }) }
+require 'chef/knife/winops_core/windows_bootstrap_context'
+describe Chef::Knife::Core::WinBootstrapContext do
+  let(:mock_bootstrap_context) { Chef::Knife::Core::WinBootstrapContext.new({ }, nil, { :knife => {} }) }
 
   before do
-     allow(Chef::Knife::Core::WindowsBootstrapContext).to receive(:new).and_return(mock_bootstrap_context)
+     allow(Chef::Knife::Core::WinBootstrapContext).to receive(:new).and_return(mock_bootstrap_context)
    end
 
   describe "fips" do
@@ -242,7 +242,7 @@ EXPECTED
 
   describe "bootstrap_install_command for bootstrap through WinRM" do
     context "when bootstrap_install_command option is passed on CLI" do
-      let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new(['--bootstrap-install-command', 'chef-client']) }
+      let(:bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new(['--bootstrap-install-command', 'chef-client']) }
       before do
         bootstrap.config[:bootstrap_install_command] = "chef-client"
       end
@@ -258,7 +258,7 @@ EXPECTED
     end
 
     context "when bootstrap_install_command option is not passed on CLI" do
-      let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new([]) }
+      let(:bootstrap) { Chef::Knife::BootstrapWindowsWinRM.new([]) }
       it "does not set the bootstrap_install_command option under Chef::Config::Knife object" do
         expect(Chef::Config[:knife][:bootstrap_install_command]). to eq(nil)
       end
@@ -267,7 +267,7 @@ EXPECTED
 
   describe "bootstrap_install_command for bootstrap through SSH" do
     context "when bootstrap_install_command option is passed on CLI" do
-      let(:bootstrap) { Chef::Knife::BootstrapWindowsSsh.new(['--bootstrap-install-command', 'chef-client']) }
+      let(:bootstrap) { Chef::Knife::BootstrapWindowsSSH.new(['--bootstrap-install-command', 'chef-client']) }
       before do
         bootstrap.config[:bootstrap_install_command] = "chef-client"
       end
@@ -283,7 +283,7 @@ EXPECTED
     end
 
     context "when bootstrap_install_command option is not passed on CLI" do
-      let(:bootstrap) { Chef::Knife::BootstrapWindowsSsh.new([]) }
+      let(:bootstrap) { Chef::Knife::BootstrapWindowsSSH.new([]) }
       it "does not set the bootstrap_install_command option under Chef::Config::Knife object" do
         expect(Chef::Config[:knife][:bootstrap_install_command]). to eq(nil)
       end

data/spec/unit/knife/windows_cert_generate_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require 'spec_helper'
-require 'chef/knife/windows_cert_generate'
+require 'chef/knife/winops_windows_cert_generate'
 require 'openssl'
 
 describe Chef::Knife::WindowsCertGenerate do

data/spec/unit/knife/windows_cert_install_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require 'spec_helper'
-require 'chef/knife/windows_cert_install'
+require 'chef/knife/winops_windows_cert_install'
 
 describe Chef::Knife::WindowsCertInstall do
   context "on Windows" do

data/spec/unit/knife/windows_listener_create_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require 'spec_helper'
-require 'chef/knife/windows_listener_create'
+require 'chef/knife/winops_windows_listener_create'
 
 describe Chef::Knife::WindowsListenerCreate do
   context "on Windows" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-winops
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Robbert-Jan Sperna Weiland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -73,26 +73,26 @@ files:
 - appveyor.yml
 - ci.gemfile
 - knife-winops.gemspec
-- lib/chef/knife/bootstrap/Chef_bootstrap.erb
-- lib/chef/knife/bootstrap/bootstrap.ps1
-- lib/chef/knife/bootstrap/tail.cmd
-- lib/chef/knife/bootstrap/windows-chef-client-msi.erb
-- lib/chef/knife/bootstrap_windows_base.rb
-- lib/chef/knife/bootstrap_windows_ssh.rb
-- lib/chef/knife/bootstrap_windows_winrm.rb
-- lib/chef/knife/core/windows_bootstrap_context.rb
-- lib/chef/knife/knife_windows_base.rb
-- lib/chef/knife/windows_cert_generate.rb
-- lib/chef/knife/windows_cert_install.rb
-- lib/chef/knife/windows_helper.rb
-- lib/chef/knife/windows_listener_create.rb
-- lib/chef/knife/winrm.rb
-- lib/chef/knife/winrm_base.rb
-- lib/chef/knife/winrm_knife_base.rb
-- lib/chef/knife/winrm_session.rb
-- lib/chef/knife/winrm_shared_options.rb
-- lib/chef/knife/wsman_endpoint.rb
-- lib/chef/knife/wsman_test.rb
+- lib/chef/knife/winops_bootstrap/Chef_bootstrap.erb
+- lib/chef/knife/winops_bootstrap/bootstrap.ps1
+- lib/chef/knife/winops_bootstrap/tail.cmd
+- lib/chef/knife/winops_bootstrap/windows-bootstrap-template.erb
+- lib/chef/knife/winops_bootstrap_windows_base.rb
+- lib/chef/knife/winops_bootstrap_windows_ssh.rb
+- lib/chef/knife/winops_bootstrap_windows_winrm.rb
+- lib/chef/knife/winops_core/windows_bootstrap_context.rb
+- lib/chef/knife/winops_knife_windows_base.rb
+- lib/chef/knife/winops_windows_cert_generate.rb
+- lib/chef/knife/winops_windows_cert_install.rb
+- lib/chef/knife/winops_windows_helper.rb
+- lib/chef/knife/winops_windows_listener_create.rb
+- lib/chef/knife/winops_winrm.rb
+- lib/chef/knife/winops_winrm_base.rb
+- lib/chef/knife/winops_winrm_knife_base.rb
+- lib/chef/knife/winops_winrm_session.rb
+- lib/chef/knife/winops_winrm_shared_options.rb
+- lib/chef/knife/winops_wsman_endpoint.rb
+- lib/chef/knife/winops_wsman_test.rb
 - lib/knife-winops/path_helper.rb
 - lib/knife-winops/version.rb
 - spec/assets/fake_trusted_certs/excluded.txt
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting