capistrano-git-copy 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2af2b9b1eb48bc206244ecbda119ffa9769e978
-  data.tar.gz: 3dd5ff5a4a71cdb64fef39f0875bb5f92f1a9177
+  metadata.gz: da14278f5b4f4b247cf32afd34a66748b2443cc2
+  data.tar.gz: 757ddb4c2fa4135242423b66ce9746bfcc0b84f7
 SHA512:
-  metadata.gz: 5d4a0f91a0780fadb3c11d0fbd914a47011d24af088aec896d34fa440f18b721769b5d755b1733d7646aded5ad4ff39aca682f77cb915a9a814620394f1824ff
-  data.tar.gz: a2e88cc490728d6943257563975d87e08ee5cc8cd2f4fdfe18f9714ce543e069a40b81eaae208011346d4c5237713892dcc1639f22522c3c0aeaccb080ca4d45
+  metadata.gz: 5b8eaeae3a93a485d221921ec82dcf8095efff3bf076f9746747668c76429ac8fe63178c62cea5a7b37cf0e00a5c72ebd0dc57c91acb7b5176a004bf34145bc8
+  data.tar.gz: e8bddba412086a66be0152e68fa2839ac62a6ad780335e56fa4df869b0d54e0ce3e19d8cb427ddbd2baf6166ceec611bea40d6e7a43f1192d8ff6c42e7c836bc

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change Log
+
+## 0.8.0 (2015-04-07)
+### Changes
+  - changed namespace from Capistrano::Git::Copy to Capistrano::GitCopy to avoid problems when using it in conjunction with build-in git support from capistrano
+  - strip whitespaces from branch for checking revision

data/README.md

