capsum 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c06df9244eac39a41571d7fe9f51099d748ea7
-  data.tar.gz: aa216f707e7c666df0cb51f21053e9718e77c67b
+  metadata.gz: d12f8b33e375d6f689d08c042abb011332b2e72c
+  data.tar.gz: 86fd10b0b7c8df2146f2541447268cf0e59feb78
 SHA512:
-  metadata.gz: f09c73e7cdfb97582d3e7fbc13d0abbe703497e2b5b93f0aaa46ceca73e6f0d305a1eef95f3d57a2f83aa59ffa234d9de3aa588a7a3172df3f423cc887218b57
-  data.tar.gz: 4ebd83f4bc43fd50b0b4a4073f8d4908f0f78083a63496fbddfb2a6541b0f1b4049259b7f9e4e1cb4a93c459b6871af26cf2a7e7e05d6db4e77feb5d4f05a8f1
+  metadata.gz: db6124af1d0de49e1e22bf153d988cf65cb92b05c50b8fc70ebe4ed061cf3f4c3403fa77cbd25555ba27685502579f47edc9b57c71d741873917bfc2bcd09a01
+  data.tar.gz: e1630ea25d11ebbce9110e488b659b822e4d62b36a30c9cf0480fab14057e426b71ba7c1fbc48568feaff003ab81da7afbdb44e59bf8f67ca43f9970c5ad7095

data/capsum.gemspec

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

data/lib/capistrano/rsync.rb

@@ -1,123 +1 @@
-# NOTE: Please don't depend on tasks without a description (`desc`) as they
-# might change between minor or patch version releases. They make up the
-# private API and internals of Capistrano::Rsync. If you think something should
-# be public for extending and hooking, please let me know!
-
-rsync_cache = lambda do
-  cache = fetch(:rsync_cache)
-  cache = deploy_to + "/" + cache if cache && cache !~ /^\//
-  cache
-end
-
-# PATCH https://github.com/moll/capistrano-rsync/pull/13
-# Use cap3's load:defaults to set default vars so that they can be overridden.
-namespace :load do
-  task :defaults do
-    set :rsync_options, %w[--recursive --delete --delete-excluded  --exclude .git*]
-    set :rsync_copy, "rsync --archive --acls --xattrs"
-
-    # Stage is used on your local machine for rsyncing from.
-    set :rsync_stage, "tmp/deploy"
-
-    # Cache is used on the server to copy files to from to the release
-    # directory. Saves you rsyncing your whole app folder each time. If you nil
-    # rsync_cache, Capistrano::Rsync will sync straight to the release path.
-    set :rsync_cache, "shared/deploy"
-  end
-end
-
-
-Rake::Task["deploy:check"].enhance ["rsync:hook_scm"]
-Rake::Task["deploy:updating"].enhance ["rsync:hook_scm"]
-
-desc "Stage and rsync to the server (or its cache)."
-task :rsync => %w[rsync:stage] do
-  roles(:all).each do |role|
-    user = role.user + "@" if !role.user.nil?
-
-    rsync = %w[rsync]
-    rsync.concat fetch(:rsync_options)
-
-    if (port = role.port)
-      rsync += [ "-e", "ssh -p #{port}" ]
-    end
-
-    rsync << fetch(:rsync_stage) + "/"
-    rsync << "#{user}#{role.hostname}:#{rsync_cache.call || release_path}"
-
-    Kernel.system *rsync
-  end
-end
-
-namespace :rsync do
-  task :hook_scm do
-    Rake::Task.define_task("#{scm}:check") do
-      invoke "rsync:check"
-    end
-
-    Rake::Task.define_task("#{scm}:create_release") do
-      invoke "rsync:release"
-    end
-  end
-
-  task :check do
-    # Everything's a-okay inherently!
-  end
-
-  task :create_stage do
-    repo_url = fetch(:repo_url, ".")
-    deploy_cache_dir = fetch(:rsync_stage)
-    if File.directory?(deploy_cache_dir)
-      repo_url_changed = false
-      Dir.chdir deploy_cache_dir do
-        absolute_repo_url = File.absolute_path(repo_url)
-        absolute_cache_repo_url = File.absolute_path(`git config --get remote.origin.url`.chomp)
-        repo_url_changed = (absolute_repo_url != absolute_cache_repo_url)
-      end
-
-      if repo_url_changed
-        run_locally { execute :rm, "-rf", deploy_cache_dir }
-      else
-        next
-      end
-    end
-
-    clone = %W[git clone]
-    clone << repo_url
-    clone << deploy_cache_dir
-    run_locally { execute *clone }
-  end
-
-  task :set_current_revision do
-    Dir.chdir fetch(:rsync_stage) do
-      set :current_revision, "#{`git rev-parse --short HEAD`}".chomp
-    end
-  end
-
-  desc "Stage the repository in a local directory."
-  task :stage => %w[create_stage] do
-    Dir.chdir fetch(:rsync_stage) do
-      update = %W[git fetch --quiet --all --prune]
-      run_locally { execute *update }
-
-      checkout = %W[git reset --hard origin/#{fetch(:branch)}]
-      run_locally { execute *checkout }
-    end
-  end
-
-  desc "Copy the code to the releases directory."
-  task :release => %w[rsync] do
-    # Skip copying if we've already synced straight to the release directory.
-    next if !fetch(:rsync_cache)
-
-    copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}/" "#{release_path}/")
-    on roles(:all) do
-      execute copy
-    end
-  end
-
-  # Matches the naming scheme of git tasks.
-  # Plus was part of the public API in Capistrano::Rsync <= v0.2.1.
-  task :create_release => %w[release]
-end
-
+load File.expand_path("../tasks/rsync.rake", __FILE__)

