capistrano-rbenv 0.0.2 → 0.0.3

data/lib/capistrano-rbenv/deploy.rb

@@ -10,8 +10,7 @@ module Capistrano
             File.join(rbenv_path, 'bin', 'rbenv')
           }
           _cset(:rbenv_cmd) { # to use custom rbenv_path, we use `env` instead of cap's default_environment.
-            path = "#{rbenv_path}/bin:#{rbenv_path}/shims:$PATH"
-            "env PATH=#{path.dump()} #{rbenv_bin}"
+            "env RBENV_VERSION=#{rbenv_ruby_version.dump} #{rbenv_bin}"
           }
           _cset(:rbenv_repository, 'git://github.com/sstephenson/rbenv.git')
           _cset(:rbenv_branch, 'master')
@@ -39,7 +38,6 @@ module Capistrano
           }
 
           _cset(:rbenv_ruby_version, '1.9.3-p194')
-          _cset(:rbenv_ruby_dependencies, %w(build-essential libreadline6-dev zlib1g-dev libssl-dev bison))
 
           _cset(:rbenv_use_bundler, true)
           set(:bundle_cmd) { # override bundle_cmd in "bundler/capistrano"
@@ -95,9 +93,42 @@ module Capistrano
             # nop
           }
 
+          _cset(:rbenv_platform) {
+            capture((<<-EOS).gsub(/\s+/, ' '))
+              if test -f /etc/debian_version; then
+                if test -f /etc/lsb-release && grep -i -q DISTRIB_ID=Ubuntu /etc/lsb-release; then
+                  echo ubuntu;
+                else
+                  echo debian;
+                fi;
+              elif test -f /etc/redhat-release; then
+                echo redhat;
+              else
+                echo unknown;
+              fi;
+            EOS
+          }
+          _cset(:rbenv_ruby_dependencies) {
+            case rbenv_platform
+            when /(debian|ubuntu)/i
+              %w(build-essential libreadline6-dev zlib1g-dev libssl-dev bison)
+            when /redhat/i
+              %w(autoconf glibc-devel patch readline readline-devel zlib zlib-devel openssl bison)
+            else
+              []
+            end
+          }
           task(:dependencies, :except => { :no_release => true }) {
-            unless rbenv_ruby_dependencies.empty? # dpkg-query is faster than apt-get on querying if packages are installed
-              run("dpkg-query --show #{rbenv_ruby_dependencies.join(' ')} 2>/dev/null || #{sudo} apt-get -y install #{rbenv_ruby_dependencies.join(' ')}")
+            unless rbenv_ruby_dependencies.empty?
+              case rbenv_platform
+              when /(debian|ubuntu)/i
+                # dpkg-query is faster than apt-get on querying if packages are installed
+                run("dpkg-query --show #{rbenv_ruby_dependencies.join(' ')} 2>/dev/null || #{sudo} apt-get -y install #{rbenv_ruby_dependencies.join(' ')}")
+              when /redhat/i
+                run("#{sudo} yum install -y #{rbenv_ruby_dependencies.join(' ')}")
+              else
+                # nop
+              end
             end
           }
 
@@ -105,7 +136,7 @@ module Capistrano
           task(:build, :except => { :no_release => true }) {
             ruby = fetch(:rbenv_ruby_cmd, 'ruby')
             run("#{rbenv_cmd} whence #{ruby} | grep -q #{rbenv_ruby_version} || #{rbenv_cmd} install #{rbenv_ruby_version}")
-            run("#{rbenv_cmd} global #{rbenv_ruby_version} && #{rbenv_cmd} exec #{ruby} --version")
+            run("#{rbenv_cmd} exec #{ruby} --version")
           }
 
           _cset(:rbenv_bundler_gem, 'bundler')

data/lib/capistrano-rbenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module RbEnv
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano