knife-windows 0.8.5 → 0.8.6.rc.0

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
-module Knife
-  module Windows
-    VERSION = "0.8.5"
-    MAJOR, MINOR, TINY = VERSION.split('.')
-  end
-end
+module Knife
+  module Windows
+    VERSION = "0.8.6.rc.0"
+    MAJOR, MINOR, TINY = VERSION.split('.')
+  end
+end

data/spec/functional/bootstrap_download_spec.rb

@@ -1,122 +1,122 @@
-#
-# Author:: Adam Edwards (<adamed@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'tmpdir'
-
-# These test cases exercise the Knife::Windows knife plugin's ability
-# to download a bootstrap msi as part of the bootstrap process on
-# Windows nodes. The test modifies the Windows batch file generated
-# from an erb template in the plugin source in order to enable execution
-# of only the download functionality contained in the bootstrap template.
-# The test relies on knowledge of the fields of the template itself and 
-# also on knowledge of the contents and structure of the Windows batch
-# file generated by the template.
-#
-# Note that if the bootstrap template changes substantially, the tests
-# should fail and will require re-implementation. If such changes
-# occur, the bootstrap code should be refactored to explicitly expose
-# the download funcitonality separately from other tasks to make the
-# test more robust.
-describe 'Knife::Windows::Core msi download functionality for knife Windows winrm bootstrap template' do 
-
-  before(:all) do
-    # Since we're always running 32-bit Ruby, fix the
-    # PROCESSOR_ARCHITECTURE environment variable.
-
-    if ENV["PROCESSOR_ARCHITEW6432"]
-      ENV["PROCESSOR_ARCHITECTURE"] = ENV["PROCESSOR_ARCHITEW6432"]
-    end
-    
-    # All file artifacts from this test will be written into this directory
-    @temp_directory = Dir.mktmpdir("bootstrap_test")
-
-    # Location to which the download script will be modified to write
-    # the downloaded msi
-    @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"    
-  end
-
-  after(:all) do
-    # Clear the temp directory upon exit
-    if Dir.exists?(@temp_directory)
-      FileUtils::remove_dir(@temp_directory)
-    end
-  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_winrm) { Chef::Knife::Winrm.new }
-
-    before do
-      # Stub the bootstrap context and prevent config related sections
-      # from being populated, i.e. chef installation and first chef
-      # run sections
-      allow(mock_bootstrap_context).to receive(:validation_key).and_return("echo.validation_key")
-      allow(mock_bootstrap_context).to receive(:encrypted_data_bag_secret).and_return("echo.encrypted_data_bag_secret")
-      allow(mock_bootstrap_context).to receive(:config_content).and_return("echo.config_content")
-      allow(mock_bootstrap_context).to receive(:start_chef).and_return("echo.echo start_chef_command")
-      allow(mock_bootstrap_context).to receive(:run_list).and_return("echo.run_list")
-      allow(mock_bootstrap_context).to receive(:install_chef).and_return("echo.echo install_chef_command")
-
-      # Change the directories where bootstrap files will be created
-      allow(mock_bootstrap_context).to receive(:bootstrap_directory).and_return(@temp_directory.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
-      allow(mock_bootstrap_context).to receive(:local_download_path).and_return(@local_file_download_destination.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
-
-      # Prevent password prompt during bootstrap process
-      allow(mock_winrm).to receive(:get_password).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)
-    end
-
-    it "downloads the chef-client MSI during winrm bootstrap" do
-
-      clean_test_case
-
-      winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
-      allow(winrm_bootstrapper).to receive(:wait_for_remote_response)
-      winrm_bootstrapper.config[:template_file] = @template_file_path      
-
-      # Execute the commands locally that would normally be executed via WinRM
-      allow(winrm_bootstrapper).to receive(:run_command) do |command|
-        system(command)
-      end
-
-      winrm_bootstrapper.run
-
-      # Download should succeed
-      expect(download_succeeded?).to be true
-    end
-  end
-
-  def download_succeeded?
-    File.exists?(@local_file_download_destination) && ! File.zero?(@local_file_download_destination)
-  end
-
-  # Remove file artifacts generated by individual test cases
-  def clean_test_case
-    if File.exists?(@local_file_download_destination)
-      File.delete(@local_file_download_destination)
-    end
-  end
-  
-end 
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'tmpdir'
+
+# These test cases exercise the Knife::Windows knife plugin's ability
+# to download a bootstrap msi as part of the bootstrap process on
+# Windows nodes. The test modifies the Windows batch file generated
+# from an erb template in the plugin source in order to enable execution
+# of only the download functionality contained in the bootstrap template.
+# The test relies on knowledge of the fields of the template itself and 
+# also on knowledge of the contents and structure of the Windows batch
+# file generated by the template.
+#
+# Note that if the bootstrap template changes substantially, the tests
+# should fail and will require re-implementation. If such changes
+# occur, the bootstrap code should be refactored to explicitly expose
+# the download funcitonality separately from other tasks to make the
+# test more robust.
+describe 'Knife::Windows::Core msi download functionality for knife Windows winrm bootstrap template' do 
+
+  before(:all) do
+    # Since we're always running 32-bit Ruby, fix the
+    # PROCESSOR_ARCHITECTURE environment variable.
+
+    if ENV["PROCESSOR_ARCHITEW6432"]
+      ENV["PROCESSOR_ARCHITECTURE"] = ENV["PROCESSOR_ARCHITEW6432"]
+    end
+    
+    # All file artifacts from this test will be written into this directory
+    @temp_directory = Dir.mktmpdir("bootstrap_test")
+
+    # Location to which the download script will be modified to write
+    # the downloaded msi
+    @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"    
+  end
+
+  after(:all) do
+    # Clear the temp directory upon exit
+    if Dir.exists?(@temp_directory)
+      FileUtils::remove_dir(@temp_directory)
+    end
+  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_winrm) { Chef::Knife::Winrm.new }
+
+    before do
+      # Stub the bootstrap context and prevent config related sections
+      # from being populated, i.e. chef installation and first chef
+      # run sections
+      allow(mock_bootstrap_context).to receive(:validation_key).and_return("echo.validation_key")
+      allow(mock_bootstrap_context).to receive(:encrypted_data_bag_secret).and_return("echo.encrypted_data_bag_secret")
+      allow(mock_bootstrap_context).to receive(:config_content).and_return("echo.config_content")
+      allow(mock_bootstrap_context).to receive(:start_chef).and_return("echo.echo start_chef_command")
+      allow(mock_bootstrap_context).to receive(:run_list).and_return("echo.run_list")
+      allow(mock_bootstrap_context).to receive(:install_chef).and_return("echo.echo install_chef_command")
+
+      # Change the directories where bootstrap files will be created
+      allow(mock_bootstrap_context).to receive(:bootstrap_directory).and_return(@temp_directory.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
+      allow(mock_bootstrap_context).to receive(:local_download_path).and_return(@local_file_download_destination.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
+
+      # Prevent password prompt during bootstrap process
+      allow(mock_winrm).to receive(:get_password).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)
+    end
+
+    it "downloads the chef-client MSI during winrm bootstrap" do
+
+      clean_test_case
+
+      winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
+      allow(winrm_bootstrapper).to receive(:wait_for_remote_response)
+      winrm_bootstrapper.config[:template_file] = @template_file_path      
+
+      # Execute the commands locally that would normally be executed via WinRM
+      allow(winrm_bootstrapper).to receive(:run_command) do |command|
+        system(command)
+      end
+
+      winrm_bootstrapper.run
+
+      # Download should succeed
+      expect(download_succeeded?).to be true
+    end
+  end
+
+  def download_succeeded?
+    File.exists?(@local_file_download_destination) && ! File.zero?(@local_file_download_destination)
+  end
+
+  # Remove file artifacts generated by individual test cases
+  def clean_test_case
+    if File.exists?(@local_file_download_destination)
+      File.delete(@local_file_download_destination)
+    end
+  end
+  
+end 

data/spec/spec_helper.rb

@@ -1,61 +1,61 @@
-
-# Author:: Adam Edwards (<adamed@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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'
-
-if windows?
-  require 'ruby-wmi'
-end
-
-def windows2012?
-  is_win2k12 = false
-  
-  if  windows?
-    this_operating_system = WMI::Win32_OperatingSystem.find(:first)
-    os_version = this_operating_system.send('Version')
-
-    # The operating system version is a string in the following form
-    # that can be split into components based on the '.' delimiter:
-    # MajorVersionNumber.MinorVersionNumber.BuildNumber
-    os_version_components = os_version.split('.')
-
-    if os_version_components.length < 2
-      raise 'WMI returned a Windows version from Win32_OperatingSystem.Version ' +
-        'with an unexpected format. The Windows version could not be determined.'
-    end
-
-    # Windows 6.2 is Windows Server 2012, so test the major and
-    # minor version components
-    is_win2k12 = os_version_components[0] == '6' && os_version_components[1] == '2'
-  end
-
-  is_win2k12
-end
-
-
-RSpec.configure do |config|
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :windows_2012_only => true unless windows2012?
-end
-
+
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+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'
+
+if windows?
+  require 'ruby-wmi'
+end
+
+def windows2012?
+  is_win2k12 = false
+  
+  if  windows?
+    this_operating_system = WMI::Win32_OperatingSystem.find(:first)
+    os_version = this_operating_system.send('Version')
+
+    # The operating system version is a string in the following form
+    # that can be split into components based on the '.' delimiter:
+    # MajorVersionNumber.MinorVersionNumber.BuildNumber
+    os_version_components = os_version.split('.')
+
+    if os_version_components.length < 2
+      raise 'WMI returned a Windows version from Win32_OperatingSystem.Version ' +
+        'with an unexpected format. The Windows version could not be determined.'
+    end
+
+    # Windows 6.2 is Windows Server 2012, so test the major and
+    # minor version components
+    is_win2k12 = os_version_components[0] == '6' && os_version_components[1] == '2'
+  end
+
+  is_win2k12
+end
+
+
+RSpec.configure do |config|
+  config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :windows_2012_only => true unless windows2012?
+end
+

data/spec/unit/knife/bootstrap_template_spec.rb

@@ -1,92 +1,92 @@
-#
-# Author:: Chirag Jog (<chirag@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Chirag Jog
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
-
-require 'spec_helper'
-
-describe "While Windows Bootstrapping" do
-  context "the default Windows bootstrapping template" do
-    bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
-    bootstrap.config[:template_file] = TEMPLATE_FILE
-
-    template = bootstrap.load_template
-    template_file_lines = template.split('\n')
-    it "should download Platform specific MSI" do
-      download_url=template_file_lines.find {|l| l.include?("url=")}
-      download_url.include?("%MACHINE_OS%") && download_url.include?("%MACHINE_ARCH%")
-    end
-    it "should download specific version of MSI if supplied" do
-      download_url_ext= template_file_lines.find {|l| l.include?("url +=")}
-      download_url_ext.include?("[:bootstrap_version]")
-    end
-  end
-end
-
-describe Chef::Knife::BootstrapWindowsWinrm do
-  before(:all) do
-    @original_config = Chef::Config.hash_dup
-    @original_knife_config = Chef::Config[:knife].dup
-  end
-
-  after(:all) do
-    Chef::Config.configuration = @original_config
-    Chef::Config[:knife] = @original_knife_config
-  end
-
-  before(:each) do
-    Chef::Log.logger = Logger.new(StringIO.new)
-    @knife = Chef::Knife::BootstrapWindowsWinrm.new
-    # Merge default settings in.
-    @knife.merge_configs
-    @knife.config[:template_file] = TEMPLATE_FILE
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-    @stderr = StringIO.new
-    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
-  end
-
-  describe "specifying no_proxy with various entries" do
-    subject(:knife) { described_class.new }
-    let(:options){ ["--bootstrap-proxy", "", "--bootstrap-no-proxy", setting] }
-    let(:template_file) { TEMPLATE_FILE }
-    let(:rendered_template) do
-      knife.instance_variable_set("@template_file", template_file)
-      knife.parse_options(options)
-      # Avoid referencing a validation keyfile we won't find during #render_template
-      template = IO.read(template_file).chomp
-      template_string = template.gsub(/^.*[Vv]alidation_key.*$/, '')
-      knife.render_template(template_string)
-    end
-
-    context "via --bootstrap-no-proxy" do
-      let(:setting) { "api.opscode.com" }
-
-      it "renders the client.rb with a single FQDN no_proxy entry" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*\"api.opscode.com\".*})
-      end
-    end
-    context "via --bootstrap-no-proxy multiple" do
-      let(:setting) { "api.opscode.com,172.16.10.*" }
-
-      it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
-      end
-    end
-  end
-end
+#
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Chirag Jog
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+
+require 'spec_helper'
+
+describe "While Windows Bootstrapping" do
+  context "the default Windows bootstrapping template" do
+    bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
+    bootstrap.config[:template_file] = TEMPLATE_FILE
+
+    template = bootstrap.load_template
+    template_file_lines = template.split('\n')
+    it "should download Platform specific MSI" do
+      download_url=template_file_lines.find {|l| l.include?("url=")}
+      download_url.include?("%MACHINE_OS%") && download_url.include?("%MACHINE_ARCH%")
+    end
+    it "should download specific version of MSI if supplied" do
+      download_url_ext= template_file_lines.find {|l| l.include?("url +=")}
+      download_url_ext.include?("[:bootstrap_version]")
+    end
+  end
+end
+
+describe Chef::Knife::BootstrapWindowsWinrm do
+  before(:all) do
+    @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
+  end
+
+  after(:all) do
+    Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
+  end
+
+  before(:each) do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::BootstrapWindowsWinrm.new
+    # Merge default settings in.
+    @knife.merge_configs
+    @knife.config[:template_file] = TEMPLATE_FILE
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
+  end
+
+  describe "specifying no_proxy with various entries" do
+    subject(:knife) { described_class.new }
+    let(:options){ ["--bootstrap-proxy", "", "--bootstrap-no-proxy", setting] }
+    let(:template_file) { TEMPLATE_FILE }
+    let(:rendered_template) do
+      knife.instance_variable_set("@template_file", template_file)
+      knife.parse_options(options)
+      # Avoid referencing a validation keyfile we won't find during #render_template
+      template = IO.read(template_file).chomp
+      template_string = template.gsub(/^.*[Vv]alidation_key.*$/, '')
+      knife.render_template(template_string)
+    end
+
+    context "via --bootstrap-no-proxy" do
+      let(:setting) { "api.opscode.com" }
+
+      it "renders the client.rb with a single FQDN no_proxy entry" do
+        expect(rendered_template).to match(%r{.*no_proxy\s*\"api.opscode.com\".*})
+      end
+    end
+    context "via --bootstrap-no-proxy multiple" do
+      let(:setting) { "api.opscode.com,172.16.10.*" }
+
+      it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
+        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
+      end
+    end
+  end
+end