diff options
| author | Bryan McLellan <btm@getchef.com> | 2014-03-27 13:34:02 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2014-03-28 11:36:10 -0400 |
| commit | aae5f72358073c18ba9e2caaf214cd3855cfd189 (patch) | |
| tree | 31f4837977927a6b08756a644e41032b9ab0c5ae | |
| parent | 9e9cab6a89d9dab4ddf852b88eb522610d89f2d8 (diff) | |
| download | chef-aae5f72358073c18ba9e2caaf214cd3855cfd189.tar.gz | |
CHEF-5087: Hide win32 if not on windows
| -rw-r--r-- | lib/chef/provider/package/windows/msi.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/windows_package.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/windows/msi_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/windows_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/resource/windows_package_spec.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider/package/windows/msi.rb b/lib/chef/provider/package/windows/msi.rb index 0764a15901..a342600678 100644 --- a/lib/chef/provider/package/windows/msi.rb +++ b/lib/chef/provider/package/windows/msi.rb @@ -19,14 +19,14 @@ # TODO: Allow @new_resource.source to be a Product Code as a GUID for uninstall / network install require 'chef/mixin/shell_out' -require 'chef/win32/api/installer' +require 'chef/win32/api/installer' if RUBY_PLATFORM =~ /mswin|mingw32|windows/ class Chef class Provider class Package class Windows class MSI - include Chef::ReservedNames::Win32::API::Installer + include Chef::ReservedNames::Win32::API::Installer if RUBY_PLATFORM =~ /mswin|mingw32|windows/ include Chef::Mixin::ShellOut def initialize(resource) diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb index ff80b47115..8bd41e0cb7 100644 --- a/lib/chef/resource/windows_package.rb +++ b/lib/chef/resource/windows_package.rb @@ -18,7 +18,7 @@ require 'chef/resource/package' require 'chef/provider/package/windows' -require 'chef/win32/error' +require 'chef/win32/error' if RUBY_PLATFORM =~ /mswin|mingw|windows/ class Chef class Resource diff --git a/spec/unit/provider/package/windows/msi_spec.rb b/spec/unit/provider/package/windows/msi_spec.rb index 69322a609d..c8a63ad066 100644 --- a/spec/unit/provider/package/windows/msi_spec.rb +++ b/spec/unit/provider/package/windows/msi_spec.rb @@ -18,7 +18,7 @@ require 'spec_helper' -describe Chef::Provider::Package::Windows::MSI do +describe Chef::Provider::Package::Windows::MSI, :windows_only do let(:node) { double('Chef::Node') } let(:events) { double('Chef::Events').as_null_object } # mock all the methods let(:run_context) { double('Chef::RunContext', :node => node, :events => events) } diff --git a/spec/unit/provider/package/windows_spec.rb b/spec/unit/provider/package/windows_spec.rb index 962bf6fddf..e94404eea5 100644 --- a/spec/unit/provider/package/windows_spec.rb +++ b/spec/unit/provider/package/windows_spec.rb @@ -18,7 +18,7 @@ require 'spec_helper' -describe Chef::Provider::Package::Windows do +describe Chef::Provider::Package::Windows, :windows_only do let(:node) { double('Chef::Node') } let(:events) { double('Chef::Events').as_null_object } # mock all the methods let(:run_context) { double('Chef::RunContext', :node => node, :events => events) } diff --git a/spec/unit/resource/windows_package_spec.rb b/spec/unit/resource/windows_package_spec.rb index 23454e97e4..c9ef8d910c 100644 --- a/spec/unit/resource/windows_package_spec.rb +++ b/spec/unit/resource/windows_package_spec.rb @@ -18,7 +18,7 @@ require 'spec_helper' -describe Chef::Resource::WindowsPackage, "initialize" do +describe Chef::Resource::WindowsPackage, "initialize", :windows_only do let(:resource) { Chef::Resource::WindowsPackage.new("solitaire.msi") } |