diff options
-rw-r--r-- | lib/chef/provider/package/powershell.rb | 16 | ||||
-rw-r--r-- | spec/unit/provider/package/powershell_spec.rb | 38 |
2 files changed, 27 insertions, 27 deletions
diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb index 87af7f61d8..44b6e69a00 100644 --- a/lib/chef/provider/package/powershell.rb +++ b/lib/chef/provider/package/powershell.rb @@ -53,7 +53,7 @@ class Chef # Installs the package specified with the version passed else latest version will be installed def install_package(names, versions) names.each_with_index do |name, index| - powershell_out(build_powershell_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout) + powershell_out(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout) end end @@ -61,11 +61,11 @@ class Chef def remove_package(names, versions) names.each_with_index do |name, index| if versions && !versions[index].nil? - powershell_out(build_powershell_command("Uninstall-Package '#{name}'", versions[index]), timeout: new_resource.timeout) + powershell_out(build_powershell_package_command("Uninstall-Package '#{name}'", versions[index]), timeout: new_resource.timeout) else version = "0" until version.empty? - version = powershell_out(build_powershell_command("Uninstall-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip + version = powershell_out(build_powershell_package_command("Uninstall-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip unless version.empty? logger.info("Removed package '#{name}' with version #{version}") end @@ -79,9 +79,9 @@ class Chef versions = [] new_resource.package_name.each_with_index do |name, index| version = if new_resource.version && !new_resource.version[index].nil? - powershell_out(build_powershell_command("Find-Package '#{name}'", new_resource.version[index]), timeout: new_resource.timeout).stdout.strip + powershell_out(build_powershell_package_command("Find-Package '#{name}'", new_resource.version[index]), timeout: new_resource.timeout).stdout.strip else - powershell_out(build_powershell_command("Find-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip + powershell_out(build_powershell_package_command("Find-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip end if version.empty? version = nil @@ -96,9 +96,9 @@ class Chef version_list = [] new_resource.package_name.each_with_index do |name, index| version = if new_resource.version && !new_resource.version[index].nil? - powershell_out(build_powershell_command("Get-Package '#{name}'", new_resource.version[index]), timeout: new_resource.timeout).stdout.strip + powershell_out(build_powershell_package_command("Get-Package '#{name}'", new_resource.version[index]), timeout: new_resource.timeout).stdout.strip else - powershell_out(build_powershell_command("Get-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip + powershell_out(build_powershell_package_command("Get-Package '#{name}'"), timeout: new_resource.timeout).stdout.strip end if version.empty? version = nil @@ -108,7 +108,7 @@ class Chef version_list end - def build_powershell_command(command, version = nil) + def build_powershell_package_command(command, version = nil) command = [command] unless command.is_a?(Array) command.unshift("(") %w{-Force -ForceBootstrap}.each do |arg| diff --git a/spec/unit/provider/package/powershell_spec.rb b/spec/unit/provider/package/powershell_spec.rb index 9bebfa9194..534b7b6b13 100644 --- a/spec/unit/provider/package/powershell_spec.rb +++ b/spec/unit/provider/package/powershell_spec.rb @@ -192,88 +192,88 @@ describe Chef::Provider::Package::Powershell do end - describe "#build_powershell_command" do + describe "#build_powershell_package_command" do it "can build a valid command from a single string" do - expect(provider.build_powershell_command("Get-Package posh-git")).to eql(generated_command) + expect(provider.build_powershell_package_command("Get-Package posh-git")).to eql(generated_command) end it "can build a valid command from an array" do - expect(provider.build_powershell_command(["Get-Package", "posh-git"])).to eql(generated_command) + expect(provider.build_powershell_package_command(["Get-Package", "posh-git"])).to eql(generated_command) end context "when source is nil" do it "build get commands correctly" do - expect(provider.build_powershell_command("Get-Package xNetworking")).to eql(generated_get_cmdlet) + expect(provider.build_powershell_package_command("Get-Package xNetworking")).to eql(generated_get_cmdlet) end it "build get commands correctly when a version is passed" do - expect(provider.build_powershell_command("Get-Package xNetworking", "1.0.0.0")).to eql(generated_get_cmdlet_with_version) + expect(provider.build_powershell_package_command("Get-Package xNetworking", "1.0.0.0")).to eql(generated_get_cmdlet_with_version) end it "builds find commands correctly" do - expect(provider.build_powershell_command("Find-Package xNetworking")).to eql(generated_find_cmdlet) + expect(provider.build_powershell_package_command("Find-Package xNetworking")).to eql(generated_find_cmdlet) end it "builds find commands correctly when a version is passed" do - expect(provider.build_powershell_command("Find-Package xNetworking", "1.0.0.0")).to eql(generated_find_cmdlet_with_version) + expect(provider.build_powershell_package_command("Find-Package xNetworking", "1.0.0.0")).to eql(generated_find_cmdlet_with_version) end it "build install commands correctly" do - expect(provider.build_powershell_command("Install-Package xNetworking")).to eql(generated_install_cmdlet) + expect(provider.build_powershell_package_command("Install-Package xNetworking")).to eql(generated_install_cmdlet) end it "build install commands correctly when a version is passed" do - expect(provider.build_powershell_command("Install-Package xNetworking", "1.0.0.0")).to eql(generated_install_cmdlet_with_version) + expect(provider.build_powershell_package_command("Install-Package xNetworking", "1.0.0.0")).to eql(generated_install_cmdlet_with_version) end it "build install commands correctly" do - expect(provider.build_powershell_command("Uninstall-Package xNetworking")).to eql(generated_uninstall_cmdlet) + expect(provider.build_powershell_package_command("Uninstall-Package xNetworking")).to eql(generated_uninstall_cmdlet) end it "build install commands correctly when a version is passed" do - expect(provider.build_powershell_command("Uninstall-Package xNetworking", "1.0.0.0")).to eql(generated_uninstall_cmdlet_with_version) + expect(provider.build_powershell_package_command("Uninstall-Package xNetworking", "1.0.0.0")).to eql(generated_uninstall_cmdlet_with_version) end end context "when source is set" do it "build get commands correctly" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Get-Package xNetworking")).to eql(generated_get_cmdlet) + expect(provider.build_powershell_package_command("Get-Package xNetworking")).to eql(generated_get_cmdlet) end it "build get commands correctly when a version is passed" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Get-Package xNetworking", "1.0.0.0")).to eql(generated_get_cmdlet_with_version) + expect(provider.build_powershell_package_command("Get-Package xNetworking", "1.0.0.0")).to eql(generated_get_cmdlet_with_version) end it "builds find commands correctly" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Find-Package xNetworking")).to eql(generated_find_cmdlet_with_source) + expect(provider.build_powershell_package_command("Find-Package xNetworking")).to eql(generated_find_cmdlet_with_source) end it "builds find commands correctly when a version is passed" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Find-Package xNetworking", "1.0.0.0")).to eql(generated_find_cmdlet_with_source_and_version) + expect(provider.build_powershell_package_command("Find-Package xNetworking", "1.0.0.0")).to eql(generated_find_cmdlet_with_source_and_version) end it "build install commands correctly" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Install-Package xNetworking")).to eql(generated_install_cmdlet_with_source) + expect(provider.build_powershell_package_command("Install-Package xNetworking")).to eql(generated_install_cmdlet_with_source) end it "build install commands correctly when a version is passed" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Install-Package xNetworking", "1.0.0.0")).to eql(generated_install_cmdlet_with_source_and_version) + expect(provider.build_powershell_package_command("Install-Package xNetworking", "1.0.0.0")).to eql(generated_install_cmdlet_with_source_and_version) end it "build install commands correctly" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Uninstall-Package xNetworking")).to eql(generated_uninstall_cmdlet) + expect(provider.build_powershell_package_command("Uninstall-Package xNetworking")).to eql(generated_uninstall_cmdlet) end it "build install commands correctly when a version is passed" do new_resource.source("MyGallery") - expect(provider.build_powershell_command("Uninstall-Package xNetworking", "1.0.0.0")).to eql(generated_uninstall_cmdlet_with_version) + expect(provider.build_powershell_package_command("Uninstall-Package xNetworking", "1.0.0.0")).to eql(generated_uninstall_cmdlet_with_version) end end end |