cap_git_tools 0.8.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTRmMGUzNWE5ZWFhYzZiMTQ0MGJkMGUzYjk2Njg4MmQyYmQ5ZGIxOA==
+  data.tar.gz: !binary |-
+    MmFkMmNhMmRmZGMyNGZmM2JlOWMzYTM3MDYwNTQ1ZGJhMGNhYzk4Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MGRkZDhlYTFiOThkMDk2M2ZjNTA4NTE0ZjMzNGVkNmJkMjIzYzFhYWFmNmQ5
+    NTdkZjA4MGUyYzJkYTkwYzY0MWUzOWE0NTAxODJmZDQ5ZjI2ODhmYzNmNTlm
+    N2Y5ODAyNmU3Mjg5NmU3NmVkZWMyOTlmNGFkNzNhNWYxY2Y4NTI=
+  data.tar.gz: !binary |-
+    NGU4M2EyNzBhZWZkOTI2YTk0YTk4MmE1Mzg4ZTBkMzZiMDVjZDk2MmQxOTFj
+    NGYxOTkyZGUzYTFkN2QwZjZhYjk4YTYxYmJmYTg1YzBlOTU0MjU1NGEyNmUx
+    MTA2ZmIwZjA1MThhNTk1M2I4MjY1MzM2NTE1ZDFiZjUyYzVhY2Q=

data/README.md

@@ -1,5 +1,7 @@
 # cap_git_tools
 
