capistrano-bundle_rsync 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2272c0917be88fe7b2d61b89942628ee818d18
-  data.tar.gz: 306a9a7fe26593790c0b606463df5a190cd9a2d0
+  metadata.gz: 2f014be48949a6735ed744c4795e659db58a096a
+  data.tar.gz: e8038d006efc199865f7d069a26694b2bf777c44
 SHA512:
-  metadata.gz: d79a46b6a720e4a4239178123029f8aaa6eac9ceda6ddfacb9a6eb2fc2b8ac149030c21ef82178c8dbca782f192beb615032068df68e480039af0a2eb30bf29e
-  data.tar.gz: cd4831d0ecc67a598c2499fe8591e564db547a2aa954e493437915ef76eb4803a2bd21c836cd9c0f1836947087593475524b4dd6cc7c1155f99f20d233296ada
+  metadata.gz: 872b6b0c2ecff6fe231c3ad816c0b91982d1df2ecb4e1e71dd983b09704d0ee082905f3ecf8e1b826777cb66f0a4074b2ac090e854ec15a7bb81ace30d9c54ee
+  data.tar.gz: dd0b47db60be4ae962c11c2bfca06fa2819669c28f64c179e6c677fa6cc3b3457be478247d474b92266296f8c55406d63c9e9201e4bf77e05b46574f9751dd33

data/.gitignore

@@ -17,4 +17,8 @@ test/version_tmp
 tmp
 example/.local_repo
 example/.capistrano
+example/.vagrant
+example/log
+example/vendor
+example/try_rails4
 .ruby-version

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.7 (2016/07/22)
+
+Fixes:
+
+* Fix cleaning .local_repo/releases was not working if skip_bundle is specified (thanks to @kozyty)
+
 # 0.4.6 (2016/02/03)
 
 Enhancements:

data/README.md

@@ -54,8 +54,8 @@ scm | nil | Must be `bundle_rsync` to use capistrano-bundle_rsync.
 bundle_rsync_scm | `git` | SCM Strategy inside `bundle_rsync`. `git` uses git. `local_git` also uses git, but it enables to rsync the git repository located on local path directly without git clone. `repo_url` must be the local directory path to use `local_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. This parameter is set as `repo_url` in the case of `local_git` as default. 
+bundle_rsync_local_releases_path | `"#{base_path}/releases"` | The releases base directory to checkout your repository
+bundle_rsync_local_release_path | `"#{releases_path}/#{datetime}"` | The full path directory to checkout your repository. If you specify this, `keep_releases` for local releases path is disabled because `datetime` directories are no longer created.
 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
@@ -79,6 +79,7 @@ $ cap stage deploy --trace | grep Execute
 ** Execute bundle_rsync:rsync_release
 ** Execute bundle_rsync:rsync_shared
 ** Execute bundle_rsync:bundler:rsync
+** Execute bundle_rsync:clean_release
 ** Execute bundle_rsync:set_current_revision
 ```
 

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.4.6"
+  spec.version       = "0.4.7"
   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

@@ -1,7 +1,48 @@
 How to run:
 
+```
+brew install vagrant
+vagrant up
+```
+
+prepare rbenv, ruby in the vagrant box
+
+```
+vagrant ssh
+sudo yum install gcc make openssl-devel readline-devel zlib-devel
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+echo 'export PATH="$HOME/.rbenv/bin:$PATH" && eval "$(rbenv init -)"' >> ~/.bash_profile
+export PATH="$HOME/.rbenv/bin:$PATH" && eval "$(rbenv init -)"
+rbenv install 2.3.0
+```
+
+prepare ssh keys in the vagrant box
+
+```
+ssh-keygen
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+```
+
+prepare capistrano-bundle_rsync repository in the vagrant box
+
+```
+git clone git@github.com:sonots/capistrano-bundle_rsync
+cd capistrano-bundle_rsync/example
+bundle install --path vendor/bundle
+```
+
+run
+
 ```
 bundle exec cap git deploy
+```
+
+```
+git clone git@github.com:sonots/try_rails4.git
 bundle exec cap local_git deploy
+```
+
+```
 bundle exec cap skip_bundle deploy
 ```

data/example/Vagrantfile

