capistrano-bundle_rsync 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 57fd444228ffd2aaa2b08ae8a3aa48d641709f98
4
- data.tar.gz: 04086f39219dc6ff6922e4a09596907b105a8a61
3
+ metadata.gz: 729833358d2b8f992b042929584cd4a9bac680c6
4
+ data.tar.gz: 75ffda19038ade33a7b76c34a714e16642612dc6
5
5
  SHA512:
6
- metadata.gz: 76e50e567ac213341bafb10e0dc0060a6fe6aba2bb4c5ed46e4c8fd3e9b5f50b34227083d245abcb59f673f1788c4330f21d0c3c01000703b3100a2970c93641
7
- data.tar.gz: d4ffdd544a4d85f5b558940bef818000e3edb1cdc98106976340c9003eb099f59f1ae5428b911357472a636598c560853da5d47e3727eac50e184e98ab8baa9e
6
+ metadata.gz: 4fc0348121a5b5ade9a1b1510bb37528bb8fc785af148d6312f5b41476b2905e3914977b206b90bd0a47bcb6118c672b9159958cd6f8ff4b7f3f3b1308d83f44
7
+ data.tar.gz: f569840201a463109e537fd9007068a9d0bb7244096544f43c0a16105f6ab8a7faf281c2302079ebabaf0acd8ee68613be38fec010a127f3dedf78451d23e754
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 0.2.1 (2014/07/11)
2
+
3
+ Fixes:
4
+
5
+ * Stop to rsync binstubs not to override bin of rails 4
6
+
1
7
  # 0.2.0 (2014/07/11)
2
8
 
3
9
  Enhancements:
data/README.md CHANGED
@@ -55,7 +55,6 @@ bundle_rsync_local_mirror_path | `#{base_path}/mirror"` | Path where to mirror y
55
55
  bundle_rsync_local_releases_path | `"#{base_path}/releases"` | Path of the directory to checkout your repository
56
56
  bundle_rsync_local_release_path | `"#{release_dir}/#{time}"` | Path to checkout your repository (releases_path + release_name)
57
57
  bundle_rsync_local_bundle_path | `"#{base_path}/bundle"` | Path where to bundle install gems.
58
- bundle_rsync_local_bin_path | `"#{base_path}/bin"` | Path where to bundle install bin scripts.
59
58
  bundle_rsync_config_files | `nil` | Additional files to rsync. Specified files are copied into `config` directory.
60
59
  bundle_rsync_ssh_options | `ssh_options` | Configuration of ssh for rsync. Default uses the value of `ssh_options`
61
60
  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:
137
136
  ```ruby
138
137
  set :branch, ENV['BRANCH'] || 'master'
139
138
  set :rbenv_type, :user
140
- set :linked_dirs, %w(bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
139
+ set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
141
140
  set :keep_releases, 5
142
141
  set :scm, :bundle_rsync # Need this
143
142
  set :bundle_rsync_max_parallels, ENV['PARA']
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "capistrano-bundle_rsync"
7
- spec.version = "0.2.0"
7
+ spec.version = "0.2.1"
8
8
  spec.authors = ["sonots", "tohae"]
9
9
  spec.email = ["sonots@gmail.com", "tohaechan@gmail.com"]
10
10
  spec.description = %q{Deploy an application and bundled gems via rsync}
@@ -5,7 +5,7 @@ set :user, 'game'
5
5
  set :ssh_options, user: ENV['USER'], keys: [File.expand_path('~/.ssh/id_rsa')]
6
6
  # set :default_env, { path: "/opt/ruby/bin:$PATH" }
7
7
 
8
- set :linked_dirs, %w(bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
8
+ set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system tmp/run)
9
9
  set :keep_releases, 5
10
10
  set :rbenv_type, :user
11
11
  set :rbenv_ruby, '2.1.2'
@@ -13,7 +13,7 @@ class Capistrano::BundleRsync::Bundler < Capistrano::BundleRsync::Base
13
13
  def install
14
14
  hosts = release_roles(:all)
15
15
  Bundler.with_clean_env do
16
- execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test --binstubs=#{config.local_bin_path}"
16
+ execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test"
17
17
  end
18
18
 
19
19
  lines = <<-EOS
@@ -22,8 +22,9 @@ BUNDLE_FROZEN: '1'
22
22
  BUNDLE_PATH: #{shared_path.join('bundle')}
23
23
  BUNDLE_WITHOUT: development:test
24
24
  BUNDLE_DISABLE_SHARED_GEMS: '1'
25
- BUNDLE_BIN: #{shared_path.join('bin')}
25
+ BUNDLE_BIN: #{release_path.join('bin')}
26
26
  EOS
27
+ # BUNDLE_BIN requires rbenv-binstubs plugin to make it effectively work
27
28
  bundle_config_path = "#{config.local_base_path}/bundle_config"
28
29
  File.open(bundle_config_path, "w") {|file| file.print(lines) }
29
30
 
@@ -38,7 +39,6 @@ BUNDLE_BIN: #{shared_path.join('bin')}
38
39
  end
39
40
 
40
41
  execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bundle_path}/ #{host}:#{shared_path}/bundle/"
41
- execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bin_path}/ #{host}:#{shared_path}/bin/"
42
42
  execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{bundle_config_path} #{host}:#{release_path}/.bundle/config"
43
43
  end
44
44
 
@@ -20,10 +20,6 @@ module Capistrano::BundleRsync
20
20
  @local_bundle_path ||= fetch(:bundle_rsync_local_bundle_path) || "#{local_base_path}/bundle"
21
21
  end
22
22
 
23
- def self.local_bin_path
24
- @local_bin_path ||= fetch(:bundle_rsync_local_bin_path) || "#{local_base_path}/bin"
25
- end
26
-
27
23
  def self.config_files
28
24
  return nil unless config_files = fetch(:bundle_rsync_config_files)
29
25
  config_files.is_a?(Array) ? config_files : [config_files]
@@ -11,7 +11,7 @@ namespace :bundle_rsync do
11
11
 
12
12
  def scm
13
13
  @scm ||=
14
- if fetch(:bundle_rsync_scm) == 'local_git'
14
+ if fetch(:bundle_rsync_scm).to_s == 'local_git'
15
15
  require 'capistrano/bundle_rsync/local_git'
16
16
  set :bundle_rsync_local_release_path, repo_url
17
17
  Capistrano::BundleRsync::LocalGit.new(self)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-bundle_rsync
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - sonots