data/lib/capistrano/tasks/rsync.rake

@@ -0,0 +1,93 @@
+set_if_empty :rsync_options, %w(--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_cache = lambda do
+  cache = fetch(:rsync_cache)
+  cache = deploy_to + "/" + cache if cache && cache !~ /^\//
+  cache
+end
+
+namespace :rsync do
+  task :check do
+    # Everything's a-okay inherently!
+  end
+
+  task :set_current_revision do
+    Dir.chdir fetch(:rsync_stage) do
+      set :current_revision, "#{`git rev-parse --short HEAD`}".chomp
+    end
+  end
+
+  task :create_stage do
+    repo_url = fetch(:repo_url, ".")
+    deploy_cache_dir = fetch(:rsync_stage)
+    if File.directory?(deploy_cache_dir)
+      repo_url_changed = false
+      Dir.chdir deploy_cache_dir do
+        absolute_repo_url = File.absolute_path(repo_url)
+        absolute_cache_repo_url = File.absolute_path(`git config --get remote.origin.url`.chomp)
+        repo_url_changed = (absolute_repo_url != absolute_cache_repo_url)
+      end
+
+      if repo_url_changed
+        run_locally { execute :rm, "-rf", deploy_cache_dir }
+      else
+        next
+      end
+    end
+
+    clone = %w(git clone)
+    clone << repo_url
+    clone << deploy_cache_dir
+    run_locally { execute *clone }
+  end
+
+  desc "Stage the repository in a local directory."
+  task stage: %w(create_stage) do
+    Dir.chdir fetch(:rsync_stage) do
+      update = %w(git fetch --quiet --all --prune)
+      run_locally { execute *update }
+
+      checkout = %W(git reset --hard origin/#{fetch(:branch)})
+      run_locally { execute *checkout }
+    end
+  end
+
+  desc "Stage and rsync to the server (or its cache)."
+  task :sync => %w(stage) do
+
+    roles(:all).each do |role|
+      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 << 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
+    # Skip copying if we've already synced straight to the release directory.
+    next if !fetch(:rsync_cache)
+
+    copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}/" "#{release_path}/")
+    on roles(:all) do
+      execute copy
+    end
+  end
+end

data/lib/capsum/daemons.rb

@@ -17,7 +17,7 @@ namespace :daemons do
     fetch(:daemon_list).each do |daemon|
       script_path = release_path.join("daemons", daemon[:name])
       content = convert_daemon_script(daemon)
-      
+
       on roles (daemon[:role] || :all) do |host|
         execute :mkdir, "-pv", script_path.dirname
         upload! StringIO.new(content), script_path
@@ -56,15 +56,14 @@ namespace :daemons do
     indent = (str.scan(/^[ \t]*(?=\S)/).min || "").size
     str.gsub(/^[ \t]{#{indent}}/, '')
   end
-
-  after 'deploy:updated', :upload_daemons
 end
+after 'deploy:updated', 'daemons:upload_daemons'
 
 
 # Capistrano::Configuration.instance(true).load do
-  
+
 #   namespace :daemons do
-#     desc "Start daemons process" 
+#     desc "Start daemons process"
 #     task :start, :roles => :app do
 #       find_servers(:roles => :app).each do |server|
 #         matcher = server.options[:daemons]
@@ -73,21 +72,21 @@ end
 #         end
 #       end
 #     end
-    
-#     desc "Stop daemons process" 
+
+#     desc "Stop daemons process"
 #     task :stop, :roles => :app do
 #       daemon_list.each do |daemon|
-#         run "cd #{current_path}; #{daemon[:stop]}" 
+#         run "cd #{current_path}; #{daemon[:stop]}"
 #       end
 #     end
 
-#     desc "Restart daemons process" 
+#     desc "Restart daemons process"
 #     task :restart, :roles => :app do
 #       daemons.stop
 #       sleep(3)
 #       daemons.start
 #     end
-    
+
 #     desc "setup daemons to autostart"
 #     task :setup_autostart, :roles => :app do
 #       autostart_server_commands = fetch(:autostart_server_commands)
@@ -95,23 +94,23 @@ end
 #       find_servers(:roles => :app).each do |server|
 #         matcher = server.options[:daemons]
 #         autostart_server_commands[server] ||= []
-        
+
 #         daemon_list.each do |daemon|
 #           autostart_server_commands[server] << "cd #{current_path}; #{daemon[:start]}" if match(matcher, daemon)
 #         end
 #       end
 #     end
-    
+
 #     def match(matcher, daemon)
 #       return matcher.call(daemon[:name]) if matcher.respond_to?(:call)
 #       return matcher.match(daemon[:name]) if matcher.respond_to?(:match)
-      
+
 #       !!matcher # to boolean
 #     end
-    
+
 #     def daemon_list
 #       settings = fetch(:daemons, [])
-      
+
 #       case settings
 #       when Array
 #         settings.map { |setting| parse_daemon(setting) }
@@ -121,10 +120,10 @@ end
 #         [ parse_daemon(settings) ]
 #       end
 #     end
-    
+
 #     def parse_daemon(source, options = {})
 #       daemon = {}
-      
+
 #       case source
 #       when Array
 #         daemon[:start] = source.first
@@ -136,16 +135,15 @@ end
 #         daemon[:start] = command.gsub("%{command}", "start")
 #         daemon[:stop] = command.gsub("%{command}", "stop")
 #       end
-      
+
 #       daemon[:name] = daemon[:start] if daemon[:name].nil?
 #       daemon
 #     end
 #   end
 
-#   before "autostart:update_crontab", "daemons:setup_autostart" 
+#   before "autostart:update_crontab", "daemons:setup_autostart"
 
-#   after "deploy:start", "daemons:start" 
-#   after "deploy:stop", "daemons:stop" 
+#   after "deploy:start", "daemons:start"
+#   after "deploy:stop", "daemons:stop"
 #   after "deploy:restart", "daemons:restart"
 # end
-

data/lib/capsum/foundation.rb

@@ -14,7 +14,6 @@ namespace :load do
     fetch(:linked_dirs) { set :linked_dirs, [] }
 
     set :scm, :rsync
-    set :rsync_options, %w[--archive --delete]
 
     default_env[:https_proxy] = default_env[:http_proxy] = ENV["proxy"] if ENV["proxy"]
   end

data/lib/capsum/sidekiq.rb

@@ -93,4 +93,4 @@ class SimpleScriptRecord < SSHKit::Backend::Printer
   def command(*args)
     raise SSHKit::Backend::MethodUnavailableError
   end
-end
+end

data/lib/capsum/version.rb

@@ -1,4 +1,4 @@
 module Capsum
-  VERSION = "1.0.4"
-  CAPISTRANO_SIDEKIQ_REQUIREMENT = "~> 0.5.3"
+  VERSION = "1.0.5"
+  CAPISTRANO_SIDEKIQ_REQUIREMENT = "~> 0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsum
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: capistrano-sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - capsum.gemspec
 - lib/capistrano/rsync.rb
+- lib/capistrano/tasks/rsync.rake
 - lib/capsum.rb
 - lib/capsum/autostart.rb
 - lib/capsum/bundler.rb
@@ -129,8 +130,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Collect gems and recipes related capistrano.
 test_files: []
+has_rdoc: