capistrano-bundle_rsync 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a7c5dd4b573c62e9082fbe142cca5e7143d602
-  data.tar.gz: 1e3ffe33293099015a641d6261d358b4dd136cea
+  metadata.gz: 22c2743195991ea4910fac6fae9e521b7a4c4fb9
+  data.tar.gz: 3b56d781ba6bb30bc140aba5048225c62c2bc76c
 SHA512:
-  metadata.gz: 4d03b8d7e5ffca0357cb1e6e8a336fa6c5eb2d61a34ae55e8ffc01652f76ca7c6f54e25b2e4982db5ff203308a03ecb543e2d26727b572ff1d2ca2e3ee148226
-  data.tar.gz: b028df8af06b91db7855bcef3515e4a8e45cba4360c5fce7a92690b39fd007665ae084fd209f01e6cc1cc4a778552d20f8e27a3d0f94b4429d349489defd8554
+  metadata.gz: c1ecb673add2d7e4ebc3fb8b172212a2b7e1d9a911f329a14331c5a0059c91f1171fe8c62c634c480683f2ba74a1a6fc5b496ed1ea2b5df011a4eeefdec1abaf
+  data.tar.gz: 9fbff9b33e2cb0cdc464ecd0a7da0dc2a2a0708e943b591d36bf496d2fd13f8a9d49b67471c082657160cbf292018c35b2b759e21a3da7a278d8df36cae10d0e

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 example/.local_repo
+.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.0 (2015/03/04)
+
+Enhancements:
+
+* Support `repo_tree` to deploy subtree of a repository (thanks @lecoueyl)
+
 # 0.3.3 (2015/01/30)
 
 Fixes:

data/README.md

@@ -46,6 +46,7 @@ Set Capistrano variables with `set name, value`.
 Name          | Default | Description
 --------------|---------|------------
 repo_url      | `.` | The path or URL to a Git repository to clone from.  
+repo_tree      | nil | Specify the subtree path of the repository to deploy.
 branch        | `master` | The Git branch to checkout.  
 ssh_options   | `{}`  | Configuration of ssh :user and :keys.
 keep\_releases | 5 | The number of releases to keep.
@@ -54,7 +55,7 @@ bundle_rsync_scm | `git` | SCM Strategy inside `bundle_rsync`. `git` uses git. `
 bundle_rsync_local_base_path   | `$(pwd)/.local_repo` | The base directory to clone repository
 bundle_rsync_local_mirror_path | `#{base_path}/mirror"` | Path where to mirror your repository
 bundle_rsync_local_releases_path | `"#{base_path}/releases"` | Path of the directory to checkout your repository
-bundle_rsync_local_release_path | `"#{releases_path}/#{datetime}"` | Path to checkout your repository (releases_path + release_name). If you specify this, `keep_releases` for local releases path is disabled because `datetime` directories are no longer created. 
+bundle_rsync_local_release_path | `"#{releases_path}/#{datetime}"` | Path to checkout your repository (releases_path + release_name). If you specify this, `keep_releases` for local releases path is disabled because `datetime` directories are no longer created. This parameter is set as `repo_url` in the case of `local_git` as default. 
 bundle_rsync_local_bundle_path | `"#{base_path}/bundle"` | Path where to bundle install gems.
 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
@@ -185,7 +186,7 @@ task :precompile do
   config = Capistrano::BundleRsync::Config
   run_locally do
     Bundler.with_clean_env do
-      within config.release_path do
+      within config.local_release_path do
         execute :bundle, 'install' # install development gems
         execute :bundle, 'exec rake assets:precompile'
       end
@@ -193,7 +194,7 @@ task :precompile do
     
     hosts = release_roles(:all)
     Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
-      execute "rsync -az -e ssh #{config.release_path}/public/ #{host}:#{fetch(:deploy_to)}/shared/public"
+      execute "rsync -az -e ssh #{config.local_release_path}/public/ #{host}:#{fetch(:deploy_to)}/shared/public"
     end
   end
 end
@@ -221,10 +222,10 @@ set :scm, :bundle_rsync
 set :bundle_rsync_scm, 'local_git' # Set `local_git`
 
 set :application, 'sample'
