capistrano-rvm 0.0.3 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjZkMjQ3MTQzZGZkMzk4ZmZlZWIyMzZkYWQ3YWY3MzJkOWVjMzNjOA==
-  data.tar.gz: !binary |-
-    MDRmOWY5NjI3Yjk0NTgyODJhY2M3MWQ5MzFkM2UwNzI4M2U0ZTliMw==
+SHA1:
+  metadata.gz: 3aeff623f14eea33b115ccaa66e8f4c53b50278d
+  data.tar.gz: 9e291648b638dbfc8f6894fbaac223d1c6c1c827
 SHA512:
-  metadata.gz: !binary |-
-    NWFiOWRlZjQzOGQzYmYyMDRkNjM4YmY3ODk1ZjA4NGY1ZWJiYTQyZGM4ZDk5
-    Y2NlNjExYjJmMzk5NGYxMGMwZTVjODIyMjU2YTFiNzc1ZGM1ZjBmYzg5MGUy
-    YjgwYTkwM2E2MDY3M2Y3Y2UxMmQyNWRkNWVkYjE4NjNkZjY4ZWU=
-  data.tar.gz: !binary |-
-    YTBmMzFlNTEyODgyODNhNzU0NTQyNTY1MWVhYmYyNmY3Njk4MTM5MzhhZTZk
-    OTdiMTFiYTExMzI2Y2RhODIyZTRjZDg4N2E1NjhjZjExZjhiZTAwODMzMmQ2
-    M2QyZmFiYmU3NGI5NGE2MGM4YTRkMGExODQzNmM2ZDg5YjczYmY=
+  metadata.gz: e4d0d9d9745a67fb213cab704ce45eabd2145fdf7c4b5fbe40a58de28569b867efc4d331f257a407cc9555d8403b5e48ee242014725b4e2e5404b19f445ebd09
+  data.tar.gz: b59c20f09ee09d9adb01994464200d480f2d29338e49449f47ed87f681391133f32a72fe9e45560339b45769877e14666f3241f98555a8128b6cf63783fbe9b4

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## 0.1.0
+
+* User rvm is prefered over system (@mpapis)
+* Switching to new command map (https://github.com/capistrano/sshkit/pull/45)
+  This gives us more flexible integration and command mapping.
+  Fixed bug when `cap some_task` didn't invoke RVM hooks.
+
 ## 0.0.3
 Switching to detect the binaries at runtime using `rvm ruby do binary` (thanks to @mpapis!)
 
 ## 0.0.2
 
-Initial release
+Initial release

data/README.md

@@ -8,12 +8,12 @@ Add this line to your application's Gemfile:
 
     # Gemfile
     gem 'capistrano', '~> 3.0'
-    gem 'capistrano-rvm', '~> 0.0.2'
+    gem 'capistrano-rvm', '~> 0.1.0'
 
 And then execute:
 
-    $ bundle --binstubs
-    $ cap install
+    $ bundle install
+    $ bundle exec cap install
 
 ## Usage
 
@@ -37,7 +37,7 @@ Set those in the stage file dependant on your server configuration:
 
 Valid options are:
   * `:auto` (default): just tries to find the correct path.
-                       `/usr/local/rvm` wins over `~/.rvm`
+                       `~/.rvm` wins over `/usr/local/rvm`
   * `:system`: defines the RVM path to `/usr/local/rvm`
   * `:user`: defines the RVM path to `~/.rvm`
 
@@ -49,7 +49,7 @@ the target host.
 You can omit the ruby patch level from `:rvm_ruby_version` if you want, and
 capistrano will choose the most recent patch level for that version of ruby:
 
-    set :rvm_ruby_version '2.0.0'
+    set :rvm_ruby_version, '2.0.0'
 
 If you are using an rvm gemset, just specify it after your ruby_version:
 
@@ -68,14 +68,14 @@ to define a custom RVM path to tell capistrano where it is.
 
 ## Restrictions
 
-Capistrano can't (yet) use rvm to install rubies or create gemsets, so on the
+Capistrano can't use rvm to install rubies or create gemsets, so on the
 servers you are deploying to, you will have to manually use rvm to install the
 proper ruby and create the gemset.
 
 
 ## How it works
 
-This gem adds a new task `rvm:hook` before `deploy:starting`.
+This gem adds a new task `rvm:hook` before `deploy` task.
 It sets the `rvm ... do ...` for capistrano when it wants to run
 `rake`, `gem`, `bundle`, or `ruby`.
 
@@ -88,16 +88,6 @@ deployment.
 
     $ cap production rvm:check
 
-
-## Custom tasks which rely on RVM/Ruby
-
-When building custom tasks which need a the corrent ruby and gemset, all you
-have to do is run the `rvm:hook` task before your own task. This will handle
-the execution of the ruby-related commands.
-This is only necessary if your task is *not* *after* the `deploy:starting` task.
-
-    before :my_custom_task, 'rvm:hook'
-
 ## Contributing
 
 1. Fork it

data/capistrano-rvm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-rvm"
-  gem.version       = '0.0.3'
+  gem.version       = '0.1.0'
   gem.authors       = ["Kir Shatrov"]
   gem.email         = ["shatrov@me.com"]
   gem.description   = %q{RVM integration for Capistrano}
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano'
+  gem.add_dependency 'capistrano', '~> 3.0'
+  gem.add_dependency 'sshkit', '~> 1.2.0'
 
 end

data/lib/capistrano/tasks/rvm.rake

@@ -1,33 +1,7 @@
 RVM_SYSTEM_PATH = "/usr/local/rvm"
 RVM_USER_PATH = "~/.rvm"
 
-def bundler_loaded?
-  Gem::Specification::find_all_by_name('capistrano-bundler').any?
-end
-
-SSHKit.config.command_map = Hash.new do |hash, key|
-  if fetch(:rvm_map_bins).include?(key.to_s)
-    hash[key] = "#{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do #{key}"
-  elsif key.to_s == "rvm"
-    hash[key] = "#{fetch(:rvm_path)}/bin/rvm"
-  else
-    hash[key] = key
-  end
-end
-
-namespace :deploy do
-  after :starting, 'rvm:hook'
-end
-
 namespace :rvm do
-  desc "Runs the RVM hook - use it before any custom tasks if necessary"
-  task :hook do
-    unless fetch(:rvm_hooked)
-      invoke :'rvm:init'
-      set :rvm_hooked, true
-    end
-  end
-
   desc "Prints the RVM and Ruby version on the target host"
   task :check do
     on roles(:all) do
@@ -36,14 +10,15 @@ namespace :rvm do
       puts capture(:ruby, "--version")
     end
   end
-  before :check, 'rvm:hook'
 
-  task :init do
+  task :hook do
     on roles(:all) do
       rvm_path = fetch(:rvm_custom_path)
       rvm_path ||= case fetch(:rvm_type)
       when :auto
-        if test("[ -d #{RVM_SYSTEM_PATH} ]")
+        if test("[ -d #{RVM_USER_PATH} ]")
+          RVM_USER_PATH
+        elsif test("[ -d #{RVM_SYSTEM_PATH} ]")
           RVM_SYSTEM_PATH
         else
           RVM_USER_PATH
@@ -53,19 +28,28 @@ namespace :rvm do
       else # :user
         RVM_USER_PATH
       end
+
       set :rvm_path, rvm_path
+    end
 
-      rvm_ruby_version = fetch(:rvm_ruby_version)
-      rvm_ruby_version ||= capture(:rvm, "current")
-      set :rvm_ruby_version, rvm_ruby_version
+    SSHKit.config.command_map[:rvm] = "#{fetch(:rvm_path)}/bin/rvm"
+
+    rvm_prefix = "#{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do"
+    fetch(:rvm_map_bins).each do |command|
+      SSHKit.config.command_map.prefix[command.to_sym].unshift(rvm_prefix)
     end
   end
+end
 
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'rvm:hook'
+  after stage, 'rvm:check'
 end
 
 namespace :load do
   task :defaults do
-    set :rvm_map_bins, bundler_loaded? ? %w{bundle gem rake ruby} : %w{gem rake ruby}
+    set :rvm_map_bins, %w{gem rake ruby bundle}
     set :rvm_type, :auto
+    set :rvm_ruby_version, "default"
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rvm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Kir Shatrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sshkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: RVM integration for Capistrano
 email:
 - shatrov@me.com
@@ -50,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: RVM integration for Capistrano