capistrano-rbenv 0.0.6 → 0.0.7

data/lib/capistrano-rbenv/deploy.rb

@@ -1,3 +1,7 @@
+
+require "capistrano/configuration"
+require "capistrano/recipes/deploy/scm"
+
 module Capistrano
   module RbEnv
     def self.extended(configuration)
@@ -24,20 +28,7 @@ module Capistrano
           _cset(:rbenv_plugins_path) {
             File.join(rbenv_path, 'plugins')
           }
-
-          _cset(:rbenv_git) {
-            if scm == :git
-              if fetch(:scm_command, :default) == :default
-                fetch(:git, 'git')
-              else
-                scm_command
-              end
-            else
-              fetch(:git, 'git')
-            end
-          }
-
-          _cset(:rbenv_ruby_version, '1.9.3-p194')
+          _cset(:rbenv_ruby_version, "1.9.3-p327")
 
           _cset(:rbenv_use_bundler, true)
           set(:bundle_cmd) { # override bundle_cmd in "bundler/capistrano"
@@ -54,22 +45,40 @@ module Capistrano
           }
           after 'deploy:setup', 'rbenv:setup'
 
-          def _rbenv_sync(repository, destination, revision)
-            git = rbenv_git
-            remote = 'origin'
-            verbose = "-q"
-            run((<<-E).gsub(/\s+/, ' '))
-              if test -d #{destination}; then
-                cd #{destination} && #{git} fetch #{verbose} #{remote} && #{git} fetch --tags #{verbose} #{remote} && #{git} merge #{verbose} #{remote}/#{revision};
+          def rbenv_update_repository(destination, options={})
+            configuration = Capistrano::Configuration.new()
+            variables.merge(options).each do |key, val|
+              configuration.set(key, val)
+            end
+            configuration.set(:source) { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) }
+            configuration.set(:revision) { configuration[:source].head }
+            configuration.set(:real_revision) {
+              configuration[:source].local.query_revision(configuration[:revision]) { |cmd|
+                with_env("LC_ALL", "C") { run_locally(cmd) }
+              }
+            }
+            source = configuration[:source]
+            revision = configuration[:real_revision]
+            #
+            # we cannot use source.sync since it cleans up untacked files in the repository.
+            # currently we are just calling git sub-commands directly to avoid the problems.
+            #
+            verbose = configuration[:scm_verbose] ? nil : "-q"
+            run((<<-EOS).gsub(/\s+/, ' ').strip)
+              if [ -d #{destination} ]; then
+                cd #{destination} &&
+                #{source.command} fetch #{verbose} #{source.origin} &&
+                #{source.command} fetch --tags #{verbose} #{source.origin} &&
+                #{source.command} reset #{verbose} --hard #{revision};
               else
-                #{git} clone #{verbose} #{repository} #{destination} && cd #{destination} && #{git} checkout #{verbose} #{revision};
-              fi;
-            E
+                #{source.checkout(revision, destination)};
+              fi
+            EOS
           end
 
           desc("Update rbenv installation.")
           task(:update, :except => { :no_release => true }) {
-            _rbenv_sync(rbenv_repository, rbenv_path, rbenv_branch)
+            rbenv_update_repository(rbenv_path, :scm => :git, :repository => rbenv_repository, :branch => rbenv_branch)
             plugins.update
           }
 
@@ -84,7 +93,7 @@ module Capistrano
               rbenv_plugins.each { |name, repository|
                 options = ( rbenv_plugins_options[name] || {})
                 branch = ( options[:branch] || 'master' )
-                _rbenv_sync(repository, File.join(rbenv_plugins_path, name), branch)
+                rbenv_update_repository(File.join(rbenv_plugins_path, name), :scm => :git, :repository => repository, :branch => branch)
               }
             }
           }
@@ -187,7 +196,7 @@ module Capistrano
           task(:build, :except => { :no_release => true }) {
             ruby = fetch(:rbenv_ruby_cmd, 'ruby')
             if rbenv_ruby_version != 'system'
-              run("#{rbenv_cmd} whence #{ruby} | grep -q #{rbenv_ruby_version} || #{rbenv_cmd} install #{rbenv_ruby_version}")
+              run("#{rbenv_bin} whence #{ruby} | fgrep -q #{rbenv_ruby_version} || #{rbenv_bin} install #{rbenv_ruby_version}")
             end
             run("#{rbenv_cmd} exec #{ruby} --version && #{rbenv_cmd} global #{rbenv_ruby_version}")
           }
@@ -197,11 +206,11 @@ module Capistrano
             gem = "#{rbenv_cmd} exec gem"
             if v = fetch(:rbenv_bundler_version, nil)
               q = "-n #{rbenv_bundler_gem} -v #{v}"
-              f = "grep #{rbenv_bundler_gem} | grep #{v}"
+              f = "fgrep #{rbenv_bundler_gem} | fgrep #{v}"
               i = "-v #{v} #{rbenv_bundler_gem}"
             else
               q = "-n #{rbenv_bundler_gem}"
-              f = "grep #{rbenv_bundler_gem}"
+              f = "fgrep #{rbenv_bundler_gem}"
               i = "#{rbenv_bundler_gem}"
             end
             run("unset -v GEM_HOME; #{gem} query #{q} 2>/dev/null | #{f} || #{gem} install -q #{i}")

data/lib/capistrano-rbenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module RbEnv
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

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