capistrano-stretcher 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a341c8909b6f497f940161ab074a422166cd802e
-  data.tar.gz: a728bf6953c6841dcbae5702ff3ac844d93ed9ac
+  metadata.gz: a7ba1db01edfbfc1ff473bad8a02196740f3f92c
+  data.tar.gz: 22ded6adc6e0252c3ca601c9d7b9a7e2be1f08a8
 SHA512:
-  metadata.gz: d99cc7e5754730f2f27b82df2a7000bcff8b146c31696f23e355988a93219cfc934fdbdedd07ce6fe6cc986d35557e5bcb6e308350fa28824b1ae65995765030
-  data.tar.gz: 3aa3a09700f9ee7e043cc26a2dfc6bac6a10aad1900f6aab871ad769b12eec2cfb343b9376489ca0c43ee785c1dd8cb638564c1e04f2d87e74b9c9089f015fd2
+  metadata.gz: 194e97730f312140b0ddaf183c284a34e027137eaefbbac108548bcc61556e4208b4a10992ab884626a5ecdee94cbf514d5cd1ac7eec9c3668aef4c94ba3e002
+  data.tar.gz: efbcee6ae550cf5fe3fc2380a1839fad3c5c4ff5859c723a60dea07cb433b4387541e330f4c11def4f9a236b665fc36f8cfe2f3379fdb891b69c7cbe2dd10cfd

data/README.md

@@ -30,9 +30,12 @@ capistrano-stretcher requires target server for building to application assets.
  * openssl
  * aws-cli
  * consul
+ * pv
 
 target server builds assets, uploads assets to AWS S3 and invokes `consul event` automatically. So target server can access AWS s3 via aws-cli and join your deployment consul cluster.
 
+If you want to use non-s3 (e.g. private DC), upload assets to your server with rsync and download from http(s).
+
 ## Usage
 
 You need to add `require "capistrano/stretcher"` to Capfile and add `config/deploy.rb` following variables:
@@ -54,6 +57,13 @@ set :stretcher_src, "s3://your-deployment-bucket/assets/rails-application-#{env.
 set :manifest_path, "s3://your-deployment-bucket/manifests/"
 # Optional, if you want to use mv
 set :stretcher_sync_strategy, "mv"
+
+# Optinal, if you want to http(s) in stretcher_src, manifest_path
+set :rsync_ssh_option, "-p 22"
+set :rsync_ssh_user, "MY_USER" # if undefined, use current user on build server
+set :rsync_host, "xxx.xxx.xxx.xxx"
+set :rsync_stretcher_src_path, "/var/www/resource/assets/rails-application-#{env.now}.tgz"
+set :rsync_manifest_path,      "/var/www/resource/manifests"
 ```
 
 and write hooks for stretcher to `config/stretcher.yml.erb`

data/capistrano-stretcher.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-stretcher"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["SHIBATA Hiroshi", "Uchio Kondo"]
   spec.email         = ["hsbt@ruby-lang.org", "udzura@udzura.jp"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'capistrano', '>= 3'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
 end

data/lib/capistrano/tasks/stretcher.rake

@@ -39,6 +39,22 @@ namespace :stretcher do
     roles(fetch(:consul_roles, [:consul]))
   end
 
+  # upload to s3
+  def upload_s3(local_src_path, remote_dst_path)
+    execute :aws, :s3, :cp, local_src_path, remote_dst_path
+  end
+
+  # upload to resource server with rsync
+  def upload_resource(local_src_path, remote_dst_path)
+    rsync_ssh_command = "ssh"
+    rsync_ssh_command << " " + fetch(:rsync_ssh_option) if fetch(:rsync_ssh_option)
+    rsync_ssh_user = fetch(:rsync_ssh_user) { capture(:whoami).strip }
+
+    execute :rsync, "-ave", %Q("#{rsync_ssh_command}"),
+            local_src_path,
+            "#{rsync_ssh_user}@#{fetch(:rsync_host)}:#{remote_dst_path}"
+  end
+
   task :mark_deploying do
     set :deploying, true
   end
@@ -100,7 +116,15 @@ namespace :stretcher do
   task :upload_tarball do
     on application_builder_roles do
       as 'root' do
-        execute :aws, :s3, :cp, "#{local_tarball_path}/current/#{fetch(:local_tarball_name)}", fetch(:stretcher_src)
+        local_tarball_file = "#{local_tarball_path}/current/#{fetch(:local_tarball_name)}"
+
+        if fetch(:stretcher_src).start_with?("s3://")
+          # upload to s3
+          upload_s3(local_tarball_file, fetch(:stretcher_src))
+        else
+          # upload to resource server with rsync
+          upload_resource(local_tarball_file, fetch(:rsync_stretcher_src_path))
+        end
       end
     end
   end
@@ -120,8 +144,19 @@ namespace :stretcher do
             t.write yml
             t.path
           end
-          upload! tempfile_path, "#{local_tarball_path}/current/manifest_#{role}_#{fetch(:stage)}.yml"
-          execute :aws, :s3, :cp, "#{local_tarball_path}/current/manifest_#{role}_#{fetch(:stage)}.yml", "#{fetch(:manifest_path)}/manifest_#{role}_#{fetch(:stage)}.yml"
+
+          local_manifest_file = "#{local_tarball_path}/current/manifest_#{role}_#{fetch(:stage)}.yml"
+
+          upload! tempfile_path, local_manifest_file
+
+          if fetch(:manifest_path).start_with?("s3://")
+            # upload to s3
+            upload_s3(local_manifest_file, "#{fetch(:manifest_path)}/manifest_#{role}_#{fetch(:stage)}.yml")
+          else
+            # upload to resource server with rsync
+            execute :chmod, "644", local_manifest_file
+            upload_resource(local_manifest_file, "#{fetch(:rsync_manifest_path)}/manifest_#{role}_#{fetch(:stage)}.yml")
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-stretcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -29,30 +29,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: capistrano task for stretcher.