Merge pull request #1414 from vtolstov/upstream

next try to add exherbo linux support

6 files changed, 269 insertions, 0 deletions

diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb
index 4b59501d1f..e10b51e921 100644
--- a/lib/chef/platform/provider_mapping.rb
+++ b/lib/chef/platform/provider_mapping.rb
@@ -360,6 +360,14 @@ class Chef
                 :package => Chef::Provider::Package::Aix
               }
             },
+            :exherbo => {
+              :default => {
+                :package => Chef::Provider::Package::Paludis,
+                :service => Chef::Provider::Service::Systemd,
+                :cron => Chef::Provider::Cron,
+                :mdadm => Chef::Provider::Mdadm
+              }
+            },
             :default => {
               :file => Chef::Provider::File,
               :directory => Chef::Provider::Directory,
diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb
new file mode 100644
index 0000000000..e304cd3b8e
--- /dev/null
+++ b/lib/chef/provider/package/paludis.rb
@@ -0,0 +1,91 @@
+#
+# Author:: Vasiliy Tolstov (<v.tolstov@selfip.ru>)
+# Copyright:: Copyright (c) 2014 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 'chef/provider/package'
+require 'chef/resource/package'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Provider
+    class Package
+      class Paludis < Chef::Provider::Package
+
+        include Chef::Mixin::ShellOut
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Package.new(@new_resource.package_name)
+          @current_resource.package_name(@new_resource.package_name)
+
+          @current_resource.version(nil)
+
+          Chef::Log.debug("Checking package status for #{@new_resource.package_name}")
+          installed = false
+          re = Regexp.new('(.*)[[:blank:]](.*)[[:blank:]](.*)$')
+
+          shell_out!("cave -L warning print-ids -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line|
+            res = re.match(line)
+            unless res.nil?
+              case res[3]
+              when 'accounts', 'installed-accounts'
+                next
+              when 'installed'
+                installed = true
+                @current_resource.version(res[2])
+              else
+                @candidate_version = res[2]
+                @current_resource.version(nil)              
+              end
+            end
+          end
+
+          @current_resource
+        end
+
+        def install_package(name, version)
+          if(version)
+            pkg = "=#{name}-#{version}"
+          else
+            pkg = "#{@new_resource.package_name}"
+          end
+          shell_out!("cave -L warning resolve -x#{expand_options(@new_resource.options)} \"#{pkg}\"")
+        end
+
+        def upgrade_package(name, version)
+          install_package(name, version)
+        end
+
+        def remove_package(name, version)
+          if(version)
+            pkg = "=#{@new_resource.package_name}-#{version}"
+          else
+            pkg = "#{@new_resource.package_name}"
+          end
+
+          shell_out!("cave -L warning uninstall -x#{expand_options(@new_resource.options)} \"#{pkg}\"")
+        end
+
+        def purge_package(name, version)
+          remove_package(name, version)
+        end
+
+      end
+    end
+  end
+end
+
+
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb
index 8989aa3beb..c89037df31 100644
--- a/lib/chef/providers.rb
+++ b/lib/chef/providers.rb
@@ -62,6 +62,7 @@ require 'chef/provider/package/ips'
 require 'chef/provider/package/macports'
 require 'chef/provider/package/pacman'
 require 'chef/provider/package/portage'
+require 'chef/provider/package/paludis'
 require 'chef/provider/package/rpm'
 require 'chef/provider/package/rubygems'
 require 'chef/provider/package/yum'
diff --git a/lib/chef/resource/paludis_package.rb b/lib/chef/resource/paludis_package.rb
new file mode 100644
index 0000000000..e456750b70
--- /dev/null
+++ b/lib/chef/resource/paludis_package.rb
@@ -0,0 +1,33 @@
+#
+# Author:: Vasiliy Tolstov (<v.tolstov@selfip.ru>)
+# Copyright:: Copyright (c) 2014 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 'chef/resource/package'
+require 'chef/provider/package/paludis'
+
+class Chef
+  class Resource
+    class PaludisPackage < Chef::Resource::Package
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :paludis_package
+        @provider = Chef::Provider::Package::Paludis
+        @allowed_actions = [ :install, :remove, :upgrade ]
+      end
+    end
+  end
+end
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb
index 711becef8c..01e8d63040 100644
--- a/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
@@ -48,6 +48,7 @@ require 'chef/resource/mount'
 require 'chef/resource/ohai'
 require 'chef/resource/package'
 require 'chef/resource/pacman_package'
+require 'chef/resource/paludis_package'
 require 'chef/resource/perl'
 require 'chef/resource/portage_package'
 require 'chef/resource/powershell_script'
diff --git a/spec/unit/provider/package/paludis_spec.rb b/spec/unit/provider/package/paludis_spec.rb
new file mode 100644
index 0000000000..bf93ecb2a4
--- /dev/null
+++ b/spec/unit/provider/package/paludis_spec.rb
@@ -0,0 +1,135 @@
+#
+# Author:: Vasiliy Tolstov <v.tolstov@selfip.ru>
+# Copyright:: Copyright (c) 2014 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 'ostruct'
+
+# based on the ips specs
+
+describe Chef::Provider::Package::Paludis do
+  before(:each) do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Package.new("net/ntp")
+    @current_resource = Chef::Resource::Package.new("net/ntp")
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
+    @provider = Chef::Provider::Package::Paludis.new(@new_resource, @run_context)
+
+    @stdin = StringIO.new
+    @stderr = StringIO.new
+    @stdout =<<-PKG_STATUS
+group/ntp 0 accounts
+group/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r2 arbor
+user/ntp 0 accounts
+user/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r1 installed
+PKG_STATUS
+    @pid = 12345
+    @shell_out = OpenStruct.new(:stdout => @stdout,:stdin => @stdin,:stderr => @stderr,:status => @status,:exitstatus => 0)
+  end
+
+  context "when loading current resource" do
+    it "should create a current resource with the name of the new_resource" do
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      Chef::Resource::Package.should_receive(:new).and_return(@current_resource)
+      @provider.load_current_resource
+    end
+
+    it "should set the current resources package name to the new resources package name" do
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @current_resource.should_receive(:package_name).with(@new_resource.package_name)
+      @provider.load_current_resource
+    end
+
+    it "should run pkg info with the package name" do
+      @provider.should_receive(:shell_out!).with("cave -L warning print-ids -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").and_return(@shell_out)
+      @provider.load_current_resource
+    end
+
+    it "should return new version if package is installed" do
+      @stdout.replace(<<-INSTALLED)
+group/ntp 0 accounts
+group/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r2 arbor
+user/ntp 0 accounts
+user/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r1 installed
+INSTALLED
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource
+      @current_resource.version.should == "4.2.6_p5-r1"
+      @provider.candidate_version.should eql("4.2.6_p5-r2")
+    end
+
+    it "should return the current resource" do
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource.should eql(@current_resource)
+    end
+  end
+
+  context "when installing a package" do
+    it "should run pkg install with the package name and version" do
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.install_package("net/ntp", "4.2.6_p5-r2")
+    end
+
+
+    it "should run pkg install with the package name and version and options if specified" do
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x --preserve-world \"=net/ntp-4.2.6_p5-r2\"")
+      @new_resource.stub(:options).and_return("--preserve-world")
+      @provider.install_package("net/ntp", "4.2.6_p5-r2")
+    end
+
+    it "should not contain invalid characters for the version string" do
+      @stdout.replace(<<-PKG_STATUS)
+sys-process/lsof 4.87 arbor
+sys-process/lsof 4.87 x86_64
+PKG_STATUS
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=sys-process/lsof-4.87\"")
+      @provider.install_package("sys-process/lsof", "4.87")
+    end
+
+    it "should not include the human-readable version in the candidate_version" do
+      @stdout.replace(<<-PKG_STATUS)
+sys-process/lsof 4.87 arbor
+sys-process/lsof 4.87 x86_64
+PKG_STATUS
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource
+      @current_resource.version.should be_nil
+      @provider.candidate_version.should eql("4.87")
+    end
+  end
+
+  context "when upgrading a package" do
+    it "should run pkg install with the package name and version" do
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.upgrade_package("net/ntp", "4.2.6_p5-r2")
+    end
+  end
+
+  context "when uninstalling a package" do
+    it "should run pkg uninstall with the package name and version" do
+      @provider.should_receive(:shell_out!).with("cave -L warning uninstall -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.remove_package("net/ntp", "4.2.6_p5-r2")
+    end
+
+  end
+end