capistrano-rbenv 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba89199aa4b724bbbc2fa4032bdf85a35cd9cd61
-  data.tar.gz: 662e5d6efe7fab2ffbd9619a6e1ca1fe0bc56f14
+  metadata.gz: 98fb9cdba5c42ebe0a453c95f61397bd7c1b7a33
+  data.tar.gz: b1468bb26de51d703f3b28ea69155dd290c73795
 SHA512:
-  metadata.gz: a768fde31a2df1402b84e6385cb5d6a903909db8043c46a508aae5954d3b9314f308b739d19e8a48984fd72e506ca4c194d7402ec3c9715394a284eae0bbc069
-  data.tar.gz: 6b74e788c7887d7d671490f9d14d9f7184ddf8dbbf3c907e84f7cfa6e0111e4b320c603ec3d8d5cc0a642553d31ac1f9d385597f6df2cbbab580c63816a4ef21
+  metadata.gz: ab3c7cd28e2e6e0a695a06b84031aa1b56b41c835bbe7c37e73c5313a51aa9384843d7a1f3d1e56bf664051bf8088a70d2864cef9a15997424db06ddfb1fa036
+  data.tar.gz: a927bd0fa03a16b6fcdad03e0e632639526f6695e2e9121afcf91d6214bf4f58e192301a85ee34b512dabc772a0311deb709f13007375c9a2147f8baaa3fa0ad

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [master][]
+
+* Your contribution here!
+
+# [2.1.0][] (4 Dec 2016)
+
+* Make rbenv_ruby optional [#61](https://github.com/capistrano/rbenv/issues/61), [#67](https://github.com/capistrano/rbenv/pull/67)
+
 # 2.0.4 (3 Jan 2016)
 
 * Change default `rbenv_path` to use `$HOME` instead of `~`. This allows
@@ -32,3 +40,7 @@ Capistrano 3 -ready release.
 # 1.0.5
 
 Versions < 2.0 are located in another repo: https://github.com/yyuu/capistrano-rbenv
+
+
+[master]: https://github.com/capistrano/rbenv/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/capistrano/rbenv/compare/v2.0.4...v2.1.0

data/README.md

@@ -40,6 +40,15 @@ And then execute:
 
 If your rbenv is located in some custom path, you can use `rbenv_custom_path` to set it.
 
+### Defining the ruby version
+
+To set the Ruby version explicitly, add `:rbenv_ruby` to your Capistrano configuration:
+
+    # config/deploy.rb
+    set :rbenv_ruby, '2.0.0-p247'
+
+Alternatively, allow the remote host's `rbenv` to [determine the appropriate Ruby version](https://github.com/rbenv/rbenv#choosing-the-ruby-version) by omitting `:rbenv_ruby`. This approach is useful if you have a `.ruby-version` file in your project.
+
 ## Contributing
 
 1. Fork it

data/capistrano-rbenv.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-rbenv"
-  gem.version       = '2.0.4'
+  gem.version       = '2.1.0'
   gem.authors       = ["Kir Shatrov", "Yamashita Yuu"]
   gem.email         = ["shatrov@me.com", "yamashita@geishatokyo.com"]
   gem.description   = %q{rbenv integration for Capistrano}

data/lib/capistrano/tasks/rbenv.rake

@@ -3,12 +3,12 @@ namespace :rbenv do
     on release_roles(fetch(:rbenv_roles)) do
       rbenv_ruby = fetch(:rbenv_ruby)
       if rbenv_ruby.nil?
-        error "rbenv: rbenv_ruby is not set"
-        exit 1
+        warn "rbenv: rbenv_ruby is not set"
       end
 
-      unless test "[ -d #{fetch(:rbenv_ruby_dir)} ]"
-        error "rbenv: #{rbenv_ruby} is not installed or not found in #{fetch(:rbenv_ruby_dir)}"
+      # don't check the rbenv_ruby_dir if :rbenv_ruby is not set (it will always fail)
+      unless rbenv_ruby.nil? || (test "[ -d #{fetch(:rbenv_ruby_dir)} ]")
+        warn "rbenv: #{rbenv_ruby} is not installed or not found in #{fetch(:rbenv_ruby_dir)}"
         exit 1
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Kir Shatrov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: rbenv integration for Capistrano