capsum 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 25710bb189d3cbee3e3930fa820866f211cd2daf
-  data.tar.gz: d341bf0cb34b32dd3ed63b0dac5c118f245e7f66
+SHA256:
+  metadata.gz: 84dbb7df8499ed0015e40aa1e1aeb8d06c77c98cc403c3d27dcc9ea205efb5d7
+  data.tar.gz: 37bf4fb266abf354f9a93a33a7dd9f8dc4fe596f96b809b538b4b98fb280db6c
 SHA512:
-  metadata.gz: b33875284c5c307f39837cee76ac6a89e83ee1e9c39ebdcd3c3e866074c4f1abb74a3227101e6f823fa41437d8ac621da39283b2d61c6967d1b83bee1cc15d80
-  data.tar.gz: ab11757575e9e48dde39d8c445aed3dec9931e9018c44e49f2f129578178e8ab70e3cbb67d02d4142f9e51abf3cc8a8f0179139055c7ab175af37133cd8d92f3
+  metadata.gz: 49e89a0f4a2f149b584adb0b14dff6cdedb0eddc0472a1c8143503089905b90d6142e5811870f216eee5cf718283b564c75bb4c5f4f59c1b1ac144744c0d3fd4
+  data.tar.gz: 5790c85dd4c81034871eb51e63ea832d0d89800b49aa388e3f412d380eac8c23c9450e2fd8ce1e7f7e92ea35755f484ea40d381d151f0f4cb992a5aaa0243c64

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/rsync.rb

@@ -1,4 +1,5 @@
 require "capistrano/scm/plugin"
+require "tempfile"
 
 class Capsum::Rsync < Capistrano::SCM::Plugin
   def set_defaults
@@ -6,7 +7,7 @@ class Capsum::Rsync < Capistrano::SCM::Plugin
     set_if_empty :rsync_copy, "rsync --archive --acls --xattrs"
 
     # Stage is used on your local machine for rsyncing from.
-    set_if_empty :rsync_stage, "tmp/deploy"
+    set_if_empty :rsync_stage, File.join(Dir.tmpdir, "capsum", Dir.pwd)
 
     # Cache is used on the server to copy files to from to the release directory.
     set_if_empty :rsync_cache, "shared/deploy"

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,13 @@ 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}") ]
       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.0"
+  VERSION = "1.1.5"
   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.0
+  version: 1.1.5
 platform: ruby
 authors:
 - sunteya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2021-06-17 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
@@ -115,7 +115,7 @@ homepage: http://github.com/sunteya/capsum
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Collect gems and recipes related capistrano.
 test_files: []