@@ -2,7 +2,7 @@
 [![Dependencies](https://img.shields.io/gemnasium/ydkn/capistrano-git-copy.svg)](https://gemnasium.com/ydkn/capistrano-git-copy)
 [![Code Climate](https://img.shields.io/codeclimate/github/ydkn/capistrano-git-copy.svg)](https://codeclimate.com/github/ydkn/capistrano-git-copy)
 
-# Capistrano::GIT::Copy
+# Capistrano::GitCopy
 
 Creates a tar archive locally from the git repository and uploads it to the remote server.
 

data/capistrano-git-copy.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'capistrano/git/copy/version'
+require 'capistrano/git_copy/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-git-copy'
-  spec.version       = Capistrano::Git::Copy::VERSION
+  spec.version       = Capistrano::GitCopy::VERSION
   spec.authors       = ['Florian Schwab']
   spec.email         = ['me@ydkn.de']
   spec.description   = 'Copy local git repository deploy strategy for capistrano'

data/lib/capistrano/git/copy.rb

@@ -1,3 +1 @@
-require 'capistrano/git/copy/utility'
-
-load File.expand_path('../copy/tasks/deploy.cap', __FILE__)
+require 'capistrano/git_copy'

data/lib/capistrano/git/copy/tasks/deploy.cap

@@ -1,6 +1,6 @@
 namespace :git_copy do
   def git_copy_utility
-    @git_copy_utility ||= Capistrano::Git::Copy::Utility.new(self)
+    @git_copy_utility ||= Capistrano::GitCopy::Utility.new(self)
   end
 
   task :wrapper do; end

data/lib/capistrano/git_copy.rb

@@ -1 +1,3 @@
-require 'capistrano/git/copy'
+require 'capistrano/git_copy/utility'
+
+load File.expand_path('../git_copy/tasks/deploy.cap', __FILE__)

data/lib/capistrano/git_copy/tasks/deploy.cap

@@ -0,0 +1,61 @@
+namespace :git_copy do
+  def git_copy_utility
+    @git_copy_utility ||= Capistrano::GitCopy::Utility.new(self)
+  end
+
+  task :wrapper do; end
+
+  desc 'Check that the repository is reachable'
+  task check: :'git_copy:wrapper' do
+    run_locally do
+      git_copy_utility.check
+    end
+  end
+
+  desc 'Clone the repo to the cache'
+  task clone: :'git_copy:wrapper' do
+    run_locally do
+      if git_copy_utility.test
+        info t(:mirror_exists, at: git_copy_utility.repo_path)
+      else
+        git_copy_utility.clone
+      end
+    end
+  end
+
+  desc 'Update the repo mirror to reflect the origin state'
+  task update: :'git_copy:clone' do
+    run_locally do
+      within git_copy_utility.repo_path do
+        git_copy_utility.update
+      end
+    end
+  end
+
+  desc 'Copy repo to releases'
+  task create_release: :'git_copy:update' do
+    run_locally do
+      within git_copy_utility.repo_path do
+        git_copy_utility.prepare_release
+      end
+    end
+
+    on release_roles :all do
+      git_copy_utility.release
+    end
+  end
+
+  desc 'Determine the revision that will be deployed'
+  task :set_current_revision do
+    run_locally do
+      set :current_revision, git_copy_utility.fetch_revision
+    end
+  end
+
+  desc 'Clean repo cache'
+  task :cleanup do
+    run_locally do
+      git_copy_utility.cleanup
+    end
+  end
+end

data/lib/capistrano/git_copy/utility.rb

@@ -0,0 +1,165 @@
+require 'tmpdir'
+require 'digest/md5'
+
+module Capistrano
+  module GitCopy
+    # Utility stuff to avoid cluttering of deploy.cap
+    class Utility
+      def initialize(context)
+        @context = context
+      end
+
+      # Check if repo cache exists
+      #
+      # @return [Boolean] indicates if repo cache exists
+      def test
+        test! " [ -d #{repo_path} ] "
+      end
+
+      # Check if repo is accessible
+      #
+      # @return void
+      def check
+        git :'ls-remote --heads', repo_url
+      end
+
+      # Clone repo to cache
+      #
+      # @return void
+      def clone
+        execute :mkdir, '-p', tmp_path
+
+        git :clone, fetch(:repo_url), repo_path
+      end
+
+      # Update repo and submodules to branch
+      #
+      # @return void
+      def update
+        git :remote, :update
+        git :reset, '--hard', commit_hash
+
+        # submodules
+        git :submodule, :init
+        git :submodule, :update
+        git :submodule, :foreach, '--recursive', :git, :submodule, :update, '--init'
+
+        # cleanup
+        git :clean, '-d', '-f'
+        git :submodule, :foreach, '--recursive', :git, :clean, '-d', '-f'
+      end
+
+      # Create tar archive
+      #
+      # @return void
+      def prepare_release
+        execute git_archive_all_bin, "--prefix=''", archive_path
+      end
+
+      # Upload and extract release
+      #
+      # @return void
+      def release
+        remote_archive_path = File.join(fetch(:deploy_to), File.basename(archive_path))
+
+        upload! archive_path, remote_archive_path
+
+        execute :mkdir, '-p', release_path
+        execute :tar, '-f', remote_archive_path, '-x', '-C', release_path
+        execute :rm, '-f', remote_archive_path
+      end
+
+      # Set deployed revision
+      #
+      # @return void
+      def fetch_revision
+        capture(:git, 'rev-list', '--max-count=1', '--abbrev-commit', fetch(:branch)).strip
+      end
+
+      # Cleanup repo cache
+      #
+      # @return void
+      def cleanup
+        execute :rm, '-rf', tmp_path
+
+        info 'Local repo cache was removed'
+      end
+
+      # Temporary path for all git-copy operations
+      #
+      # @return [String]
+      def tmp_path
+        @_tmp_path ||= File.join(Dir.tmpdir, deploy_id)
+      end
+
+      # Path to repo cache
+      #
+      # @return [String]
+      def repo_path
+        @_repo_path ||= File.join(tmp_path, 'repo')
+      end
+
+      # Path to archive
+      #
+      # @return [String]
+      def archive_path
+        @_archive_path ||= File.join(tmp_path, 'archive.tar.gz')
+      end
+
+      private
+
+      def fetch(*args)
+        @context.fetch(*args)
+      end
+
+      def test!(*args)
+        @context.test(*args)
+      end
+
+      def execute(*args)
+        @context.execute(*args)
+      end
+
+      def capture(*args)
+        @context.capture(*args)
+      end
+
+      def upload!(*args)
+        @context.upload!(*args)
+      end
+
+      def info(*args)
+        @context.info(*args)
+      end
+
+      def git(*args)
+        args.unshift(:git)
+        execute(*args)
+      end
+
+      def git_archive_all_bin
+        File.expand_path('../../../../vendor/git-archive-all/git-archive-all', __FILE__)
+      end
+
+      def deploy_id
+        [
+          fetch(:application),
+          fetch(:stage),
+          Digest::MD5.hexdigest(fetch(:repo_url))[0..7]
+        ].compact.join('_')
+      end
+
+      def commit_hash
+        return @_commit_hash if @_commit_hash
+
+        branch = fetch(:branch, 'master').strip
+
+        if test! :git, 'rev-parse', "origin/#{branch}", '>/dev/null 2>/dev/null'
+          @_commit_hash = capture(:git, 'rev-parse', "origin/#{branch}").strip
+        else
+          @_commit_hash = capture(:git, 'rev-parse', branch).strip
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/git_copy/version.rb

@@ -0,0 +1,8 @@
+# Capistrano
+module Capistrano
+  # GitCopy
+  module GitCopy
+    # gem version
+    VERSION = '0.8.0'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -81,6 +81,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,9 +89,10 @@ files:
 - capistrano-git-copy.gemspec
 - lib/capistrano/git/copy.rb
 - lib/capistrano/git/copy/tasks/deploy.cap
-- lib/capistrano/git/copy/utility.rb
-- lib/capistrano/git/copy/version.rb
 - lib/capistrano/git_copy.rb
+- lib/capistrano/git_copy/tasks/deploy.cap
+- lib/capistrano/git_copy/utility.rb
+- lib/capistrano/git_copy/version.rb
 - vendor/git-archive-all/git-archive-all
 homepage: https://github.com/ydkn/capistrano-git-copy
 licenses:

data/lib/capistrano/git/copy/utility.rb

@@ -1,167 +0,0 @@
-require 'tmpdir'
-require 'digest/md5'
-
-module Capistrano
-  module Git
-    module Copy
-      # Utility stuff to avoid cluttering of deploy.cap
-      class Utility
-        def initialize(context)
-          @context = context
-        end
-
-        # Check if repo cache exists
-        #
-        # @return [Boolean] indicates if repo cache exists
-        def test
-          test! " [ -d #{repo_path} ] "
-        end
-
-        # Check if repo is accessible
-        #
-        # @return void
-        def check
-          git :'ls-remote --heads', repo_url
-        end
-
-        # Clone repo to cache
-        #
-        # @return void
-        def clone
-          execute :mkdir, '-p', tmp_path
-
-          git :clone, fetch(:repo_url), repo_path
-        end
-
-        # Update repo and submodules to branch
-        #
-        # @return void
-        def update
-          git :remote, :update
-          git :reset, '--hard', commit_hash
-
-          # submodules
-          git :submodule, :init
-          git :submodule, :update
-          git :submodule, :foreach, '--recursive', :git, :submodule, :update, '--init'
-
-          # cleanup
-          git :clean, '-d', '-f'
-          git :submodule, :foreach, '--recursive', :git, :clean, '-d', '-f'
-        end
-
-        # Create tar archive
-        #
-        # @return void
-        def prepare_release
-          execute git_archive_all_bin, "--prefix=''", archive_path
-        end
-
-        # Upload and extract release
-        #
-        # @return void
-        def release
-          remote_archive_path = File.join(fetch(:deploy_to), File.basename(archive_path))
-
-          upload! archive_path, remote_archive_path
-
-          execute :mkdir, '-p', release_path
-          execute :tar, '-f', remote_archive_path, '-x', '-C', release_path
-          execute :rm, '-f', remote_archive_path
-        end
-
-        # Set deployed revision
-        #
-        # @return void
-        def fetch_revision
-          capture(:git, 'rev-list', '--max-count=1', '--abbrev-commit', fetch(:branch)).strip
-        end
-
-        # Cleanup repo cache
-        #
-        # @return void
-        def cleanup
-          execute :rm, '-rf', tmp_path
-
-          info 'Local repo cache was removed'
-        end
-
-        # Temporary path for all git-copy operations
-        #
-        # @return [String]
-        def tmp_path
-          @_tmp_path ||= File.join(Dir.tmpdir, deploy_id)
-        end
-
-        # Path to repo cache
-        #
-        # @return [String]
-        def repo_path
-          @_repo_path ||= File.join(tmp_path, 'repo')
-        end
-
-        # Path to archive
-        #
-        # @return [String]
-        def archive_path
-          @_archive_path ||= File.join(tmp_path, 'archive.tar.gz')
-        end
-
-        private
-
-        def fetch(*args)
-          @context.fetch(*args)
-        end
-
-        def test!(*args)
-          @context.test(*args)
-        end
-
-        def execute(*args)
-          @context.execute(*args)
-        end
-
-        def capture(*args)
-          @context.capture(*args)
-        end
-
-        def upload!(*args)
-          @context.upload!(*args)
-        end
-
-        def info(*args)
-          @context.info(*args)
-        end
-
-        def git(*args)
-          args.unshift(:git)
-          execute(*args)
-        end
-
-        def git_archive_all_bin
-          File.expand_path('../../../../../vendor/git-archive-all/git-archive-all', __FILE__)
-        end
-
-        def deploy_id
-          [
-            fetch(:application),
-            fetch(:stage),
-            Digest::MD5.hexdigest(fetch(:repo_url))[0..7]
-          ].compact.join('_')
-        end
-
-        def commit_hash
-          return @_commit_hash if @_commit_hash
-
-          branch = fetch(:branch, 'master')
-
-          if test! :git, 'rev-parse', "origin/#{branch}", '>/dev/null 2>/dev/null'
-            @_commit_hash = capture(:git, 'rev-parse', "origin/#{branch}").strip
-          else
-            @_commit_hash = capture(:git, 'rev-parse', branch).strip
-          end
-        end
-      end
-    end
-  end
-end

data/lib/capistrano/git/copy/version.rb

@@ -1,11 +0,0 @@
-# Capistrano
-module Capistrano
-  # Git
-  module Git
-    # Copy
-    module Copy
-      # gem version
-      VERSION = '0.7.0'
-    end
-  end
-end