pivotal-github 0.6.12 → 0.6.14

data/.ruby-gemset

@@ -0,0 +1 @@
+pivotal-github

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/README.md

@@ -78,6 +78,17 @@ The purpose of `git story-pull` is to prepare the local story branch for rebasin
 
 but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
 
+If you've already pushed the story, you'll have to force a subsequent push using
+
+    $ git push --force
+
+If someone else might already have pulled the branch, you should probably merge `master` instead of rebasing against it:
+
+    $ git story-push
+    $ git story-pull
+    $ git merge master
+ 
+
 #### Options
 
     Usage: git story-pull [options]
@@ -183,7 +194,9 @@ Here's the process in detail:
 4. Rebase against `master` using `git story-pull` followed by `git rebase master` or `git rebase master --interactive` (optionally squashing commit messages as described in the article [A Git Workflow for Agile Teams](http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html))
 4. Push up with `git push`
 6. At the GitHub page for the repo, select **Branches** and submit a pull request
-7. Go the story at Pivotal Tracker and change the **Owner** to Developer #2 (Bob)
+6. (On OS X, replace the previous two steps with `git story-pull-request`)
+6. Assign the pull request to Bob at GitHub
+7. On the Pivotal Tracker story, change the **Owner** to Developer #2 (Bob) and add a comment with the pull request URL
 8. Continue working, taking care to branch off of the current story branch if its changes are required to continue
 
 Rather than immediately submitting a pull request, Alice can also continue by branching off the previous story branch, working on a set of related features, and then issue Bob a pull request for the final branch when she reaches a natural stopping place.

data/bin/git-story-commit

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_commit'
 
-exit Command.run!(StoryCommit, ARGV.dup)
+exit Command.run!(StoryCommit, ARGV.dup)

data/bin/git-story-merge

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_merge'
 
-exit Command.run!(StoryMerge, ARGV.dup)
+exit Command.run!(StoryMerge, ARGV.dup)

data/bin/git-story-pull

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_pull'
 
-exit Command.run!(StoryPull, ARGV.dup)
+exit Command.run!(StoryPull, ARGV.dup)

data/bin/git-story-pull-request

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_pull_request'
 
-exit Command.run!(StoryPullRequest, ARGV.dup)
+exit Command.run!(StoryPullRequest, ARGV.dup)

data/bin/git-story-push

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_push'
 
-exit Command.run!(StoryPush, ARGV.dup)
+exit Command.run!(StoryPush, ARGV.dup)

data/bin/story-open

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal-github/story_open'
 
-exit Command.run!(StoryOpen, ARGV.dup)
+exit Command.run!(StoryOpen, ARGV.dup)

data/lib/pivotal-github/command.rb

@@ -29,9 +29,9 @@ class Command
     story_branch.scan(/\d+/).first
   end
 
-  # Runs a command
+  # Runs a command.
   # If the argument array contains '--debug', returns the command that would
-  # have been run
+  # have been run.
   def self.run!(command_class, args)
     debug = args.delete('--debug')
     command = command_class.new(args)
@@ -46,7 +46,7 @@ class Command
 
   private
 
-    # Returns an argument string based on given arguments
+    # Returns an argument string based on given arguments.
     # The main trick is to add in quotes for option
     # arguments when necessary.
     # For example, ['-a', '-m', 'foo bar'] becomes

data/lib/pivotal-github/story_commit.rb

@@ -6,17 +6,17 @@ class StoryCommit < Command
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-commit [options]"
       opts.on("-m", "--message MESSAGE",
-              "add a commit message (including story #)") do |m|
-        self.options.message = m
+              "add a commit message (including story #)") do |opt|
+        self.options.message = opt
       end
-      opts.on("-f", "--finish", "mark story as finished") do |f|
-        self.options.finish = f
+      opts.on("-f", "--finish", "mark story as finished") do |opt|
+        self.options.finish = opt
       end
-      opts.on("-d", "--deliver", "mark story as delivered") do |d|
-        self.options.deliver = d
+      opts.on("-d", "--deliver", "mark story as delivered") do |opt|
+        self.options.deliver = opt
       end
-      opts.on("-a", "--all", "commit all changed files") do |a|
-        self.options.all = a
+      opts.on("-a", "--all", "commit all changed files") do |opt|
+        self.options.all = opt
       end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
@@ -40,7 +40,7 @@ class StoryCommit < Command
     end
   end
 
-  # Returns a command appropriate for executing at the command line
+  # Returns a command appropriate for executing at the command line.
   # We take care to insert the story number and, if necessary, an indication
   # that the commit finishes the story.
   def cmd

data/lib/pivotal-github/story_pull_request.rb

@@ -34,12 +34,19 @@ class StoryPullRequest < FinishedCommand
 
   private
 
-    # Returns the remote URI for the repository
-    # E.g., https://github.com/mhartl/pivotal-github
-    def origin_uri
+    # Returns the raw remote location for the repository.
+    # E.g., http://github.com/mhartl/pivotal-github or
+    # git@github.com:mhartl/pivotal-github
+    def remote_location
       `git config --get remote.origin.url`.strip.chomp('.git')
     end
 
+    # Returns the remote URI for the repository.
+    # Both https://... and git@... remote formats are supported.
+    def origin_uri
+      remote_location.sub(/^git@(.+?):(.+)$/, 'https://\1/\2')
+    end
+
     def skip?
       options.skip
     end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "0.6.12"
+    VERSION = "0.6.14"
   end
 end

data/spec/commands/story_pull_request_spec.rb

@@ -5,13 +5,32 @@ describe StoryPullRequest do
   let(:command) { StoryPullRequest.new }
   before { command.stub(:story_branch).and_return('6283185-tau-manifesto') }
   before do
-    command.stub(:origin_uri).and_return('https://github.com/mhartl/foo')
+    command.stub(:remote_location).
+            and_return('https://github.com/mhartl/foo')
   end
   subject { command }
 
   its(:cmd) { should =~ /open #{command.uri}/ }
   its(:cmd) { should =~ /git story-push/ }
 
+  describe 'origin uri parsing' do
+    let(:correct_origin) { 'https://github.com/mhartl/foo' }
+    subject { command.send :origin_uri }
+
+    context 'https protocol' do
+      it { should eq correct_origin }
+    end
+
+    context 'git protocol' do
+      before do
+        command.stub(:remote_location).
+                and_return('git@github.com:mhartl/foo')
+      end
+
+      it { should eq correct_origin }
+    end
+  end
+
   describe "command-line command" do
     subject { `bin/git-story-pull-request --debug` }
     it { should =~ /pull\/new/ }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies: []
 description: Add commands for Pivotal Tracker-GitHub integration
 email:
@@ -26,6 +26,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md