capistrano-git-copy 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2d212e098eb884c15a2a7a3f0b9dbc6e5a137e
-  data.tar.gz: 672168b65f58dc804469c16f3cca712d389c0240
+  metadata.gz: 025c8ab7ba62a08ce7aafd9ba3acd35a9ca0df58
+  data.tar.gz: c434d3eb0fb1d4ca524b8238710e68f4e493f13f
 SHA512:
-  metadata.gz: 55587ebd76886541942c3d0336fcfaaf992f34dac15d75073fee6293c90523ab14cd0e0fbd63ccce9f9a66eda9b218acf09c311848259b482c0057339bfab32e
-  data.tar.gz: 3118f37767103641b52ba4ac5991267d78daa591e7ac3ef753a25ecefbb5b3f90f7d124361a1ff83e4aa1ff5395839b541bd73b40a32964d7904080525bc0f6a
+  metadata.gz: 6db2be56e86f392f15e80d5d9d94b748b34215b0885b10c453aa8cf1b1a9b56d82f40d4631d10ccfcfe97933fc4e71a6ea8896c21465852708d9b64f20335592
+  data.tar.gz: 03ed553534d07288c570ecc654d447cc884993b779bb8189183505a19ae8b92648d9969bf1b4d17fab61ef53b23de369258003669d80c57d1fc38be500b48813

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.4.0 (2017-05-31)
+### Feature
+  - deploy subdirectory
+
 ## 1.3.2 (2017-04-30)
 ### Changes
   - updated _git-archive-all_ to 1.16.4

data/README.md

@@ -26,6 +26,7 @@ require 'capistrano/git_copy'
 install_plugin Capistrano::GitCopy::SCM
 ```
 
+### Submodules
 By default, it includes all submodules into the deployment package. However,
 if they are not needed in a particular deployment, you can disable them with
 a configuration option:
@@ -37,6 +38,30 @@ adding them to `git_excludes`:
 ```ruby
 append :git_excludes, 'config/database.yml.example', 'test', 'rspec'
 ```
+**git-archive-all does not support .gitattributes yet - please set with_submodules to false to make e.g. export-ignore work**
+
+### Subdirectories
+
+It is also possible to deploy only a subdirectory to the remote server:
+```ruby
+set :upload_path, 'dist'
+```
+This makes it possible to compile or build something locally and only upload the result
+```ruby
+namespace :deploy do
+  before :'git_copy:create_release', :'deploy:build_app'
+
+  task :build_app do
+    run_locally do
+      within(fetch(:git_copy_plugin).repo_cache_path) do
+        execute :npm, :install
+        execute :npm, :run, :'build-dist'
+      end
+    end
+  end
+end
+```
+
 ## Notes
 
 * Uses [git-archive-all](https://github.com/Kentzo/git-archive-all) for bundling repositories.

data/lib/capistrano/git_copy/scm.rb

@@ -10,7 +10,7 @@ module Capistrano
       def set_defaults
         set_if_empty :with_submodules, true
         set_if_empty :git_excludes,    []
-        set_if_empty :repo_tree,       false
+        set_if_empty :upload_path,     '.'
       end
 
       # define plugin tasks
@@ -86,12 +86,12 @@ module Capistrano
       #
       # @return void
       def prepare_release
-        target = fetch(:repo_tree) ? "HEAD:#{fetch(:repo_tree)}" : 'HEAD'
-
-        if fetch(:with_submodules)
+        if fetch(:upload_path) != '.'
+          backend.execute(:tar, '-czf', archive_path, '-C', fetch(:upload_path), '.')
+        elsif fetch(:with_submodules)
           backend.execute(git_archive_all_bin, "--prefix=''", archive_path)
         else
-          git(:archive, '--format=tar', target, '|', 'gzip', "> #{archive_path}")
+          git(:archive, '--format=tar', 'HEAD', '|', 'gzip', "> #{archive_path}")
         end
 
         exclude_files_from_archive if fetch(:git_excludes, []).count > 0
@@ -139,7 +139,7 @@ module Capistrano
       #
       # @return [String]
       def repo_cache_path
-        @_repo_cache_path ||= File.join(tmp_path, 'repo')
+        @_repo_cache_path ||= fetch(:git_repo_cach_path, File.join(tmp_path, 'repo'))
       end
 
       # Path to archive
@@ -183,9 +183,9 @@ module Capistrano
       def exclude_files_from_archive
         archive_dir = File.join(tmp_path, 'archive')
 
-        backend.execute :rm, '-rf', archive_dir
-        backend.execute :mkdir, '-p', archive_dir
-        backend.execute :tar, '-xzf', archive_path, '-C', archive_dir
+        backend.execute(:rm, '-rf', archive_dir)
+        backend.execute(:mkdir, '-p', archive_dir)
+        backend.execute(:tar, '-xzf', archive_path, '-C', archive_dir)
 
         fetch(:git_excludes, []).each do |f|
           file_path = File.join(archive_dir, f.gsub(/\A\//, ''))
@@ -199,7 +199,7 @@ module Capistrano
           FileUtils.rm_rf(file_path)
         end
 
-        backend.execute :tar, '-czf', archive_path, '-C', archive_dir, '.'
+        backend.execute(:tar, '-czf', archive_path, '-C', archive_dir, '.')
       end
     end
   end

data/lib/capistrano/git_copy/tasks/git_copy.rake

@@ -1,20 +1,20 @@
-git_copy_plugin = self
+set :git_copy_plugin, self
 
 namespace :git_copy do
   desc 'Check that the repository is reachable'
   task :check do
     run_locally do
-      git_copy_plugin.check
+      fetch(:git_copy_plugin).check
     end
   end
 
   desc 'Clone the repo to the cache'
   task :clone do
     run_locally do
-      if git_copy_plugin.test
-        info t(:mirror_exists, at: git_copy_plugin.repo_cache_path)
+      if fetch(:git_copy_plugin).test
+        info t(:mirror_exists, at: fetch(:git_copy_plugin).repo_cache_path)
       else
-        git_copy_plugin.clone
+        fetch(:git_copy_plugin).clone
       end
     end
   end
@@ -22,8 +22,8 @@ namespace :git_copy do
   desc 'Update the repo mirror to reflect the origin state'
   task update: :'git_copy:clone' do
     run_locally do
-      within git_copy_plugin.repo_cache_path do
-        git_copy_plugin.update
+      within fetch(:git_copy_plugin).repo_cache_path do
+        fetch(:git_copy_plugin).update
       end
     end
   end
@@ -31,21 +31,21 @@ namespace :git_copy do
   desc 'Copy repo to releases'
   task create_release: :'git_copy:update' do
     run_locally do
-      within git_copy_plugin.repo_cache_path do
-        git_copy_plugin.prepare_release
+      within fetch(:git_copy_plugin).repo_cache_path do
+        fetch(:git_copy_plugin).prepare_release
       end
     end
 
     on release_roles :all do
-      git_copy_plugin.release
+      fetch(:git_copy_plugin).release
     end
   end
 
   desc 'Determine the revision that will be deployed'
   task set_current_revision: :'git_copy:update' do
     run_locally do
-      within git_copy_plugin.repo_cache_path do
-        set :current_revision, git_copy_plugin.fetch_revision
+      within fetch(:git_copy_plugin).repo_cache_path do
+        set :current_revision, fetch(:git_copy_plugin).fetch_revision
       end
     end
   end
@@ -53,7 +53,7 @@ namespace :git_copy do
   desc 'Clean repo cache'
   task :cleanup do
     run_locally do
-      git_copy_plugin.cleanup
+      fetch(:git_copy_plugin).cleanup
     end
   end
 end

data/lib/capistrano/git_copy/version.rb

@@ -3,6 +3,6 @@ module Capistrano
   # GitCopy
   module GitCopy
     # gem version
-    VERSION = '1.3.2'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano