capistrano-rbenv 0.0.3 → 0.0.4

data/lib/capistrano-rbenv/deploy.rb

@@ -94,7 +94,7 @@ module Capistrano
           }
 
           _cset(:rbenv_platform) {
-            capture((<<-EOS).gsub(/\s+/, ' '))
+            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;
@@ -111,9 +111,9 @@ module Capistrano
           _cset(:rbenv_ruby_dependencies) {
             case rbenv_platform
             when /(debian|ubuntu)/i
-              %w(build-essential libreadline6-dev zlib1g-dev libssl-dev bison)
+              %w(git-core 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)
+              %w(git-core autoconf glibc-devel patch readline readline-devel zlib zlib-devel openssl bison)
             else
               []
             end
@@ -122,10 +122,9 @@ module Capistrano
             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(' ')}")
+                run("#{sudo} apt-get install -q -y #{rbenv_ruby_dependencies.join(' ')}")
               when /redhat/i
-                run("#{sudo} yum install -y #{rbenv_ruby_dependencies.join(' ')}")
+                run("#{sudo} yum install -q -y #{rbenv_ruby_dependencies.join(' ')}")
               else
                 # nop
               end
@@ -135,7 +134,9 @@ module Capistrano
           desc("Build ruby within rbenv.")
           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}")
+            if rbenv_ruby_version != 'system'
+              run("#{rbenv_cmd} whence #{ruby} | grep -q #{rbenv_ruby_version} || #{rbenv_cmd} install #{rbenv_ruby_version}")
+            end
             run("#{rbenv_cmd} exec #{ruby} --version")
           }
 
@@ -151,7 +152,7 @@ module Capistrano
               f = "grep #{rbenv_bundler_gem}"
               i = "#{rbenv_bundler_gem}"
             end
-            run("unset -v GEM_HOME; #{gem} query #{q} 2>/dev/null | #{f} || #{gem} install #{i}")
+            run("unset -v GEM_HOME; #{gem} query #{q} 2>/dev/null | #{f} || #{gem} install -q #{i}")
             run("#{rbenv_cmd} rehash && #{bundle_cmd} version")
           }
         }

data/lib/capistrano-rbenv/version.rb

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

metadata

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