-set :repo_url, "/home/sonots/sample" # Need to git clone your repository to this path beforehand.
-                                     # This path should be different with the path running cap.
-set :deploy_to, "/home/sonots/sample"
-set :rbenv_ruby, "2.1.2" # Required on both deploy machine and remote machines
+set :repo_url, "/path/to/app/local" # Need to git clone your repository to this path beforehand.
+                                    # This path should be different with the path running cap.
+set :deploy_to, "/path/to/app/production"
+set :rbenv_ruby, "2.1.2" # Required the same ruby on both deploy machine and remote machines
 set :ssh_options, user: 'sonots', keys: File.expand_path('~/.ssh/id_rsa')
 
 role :app, ['127.0.0.1']

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.3.3"
+  spec.version       = "0.4.0"
   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/README.md

@@ -0,0 +1,7 @@
+How to run:
+
+```
+bundle exec cap git deploy
+bundle exec cap local_git deploy
+bundle exec cap skip_bundle deploy
+```

data/example/config/deploy.rb

@@ -1,11 +1,11 @@
-set :user, 'game'
+set :user, `whoami`.chomp
 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(log tmp/pids vendor/bundle)
 set :keep_releases, 5
 set :rbenv_type, :user
-set :rbenv_ruby, '2.1.5'
+set :rbenv_ruby, RUBY_VERSION # '2.1.5'
 set :deploy_to, "#{ENV['HOME']}/sample"
 
 set :scm, :bundle_rsync

data/example/config/deploy/git.rb

@@ -0,0 +1,24 @@
+set :bundle_rsync_scm, 'git'
+set :repo_url, 'https://github.com/sonots/try_rails4'
+set :branch, 'master'
+
+role :app, ['127.0.0.1']
+
+task :precompile do
+  config = Capistrano::BundleRsync::Config
+  run_locally do
+    Bundler.with_clean_env do
+      within config.local_release_path do
+        execute :bundle, 'install' # install development gems
+        execute :bundle, 'exec rake assets:precompile'
+      end
+    end
+
+    hosts = release_roles(:all)
+    Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
+      execute "rsync -az -e ssh #{config.local_release_path}/public/ #{host}:#{fetch(:deploy_to)}/shared/public"
+    end
+  end
+end
+
+before "bundle_rsync:rsync_release", "precompile"

data/lib/capistrano/bundle_rsync/bundler.rb

@@ -35,7 +35,9 @@ BUNDLE_BIN: #{release_path.join('bin')}
       execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{bundle_config_path} #{host}:#{release_path}/.bundle/config"
     end
 
-    # Do not remove if :bundle_rsync_local_release_path is directly specified.
+    # Do not remove if :bundle_rsync_local_release_path is directly specified
+    # because releases/#{datetime} directories are not created in such case. 
+    # Note that :bundle_rsync_local_release_path is automatically set when `local_git` scm is used. 
     unless fetch(:bundle_rsync_local_release_path)
       releases = capture(:ls, '-x', config.local_releases_path).split
       if releases.count >= config.keep_releases

data/lib/capistrano/bundle_rsync/git.rb

@@ -24,7 +24,13 @@ class Capistrano::BundleRsync::Git < Capistrano::BundleRsync::SCM
     execute "mkdir -p #{config.local_release_path}"
 
     within config.local_mirror_path do
-      execute :git, :archive, fetch(:branch), '| tar -x -C', "#{config.local_release_path}"
+      if tree = fetch(:repo_tree)
+        stripped = tree.slice %r#^/?(.*?)/?$#, 1 # strip both side /
+        num_components = stripped.count('/')
+        execute :git, :archive, fetch(:branch), tree, "| tar -x --strip-components #{num_components} -f - -C ", "#{config.local_release_path}"
+      else
+        execute :git, :archive, fetch(:branch), '| tar -x -C', "#{config.local_release_path}"
+      end      
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundle_rsync
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - sonots
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -84,9 +84,10 @@ files:
 - capistrano-bundle_rsync.gemspec
 - example/Capfile
 - example/Gemfile
+- example/README.md
 - example/config/deploy.rb
+- example/config/deploy/git.rb
 - example/config/deploy/local_git.rb
-- example/config/deploy/sample.rb
 - example/config/deploy/skip_bundle.rb
 - lib/capistrano-bundle_rsync.rb
 - lib/capistrano/bundle_rsync.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Deploy an application and bundled gems via rsync.

data/example/config/deploy/sample.rb

@@ -1,5 +0,0 @@
-set :bundle_rsync_scm, 'git'
-set :repo_url, 'https://github.com/sonots/try_rails4'
-set :branch, 'master'
-
-role :app, ['127.0.0.1']