capistrano-s3tarball 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee04e4d5d2657e0bd9489f8564c4823d6297de9
-  data.tar.gz: 2b77e1dc0565ab453982b6f30e373d0adf0c5685
+  metadata.gz: b8123c9511226de686656af38e09ff1aebd4ad49
+  data.tar.gz: fa5f0d8d3c2c9485416d28c501970f0bc6d12704
 SHA512:
-  metadata.gz: bdbecf49eaf9e6d8c13ca9c2ca645985dfaedf19fb7171b8869cd5f5d15c966ee02569e67231924eba3d5608cdb60213fcabea30f33f4b8b0e47440e9cb00591
-  data.tar.gz: 6a2548f5b09ac51eff30e17f8e592192c670f08bda1b73baae4ea60ecaaf9c9ee1c6389c89f3c8db76b5183b7b4a61a6a7427cd1f5a044524a2d16407be07c38
+  metadata.gz: 67fc41d21c6adfff5cfc337044ed0f52eba40e581ebc6950ac1b7400733b5ecba55ed0346dc7ec10f2fbd6febe5c4e511c6f3a5d9ecfd4621242551424f22e7d
+  data.tar.gz: 6e827f8b0366a243e5118a6d6880333e34bc08d14de47e440d0ecf3de00a2f785134ec4192aa8ecac0f0e36f48a40ffc57221257cde72b6f455da23eacbb580f

data/lib/capistrano/s3tarball/plugin.rb

@@ -3,11 +3,11 @@ require "capistrano/scm/plugin"
 module Capistrano
   class S3Plugin < ::Capistrano::SCM::Plugin
     def set_defaults
-      set :current_revision, ENV.fetch('BUILD_VERSION', `git ls-remote #{fetch(:git_repo)} #{fetch(:git_branch)}`)[0...7]
-      set :git_repo, ''
-      set :aws_profile, 'default'
-      set :git_branch, ENV['BRANCH']
-      set :bucket_name, ''
+      set :git_repo, ""
+      set :aws_profile, "default"
+      set :git_branch, ENV.fetch("GIT_BRANCH", "master")
+      set :bucket_name, ""
+      set :current_revision, ENV.fetch("BUILD_REVISION", nil)
     end
 
     def define_tasks
@@ -16,6 +16,7 @@ module Capistrano
 
     def register_hooks
       after "deploy:new_release_path", "s3:create_release"
+      before "deploy:set_current_revision", "s3:set_current_revision"
       before "deploy:check", "s3:check"
     end
 
@@ -28,7 +29,7 @@ module Capistrano
     end
 
     def clone
-      backend.execute(:mkdir, '-p', repo_path)
+      backend.execute(:mkdir, "-p", repo_path)
     end
 
     def update
@@ -53,6 +54,10 @@ module Capistrano
     def tarball
       "#{fetch(:application)}-#{fetch(:current_revision)}.tar.gz"
     end
+
+    def fetch_revision
+      command = "git ls-remote #{fetch(:git_repo)} #{fetch(:git_branch)}"
+      @current_revision ||= fetch(:current_revision) || `#{command}`[0...7]
+    end
   end
 end
-

data/lib/capistrano/s3tarball/tasks/s3.rake

@@ -2,7 +2,7 @@ strategy = self
 
 namespace :s3 do
   desc 'Check that the repository is reachable'
-  task :check do
+  task :check => 's3:set_current_revision' do
     on roles(:all) do
       strategy.check
     end
@@ -39,4 +39,9 @@ namespace :s3 do
       end
     end
   end
+
+  desc "Determine the revision that will be deployed"
+  task :set_current_revision do
+    set :current_revision, strategy.fetch_revision
+  end
 end

data/lib/capistrano/s3tarball/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3tarball
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3tarball
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mo khan