capistrano-bundle_rsync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57fd444228ffd2aaa2b08ae8a3aa48d641709f98
-  data.tar.gz: 04086f39219dc6ff6922e4a09596907b105a8a61
+  metadata.gz: 729833358d2b8f992b042929584cd4a9bac680c6
+  data.tar.gz: 75ffda19038ade33a7b76c34a714e16642612dc6
 SHA512:
-  metadata.gz: 76e50e567ac213341bafb10e0dc0060a6fe6aba2bb4c5ed46e4c8fd3e9b5f50b34227083d245abcb59f673f1788c4330f21d0c3c01000703b3100a2970c93641
-  data.tar.gz: d4ffdd544a4d85f5b558940bef818000e3edb1cdc98106976340c9003eb099f59f1ae5428b911357472a636598c560853da5d47e3727eac50e184e98ab8baa9e
+  metadata.gz: 4fc0348121a5b5ade9a1b1510bb37528bb8fc785af148d6312f5b41476b2905e3914977b206b90bd0a47bcb6118c672b9159958cd6f8ff4b7f3f3b1308d83f44
+  data.tar.gz: f569840201a463109e537fd9007068a9d0bb7244096544f43c0a16105f6ab8a7faf281c2302079ebabaf0acd8ee68613be38fec010a127f3dedf78451d23e754

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.1 (2014/07/11)
+
+Fixes:
+
+* Stop to rsync binstubs not to override bin of rails 4
+
 # 0.2.0 (2014/07/11)
 
 Enhancements:

data/README.md

@@ -55,7 +55,6 @@ bundle_rsync_local_mirror_path | `#{base_path}/mirror"` | Path where to mirror y
 bundle_rsync_local_releases_path | `"#{base_path}/releases"` | Path of the directory to checkout your repository
 bundle_rsync_local_release_path | `"#{release_dir}/#{time}"` | Path to checkout your repository (releases_path + release_name)
 bundle_rsync_local_bundle_path | `"#{base_path}/bundle"` | Path where to bundle install gems.
-bundle_rsync_local_bin_path | `"#{base_path}/bin"` | Path where to bundle install bin scripts.
 bundle_rsync_config_files | `nil` | Additional files to rsync. Specified files are copied into `config` directory.
 bundle_rsync_ssh_options | `ssh_options` | Configuration of ssh for rsync. Default uses the value of `ssh_options`
 bundle_rsync_keep_releases | `keep_releases` | The number of releases to keep on .local_repo
@@ -137,7 +136,7 @@ Edit `config/deploy/localhost.rb` as followings for example:
 ```ruby
 set :branch, ENV['BRANCH'] || 'master'
 set :rbenv_type, :user
-set :linked_dirs, %w(bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
+set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
 set :keep_releases, 5
 set :scm, :bundle_rsync # Need this
 set :bundle_rsync_max_parallels, ENV['PARA']

data/capistrano-bundle_rsync.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-bundle_rsync"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["sonots", "tohae"]
   spec.email         = ["sonots@gmail.com", "tohaechan@gmail.com"]
   spec.description   = %q{Deploy an application and bundled gems via rsync}

data/example/config/deploy.rb

@@ -5,7 +5,7 @@ set :user, 'game'
 set :ssh_options, user: ENV['USER'], keys: [File.expand_path('~/.ssh/id_rsa')]
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
 
-set :linked_dirs, %w(bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
+set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
 set :keep_releases, 5
 set :rbenv_type, :user
 set :rbenv_ruby, '2.1.2'

data/lib/capistrano/bundle_rsync/bundler.rb

@@ -13,7 +13,7 @@ class Capistrano::BundleRsync::Bundler < Capistrano::BundleRsync::Base
   def install
     hosts = release_roles(:all)
     Bundler.with_clean_env do
-      execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test --binstubs=#{config.local_bin_path}"
+      execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test"
     end
 
     lines = <<-EOS
@@ -22,8 +22,9 @@ BUNDLE_FROZEN: '1'
 BUNDLE_PATH: #{shared_path.join('bundle')}
 BUNDLE_WITHOUT: development:test
 BUNDLE_DISABLE_SHARED_GEMS: '1'
-BUNDLE_BIN: #{shared_path.join('bin')}
+BUNDLE_BIN: #{release_path.join('bin')}
     EOS
+    # BUNDLE_BIN requires rbenv-binstubs plugin to make it effectively work
     bundle_config_path = "#{config.local_base_path}/bundle_config"
     File.open(bundle_config_path, "w") {|file| file.print(lines) }
 
@@ -38,7 +39,6 @@ BUNDLE_BIN: #{shared_path.join('bin')}
       end
 
       execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bundle_path}/ #{host}:#{shared_path}/bundle/"
-      execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bin_path}/ #{host}:#{shared_path}/bin/"
       execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{bundle_config_path} #{host}:#{release_path}/.bundle/config"
     end
 

data/lib/capistrano/bundle_rsync/config.rb

@@ -20,10 +20,6 @@ module Capistrano::BundleRsync
       @local_bundle_path ||= fetch(:bundle_rsync_local_bundle_path) || "#{local_base_path}/bundle"
     end
 
-    def self.local_bin_path
-      @local_bin_path ||= fetch(:bundle_rsync_local_bin_path) || "#{local_base_path}/bin"
-    end
-
     def self.config_files
       return nil unless config_files = fetch(:bundle_rsync_config_files)
       config_files.is_a?(Array) ? config_files : [config_files]

data/lib/capistrano/tasks/bundle_rsync.rake

@@ -11,7 +11,7 @@ namespace :bundle_rsync do
 
   def scm
     @scm ||=
-      if fetch(:bundle_rsync_scm) == 'local_git'
+      if fetch(:bundle_rsync_scm).to_s == 'local_git'
         require 'capistrano/bundle_rsync/local_git'
         set :bundle_rsync_local_release_path, repo_url
         Capistrano::BundleRsync::LocalGit.new(self)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundle_rsync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - sonots