+[![Gem Version](https://badge.fury.io/rb/cap_git_tools.png)](http://badge.fury.io/rb/cap_git_tools)
+
 Re-usable, composable [Capistrano](https://github.com/capistrano/capistrano) tasks for git tagging and other work with the
 git repository you use for your Cap deploys. 
 
@@ -18,7 +20,7 @@ to be using it.
 (_Inspired by Alan Pinstein and Josh Nichols' neat
 [gitflow](https://github.com/apinstein/git-deployment), but refactored for more
 flexiblity with less hardcoded workflow. Some functionality changed in the
-process.)_
+process.)
 
 ## Installation
 
@@ -37,7 +39,9 @@ This makes cap_git_tool's tasks available to you, but doesn't automatically wire
 them up to be used by your `cap deploy`. See below.
 
 You probably want to make sure you have an `ssh-agent` set up, or you'll have to
-enter your private key password to access git several times. You will need to be
+enter your private key password to access git several times. 
+
+**Note**: You will need to be
 running your cap recipes from a directory with a git checkout (usual behavior
 for cap usage, but not actually required otherwise by cap). 
 
@@ -79,7 +83,7 @@ you have set cap's `:branch`, it'll tag and deploy the HEAD of that branch
 even if that's not your current checkout. 
 
 You can customize the prefix and other aspects of tagging, both in your recipe 
-and with command line over-rides, see `cap -E git:tag` for more info. 
+and with command line over-rides, see `cap -e git:tag` for more info. 
 
 ## Multistage workflow
 
@@ -89,7 +93,7 @@ In one commonly desired multistage workflow (similar to what
 [gitflow](https://github.com/apinstein/git-deployment) enforces):
  
  * Under staging, you want automatic tagging with staging-yyyy-mm-dd-hhmm, just 
-   as above under 'Automatically tag on deploy'. Add to your `config/staging.rb`:
+   as above under 'Automatically tag on deploy'. Add to your `config/deploy/staging.rb`:
    
            before "deploy:update_code", "git:guard_committed", "git:guard_upstream", "git:tag"
       
@@ -97,7 +101,7 @@ In one commonly desired multistage workflow (similar to what
    it by deploying that tag to production, re-tagging with a "production-" tag.
    Maybe you also want to print out the commit log between the last production
    tag and what you're about to deploy, and require interactive confirmation.
-   Add to your `config/deploy.rb`:
+   Add to your `config/deploy/production.rb`:
    
            before "deploy:update_code",  "git:commit_log", "git:retag"
            set :confirm_tag, true
@@ -167,4 +171,4 @@ point.
 ## Let me know
 
 Feedback, pull requests, complaints, welcome. Not sure if anyone's gonna use
-this. 
+this. 

data/cap_git_tools.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = CapGitTools::VERSION
   s.authors     = ["Jonathan Rochkind"]
   s.email       = ["jonathan@dnil.net"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/jrochkind/cap_git_tools"
   s.summary     = %q{re-usable, composable Capistrano tasks for git tagging and other work with a git repo}
 
   s.rubyforge_project = "cap_git_tools"

data/lib/cap_git_tools/task_helpers.rb

@@ -37,38 +37,47 @@ module CapGitTools::TaskHelpers
     # will occasionally return a raw git url when it's not configured in
     # remotes for some reason. 
     #
-    # This used to be hard-coded to 'origin'. Then it was configurable.
-    # Then I realized it _has_ to be whatever is set in cap :repository.
-    # We'll look up the remote alias for that, if available, and cache
-    # the lookup. Usually it'll be 'origin',  yeah. 
+    # When using deploy_via copy, will find the remote if the repository only 
+    # has one configured. If more than one remote is configured an error will 
+    # be raised unless the `upstream_remote_name` variable is set specifying the 
+    # correct remote.
+    #
+    # Remote determination can be overridden manually for any deployment method 
+    # by setting the remote to use in the `upstream_remote_name` variable.
     def upstream_remote
       @__upstream_remote = begin
-        git_url = fetch(:repository)        
-        
-        remote_info = 
-        `git remote -v`.
-          split("\n").
-          collect {|line| line.split(/[\t ]/) }.
-          find {|list| list[1] == git_url }
-        
-        remote_info ? remote_info[0] : git_url
+        if exists?('upstream_remote_name')
+          fetch(:upstream_remote_name)
+        elsif fetch(:deploy_via) == :copy
+          upstream_remote_for_copy
+        else
+          git_url = fetch(:repository)        
+          upstream_remote_by_url git_url
+        end
       end
     end
-    
+
   
     # what branch we're going to tag and deploy -- if cap 'branch' is set,
     # use that one, otherwise use current branch in checkout
     def working_branch
       @__git_working_branch ||= begin
         if exists?("branch")
+          p fetch(:branch)
           fetch(:branch)
         else
-          b = `git symbolic-ref -q HEAD`.sub(%r{^refs/heads/}, '').chomp
-          b.empty? ? "HEAD" : b
+          current_branch
         end
       end
       
     end
+
+    # The branch that is currently checkout out in the local repository
+    def current_branch
+      b = `git symbolic-ref -q HEAD`.sub(%r{^refs/heads/}, '').chomp
+      b.empty? ? "HEAD" : b
+      return b
+    end
     
     # current SHA fingerprint of local branch mentioned in :branch
     def local_sha
@@ -189,6 +198,28 @@ module CapGitTools::TaskHelpers
         end
       end
     end
+
+    def upstream_remote_by_url(git_url)
+      remote_info = 
+        `git remote -v`.
+        split("\n").
+        collect {|line| line.split(/[\t ]/) }.
+        find {|list| list[1] == git_url }
+
+      remote_info ? remote_info[0] : git_url
+    end
     
-  
+    def upstream_remote_for_copy
+      remotes = `git remote`.split("\n")
+      remotes.size == 1 ? remotes[0] : abort(%Q{failed: upstream_remote: multiple possible upstream remotes
+
+    You are deploying via copy, and have multiple possible upstream remotes.
+
+    Please specify the correct remote to use by setting the 
+    :upstream_remote_name variable.
+
+    Available remotes:
+      #{remotes.join("\n      ")}
+      })
+    end
 end

data/lib/cap_git_tools/tasks.rb

@@ -196,8 +196,8 @@ Capistrano::Configuration.instance.load do
         * Normally the most recent tag beginning "staging-"
         * Or set cap :tag_prefix in config file or command line
           to use a different prefix.
-        * Or set :tag_from in config file or on command line
-          to specify a specific tag. `cap deploy -s tag_from=staging_something`
+        * Or set :from_tag in config file or on command line
+          to specify a specific tag. `cap deploy -s from_tag=staging_something`
           
         What will the newly created tag look like? Same rules as for
         git:tag. 

data/lib/cap_git_tools/version.rb

@@ -1,3 +1,3 @@
 module CapGitTools
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cap_git_tools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,29 +40,29 @@ files:
 - lib/cap_git_tools/task_helpers.rb
 - lib/cap_git_tools/tasks.rb
 - lib/cap_git_tools/version.rb
-homepage: ''
+homepage: http://github.com/jrochkind/cap_git_tools
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cap_git_tools
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: re-usable, composable Capistrano tasks for git tagging and other work with
   a git repo
 test_files: []
+has_rdoc: