capistrano-rbenv-install 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afdb932ae318230056e5634b199d619b18e1eefd
-  data.tar.gz: 9cc4770b5547475e981a478abc709ed9e88448b7
+  metadata.gz: b4376d1f69aaf179537baaa44d45a7fd433ddac8
+  data.tar.gz: ffdea53b5d9d4c1133a3a32864f331466d28340f
 SHA512:
-  metadata.gz: 9eda8b1fd55349c806c86259cc246088bdef2f74fdfdf24a65dab5400a146988bd23bbe6c1f15b0425079b269236bade7895be5189d4bd09b2f84a59f3ba1d41
-  data.tar.gz: db9217e6149e8b22053e718cf1e1ea51f7896f4a06465a8fcf15d831b7d3f269cf8bcda3c8eb01f98a56e2d56eea4db51b8d8a4804aadbd96d35992b14a6c723
+  metadata.gz: ac0ae27eb2180c370bf89719c6370c24507d603eca9b60817d325c4e5b3fb2880cde89afbea594939b026670736ab3686304a6c69ab57469bef8cca7e2c89546
+  data.tar.gz: 3a995a8d4e7ff503d6b406ada4cb0852a16fcd1571962df2c6b1494730fc6e71d9d0b64b1fb9f2a050f2f8c6ccf52622b55f84c31f6fb803d2b84a3ace3804fb

data/CHANGELOG.md

@@ -1,2 +1,12 @@
-### v1.0.0, 2014-03-39
+# Changelog
+
+### master
+
+### v1.1.0, 2014-11-17
+- extract paths and urls to a separate module
+- update gem homepage
+- fix a bug where bundler gem installation fails because `bundler:map_bins` task
+  is executed earlier.
+
+### v1.0.0, 2014-03-29
 - @bruno- all the v1.0.0 features

data/README.md

@@ -10,7 +10,7 @@ Works with Capistrano 3 (only). For Capistrano 2 support check
 
 Install by adding the following to the `Gemfile`:
 
-    gem 'capistrano', '~> 3.1'
+    gem 'capistrano', '~> 3.2.1'
     gem 'capistrano-rbenv', '~> 2.0' # required
     gem 'capistrano-rbenv-install'
 
@@ -94,16 +94,7 @@ supported.
 
 ### More Capistrano automation?
 
-If you'd like to streamline your Capistrano deploys, you might want to check
-these zero-configuration, plug-n-play plugins:
-
-- [capistrano-postgresql](https://github.com/bruno-/capistrano-postgresql)<br/>
-plugin that automates postgresql configuration and setup
-- [capistrano-unicorn-nginx](https://github.com/bruno-/capistrano-unicorn-nginx)<br/>
-no-configuration unicorn and nginx setup with sensible defaults
-- [capistrano-safe-deploy-to](https://github.com/bruno-/capistrano-safe-deploy-to)<br/>
-if you're annoyed that Capistrano does **not** create a deployment path for the
-app on the server (default `/var/www/myapp`), this is what you need!
+Check out [capistrano-plugins](https://github.com/capistrano-plugins) github org.
 
 ### Thanks
 

data/capistrano-rbenv-install.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
     https://github.com/yyuu/capistrano-rbenv
   EOF
   gem.summary       = "Capistrano plugin for lightweight rubies managment with rbenv."
-  gem.homepage      = "https://github.com/bruno-/capistrano-rbenv-install"
+  gem.homepage      = "https://github.com/capistrano-plugins/capistrano-rbenv-install"
 
   gem.license       = "MIT"
 

data/lib/capistrano/dsl/rbenv_install.rb

@@ -0,0 +1,23 @@
+module Capistrano
+  module DSL
+    module RbenvInstall
+
+      def rbenv_ruby_build_path
+        "#{fetch(:rbenv_path)}/plugins/ruby-build"
+      end
+
+      def rbenv_bin_executable_path
+        "#{fetch(:rbenv_path)}/bin/rbenv"
+      end
+
+      def rbenv_repo_url
+        'https://github.com/sstephenson/rbenv.git'
+      end
+
+      def ruby_build_repo_url
+        'https://github.com/sstephenson/ruby-build.git'
+      end
+
+    end
+  end
+end

data/lib/capistrano/rbenv_install/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module RbenvInstall
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/capistrano/tasks/rbenv_install.rake

@@ -1,31 +1,29 @@
-namespace :load do
-  task :defaults do
-    # Heavily depends on 'capistrano-rbenv' variables:
-    # https://github.com/capistrano/rbenv/blob/master/lib/capistrano/tasks/rbenv.rake#L33-49
-    # set :rbenv_type               # :user or :system
-    # set :rbenv_ruby, '2.0.0-p247' # ruby version
-    # set :rbenv_roles, :all        # where rbenv should be installed
-    # set :rbenv_path,              # ~/.rbenv or /usr/local/rbenv, depends on :rbenv_type
-    # set :rbenv_ruby_dir           # "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}" }
-
-    set :rbenv_ruby_build_path, -> { "#{fetch(:rbenv_path)}/plugins/ruby-build" }
-  end
-end
+require 'capistrano/dsl/rbenv_install'
+
+include Capistrano::DSL::RbenvInstall
+
+# Heavily depends on 'capistrano-rbenv' variables:
+# https://github.com/capistrano/rbenv/blob/master/lib/capistrano/tasks/rbenv.rake#L33-49
+# set :rbenv_type               # :user or :system
+# set :rbenv_ruby, '2.0.0-p247' # ruby version
+# set :rbenv_roles, :all        # where rbenv should be installed
+# set :rbenv_path,              # ~/.rbenv or /usr/local/rbenv, depends on :rbenv_type
+# set :rbenv_ruby_dir           # "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}" }
 
 namespace :rbenv do
   desc 'Install rbenv'
   task :install_rbenv do
     on roles fetch(:rbenv_roles) do
       next if test "[ -d #{fetch(:rbenv_path)} ]"
-      execute :git, :clone, 'https://github.com/sstephenson/rbenv.git', fetch(:rbenv_path)
+      execute :git, :clone, rbenv_repo_url, fetch(:rbenv_path)
     end
   end
 
   desc 'Install ruby build - rbenv plugin'
   task :install_ruby_build do
     on roles fetch(:rbenv_roles) do
-      next if test "[ -d #{fetch(:rbenv_ruby_build_path)} ]"
-      execute :git, :clone, 'https://github.com/sstephenson/ruby-build.git', fetch(:rbenv_ruby_build_path)
+      next if test "[ -d #{rbenv_ruby_build_path} ]"
+      execute :git, :clone, ruby_build_repo_url, rbenv_ruby_build_path
     end
   end
 
@@ -33,12 +31,12 @@ namespace :rbenv do
   task :install_ruby do
     on roles fetch(:rbenv_roles) do
       next if test "[ -d #{fetch(:rbenv_ruby_dir)} ]"
-      execute "#{fetch(:rbenv_path)}/bin/rbenv", :install, fetch(:rbenv_ruby)
+      execute rbenv_bin_executable_path, :install, fetch(:rbenv_ruby)
     end
   end
 
   desc 'Install bundler gem'
-  task :install_bundler do
+  task install_bundler: ['rbenv:map_bins'] do
     on roles fetch(:rbenv_roles) do
       next if test :gem, :query, '--quiet --installed --name-matches ^bundler$'
       execute :gem, :install, :bundler, '--quiet --no-rdoc --no-ri'
@@ -50,8 +48,9 @@ namespace :rbenv do
     invoke 'rbenv:install_rbenv'
     invoke 'rbenv:install_ruby_build'
     invoke 'rbenv:install_ruby'
+    invoke 'rbenv:install_bundler'
   end
 
   before 'rbenv:validate', 'rbenv:install'
-  after 'rbenv:map_bins', 'rbenv:install_bundler'
+  before 'bundler:map_bins', 'rbenv:install' if Rake::Task.task_defined?('bundler:map_bins')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv-install
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -69,10 +69,11 @@ files:
 - Rakefile
 - capistrano-rbenv-install.gemspec
 - lib/capistrano-rbenv-install.rb
+- lib/capistrano/dsl/rbenv_install.rb
 - lib/capistrano/rbenv_install.rb
 - lib/capistrano/rbenv_install/version.rb
 - lib/capistrano/tasks/rbenv_install.rake
-homepage: https://github.com/bruno-/capistrano-rbenv-install
+homepage: https://github.com/capistrano-plugins/capistrano-rbenv-install
 licenses:
 - MIT
 metadata: {}
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Capistrano plugin for lightweight rubies managment with rbenv.