capistrano-rbenv 0.0.7 → 0.0.8

data/README.md

@@ -32,7 +32,6 @@ Following options are available to manage your rbenv.
  * `:rbenv_bundler_version` -  version for `bundler` package.
  * `:rbenv_cmd` - the `rbenv` command.
  * `:rbenv_path` - the path where `rbenv` will be installed. use `$HOME/.rbenv` by default.
- * `:rbenv_plugins_options` - install options for rbenv plugins.
  * `:rbenv_plugins` - rbenv plugins to install. install `ruby-build` by default.
  * `:rbenv_repository` - repository URL of rbenv.
  * `:rbenv_ruby_dependencies` - dependency packages.

data/lib/capistrano-rbenv/deploy.rb

@@ -19,12 +19,10 @@ module Capistrano
           _cset(:rbenv_repository, 'git://github.com/sstephenson/rbenv.git')
           _cset(:rbenv_branch, 'master')
 
-          _cset(:rbenv_plugins, {
-            'ruby-build' => 'git://github.com/sstephenson/ruby-build.git',
-          })
-          _cset(:rbenv_plugins_options, {
-            'ruby-build' => {:branch => 'master'},
-          })
+          _cset(:rbenv_plugins) {{
+            "ruby-build" => { :repository => "git://github.com/sstephenson/ruby-build.git", :branch => "master" },
+          }}
+          _cset(:rbenv_plugins_options, {}) # for backward compatibility. plugin options can be configured from :rbenv_plugins.
           _cset(:rbenv_plugins_path) {
             File.join(rbenv_path, 'plugins')
           }
@@ -47,16 +45,16 @@ module Capistrano
 
           def rbenv_update_repository(destination, options={})
             configuration = Capistrano::Configuration.new()
+            options = {
+              :source => proc { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) },
+              :revision => proc { configuration[:source].head },
+              :real_revision => proc {
+                configuration[:source].local.query_revision(configuration[:revision]) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } }
+              },
+            }.merge(options)
             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]
             #
@@ -90,11 +88,12 @@ module Capistrano
           namespace(:plugins) {
             desc("Update rbenv plugins.")
             task(:update, :except => { :no_release => true }) {
-              rbenv_plugins.each { |name, repository|
-                options = ( rbenv_plugins_options[name] || {})
-                branch = ( options[:branch] || 'master' )
-                rbenv_update_repository(File.join(rbenv_plugins_path, name), :scm => :git, :repository => repository, :branch => branch)
-              }
+              rbenv_plugins.each do |name, repository|
+                # for backward compatibility, obtain plugin options from :rbenv_plugins_options first
+                options = rbenv_plugins_options.fetch(name, {})
+                options = options.merge(Hash === repository ? repository : {:repository => repository})
+                rbenv_update_repository(File.join(rbenv_plugins_path, name), options.merge(:scm => :git))
+              end
             }
           }
 

data/lib/capistrano-rbenv/version.rb

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

metadata

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