pivotal-integration 1.6.0.1 → 1.6.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY3YjFhNGFjYjYxMjdhYmU1Zjc3Mzg0YjVhZTk0NjQwYjZhYWU0Zg==
+    MDA0MzQ0NjdkMTNiN2ViMTViM2Y0MGU2YmYzN2M5Nzg4OGRmMjAxYw==
   data.tar.gz: !binary |-
-    Mjk2ODZhNjI5NGY1OTk4ZGI4NTcyNzYyZGM1ZmY2OWM2NjA4OGE3Yw==
+    ZDI5NmVkMTI4YWRhZjk0M2M4NzgzODg2MTg3MDBlMTAzZDI5ZWY1OQ==
 SHA512:
   metadata.gz: !binary |-
-    YzM2NTFmNDNmMjY1MjFmOTBjZmFhYWU0ODdlMjZjZjZmMmFmOTA1MmM2N2Vj
-    NTU5ZWMyZjA4NGIxMjRmYTJkMGNiZjhlMDAyMzRhZjQ3NDRiYzVmOGIwOTAy
-    MDM1ODU0ZTZjZjUwNTFhOWU1MjJmMGVkOGM4ZWExODM4NzVhYjQ=
+    NDc3OWNmMzYzMzg4YzMyOWE2NzQ3OGFjNjBmMWYxODNiZGIwMTQ5ZmRlNTk4
+    NDBhN2VmYjcwYTM4NzU4ZDFhOGVkYzBiZWI4NWMwNjIzNTcwNGJkOWU3OWFi
+    YjI5M2Y0NWViMGRmOTFlZTE2NGYyNTc5OTE2NThjZjkyZTAzMzA=
   data.tar.gz: !binary |-
-    ZTgwZTE5YjA5MjNjN2JhYmY4MDI2ZDI0OTdkZjE3MmJjNzE1YTg0ZjIwZmIy
-    NGM1ZjY3YzZhNmQ0YjQwYzAzMjFkYmM0MzFiYzg2MjNkZmNlOGI4N2JlMDc0
-    OGY5OGE1NjYzNWI0Mjg1NzAxYmU5YWE2YTIzOTdiZmFhN2MxNTg=
+    YjEzODE1ODdkMTU4ODk0Nzc1NjdhMjQ3Y2YwZmVlZjQ4ZmY3YmIwNmRjYTZh
+    NDlhZTUyZjFiY2YwYzliMTgwYTVmZWI2ODg5NjBlOTk4ODk5NGUwMGFhMDMw
+    ZWRmN2U4M2RmMjIwZDlkODM1YWQwNjUwZmViYTcyNmUzNzk0MmE=

data/README.md

@@ -1,11 +1,5 @@
 # Git Pivotal Tracker Integration
-[![Build Status](https://travis-ci.org/nebhale/git-pivotal-tracker-integration.png?branch=master)](https://travis-ci.org/nebhale/git-pivotal-tracker-integration)
-[![Gem Version](https://badge.fury.io/rb/git-pivotal-tracker-integration.png)](http://badge.fury.io/rb/git-pivotal-tracker-integration)
-[![Dependency Status](https://gemnasium.com/nebhale/git-pivotal-tracker-integration.png)](http://gemnasium.com/nebhale/git-pivotal-tracker-integration)
-[![Code Climate](https://codeclimate.com/github/nebhale/git-pivotal-tracker-integration.png)](https://codeclimate.com/github/nebhale/git-pivotal-tracker-integration)
-
-
-`pivotal-integration` provides a set of additional Git commands to help developers when working with [Pivotal Tracker][pivotal-tracker].
+`pivotal-integration` provides a set of additional Git commands to help developers when working with [Pivotal Tracker][pivotal-tracker]. It is based on and extended from [git-pivotal-tracker-integration](https://github.com/nebhale/git-pivotal-tracker-integration) by Ben Hale.
 
 [pivotal-tracker]: http://www.pivotaltracker.com
 

data/bin/pivotal

@@ -33,7 +33,7 @@ def print_command_help(commands)
 end
 
 def show_help
-  puts "Usage: git pivotal [--help] <command> [<args>]"
+  puts "Usage: pivotal [--help] <command> [<args>]"
   puts
 
   main_commands = COMMANDS.select{ |c| %w(start finish new).include? c.name.demodulize.downcase }
@@ -48,21 +48,46 @@ def show_help
 end
 
 begin
-  options = {}
-  optparse = OptionParser.new do |opts|
-    opts.on('-h', '--help') do
-      show_help
-      exit
-    end
+  if COMMAND_NAMES.include?(ARGV.first.try(:downcase))
+    command = ARGV.shift.downcase
+
+    options = {}
+    optparse = OptionParser.new do |opts|
+      opts.on('-h', '--help') do
+        show_help
+        exit
+      end
+
+      opts.on('-S', '--story ID') do |id|
+        options[:story_id] = id
+      end
+
+      if command == 'start'
+        opts.on('--use-current') do
+          options[:use_current] = true
+        end
+      end
 
-    opts.on('-S', '--story ID') do |id|
-      options[:story_id] = id
+      if command == 'finish'
+        opts.on('--pull-request') do
+          options[:pull_request] = true
+        end
+
+        opts.on('--no-complete') do
+          options[:no_complete] = true
+        end
+
+        opts.on('--no-delete') do
+          options[:no_delete] = true
+        end
+
+        opts.on('--no-merge') do
+          options[:no_merge] = true
+        end
+      end
     end
-  end
-  optparse.parse!
+    optparse.parse!
 
-  if COMMAND_NAMES.include?(ARGV.first.try(:downcase))
-    command = ARGV.shift
     command_class = PivotalIntegration::Command.const_get(command.classify)
     command_class.new(options).run(*ARGV)
 

data/lib/pivotal-integration/command/finish.rb

@@ -27,10 +27,10 @@ class PivotalIntegration::Command::Finish < PivotalIntegration::Command::Base
   #
   # @return [void]
   def run(*arguments)
-    no_complete = arguments.delete('--no-complete')
-    no_delete = arguments.delete('--no-delete')
-    no_merge = arguments.delete('--no-merge')
-    pull_request = arguments.delete('--pull-request') || PivotalIntegration::Util::Git.finish_mode == :pull_request
+    no_complete = @options.fetch(:no_complete, false)
+    no_delete = @options.fetch(:no_delete, false)
+    no_merge = @options.fetch(:no_merge, false)
+    pull_request = @options.fetch(:pull_request, false) || PivotalIntegration::Util::Git.finish_mode == :pull_request
 
     if pull_request
       PivotalIntegration::Util::Git.push PivotalIntegration::Util::Git.branch_name

data/lib/pivotal-integration/command/prepare-commit-msg.sh

@@ -21,6 +21,6 @@ if [[ $2 != "commit" && -n $STORY_ID ]]; then
 	ORIG_MSG_FILE="$1"
 	TEMP=$(mktemp /tmp/git-XXXXX)
 
-	(printf "\n\n[#$STORY_ID] " ; cat "$1") > "$TEMP"
+  (cat "$1" ; printf "\n\n[#$STORY_ID]") > "$TEMP"
 	cat "$TEMP" > "$ORIG_MSG_FILE"
 fi

data/lib/pivotal-integration/command/start.rb

@@ -33,7 +33,7 @@ class PivotalIntegration::Command::Start < PivotalIntegration::Command::Base
   # @return [void]
   def run(*arguments)
     filter = arguments.first
-    use_current_branch = arguments.delete('--use-current')
+    use_current_branch = @options.fetch(:use_current, false)
 
     if filter == 'new'
       arguments.shift

data/lib/pivotal-integration/util/git.rb

@@ -176,7 +176,7 @@ class PivotalIntegration::Util::Git
       when :web
         # Open the PR editor in a web browser
         repo = get_config('remote.origin.url')[/(?<=git@github.com:)[a-z0-9_-]+\/[a-z0-9_-]+/]
-        title = CGI::escape("#{story.name} [##{story.id}]")
+        title = CGI::escape("[##{story.id}] #{story.name}]")
         Launchy.open "https://github.com/#{repo}/compare/#{branch_name}?expand=1&pull_request[title]=#{title}"
 
       else

data/lib/pivotal_integration.rb

@@ -15,4 +15,5 @@
 
 # The root module for the project
 module PivotalIntegration
+  VERSION = '1.6.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-integration
 version: !ruby/object:Gem::Version
-  version: 1.6.0.1
+  version: 1.6.0.2
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime