capistrano-withrsync 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f63b8e34f6b36e17cc7f1aa3bb12f16f5911b8
-  data.tar.gz: a17e0538c3f58d3f6e3fa141490f338320d63544
+  metadata.gz: 9024bc30f23503a0351a2d4d6ede53fc4e522a95
+  data.tar.gz: 3d65c63d21ded7fd3761b5a4b4f9d496eb319d68
 SHA512:
-  metadata.gz: 92d56e18ac4c0ecdadb4983403cdbf63fb87f9bc1ef69ce4742eee448fc41db796dac1d61ced716af9d387da8b9639d9a6f9cc1a1bdcc1dac1ce3a86e5ca061d
-  data.tar.gz: 8d3856bea902a339613854b8455f8999a8f766eb050c0aa0bfb17df22b1c17f00bc00bb8f55c3488163b9cfac185fc043c8f19fcfce49d8e9f219219201ecc7e
+  metadata.gz: 2b6021dcf6c61af1f934e4c6a59dcc4df584b65a54d4f240b4016e25ded50cd181740c4fa0ef786d950cf364c09abc151c4bec724c2557bec89d5776d1429463
+  data.tar.gz: 4ff0d05aff67bd0a99369854948d1460796744b1b09fd1c2f5468caa6694a99e42b5897e221102546c565195077017fef4b44b172cfeb0bd3502a810c327c15f

data/.rspec

@@ -1,2 +1,3 @@
 --color
---require spec_helper
+--require helper
+--format documentation

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in capistrano-withrsync.gemspec
 gemspec
 
-gem 'pry'
-gem 'rspec'
-gem 'tid'
+group :test do
+  gem 'rspec'
+  gem 'pry'
+end

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+task :default => :test

data/lib/capistrano/tasks/withrsync.rake

@@ -85,21 +85,14 @@ namespace :rsync do
 
   desc 'Sync to deployment hosts from local'
   task sync: :'rsync:stage' do
-    last_rsync_to = nil
-    release_roles(:all).each do |role|
-      unless Capistrano::Configuration.env.filter(role).roles_array.empty?
-        run_locally do
-          user = "#{role.user}@" if !role.user.nil?
-          rsync_options = "#{fetch(:rsync_options).join(' ')}"
-          rsync_from = "#{fetch(:rsync_src)}/"
-          rsync_to = Shellwords.escape("#{user}#{role.hostname}:#{fetch(:rsync_dest_fullpath) || release_path}")
-
-          unless rsync_to == last_rsync_to
-            execute :rsync, rsync_options, rsync_from, rsync_to
-            last_rsync_to = rsync_to
-          end
-        end
-      end
+    release_roles(:all).each do |server|
+      run_locally do
+        user = "#{server.user}@" if !server.user.nil?
+        rsync_options = "#{fetch(:rsync_options).join(' ')}"
+        rsync_from = "#{fetch(:rsync_src)}/"
+        rsync_to = Shellwords.escape("#{user}#{server.hostname}:#{fetch(:rsync_dest_fullpath) || release_path}")
+        execute :rsync, rsync_options, rsync_from, rsync_to
+      end unless server.roles.empty?
     end
   end
 

data/lib/capistrano/withrsync/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Withrsync
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/spec/helper.rb

@@ -0,0 +1,10 @@
+require 'capistrano/all'
+require 'rspec'
+
+load 'capistrano/setup.rb'
+
+def run_task(name, *args)
+  Rake.application.options.trace = !!ENV['DEBUG']
+  Rake::Task[name].reenable
+  Rake::Task[name].invoke(*args)
+end

data/spec/task_spec.rb

@@ -0,0 +1,156 @@
+describe 'task' do
+  let(:user) { 'deploy' }
+  let(:escaped_user) { 'deploy' }
+  let(:submodule) { false }
+
+  before do
+    Rake.application.rake_require 'capistrano/tasks/deploy'
+    Rake.application.rake_require 'capistrano/tasks/git'
+    Rake.application.rake_require 'capistrano/tasks/framework'
+    Rake.application.rake_require 'capistrano/tasks/withrsync'
+
+    # for capistrano v3.2
+    servers = Capistrano::Configuration.env.send(:servers)
+    servers.send(:servers).clear unless servers.to_a.length.zero?
+
+    server 'example1.com', user: user, roles: %w(web)
+    server 'example2.com', user: user, roles: %w(app web)
+    server 'example3.com', user: user, roles: %w(db), no_release: true
+
+    set :application, 'my_app_name'
+    set :repo_url, 'https://github.com/linyows/capistrano-withrsync.git'
+    set :branch, 'master'
+    set :deploy_to, Pathname.new('/var/www/app')
+    set :scm, :git
+    set :shared_path, deploy_to.join('shared')
+    set :current_path, deploy_to.join('current')
+    set :releases_path, deploy_to.join('releases')
+    set :release_path, releases_path.join(Time.now.utc.strftime "%Y%m%d%H%M%S")
+    set :rsync_with_submodules, submodule
+    set :format_options, log_file: nil
+    set :stage, 'test'
+  end
+
+  shared_context :create_src do
+    before do
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with(:git, :clone, nil, fetch(:repo_url), fetch(:rsync_src))
+    end
+  end
+
+  shared_context :check_dir do
+    before do
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with("          if test ! -d tmp/deploy\n            then echo \"Directory does not exist '#{fetch :rsync_src}'\" 1>&2\n            false\n          fi\n", {:verbosity=>0})
+    end
+  end
+
+  shared_context :stage do
+    before do
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with(:git, :fetch, nil, '--quiet --all --prune')
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with(:git, :reset, '--hard origin/master')
+    end
+  end
+
+  shared_context :stage_with_submodule do
+    before do
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with(:git, :fetch, '--recurse-submodules=on-demand', '--quiet --all --prune')
+      allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+        with(:git, :submodule, :update, '--init')
+    end
+  end
+
+  shared_context :sync do
+    before do
+      1.upto 2 do |i|
+        host = "example#{i}.com"
+        allow_any_instance_of(SSHKit::Backend::Local).to receive(:execute).
+          with(:rsync, '--recursive --delete --delete-excluded --exclude .git* --exclude .svn*',
+            'tmp/deploy/', "#{escaped_user}@#{host}:#{fetch(:deploy_to)}/shared/deploy")
+      end
+    end
+  end
+
+  describe 'attributes' do
+    %i(
+      rsync_options
+      rsync_copy_options
+      rsync_src
+      rsync_dest
+      rsync_dest_fullpath
+      rsync_with_submodules
+    ).each do |k|
+      it "contain #{k}" do
+        expect(env.keys).to include k
+      end
+    end
+  end
+
+  describe 'stage' do
+    include_context :create_src
+    include_context :check_dir
+    include_context :stage
+
+    it 'sets up repository on local' do
+      run_task :'rsync:stage'
+    end
+
+    context 'uses git submodule' do
+      let(:submodule) { true }
+      include_context :stage_with_submodule
+
+      it 'supports submodule' do
+        run_task :'rsync:stage'
+      end
+    end
+  end
+
+  describe 'sync' do
+    include_context :create_src
+    include_context :check_dir
+    include_context :stage
+    include_context :sync
+
+    it 'synchronizes to remote from local' do
+      run_task :'rsync:sync'
+    end
+
+    context 'includes space in username' do
+      let(:user) { 'deploy user' }
+      let(:escaped_user) { "deploy\\ user" }
+
+      it 'escapes username' do
+        run_task :'rsync:sync'
+      end
+    end
+
+    context 'excludes no-role hosts' do
+      before do
+        server 'example4.com', user: user, roles: %w()
+        server 'example5.com', user: user
+      end
+
+      it 'contains no-role hosts' do
+        run_task :'rsync:sync'
+      end
+    end
+  end
+
+  describe 'release' do
+    include_context :create_src
+    include_context :check_dir
+    include_context :stage
+    include_context :sync
+
+    it 'releases from temp directory on remote' do
+      allow_any_instance_of(SSHKit::Backend::Netssh).to receive(:execute).
+        with(:rsync, '--archive --acls --xattrs',
+          "#{fetch(:shared_path).join('deploy')}/", "#{fetch :release_path}/")
+
+      run_task :'rsync:release'
+    end
+  end
+end

data/wercker.yml

@@ -1,23 +1,14 @@
-box: wercker-labs/docker
+box: wercker/rvm
 build:
     steps:
-        - install-packages:
-            packages: build-essential ruby2.0 ruby2.0-dev bundler
-        - script:
-            name: install latest docker
-            code: |
-              docker version
-              curl -s http://get.docker.io/ubuntu/ | sudo sh
-              docker version
-        - script:
-            name: chmod private key
-            code: chmod 600 ./spec/tid/id_rsa
-        - script:
-            name: create ssh config
-            code: |
-              echo "Host *" >> ~/.ssh/config
-              echo " StrictHostKeyChecking no" >> ~/.ssh/config
+        - rvm-use:
+             version: ruby-2.3.0
         - bundle-install
         - script:
              name: rspec
              code: bundle exec rspec
+
+    after-steps:
+        - linyows/slack_notification:
+            token: $SLACK_TOKEN
+            channel: C02FCHEQH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-withrsync
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -71,15 +71,8 @@ files:
 - lib/capistrano/withrsync.rb
 - lib/capistrano/withrsync/rake/task.rb
 - lib/capistrano/withrsync/version.rb
-- spec/feature_spec.rb
-- spec/spec_helper.rb
-- spec/tid/Capfile
-- spec/tid/Dockerfile
-- spec/tid/Gemfile
-- spec/tid/config/deploy.rb
-- spec/tid/config/deploy/test.rb
-- spec/tid/id_rsa
-- spec/tid/id_rsa.pub
+- spec/helper.rb
+- spec/task_spec.rb
 - wercker.yml
 homepage: https://github.com/linyows/capistrano-withrsync
 licenses:
@@ -101,17 +94,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capistrano with rsync
 test_files:
-- spec/feature_spec.rb
-- spec/spec_helper.rb
-- spec/tid/Capfile
-- spec/tid/Dockerfile
-- spec/tid/Gemfile
-- spec/tid/config/deploy.rb
-- spec/tid/config/deploy/test.rb
-- spec/tid/id_rsa
-- spec/tid/id_rsa.pub
+- spec/helper.rb
+- spec/task_spec.rb

data/spec/feature_spec.rb

@@ -1,17 +0,0 @@
-RSpec.describe 'Capistrano with Rsync' do
-  describe '# bundle exec cap test deploy' do
-    it 'successful' do
-      Dir.chdir ENV['TID_BASE_PATH'] do
-        _, _, ex = cmd 'bundle exec cap test deploy'
-        expect(ex.exitstatus).to eq 0
-      end
-    end
-
-    it 'puts some string' do
-      Dir.chdir ENV['TID_BASE_PATH'] do
-        out, _, _ = cmd 'bundle exec cap test deploy'
-        expect(out).to include 'Running /usr/bin/env rsync -e \'ssh -p'
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,18 +0,0 @@
-require 'tid'
-
-RSpec.configure do |config|
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.include(Tid)
-  config.before(:all) {
-    Tid.bundle
-    Tid.prepare
-  }
-  config.after(:all) { Tid.clear }
-end

data/spec/tid/Capfile

@@ -1,3 +0,0 @@
-require 'capistrano/setup'
-require 'capistrano/deploy'
-require 'capistrano/withrsync'

data/spec/tid/Dockerfile

@@ -1,9 +0,0 @@
-FROM rastasheep/ubuntu-sshd:14.04
-MAINTAINER linyows <linyows@gmail.com>
-
-ENV HOME /root
-RUN apt-get install -y rsync
-RUN mkdir /root/.ssh
-ADD id_rsa.pub /root/.ssh/authorized_keys
-RUN chmod 700 /root/.ssh
-RUN chmod 600 /root/.ssh/authorized_keys

data/spec/tid/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'capistrano-withrsync'

data/spec/tid/config/deploy/test.rb

@@ -1,24 +0,0 @@
-host = ENV['TID_HOSTNAME']
-port = ENV['TID_PORT']
-
-server host,
-  user: 'root',
-  roles: %w(app),
-  ssh_options: {
-    port: port,
-    user: 'root',
-    keys: %w(./id_rsa),
-    forward_agent: false,
-    auth_methods: %w(publickey)
-  }
-
-namespace :rsync do
-  set :rsync_options, [
-    "-e 'ssh -p #{port} -i ./id_rsa'",
-    '--recursive',
-    '--delete',
-    '--delete-excluded',
-    '--exclude .git*',
-    '--exclude .svn*',
-  ]
-end

data/spec/tid/config/deploy.rb

@@ -1,8 +0,0 @@
-Rake::Task['metrics:collect'].clear_actions
-
-set :application, 'capistrano_with_rsync'
-set :repo_url, 'https://github.com/linyows/capistrano-withrsync.git'
-set :deploy_to, '/var/capistrano_with_rsync'
-set :scm, :git
-set :format, :pretty
-set :log_level, :debug

