capistrano_chef_solo 0.0.4 → 0.0.5

data/lib/capistrano_chef_solo.rb

@@ -138,16 +138,29 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Performs a dist-upgrade on your system"
       task :dist_upgrade, :except => { :no_release => true } do
-        stream_or_run "#{sudo} aptitude update"
-        stream_or_run "#{sudo} apt-get -o Dpkg::Options::=\"--force-confnew\" --force-yes -fuy dist-upgrade"
+        case os
+        when "ubuntu"
+          stream_or_run "#{sudo} aptitude update"
+          stream_or_run "#{sudo} apt-get -o Dpkg::Options::=\"--force-confnew\" --force-yes -fuy dist-upgrade"
+        when "centos"
+          stream_or_run "#{sudo} yum update -y"
+        end
       end
 
       desc "Installs the dependencies to compile Ruby"
       task :dependencies, :except => { :no_release => true } do
-        stream_or_run "#{sudo} aptitude install -y git-core curl build-essential bison openssl \
-              libreadline6 libreadline6-dev git-core zlib1g zlib1g-dev libssl-dev \
-              libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev \
-              vim wget tree" # this line not really dependencies, but who can live without them?
+        case os
+        when "ubuntu"
+          stream_or_run "#{sudo} aptitude install -y git-core curl build-essential bison openssl \
+                libreadline6 libreadline6-dev zlib1g zlib1g-dev libssl-dev \
+                libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev \
+                vim wget tree" # this line not really dependencies, but who can live without them?
+        when "centos"
+          stream_or_run "#{sudo} yum install -y git-core curl patch bison openssl \
+                readline readline-devel zlib zlib-devel openssl-devel \
+                libyaml-devel libxml2-devel libxslt-devel autoconf glibc-devel ncurses-devel \
+                vim wget tree" # this line not really dependencies, but who can live without them?
+        end
       end
 
       desc <<-DESC
@@ -247,7 +260,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Install the gems needed for chef-solo"
       task :chef, :except => { :no_release => true } do
-        run "#{sudo} gem install chef ruby-shadow --no-ri --no-rdoc"
+        chef_version = fetch :chef_version, ">= 0"
+        run "#{sudo} #{sudo_opts} gem install chef --version '#{chef_version}' --no-ri --no-rdoc"
+        run "#{sudo} #{sudo_opts} gem install ruby-shadow --no-ri --no-rdoc"
       end
 
     end
@@ -258,11 +273,22 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       ensure_cookbooks
       default
-      run "mkdir -p /tmp/chef"
+      run "mkdir -p /tmp/chef/cache"
       generate_config
       generate_attributes(run_list)
       copy_cookbooks
-      stream_or_run "#{sudo} chef-solo -c /tmp/chef/solo.rb -j /tmp/chef/solo.json"
+      stream_or_run "#{sudo} #{sudo_opts} chef-solo -c /tmp/chef/solo.rb -j /tmp/chef/solo.json"
+    end
+
+    def sudo_opts
+      case os
+      when "centos"
+        "env PATH=$PATH" # to fix missing paths when using sudo
+      end
+    end
+
+    def os
+      fetch(:os, "ubuntu")
     end
 
     def ensure_cookbooks
@@ -278,7 +304,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     def generate_config
       cookbook_paths = cookbooks.map { |c| "File.join(root, #{c.to_s.inspect})" }.join(', ')
       solo_rb = <<-RUBY
-        root = File.absolute_path(File.dirname(__FILE__))
+        root = File.expand_path(File.dirname(__FILE__))
         file_cache_path File.join(root, "cache")
         cookbook_path [ #{cookbook_paths} ]
       RUBY
@@ -308,7 +334,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       tar_file = Tempfile.new("cookbooks.tar")
       begin
         tar_file.close
-        system "tar -cjf #{tar_file.path} #{cookbooks.join(' ')}"
+        env_vars = fetch(:copyfile_disable, false) && RUBY_PLATFORM.downcase.include?('darwin') ? "COPYFILE_DISABLE=true" : ""
+        system "#{env_vars} tar -cjf #{tar_file.path} #{cookbooks.join(' ')}"
         upload tar_file.path, "/tmp/chef/cookbooks.tar", :via => :scp
         run "cd /tmp/chef && tar -xjf cookbooks.tar"
       ensure

data/lib/capistrano_chef_solo/version.rb

@@ -1,3 +1,3 @@
 module CapistranoChefSolo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_chef_solo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2165623580 !ruby/object:Gem::Requirement
+  requirement: &2173526080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165623580
+  version_requirements: *2173526080
 description: This gem provides Capistrano tasks to run chef-solo with Capistrano,
   with hardly any configuration needed.
 email:
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano_chef_solo
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Combining the awesome powers of Capistrano and chef-solo