capistrano-scm-gitcopy 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d35e2b43b2d196cc35eccfa170dcd701aacdd4e
-  data.tar.gz: defb71f2f16a188a6206029c613103586269aaca
+  metadata.gz: 8e94b015b2dee31deae48e65ad6e9bc786766b8a
+  data.tar.gz: 730b078fbd172c6c644e9ace6b66496749ff80e8
 SHA512:
-  metadata.gz: 8e1eb382e5054e69d52090b8ddc24651744f34a563c56c90e4ac314fe389d1b0a7e4ac71d08cdbf19318b51c344fa522438145d67987d9ed61682ac60f6aafd0
-  data.tar.gz: de3ebff42cbc833879194ebc1f8486335bdabc65d5fb30d5de6bff9e278953be0ad40c35028b2f39c485e21d938aaa69342cb52bf20e43d49cd4b7c98f4de524
+  metadata.gz: 08f27643eb8b0235ca94e0ae76db50647c15d77d5dd24b27b5319d355c2ac1a0f630e8f455418337b70c3e8a5794e75c5c1ed9e027e729de0ef7564c3c3c46cc
+  data.tar.gz: 850fc3ba098b503873896fd68ba53c76435e1c7412ae233555a2a05493c119303e4f98623b63e268d32a4c58066fb4b2cb1cc1832023d8822c3af8a9daa5259a

data/README.md