@@ -0,0 +1,24 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "centos6.5.3"
+  config.vm.box_url = 'https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box'
+
+  # name
+  config.vm.define "vagrant-centos"
+  config.ssh.forward_agent = true
+
+  config.vm.provider "virtualbox" do |vb|
+    # Use VBoxManage to customize the VM. For example to change memory:
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+end

data/example/config/deploy/local_git.rb

@@ -1,4 +1,4 @@
 set :bundle_rsync_scm, 'local_git'
-set :repo_url, "#{ENV['HOME']}/src/github.com/sonots/try_rails4"
+set :repo_url, "#{ENV['PWD']}/try_rails4" # git clone git@github.com:sonots/try_rails4.git
 
 role :app, ['127.0.0.1']

data/lib/capistrano/bundle_rsync/bundler.rb

@@ -42,21 +42,5 @@ BUNDLE_BIN: #{release_path.join('bin')}
       execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bundle_path}/ #{host}:#{shared_path}/bundle/"
       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
-    # 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
-        directories = (releases - releases.last(config.keep_releases))
-        if directories.any?
-          directories_str = directories.map do |release|
-            File.join(config.local_releases_path, release)
-          end.join(" ")
-          execute :rm, '-rf', directories_str
-        end
-      end
-    end
   end
 end

data/lib/capistrano/bundle_rsync/git.rb

@@ -35,6 +35,22 @@ class Capistrano::BundleRsync::Git < Capistrano::BundleRsync::SCM
     end
   end
 
+  def clean_release
+    # Do not remove if :bundle_rsync_local_release_path is directly specified
+    # because releases/#{datetime} directories are no longer created.
+    return if fetch(:bundle_rsync_local_release_path)
+    releases = capture(:ls, '-x', config.local_releases_path).split
+    if releases.count >= config.keep_releases
+      directories = (releases - releases.last(config.keep_releases))
+      if directories.any?
+        directories_str = directories.map do |release|
+          File.join(config.local_releases_path, release)
+        end.join(" ")
+        execute :rm, '-rf', directories_str
+      end
+    end
+  end
+
   def rsync_release
     hosts = ::Capistrano::Configuration.env.filter(release_roles(:all))
     rsync_options = config.rsync_options

data/lib/capistrano/bundle_rsync/local_git.rb

@@ -17,6 +17,9 @@ class Capistrano::BundleRsync::LocalGit < Capistrano::BundleRsync::SCM
   def create_release
   end
 
+  def clean_release
+  end
+
   def rsync_release
     hosts = ::Capistrano::Configuration.env.filter(release_roles(:all))
     rsync_options = config.rsync_options

data/lib/capistrano/bundle_rsync/scm.rb

@@ -67,6 +67,18 @@ class Capistrano::BundleRsync::SCM < Capistrano::BundleRsync::Base
     )
   end
 
+  # @abstract
+  #
+  # Clean the contents of the cache-repository onto the release path
+  #
+  # @return void
+  #
+  def clean_release
+    raise NotImplementedError.new(
+      "Your SCM strategy module should provide a #clean_release method"
+    )
+  end
+
   # @abstract
   #
   # Rsync the contents of the release path

data/lib/capistrano/tasks/bundle_rsync.rake

@@ -17,7 +17,6 @@ namespace :bundle_rsync do
     @bundle_rsync_scm ||=
       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)
       else
         require 'capistrano/bundle_rsync/git'
@@ -91,6 +90,14 @@ namespace :bundle_rsync do
     end
   end
 
+  # additional extra tasks of bundle_rsync scm
+  desc 'Clean releases'
+  task :clean_release do
+    run_locally do
+      bundle_rsync_scm.clean_release
+    end
+  end
+
   desc 'Determine the revision that will be deployed'
   task :set_current_revision do
     run_locally do
@@ -102,5 +109,6 @@ namespace :bundle_rsync do
   after 'bundle_rsync:bundler:install', 'bundle_rsync:rsync_release'
   after 'bundle_rsync:rsync_release', 'bundle_rsync:rsync_shared'
   after 'bundle_rsync:rsync_shared', 'bundle_rsync:bundler:rsync'
+  after 'bundle_rsync:bundler:rsync', 'bundle_rsync:clean_release'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundle_rsync
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - sonots
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -100,6 +100,7 @@ files:
 - example/Capfile
 - example/Gemfile
 - example/README.md
+- example/Vagrantfile
 - example/config/deploy.rb
 - example/config/deploy/git.rb
 - example/config/deploy/local_git.rb