capistrano-nvm 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 02a785e076b46e058dae28e65c8a47acb52b5523
+  data.tar.gz: b4344bd9759ff77368f7a7fcfc0f55bd503e2579
+SHA512:
+  metadata.gz: 0b8602193ca3e4c0711be0b72baf308a76b37773e0dffd578d25f8fc61834daed1e430243a9a26b61aea9aa8ff22f42d263810c7b479f0f6f8a6f6e14ba7357c
+  data.tar.gz: ce920c0b54e646a1c20a56218fcb413c787a5643c2b35823ee9666946cfdc18903624087bea10ba68b5e4ac0b486fd8760dd16f7ef2a69d592a433dbaac54349

data/README.md

@@ -1,14 +1,15 @@
 # Capistrano::nvm
 
-This gem provides idiomatic [nvm](https://github.com/creationix/nvm) support for Capistrano 3.x (and 3.x
-*only*).
+[nvm](https://github.com/creationix/nvm) support for Capistrano 3.x
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano', '~> 3.0'
-    gem 'capistrano-nvm', github: "koenpunt/capistrano-nvm"
+```ruby
+gem 'capistrano', '~> 3.0'
+gem 'capistrano-nvm'
+```
 
 And then execute:
 
@@ -17,12 +18,19 @@ And then execute:
 
 ## Usage
 
-    # Capfile
+Require in `Capfile` to use the default task:
 
-    require 'capistrano/nvm'
+```ruby
+require 'capistrano/nvm'
+```
 
-    set :nvm_type, :user # or :system, depends on your nvm setup
-    set :nvm_node, 'v0.10.21'
+Configurable options:
+
+```ruby
+set :nvm_type, :user # or :system, depends on your nvm setup
+set :nvm_node, 'v0.10.21'
+set :nvm_map_bins, %w{node npm}
+```
 
 If your nvm is located in some custom path, you can use `nvm_custom_path` to set it.
 

data/capistrano-nvm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-nvm'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Koen Punt']
   spec.email         = ['me@koen.pt']
   spec.description   = %q{nvm support for Capistrano 3.x}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '>= 3.0.0.pre'
+  spec.add_dependency 'capistrano', '~> 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/capistrano/tasks/nvm.cap

@@ -1,9 +1,5 @@
-namespace :deploy do
-  before :starting, :'nvm:check'
-end
-
 namespace :nvm do
-  task :check do
+  task validate: :'nvm:wrapper' do
     on roles(:all) do
       nvm_node = fetch(:nvm_node)
       if nvm_node.nil?
@@ -11,34 +7,47 @@ namespace :nvm do
         exit 1
       end
 
-      unless test "[ -d #{fetch(:nvm_node_dir)} ]"
-        error "nvm: #{nvm_node} is not installed or not found in #{fetch(:nvm_node_dir)}"
+      unless test "[ -d #{fetch(:nvm_node_path)} ]"
+        error "nvm: #{nvm_node} is not installed or not found in #{fetch(:nvm_node_path)}"
         exit 1
       end
+    end
+  end
+
+  task :map_bins do
+    nvm_prefix = fetch(:nvm_prefix, -> { "NODE_VERSION=#{fetch(:nvm_node)} #{fetch(:tmp_dir)}/#{fetch(:application)}/nvm-exec.sh" } )
+    fetch(:nvm_map_bins).each do |command|
+      SSHKit.config.command_map.prefix[command.to_sym].unshift(nvm_prefix)
+    end
+  end
 
-      default_env = fetch(:default_env)
-      default_env[:path] = if default_env[:path].nil?
-                             "#{fetch(:nvm_bin_path)}:$PATH"
-                           else
-                             "#{fetch(:nvm_bin_path)}:#{default_env[:path]}"
-                           end
+  task :wrapper do
+    on roles(:all) do
+      execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
+      upload! StringIO.new("#!/bin/bash -e\nsource \"#{fetch(:nvm_path)}/nvm.sh\"\nnvm use $NODE_VERSION\nexec \"$@\""), "#{fetch(:tmp_dir)}/#{fetch(:application)}/nvm-exec.sh"
+      execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/nvm-exec.sh"
     end
   end
 end
 
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'nvm:validate'
+  after stage, 'nvm:map_bins'
+end
+
 namespace :load do
   task :defaults do
 
-    set :nvm_dir, -> {
-      nvm_dir = fetch(:nvm_custom_dir)
-      nvm_dir ||= if fetch(:nvm_type, :user) == :system
+    set :nvm_path, -> {
+      nvm_path = fetch(:nvm_custom_path)
+      nvm_path ||= if fetch(:nvm_type, :user) == :system
         "/usr/local/nvm"
       else
         "~/.nvm"
       end
     }
 
-    set :nvm_node_dir, -> { "#{fetch(:nvm_dir)}/#{fetch(:nvm_node)}" }
-    set :nvm_bin_path, -> { "#{fetch(:nvm_node_dir)}/bin" }
+    set :nvm_node_path, -> { "#{fetch(:nvm_path)}/#{fetch(:nvm_node)}" }
+    set :nvm_map_bins, %w{node npm}
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nvm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Koen Punt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,17 +41,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: nvm support for Capistrano 3.x
@@ -76,32 +69,25 @@ files:
 homepage: https://github.com/koenpunt/capistrano-nvm
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2827476677612085551
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2827476677612085551
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: nvm support for Capistrano 3.x
 test_files: []