@@ -1,7 +1,7 @@
-[ capistrano-scm-gitcopy ](https://github.com/xuwupeng2000/capsitrano-scm-gitcopy)
+[  capistrano-scm-gitcopy ](https://github.com/xuwupeng2000/capsitrano-scm-gitcopy)
 ===================
 
-Capistrano 3 :copy 
+Capistrano 3 :copy
 
 A copy strategy for Capistrano 3, which mimics the `:copy` scm of Capistrano 2.
 This Gem is inspired by and based on https://github.com/wercker/capistrano-scm-copy.
@@ -9,10 +9,6 @@ Thank wercker so much.
 
 This will make Capistrano tar the a specific git branch, upload it to the server(s) and then extract it in the release directory.
 
-There is `sub_directory` option. 
-When specified, onthe the subtree of the checked-out repository will be deployed. 
-This is useful when the rails application is not at the root of the repository.
-
 Requirements
 ============
 
@@ -26,6 +22,7 @@ Servers:
 - mktemp
 - tar
 - ruby
+- bundler (if you allow cap to run bundle for you)
 
 Installation
 ============
@@ -37,7 +34,7 @@ First make sure you install the capistrano-scm-gitcopy by adding it to your `Gem
 Then switch the `:scm` option to `:gitcopy` in `config/deploy.rb`:
 
     set :scm, :gitcopy
-    
+
 Finally, DO NOT ADD `require 'capistrano/gitcopy'` to `Capfile` because `capistrano/setup` already loads the scm module with the :scm value you specified.
 
 
@@ -45,5 +42,5 @@ Usage
 ============
 
 ```bash
-  cap uat deploy -s branch=(your release branch)
+  cap staging deploy branch=(your release branch)
   ```

data/capistrano-scm-gitcopy.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'capistrano-scm-gitcopy'
-  s.version     = '0.1.2'
+  s.version     = '0.1.4'
   s.licenses    = ['MIT']
   s.authors     = ['Jack Wu', 'Carl Douglas']
   s.email       = ['xuwupeng2000@gmail.com']

data/lib/capistrano/gitcopy.rb

@@ -2,7 +2,7 @@ load File.expand_path('../tasks/gitcopy.rake', __FILE__)
 
 require 'capistrano/scm'
 
-set_if_empty :repo_path, -> { "/tmp/#{fetch(:application)}-repository" }
+set_if_empty :local_path, -> { "/tmp/#{fetch(:application)}-repository/#{Time.now.to_i}" }
 
 class Capistrano::GitCopy < Capistrano::SCM
 
@@ -15,19 +15,17 @@ class Capistrano::GitCopy < Capistrano::SCM
 
   module DefaultStrategy
 
-    def test
-      test! " [ -f #{repo_path}/HEAD ] "
-    end
-
     def check
       git :'ls-remote --heads', repo_url
     end
 
     def clone
+      local_path = fetch(:local_path)
+
       if (depth = fetch(:git_shallow_clone))
-        git :clone, '--verbose', '--mirror', '--depth', depth, '--no-single-branch', repo_url, repo_path
+        git :clone, '--verbose', '--mirror', '--depth', depth, '--no-single-branch', repo_url, local_path
       else
-        git :clone, '--verbose', '--mirror', repo_url, repo_path
+        git :clone, '--verbose', '--mirror', repo_url, local_path
       end
     end
 
@@ -61,6 +59,6 @@ class Capistrano::GitCopy < Capistrano::SCM
         git :archive, fetch(:branch), '--format', 'tar', "|gzip > #{local_tarfile}"
       end
     end
-  end 
+  end
 
 end

data/lib/capistrano/tasks/gitcopy.rake

@@ -15,16 +15,17 @@ namespace :gitcopy do
   task :wrapper do
     run_locally do
       execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
+
       File.open("#{fetch(:tmp_dir)}/#{fetch(:application)}/git-ssh.sh", "w") do |file|
         file.write ("#!/bin/sh -e\nexec /usr/bin/ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n")
       end
+
       execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/git-ssh.sh"
     end
   end
 
   desc 'Check that the repository is reachable'
   task :check => :'gitcopy:wrapper' do
-    fetch(:branch)
     run_locally do
       with fetch(:git_environmental_variables) do
         strategy.check
@@ -34,15 +35,14 @@ namespace :gitcopy do
 
   desc 'Clone the repo to the cache'
   task :clone => :'gitcopy:wrapper' do
+    local_path = fetch(:local_path)
+
     run_locally do
-      execute :mkdir, '-p', repo_path
-      if strategy.test
-        info t(:mirror_exists, at: repo_path)
-      else
-        within repo_path do
-          with fetch(:git_environmental_variables) do
-            strategy.clone
-          end
+      execute :mkdir, '-p', local_path
+
+      within local_path do
+        with fetch(:git_environmental_variables) do
+          strategy.clone
         end
       end
     end
@@ -50,8 +50,10 @@ namespace :gitcopy do
 
   desc 'Update the repo mirror to reflect the origin state'
   task :update => :'gitcopy:clone' do
+    local_path = fetch(:local_path)
+
     run_locally do
-      within repo_path do
+      within local_path do
         with fetch(:git_environmental_variables) do
           strategy.update
         end
@@ -61,8 +63,10 @@ namespace :gitcopy do
 
   desc 'Create tarfile'
   task :create_tarfile => [:'gitcopy:update', :'gitcopy:set_current_revision'] do
+    local_path = fetch(:local_path)
+
     run_locally do
-      within repo_path do
+      within local_path do
         with fetch(:git_environmental_variables) do
           strategy.release
         end

data/spec/lib/capistrano/gitcopy_spec.rb

@@ -19,15 +19,6 @@ module Capistrano
     let(:context) { Class.new.new }
     subject { Capistrano::GitCopy.new(context, Capistrano::GitCopy::DefaultStrategy) }
 
-    describe "#test" do
-      it "should call test for repo HEAD" do
-        context.expects(:repo_path).returns("/path/to/repo")
-        context.expects(:test).with " [ -f /path/to/repo/HEAD ] "
-
-        subject.test
-      end
-    end
-
     describe "#check" do
       it "should test the repo url" do
         context.expects(:repo_url).returns(:url)
@@ -40,19 +31,19 @@ module Capistrano
     describe "#clone" do
       it "should run git clone" do
         context.expects(:fetch).with(:git_shallow_clone).returns(nil)
+        context.expects(:fetch).with(:local_path).returns(:local_path)
         context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
-        context.expects(:execute).with(:git, :clone, '--verbose', '--mirror', :url, :path)
+        context.expects(:execute).with(:git, :clone, '--verbose', '--mirror', :url, :local_path)
 
         subject.clone
       end
 
       it "should run git clone in shallow mode" do
         context.expects(:fetch).with(:git_shallow_clone).returns('1')
+        context.expects(:fetch).with(:local_path).returns(:local_path)
         context.expects(:repo_url).returns(:url)
-        context.expects(:repo_path).returns(:path)
 
-        context.expects(:execute).with(:git, :clone, '--verbose', '--mirror', "--depth", '1', '--no-single-branch', :url, :path)
+        context.expects(:execute).with(:git, :clone, '--verbose', '--mirror', "--depth", '1', '--no-single-branch', :url, :local_path)
 
         subject.clone
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-gitcopy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Jack Wu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Gitcopy strategy for capistrano 3.x