capsum 1.0.0.alpha2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74da8e445fba62989f6994b4ea197629e62c1284
-  data.tar.gz: ed982fe0747c02d5ec3bb3ebf5c50c95ee50a501
+  metadata.gz: 9d09e821480f7f9b5ffcf82f921efa2203413965
+  data.tar.gz: cde51a1f96345732f64130c113705c952e7aa4ad
 SHA512:
-  metadata.gz: ce7ea0e80e5dc76e4e0eff1b07c9578b4965d860915ffbb843991bd437089da0c3fc07d5cdf5fba91318245c4bd56da82815439876687aa23da37abdc502a2a9
-  data.tar.gz: b52e10c7c4b326c39ae0d815dd5742736400e299bcca62d889a6d4800e0ebb80894d8b958bd864f4139e5442c4fed4e0c3da67ed5079c4b424308a039a85eb44
+  metadata.gz: ecd63e8b409392f367bdbe616967ef378db68d82571a65e1845ed82e9ed2a0c4610425a89a9b29ae79739ca26ba1746a7a64eb76a5cab47ce17f439826ce7cc2
+  data.tar.gz: 730f24325dacd811277e9e6e4a6dd60aeea2704ec51dc564e6e1b3bad86689da137bca5449f182616e54858de03f599f8a9ba792e4cdb1e5f4fd3cd7c7e4d311

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 ## TODO:
 
 ## v1.0:
-- upgrade capistrano to v3, v2 is not compatible
+- upgrade capistrano to v3.2, v2 is not compatible
+- monkey patch for sshkit to support non-ascii in command
+- upgrade capistrano-sidekiq to 0.2.5
 
 ## v0.9:
 - use the official whenever recipe

data/capsum.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Dependency Gems
-  spec.add_dependency "capistrano", "~> 3.1"
+  spec.add_dependency "capistrano", "~> 3.2.0"
   # spec.add_dependency "capistrano-rsync", "~> 1.0.2" # broken, wait update
   spec.add_dependency "capistrano-rails", "~> 1.1.1"
-  spec.add_development_dependency "capistrano-sidekiq", "~> 0.1.3" # optional
+  spec.add_development_dependency "capistrano-sidekiq", Capsum::CAPISTRANO_SIDEKIQ_REQUIREMENT # optional
 
   # spec.add_dependency "capistrano-helpers", "~> 0.7.1"
   # spec.add_dependency "cap-recipes", "~> 0.3.36"

data/lib/capistrano/rsync.rb

@@ -60,14 +60,35 @@ namespace :rsync do
   end
 
   task :create_stage do
-    next if File.directory?(fetch(:rsync_stage))
+    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 << fetch(:repo_url, ".")
-    clone << fetch(:rsync_stage)
+    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
@@ -76,9 +97,6 @@ namespace :rsync do
 
       checkout = %W[git reset --hard origin/#{fetch(:branch)}]
       run_locally { execute *checkout }
-
-      # PATCH https://github.com/moll/capistrano-rsync/pull/8
-      set :current_revision, "#{`git rev-parse --short HEAD`}".chomp
     end
   end
 

data/lib/capsum.rb

@@ -1,4 +1,5 @@
 require "capsum/version"
+require "capsum/patch_sshkit_force_encoding_to_utf8"
 
 module Capsum
-end
+end

data/lib/capsum/patch_sshkit_force_encoding_to_utf8.rb

@@ -0,0 +1,11 @@
+require "sshkit"
+
+module SSHKit
+  class Command
+    alias_method :to_command_without_utf8, :to_command
+
+    def to_command
+      to_command_without_utf8.force_encoding('ASCII-8BIT')
+    end
+  end
+end

data/lib/capsum/sidekiq.rb

@@ -3,6 +3,10 @@ require "capsum/daemons"
 
 begin
   require 'capistrano/sidekiq'
+  unless Gem::Requirement.new(Capsum::CAPISTRANO_SIDEKIQ_REQUIREMENT) =~ Gem.loaded_specs["capistrano-sidekiq"].version
+    puts "ERROR: Could not find gem 'capistrano-sidekiq (#{Capsum::CAPISTRANO_SIDEKIQ_REQUIREMENT}) ruby' in the gems available on this machine."
+    exit 1
+  end
 rescue LoadError
   puts 'ERROR: If you want to use the "capsum/sidekiq". you must to add [ gem "capistrano-sidekiq", require: false ] to your Gemfile.'
   exit 1

data/lib/capsum/version.rb

@@ -1,3 +1,4 @@
 module Capsum
-  VERSION = "1.0.0.alpha2"
+  VERSION = "1.0.0"
+  CAPISTRANO_SIDEKIQ_REQUIREMENT = "~> 0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsum
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2
+  version: 1.0.0
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ files:
 - lib/capsum/foundation.rb
 - lib/capsum/git.rb
 - lib/capsum/passenger.rb
+- lib/capsum/patch_sshkit_force_encoding_to_utf8.rb
 - lib/capsum/shared.rb
 - lib/capsum/sidekiq.rb
 - lib/capsum/typical.rb
@@ -123,9 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0