capsum 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 38f85d443ac25bc5f0ad230f9383fa1a93b8fe69
-  data.tar.gz: 4a7523d24cb81a3a031e639b2a0e1f334e166c56
+SHA256:
+  metadata.gz: 46f0ab06296b89170d8076f017b2d3f3347ba13bca4a3fbb937f851c03693070
+  data.tar.gz: 67d94bd41c873dddf6b567380398381fd0b68dec0c1c2e08a831e8ab0b45a98a
 SHA512:
-  metadata.gz: c2bf772734f9505d62dc85ca6530f1895698c38e96cff1ac52fe22980945410aebcb436ab352d3081b803c73b9f2636a8df16c3e2d59c618dd7631d77b0f9eb7
-  data.tar.gz: 3a7dbbc0216d064b0d179eb34451efa742faf0d3b5967a4c55ae16cd8df4adc23ff7b8891255fe1a0c436a46af3dbc842f10035f8408a941a505e2d34933d241
+  metadata.gz: d2943f1a1b7434578a0b8d3854c5f3321ab6ef7bf6af5045c4e5258adb21edcd1366487e867271bae27c406311944b0a6abc5826a9b21e34cf5802bab7e3b1ab
+  data.tar.gz: 0a996d14cb0b4989ff3beaedbb93e166acf2fe5db3b2476de9346d703961364230b353672af98c538fa0d3ddba6e1c91462b1905db52ee58df7c46e95e95a29d

data/capsum.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Dependency Gems
-  spec.add_dependency "capistrano", "~> 3.8.1"
+  spec.add_dependency "capistrano", "~> 3.13.0"
   # spec.add_dependency "capistrano-rsync", "~> 1.0.2" # broken, wait update
-  spec.add_dependency "capistrano-rails", "~> 1.3.0"
+  spec.add_dependency "capistrano-rails", "~> 1.4.0"
   spec.add_development_dependency "capistrano-sidekiq", Capsum::CAPISTRANO_SIDEKIQ_REQUIREMENT # optional
 
   # spec.add_dependency "capistrano-helpers", "~> 0.7.1"

data/lib/capsum/git.rb

@@ -3,7 +3,7 @@ require "capsum"
 namespace :load do
   task :defaults do
     # use current branch
-    set :branch, -> { `git describe --contains --all HEAD | tr -d '\n'` }
+    set :branch, -> { `git rev-parse --abbrev-ref HEAD`.chomp }
 
     # use current remote repo url
     set :repo_url, -> {
@@ -15,4 +15,4 @@ namespace :load do
 
     # TODO: set :scm_verbose, true
   end
-end
+end

data/lib/capsum/tasks/rsync.rake

@@ -49,6 +49,9 @@ namespace :rsync do
 
       checkout = %W(git reset --hard origin/#{fetch(:branch)})
       run_locally { execute *checkout }
+
+      submodule = %w(git submodule update --init --force)
+      run_locally { execute *submodule }
     end
   end
 
@@ -58,12 +61,15 @@ namespace :rsync do
       user = role.user + "@" if role.user
 
       rsync = %w(rsync)
-      rsync.concat fetch(:rsync_options)
 
       if (port = role.port)
-        rsync += [ "-e", %("ssh -p #{port}") ]
+        rsync += [ "-e", %("ssh -p #{port} #{fetch(:rsync_ssh_options)}") ]
+      elsif (rsync_ssh_options = fetch(:rsync_ssh_options))
+        rsync += [ "-e", %("ssh #{rsync_ssh_options}") ]
       end
 
+      rsync.concat fetch(:rsync_options)
+
       rsync << fetch(:rsync_stage) + "/"
       rsync << "#{user}#{role.hostname}:#{rsync_cache.call || release_path}"
 

data/lib/capsum/version.rb

@@ -1,4 +1,4 @@
 module Capsum
-  VERSION = "1.1.2"
+  VERSION = "1.1.6"
   CAPISTRANO_SIDEKIQ_REQUIREMENT = "~> 0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsum
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: capistrano-sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Collect gems and recipes related capistrano.