capsum 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e6e6a836aee6aa424c46e97f36d2202b047b4f
-  data.tar.gz: '08ac801ce0dd2973d048b734bc07bd06bcff1968'
+  metadata.gz: 25710bb189d3cbee3e3930fa820866f211cd2daf
+  data.tar.gz: d341bf0cb34b32dd3ed63b0dac5c118f245e7f66
 SHA512:
-  metadata.gz: 49c58efcee8f8f55de26305036de77bf2559d51d67af5c98bebde55590fa6e69ca71d4e30d40c8e51fbcd2de8550279f81ec9726a76cadb3a935e86b0006ad10
-  data.tar.gz: ac0d7b537af5fae58898c7f75e1099055945231ca16ac0e6ea0960a6a2a6146d927ccc75834c092b95c56e3afd6dd2e8ab21e766dcb691faa9143fdaa7239b46
+  metadata.gz: b33875284c5c307f39837cee76ac6a89e83ee1e9c39ebdcd3c3e866074c4f1abb74a3227101e6f823fa41437d8ac621da39283b2d61c6967d1b83bee1cc15d80
+  data.tar.gz: ab11757575e9e48dde39d8c445aed3dec9931e9018c44e49f2f129578178e8ab70e3cbb67d02d4142f9e51abf3cc8a8f0179139055c7ab175af37133cd8d92f3

data/README.md

@@ -20,6 +20,9 @@ require 'capistrano/deploy'
 
 require "capsum/typical" # for rails project
 # require "capsum/sidekiq"
+
+require "capsum/rsync"
+install_plugin Capsum::Rsync
 ~~~~
 
 ### ./config/deploy.rb

data/capsum.gemspec

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

data/lib/capsum/foundation.rb

@@ -2,7 +2,7 @@ require "capsum"
 require "capsum/git"
 require "capsum/shared"
 require "capistrano/console"
-require "capistrano/rsync"
+require File.expand_path("../remote_env.rb", __FILE__)
 
 namespace :load do
   task :defaults do
@@ -13,9 +13,7 @@ namespace :load do
     fetch(:linked_files) { set :linked_files, [] }
     fetch(:linked_dirs) { set :linked_dirs, [] }
 
-    set :scm, :rsync
-
-    default_env[:https_proxy] = default_env[:http_proxy] = ENV["proxy"] if ENV["proxy"]
+    remote_env[:https_proxy] = remote_env[:http_proxy] = ENV["proxy"] if ENV["proxy"]
   end
 end
 

data/lib/capsum/remote_env.rb

@@ -0,0 +1,23 @@
+module Capistrano
+  module DSL
+    def remote_env
+      fetch(:remote_env)
+    end
+  end
+end
+
+module Capsum
+  module RemoteEnv
+    set_if_empty :remote_env, {}
+
+    def on(hosts, options={}, &block)
+      super(hosts, options) do
+        with remote_env do
+          instance_eval(&block)
+        end
+      end
+    end
+  end
+end
+
+extend Capsum::RemoteEnv

data/lib/capsum/rsync.rb

@@ -0,0 +1,24 @@
+require "capistrano/scm/plugin"
+
+class Capsum::Rsync < Capistrano::SCM::Plugin
+  def set_defaults
+    set_if_empty :rsync_options, %w(--links --recursive --delete --delete-excluded  --exclude .git*)
+    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"
+
+    # Cache is used on the server to copy files to from to the release directory.
+    set_if_empty :rsync_cache, "shared/deploy"
+  end
+
+  def register_hooks
+    after "deploy:new_release_path", "rsync:create_release"
+    before "deploy:check", "rsync:check"
+    before "deploy:set_current_revision", "rsync:set_current_revision"
+  end
+
+  def define_tasks
+    eval_rakefile File.expand_path("../tasks/rsync.rake", __FILE__)
+  end
+end

data/lib/{capistrano → capsum}/tasks/rsync.rake

@@ -1,11 +1,4 @@
-set_if_empty :rsync_options, %w(--links --recursive --delete --delete-excluded  --exclude .git*)
-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"
-
-# Cache is used on the server to copy files to from to the release directory.
-set_if_empty :rsync_cache, "shared/deploy"
+rsync_plugin = self
 
 rsync_cache = lambda do
   cache = fetch(:rsync_cache)
@@ -60,8 +53,7 @@ namespace :rsync do
   end
 
   desc "Stage and rsync to the server (or its cache)."
-  task :sync => %w(stage) do
-
+  task sync: %w(stage) do
     roles(:all).each do |role|
       user = role.user + "@" if role.user
 
@@ -75,17 +67,15 @@ namespace :rsync do
       rsync << fetch(:rsync_stage) + "/"
       rsync << "#{user}#{role.hostname}:#{rsync_cache.call || release_path}"
 
-      # Kernel.system *rsync
       run_locally { execute *rsync }
     end
   end
 
   desc "Copy the code to the releases directory."
-  task :create_release => %w(sync) do
+  task create_release: %w(sync) do
     # Skip copying if we've already synced straight to the release directory.
     next if !fetch(:rsync_cache)
 
-
     folder = fetch(:rsync_folder, "/")
     copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}#{folder}" "#{release_path}/")
     on roles(:all) do

data/lib/capsum/version.rb

@@ -1,4 +1,4 @@
 module Capsum
-  VERSION = "1.0.8"
-  CAPISTRANO_SIDEKIQ_REQUIREMENT = "~> 0.5.4"
+  VERSION = "1.1.0"
+  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.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.1
+        version: 3.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.1
+        version: 3.8.1
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano-sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +94,6 @@ files:
 - README.md
 - Rakefile
 - capsum.gemspec
-- lib/capistrano/rsync.rb
-- lib/capistrano/tasks/rsync.rake
 - lib/capsum.rb
 - lib/capsum/autostart.rb
 - lib/capsum/bundler.rb
@@ -105,8 +103,11 @@ files:
 - lib/capsum/git.rb
 - lib/capsum/passenger.rb
 - lib/capsum/patch_sshkit_force_encoding_to_utf8.rb
+- lib/capsum/remote_env.rb
+- lib/capsum/rsync.rb
 - lib/capsum/shared.rb
 - lib/capsum/sidekiq.rb
+- lib/capsum/tasks/rsync.rake
 - lib/capsum/typical.rb
 - lib/capsum/version.rb
 - lib/capsum/whenever.rb

data/lib/capistrano/rsync.rb

@@ -1 +0,0 @@
-load File.expand_path("../tasks/rsync.rake", __FILE__)