capistrano-pyenv 0.0.1 → 0.0.2

data/lib/capistrano-pyenv/deploy.rb

@@ -10,8 +10,7 @@ module Capistrano
             File.join(pyenv_path, 'bin', 'pyenv')
           }
           _cset(:pyenv_cmd) { # to use custom pyenv_path, we use `env` instead of cap's default_environment.
-            path = "#{pyenv_path}/bin:#{pyenv_path}/shims:$PATH"
-            "env PATH=#{path.dump()} #{pyenv_bin}"
+            "env PYENV_VERSION=#{pyenv_python_version.dump} #{pyenv_bin}"
           }
           _cset(:pyenv_repository, 'git://github.com/yyuu/pyenv.git')
           _cset(:pyenv_branch, 'master')
@@ -35,7 +34,6 @@ module Capistrano
           }
 
           _cset(:pyenv_python_version, '2.7.3')
-          _cset(:pyenv_python_dependencies, %w(build-essential libreadline6-dev zlib1g-dev libssl-dev))
 
           desc("Setup pyenv.")
           task(:setup, :except => { :no_release => true }) {
@@ -85,9 +83,42 @@ module Capistrano
             # nop
           }
 
+          _cset(:pyenv_platform) {
+            capture((<<-EOS).gsub(/\s+/, ' ')).strip
+              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(:pyenv_python_dependencies) {
+            case pyenv_platform
+            when /(debian|ubuntu)/i
+              %w(build-essential libreadline6-dev zlib1g-dev libssl-dev)
+            when /redhat/i
+              %w(autoconf glibc-devel patch readline readline-devel zlib zlib-devel openssl)
+            else
+              []
+            end
+          }
           task(:dependencies, :except => { :no_release => true }) {
-            unless pyenv_python_dependencies.empty? # dpkg-query is faster than apt-get on querying if packages are installed
-              run("dpkg-query --show #{pyenv_python_dependencies.join(' ')} 2>/dev/null || #{sudo} apt-get -y install #{pyenv_python_dependencies.join(' ')}")
+            unless pyenv_python_dependencies.empty?
+              case pyenv_platform
+              when /(debian|ubuntu)/i
+                # dpkg-query is faster than apt-get on querying if packages are installed
+                run("dpkg-query --show #{pyenv_python_dependencies.join(' ')} 2>/dev/null || #{sudo} apt-get -y install #{pyenv_python_dependencies.join(' ')}")
+              when /redhat/i
+                run("#{sudo} yum install -y #{pyenv_python_dependencies.join(' ')}")
+              else
+                # nop
+              end
             end
           }
 
@@ -95,7 +126,7 @@ module Capistrano
           task(:build, :except => { :no_release => true }) {
             python = fetch(:pyenv_python_cmd, 'python')
             run("#{pyenv_cmd} whence #{python} | grep -q #{pyenv_python_version} || #{pyenv_cmd} install #{pyenv_python_version}")
-            run("#{pyenv_cmd} global #{pyenv_python_version} && #{pyenv_cmd} exec #{python} --version")
+            run("#{pyenv_cmd} exec #{python} --version")
           }
         }
       }

data/lib/capistrano-pyenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module PyEnv
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pyenv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   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