diff options
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/easy_install.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/easy_install_spec.rb | 6 |
6 files changed, 20 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 20099fd073..8987ff0681 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,9 +18,9 @@ GIT PATH remote: . specs: - chef (12.10.16) + chef (12.10.17) bundler (>= 1.10) - chef-config (= 12.10.16) + chef-config (= 12.10.17) chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -44,9 +44,9 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.10.16-universal-mingw32) + chef (12.10.17-universal-mingw32) bundler (>= 1.10) - chef-config (= 12.10.16) + chef-config (= 12.10.17) chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -85,7 +85,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.10.16) + chef-config (12.10.17) fuzzyurl (~> 0.8.0) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) @@ -200,7 +200,7 @@ GEM thor hashie (3.4.3) highline (1.7.8) - httpclient (2.7.1) + httpclient (2.8.0) inifile (3.0.0) iniparse (1.4.2) ipaddress (0.8.3) @@ -239,7 +239,7 @@ GEM win32-process (~> 0.8.2) wmi-lite (~> 1.0) mixlib-versioning (1.1.0) - multi_json (1.11.2) + multi_json (1.11.3) multi_xml (0.5.5) multipart-post (2.0.0) net-scp (1.2.1) @@ -334,7 +334,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-prof (0.15.9) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.0) ruby-shadow (2.5.0) rubyntlm (0.6.0) rufus-lru (1.0.5) @@ -353,7 +353,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - specinfra (2.56.1) + specinfra (2.57.0) net-scp net-ssh (>= 2.7, < 4.0) net-telnet @@ -1 +1 @@ -12.10.16
\ No newline at end of file +12.10.17
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index ec15f12fdf..129ad7f518 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.10.16" + VERSION = "12.10.17" end # diff --git a/lib/chef/provider/package/easy_install.rb b/lib/chef/provider/package/easy_install.rb index a876258d04..989f2ab9d2 100644 --- a/lib/chef/provider/package/easy_install.rb +++ b/lib/chef/provider/package/easy_install.rb @@ -112,6 +112,7 @@ class Chef end def install_package(name, version) + Chef.log_deprecation("The easy_install package provider is deprecated and will be removed in Chef 13.") run_command(:command => "#{easy_install_binary_path}#{expand_options(@new_resource.options)} \"#{name}==#{version}\"") end @@ -120,6 +121,7 @@ class Chef end def remove_package(name, version) + Chef.log_deprecation("The easy_install package provider is deprecated and will be removed in Chef 13.") run_command(:command => "#{easy_install_binary_path }#{expand_options(@new_resource.options)} -m #{name}") end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b3327a4164..5ac4f91ec3 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.10.16" + VERSION = "12.10.17" end # diff --git a/spec/unit/provider/package/easy_install_spec.rb b/spec/unit/provider/package/easy_install_spec.rb index 79a5889f9f..fa5eea00a2 100644 --- a/spec/unit/provider/package/easy_install_spec.rb +++ b/spec/unit/provider/package/easy_install_spec.rb @@ -61,6 +61,7 @@ describe Chef::Provider::Package::EasyInstall do describe "actions_on_package" do it "should run easy_install with the package name and version" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"", }) @@ -68,6 +69,7 @@ describe Chef::Provider::Package::EasyInstall do end it "should run easy_install with the package name and version and specified options" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install --always-unzip \"boto==1.8d\"", }) @@ -76,6 +78,7 @@ describe Chef::Provider::Package::EasyInstall do end it "should run easy_install with the package name and version" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"", }) @@ -83,6 +86,7 @@ describe Chef::Provider::Package::EasyInstall do end it "should run easy_install -m with the package name and version" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto", }) @@ -90,6 +94,7 @@ describe Chef::Provider::Package::EasyInstall do end it "should run easy_install -m with the package name and version and specified options" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install -x -m boto", }) @@ -98,6 +103,7 @@ describe Chef::Provider::Package::EasyInstall do end it "should run easy_install -m with the package name and version" do + expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/) expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto", }) |