spec/spec_helper.rb in knife-windows-1.0.0.rc.1 vs spec/spec_helper.rb in knife-windows-1.0.0.rc.2

@@ -1,72 +1,87 @@
-
-# Author:: Adam Edwards (<[e-mail]>)
-# 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'
-require_relative '../lib/chef/knife/bootstrap_windows_ssh'
-require_relative '../lib/chef/knife/wsman_test'
-
-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
-
-def chef_gte_12?
-  Chef::VERSION.split('.').first.to_i >= 12
-end
-
-def chef_lt_12?
-  Chef::VERSION.split('.').first.to_i < 12
-end
-
-RSpec.configure do |config|
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :windows_2012_only => true unless windows2012?
-  config.filter_run_excluding :chef_gte_12_only => true unless chef_gte_12?
-  config.filter_run_excluding :chef_lt_12_only => true unless chef_lt_12?
-end
-
+
+# Author:: Adam Edwards (<[e-mail]>)
+# 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'
+require_relative '../lib/chef/knife/bootstrap_windows_ssh'
+require_relative '../lib/chef/knife/wsman_test'
+
+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
+
+def chef_gte_12?
+  Chef::VERSION.split('.').first.to_i >= 12
+end
+
+def chef_gte_12_5?
+  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.5
+end
+
+def chef_lt_12?
+  Chef::VERSION.split('.').first.to_i < 12
+end
+
+def chef_eq_11?
+  Chef::VERSION.split('.').first.to_i == 11
+end
+
+def sample_data(file_name)
+  file =  File.expand_path(File.dirname("spec/assets/*"))+"/#{file_name}"
+  File.read(file)
+end
+
+RSpec.configure do |config|
+  config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :windows_2012_only => true unless windows2012?
+  config.filter_run_excluding :chef_gte_12_only => true unless chef_gte_12?
+  config.filter_run_excluding :chef_gte_12_5_only => true unless chef_gte_12_5?  
+  config.filter_run_excluding :chef_lt_12_only => true unless chef_lt_12?
+  config.filter_run_excluding :if_chef_11 => true if chef_eq_11?
+end
+