data/spec/tid/id_rsa

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA54RVv3+XjUFcOJC5QD1wobIwkAAvicEz/Ihoq0lVhh3NTSv7
-yyJl3XKq2KqnzYCln6TFXUiQES6IaeDf3usH55wKOnkgtuxmqn0Lq6aVV6Ly8gfT
-4qOuKTAMfdQud2VT5vBRWIsxkxPog9Q60EWf99unCGB16wuMrGAPRwYwPQDVbBcW
-lDR7VkksXsU1vww3ux599GbL6lT74HvzW862onwwmCqesefHr74Aii/5iRVTUBYY
-be/pN1dm/F7tgT6nEkpdbzzRy6cy0zN/fzCR6FCds17p1q7ujbJz7hzzz3EJwFIu
-bjtnnjAqOQDsRETkleM6RzwghJZHV/PsOq5HawIDAQABAoIBAQCeO5w/nfz+1kUp
-hACZH2Tzns4CHZ5gEGRvnOus5hpF5+iBbiZR19i3Wb/bBghaNCr+yab68rVEiQFD
-HCbmPMzSR5vWCyOI4lno/D4Vu20m0IArW549sJFAJU7kUTjQ8bg+htGSKtBfLaQl
-NdBcuLl0tfObjhIJ64Lh7WWDrX8asUJbXFRzTd9CdamMSlvwTD2d2kXsjY4gYC3T
-OOP/zrzKP/WJ/vXtCNqINzyzSOFVMnU2ZICbImCZfXY7WexCT/jyxU5HpBMjgd5K
-PJMv6GM53AFuA4cmyy6LfmTdVoLzN+6NWboGacCrNv1wLUx0rHbe9vA4YcD+Hqkb
-dxn6xAJBAoGBAPcEN+TVXYCrFubBbhCJN9fesnuIwtjd1zPKYqERDAUSGVNNV3fp
-luoqGhLZtJ3hU31yurRMplL6dlkRFGL7v5DIX5gtYF0CAOr5VeNBN5uvOzl1s6uz
-8lGPureBhPQR6MJHt1tQRYDEFBU2V5wlKuluge2RnvImji1o67mrp3MFAoGBAO/v
-z+yRyjU8v59ytGr3sRaxcYUxgd7xV4Wtifxr2RJC57wtlRtIh1K/j4IXDRhFeluB
-rHZ3gMClaWZ6lZ6def5Ezl7yqArZ5eqCD+t0FmOfvB9fEE43ez7Pts7f7qQxslVu
-lwiFInDQX21xP5OBTtyXdVSrRPmDTCQGtw4ECruvAoGAfsU5ckVWQUyM6kxnEjF5
-6V2vN9sONIJViYzaZVL8WjXZrXjJ5Q6Klw6YZwg3u7cCRCV3UETuLzO/PSKY1dvh
-ioprFQxkohb/JZhkzcaQpWOe/3Q6i2pEeDtNVhQwiZoPXHW10jU2FkmLDP/gopAo
-n7hJEgVkD15eJUvtflJsE4kCgYA3z0RB9rdeIr8/y2KD7xFWAfgxzw4yWVjOU0th
-V4SqZr2YW9HvArPXX4915v64wpBvcH45IBrmtJMLrz/WITMbHc4S78Z+n6iHH7Gs
-RtheW+1aLraQOv+D4LTY8eWEc7rTfGHNLYqRSyanQkxTdyRs0x4Lj7r/frbbOmSh
-8fa9KQKBgQDmxFjHtl7gS58+vlMQZ+M76ChUO+Bvlz4A7No52jQkDvHV0M2Ev5t1
-H74LIInwkghw8qAOiOSzaFEyEJANDGX9998qTLMKpQF/iZ5cz86uIKsqGBN9sM28
-zgAhOfA4IkTKAtDOWU9mH3ONet27Kx2acsansL5LU3evm+LE4M1Emg==
------END RSA PRIVATE KEY-----

data/spec/tid/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnhFW/f5eNQVw4kLlAPXChsjCQAC+JwTP8iGirSVWGHc1NK/vLImXdcqrYqqfNgKWfpMVdSJARLohp4N/e6wfnnAo6eSC27GaqfQurppVXovLyB9Pio64pMAx91C53ZVPm8FFYizGTE+iD1DrQRZ/326cIYHXrC4ysYA9HBjA9ANVsFxaUNHtWSSxexTW/DDe7Hn30ZsvqVPvge/NbzraifDCYKp6x58evvgCKL/mJFVNQFhht7+k3V2b8Xu2BPqcSSl1vPNHLpzLTM39/MJHoUJ2zXunWru6NsnPuHPPPcQnAUi5uO2eeMCo5AOxEROSV4zpHPCCElkdX8+w6rkdr tomohisaoda@PMAC127S.local