capistrano-git-copy-bundle 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279dec3ad87eb26598309202ae710e8d56a48168
-  data.tar.gz: d3264a4fa769f780137897833859e0b4b1a6142f
+  metadata.gz: df61315e329e8b5892b56b025b5f525e18224743
+  data.tar.gz: e1282409da8e80ebb2d9369db3dd555626230f03
 SHA512:
-  metadata.gz: 2b3d8d8c19d9f0271023175873a304d110574d3afa97d7927acabd665151f9c5827bcbe4d437cd7582eac1a89913fe090d1f8ca56c9439e4a6182ce371d4edb5
-  data.tar.gz: be90b7e6c971904055c0aeac706d9de87a16cf2434c57a0d8429ad361eea13dcc217df402d93555ee40145ed47a5f8f44cd8e99484b09a0477dfcc6f62a731d3
+  metadata.gz: 28d78d5ec7401ec119edcdb6aa95538afbe3ee5f6a9dad42627e71b5d4b5b242a2f2d2d1b00094dd7644f5b350b822dc79387f53670520411605cea7c5499b29
+  data.tar.gz: 73db3645f17321fd485959c505bb0185655b253a53fa7014770b24db417b9d1c0123ffaf34508d04c0d7c59ac3a14bb64a20117e9382d71ffdc21e79f91392a7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.0 (2017-04-08)
+### Changes
+  - Removed dependency of _capistrano-git-copy_
+
 ## 0.1.0 (2015-08-26)
 ### Changes
   - Package gems

data/lib/capistrano/git_copy/bundle.rb

@@ -1,4 +1,3 @@
-require 'digest/md5'
 require 'capistrano/bundler'
 require 'capistrano/git_copy/bundle/utility'
 require 'capistrano/git_copy/bundle/task'

data/lib/capistrano/git_copy/bundle/task.rb

@@ -1 +1 @@
-load File.expand_path('../tasks/bundle.cap', __FILE__)
+load File.expand_path('../tasks/bundle.rake', __FILE__)

data/lib/capistrano/git_copy/bundle/tasks/{bundle.cap → bundle.rake}

@@ -1,3 +1,7 @@
+def git_copy_bundle_utility
+  @_git_copy_bundle_utility ||= Capistrano::GitCopy::Bundle::Utility.new(self)
+end
+
 namespace :load do
   task :defaults do
     set :bundle_flags, "#{fetch(:bundle_flags)} --local"
@@ -6,17 +10,14 @@ end
 
 namespace :git_copy do
   namespace :bundle do
-    def git_copy_bundle_utility
-      @git_copy_bundle_utility ||= Capistrano::GitCopy::Bundle::Utility.new(self)
-    end
-
     task upload: :'git_copy:bundle:cache' do
       on release_roles :all do
         git_copy_bundle_utility.upload
       end
     end
 
-    task cache: :'git_copy:update' do
+    desc 'Cache bundled gems'
+    task :cache do
       run_locally do
         git_copy_bundle_utility.cache
       end

data/lib/capistrano/git_copy/bundle/utility.rb

@@ -1,24 +1,24 @@
-require 'capistrano/git_copy/utility'
+require 'fileutils'
+require 'digest/md5'
 
 module Capistrano
   module GitCopy
     module Bundle
-      # Utility stuff to avoid cluttering of bundle.cap
-      class Utility < ::Capistrano::GitCopy::Utility
+      # Utility stuff to avoid cluttering of bundle.rake
+      class Utility
+        def initialize(context)
+          @context = context
+        end
+
         # Cache used gems
         #
         # @return void
         def cache
-          local_vendor_path = File.join(repo_path, 'vendor')
-
           execute(:mkdir, '-p', local_cache_path)  unless test!("[ -d #{local_cache_path} ]")
-          execute(:mkdir, '-p', local_vendor_path) unless test!("[ -d #{local_vendor_path} ]")
-
-          execute(:ln, '-s', local_cache_path, File.join(local_vendor_path, 'cache'))
 
           if gems_changed?
             Bundler.with_clean_env do
-              execute("bundle package --gemfile #{File.join(repo_path, 'Gemfile')} --all --all-platforms")
+              execute("bundle package --gemfile #{File.join(Dir.pwd, 'Gemfile')} --all --all-platforms")
             end
 
             File.open(cached_gemfile_md5_path, 'w') { |f| f.write(gemfile_md5) } unless gemfile_md5.nil?
@@ -48,6 +48,7 @@ module Capistrano
         # @return void
         def clear_local
           execute(:rm, '-rf', File.join(local_cache_path, '*')) if test!("[ -d #{local_cache_path} ]")
+
           File.unlink(cached_gemfile_md5_path)
         end
 
@@ -69,14 +70,14 @@ module Capistrano
         #
         # @return [String]
         def local_cache_path
-          File.join(tmp_path, 'bundle_cache')
+          File.join(Dir.pwd, 'vendor', 'cache')
         end
 
         # MD5 sum of Gemfile.lock to deploy
         #
         # @return [String]
         def gemfile_md5
-          @_gemfile_md5 ||= Digest::MD5.file(File.join(repo_path, 'Gemfile.lock')).hexdigest rescue nil
+          @_gemfile_md5 ||= Digest::MD5.file(File.join(Dir.pwd, 'Gemfile.lock')).hexdigest rescue nil
         end
 
         # MD5 sum of Gemfile.lock for local gem cache
@@ -90,7 +91,7 @@ module Capistrano
         #
         # @return [String]
         def cached_gemfile_md5_path
-          File.join(tmp_path, 'git_copy_bundle_gemfile_lock.md5')
+          File.join(Dir.pwd, '.capistrano-git-copy-bundle-gemfile-lock.md5')
         end
 
         # Checks if Gemfile.lock has changed since last deploy
@@ -106,6 +107,28 @@ module Capistrano
         def local_gems
           %x(ls #{local_cache_path}).split(/\s+/)
         end
+
+        private
+
+        def fetch(*args)
+          @context.fetch(*args)
+        end
+
+        def execute(*args)
+          @context.execute(*args)
+        end
+
+        def capture(*args)
+          @context.capture(*args)
+        end
+
+        def test!(*args)
+          @context.test(*args)
+        end
+
+        def upload!(*args)
+          @context.upload!(*args)
+        end
       end
     end
   end

data/lib/capistrano/git_copy/bundle/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module GitCopy
     module Bundle
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy-bundle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ files:
 - capistrano-git-copy-bundle.gemspec
 - lib/capistrano/git_copy/bundle.rb
 - lib/capistrano/git_copy/bundle/task.rb
-- lib/capistrano/git_copy/bundle/tasks/bundle.cap
+- lib/capistrano/git_copy/bundle/tasks/bundle.rake
 - lib/capistrano/git_copy/bundle/utility.rb
 - lib/capistrano/git_copy/bundle/version.rb
 homepage: https://github.com/ydkn/capistrano-git-copy-bundle
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Packages gems locally and uploads them to the remote server instead of fetching