pivotal-github 0.7.0 → 0.8.0

data/README.md

@@ -1,6 +1,6 @@
 # pivotal-github
 
-The `pivotal-github` gem facilitates a [Pivotal Tracker](http://pivotaltracker.com/)–[GitHub](http://github.com/) workflow inspired by the workflow used by [Logical Reality](http://lrdesign.com/). (It also works fine with [BitBucket](http://bitbucket.com/); see **Configuration** below.) As per usual, there are several projects (notably [git-flow](https://github.com/nvie/gitflow) and [git-pivotal](https://github.com/trydionel/git-pivotal)) that implement similar solutions, but none met my exact needs, so I rolled my own.
+The `pivotal-github` gem facilitates a [Pivotal Tracker](http://pivotaltracker.com/)–[GitHub](http://github.com/) workflow inspired by the workflow used by [Logical Reality](http://lrdesign.com/). (Despite its name, `pivotal-github` also works fine with [BitBucket](http://bitbucket.com/); see **Configuration** below.) As per usual, there are several projects (notably [git-flow](https://github.com/nvie/gitflow) and [git-pivotal](https://github.com/trydionel/git-pivotal)) that implement similar solutions, but none met my exact needs, so I rolled my own.
 
 ## Installation
 
@@ -8,42 +8,67 @@ You can install the `pivotal-github` gem directly as follows:
 
     $ gem install pivotal-github
 
+The full workflow described herein requires some of the Git utilities from [git-utils](https://github.com/mhartl/git-utils), so it is recommended to install those as well.
 
 ## Usage
 
-The `pivotal-github` gem adds several additional Git commands to the local environment. The main addition, `git story-commit`, automatically incorporates the Pivotal Tracker story id(s) into the commit messages, while adding options to mark the story **Finished** or **Delivered**. 
+The `pivotal-github` gem adds several additional Git commands to the local environment. The main addition, `git story-commit`, automatically incorporates the Pivotal Tracker story id(s) into the commit messages, while adding options to mark the story **Finished** or **Delivered**.
 
-The `git story-commit` command makes the assumption that any string of digits in the branch name is a story id. This means that, when the story id is `6283185`, the branch names `6283185-add-markdown-support`, `6283185_add_markdown_support`, and `add-markdown-support-6283185` all correspond to story id `6283185`, while `add-things-6283185-3141592` corresponds to both `6283185` *and* `3141592`.
+The `git story-commit` command makes the assumption that any string of digits in the branch name is a story id. This means that the branch names `6283185-add-markdown-support`, `6283185_add_markdown_support`, and `add-markdown-support-6283185` all correspond to story id `6283185`, while `add-things-6283185-3141592` corresponds to both `6283185` *and* `3141592`.
 
 The full set of commands is as follows:
 
 ### git story-commit
 
-`git story-commit` makes a standard `git commit` with the story number added to the commit message. This automatically adds a link at Pivotal Tracker between the story and the diff when the branch gets pushed up to GitHub. 
+`git story-commit` makes a standard `git commit` with the story number added to the commit message. This automatically adds a link at Pivotal Tracker between the story and the diff when the branch gets pushed up to GitHub.
 
 For example, when on a branch called `add-markdown-support-6283185`, the `git story-commit` command automatically adds `[#6283185]` to the commit message:
-	
+
     $ git story-commit -am "Add foo bars"
-	[add-markdown-support-6283185 6f56414] [#6283185] Add foo bars
+	[add-markdown-support-6283185 6f56414] Add foo bars
+
+The commit message is multiline and includes the story id:
+
+    Add foo bars
+
+    [#6283185]
+
+(Previous versions of `pivotal-github` put the story id on the same line as the commit summary (per the usage at the [Pivotal Tracker API](https://www.pivotaltracker.com/help/api?version=v3)), but placing it in a separate line gives the user direct control over the length of the message. It also looks less cluttered.)
 
 To mark a story as **Finished**, add the `-f` flag:
 
     $ git story-commit -f -am "Remove baz quuxes"
-	[add-markdown-support-6283185 7g56429] [Finishes #6283185] Remove baz quuxes
+
+This gives the message
+
+    Remove baz quuxes
+
+    [Finishes #6283185]
 
 To mark a story as **Delivered**, add the `-d` flag:
 
     $ git story-commit -d -am "Remove baz quuxes"
-	[add-markdown-support-6283185 7g56429] [Delivers #6283185] Remove baz quuxes
+
+The message in this case is
+
+    Remove baz quuxes
+
+    [Delivers #6283185]
 
 Either the `-f` flag or the `-d` flag can be combined with other flags, yielding commands like
 
     $ git story-commit -dam "Remove baz quuxes"
 
-`git story commit` supports multiple story numbers as well. For example, with a branch called `add-things-6283185-3141592`, we could deliver both stories as follows 
+`git story commit` supports multiple story numbers as well. For example, with a branch called `add-things-6283185-3141592`, we could deliver both stories as follows:
 
     $ git story-commit -dam "Remove baz quuxes"
-	[add-things-6283185-3141592 7g56429] [Delivers #6283185 #3141592] Remove baz quuxes
+	[add-things-6283185-3141592 7g56429] Remove baz quuxes
+
+The message here is
+
+    Remove baz quuxes
+
+    [Delivers #6283185 #3141592]
 
 #### Options
 
@@ -57,70 +82,16 @@ Either the `-f` flag or the `-d` flag can be combined with other flags, yielding
 
 Additionally, `git story-commit` accepts any options valid for `git commit`. (`git story-commit` supports the `-a` flag even though that's a valid option to `git commit` so that the compound flag in `git story-commit -am "message"` works.)
 
-### git story-push
-
-`git story push` creates a remote branch at `origin` with the name of the current branch:
-
-    $ git story-push
-    * [new branch]      add-markdown-support-6283185 -> add-markdown-support-6283185
-
-#### Options
-
-	Usage: git story-push [options]
-	    -t, --target TARGET              push to a given target (defaults to origin)
-	    -h, --help                       this usage guide
-
-Additionall, `git story-push` accepts any options valid for `git push`.
-
-### git story-pull
-
-`git story-pull` syncs the local `master` with the remote `master`. On a branch called `add-markdown-support-6283185`, `git story-pull` is equivalent to the following:
-
-    $ git checkout master
-    $ git pull
-    $ git checkout add-markdown-support-6283185
-
-The purpose of `git story-pull` is to prepare the local story branch for rebasing against `master`:
-
-    $ git story-pull
-    $ git rebase master
-
-(This is essentially equivalent to 
-
-    $ git fetch
-    $ git rebase origin/master
-
-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]
-        -d, --development BRANCH         development branch (defaults to master)
-        -h, --help                       this usage guide
-
-Additionally, `git story-pull` accepts any options valid for `git pull`.
-    
 ### git story-merge
 
-`git story-merge` merges the current branch into `master`. On a branch called `add-markdown-support-6283185`, `git story-merge` is equivalent to the following: 
+`git story-merge` merges the current branch into `master`. On a branch called `add-markdown-support-6283185`, `git story-merge` is equivalent to the following:
 
     $ git checkout master
     $ git merge --no-ff --log add-markdown-support-6283185
 
 Note that this effectively changes the default merge behavior from fast-forward to no-fast-forward, which makes it possible to use `git log` to see which of the commit objects together have implemented a story. As noted in [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/),
 
-> The `--no-ff` flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature… Yes, it will create a few more (empty) commit objects, but the gain is much bigger that that cost.
+> The `--no-ff` flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature… Yes, it will create a few more (empty) commit objects, but the gain is much bigger than that cost.
 
 In addition, the `--log` option puts the commit messages from the individual commits in the merge message, which arranges for the merge commit itself to appear in the activity log at Pivotal Tracker. This is especially useful for viewing the full diff represented by the commit.
 
@@ -143,7 +114,7 @@ Additionally, `git story-merge` accepts any options valid for `git merge`.
 
     $ git story-pull-request
 
-By default, `git story-pull-request` issues a `git story-push` as well, just in case the local branch hasn't yet been pushed up to the remote repository. This step can be skipped with the `--skip` option.
+By default, `git story-pull-request` issues a `git push-branch` as well, just in case the local branch hasn't yet been pushed up to the remote repository. 
 
 As with `git story-merge`, by default `git story-pull-request` exits with a warning if the most recent commit doesn't finish the story.
 
@@ -151,12 +122,11 @@ As with `git story-merge`, by default `git story-pull-request` exits with a warn
 
     Usage: git story-pull-request [options]
     	-f, --force                      override unfinished story warning
-        -s, --skip                       skip `git story-push`
         -h, --help                       this usage guide
 
 ### story-open
 
-The `story-open` command (without `git`) opens the current story in the default browser (OS X–only):
+The `story-open` command (*note*: no `git`) opens the current story in the default browser (OS X–only):
 
     $ story-open
 
@@ -168,15 +138,17 @@ In order to use the `pivotal-github` gem, you need to configure a post-receive h
 The `pivotal-github` command names follow the Git convention of being verbose (e.g., unlike Subversion, Git doesn't natively support `co` for `checkout`), but I recommend setting up aliases as necessary. Here are some suggestions, formatted so that they can be pasted directly into a terminal window:
 
     git config --global alias.sc story-commit
-    git config --global alias.sp story-push    
-    git config --global alias.sl story-pull
     git config --global alias.sm story-merge
     git config --global alias.spr story-pull-request
 
+I also recommend setting up an alias for `git push-branch` from [git-utils](https://github.com/mhartl/git-utils):
+
+    git config --global alias.pb push-branch
+
 A single-developer workflow would then look like this:
 
     $ git co -b add-markdown-support-6283185
-    $ git sp
+    $ git pb
     <work>
     $ git sc -am "Added foo"
     $ git push
@@ -185,12 +157,10 @@ A single-developer workflow would then look like this:
     <complete story>
     $ git sc -f -am "Added baz"
     $ git push
-    $ git sl
+    $ git sync
     $ git rebase master
     $ git sm
 
-Note that this workflow uses `git sp` (and subsequent invocations of `git push`) only to create a remote backup. The principal purpose of `git story-push` is to support the integrated code review workflow described below.
-    
 ## Workflow with integrated code reivew
 
 The `pivotal-github` gem is degined to support a workflow involving integrated code review, which has the usual benefits: at least two pairs of eyes see any committed code, and at least two brains know basically what the committed code does. The cost is that having a second developer involved can slow you down. I suggest using your judgment to determine which workflow makes the most sense on a story-by-story basis.
@@ -201,16 +171,16 @@ Here's the process in detail:
 
 1. Start an issue at [Pivotal Tracker](http://pivotaltracker.com/) and copy the story id to your buffer
 2. Create a branch in the local Git repository containing the story id and a brief description: `git checkout -b add-markdown-support-6283185`
-3. Create a remote branch at [GitHub](http://github.com/) using `git story-push`
+3. Create a remote branch at [GitHub](http://github.com/) using `git push-branch`
 3. Use `git story-commit` to make commits, which includes the story number in the commit message: `git story-commit -am "Add syntax highlighting"`
 4. Continue pushing up after each commit using `git push` as usual
 4. When done with the story, add `-f` to mark the story as **Finished** using `git story-commit -f -am "Add paragraph breaks"` or as **Delivered** using `git story-commit -d -am "Add paragraph breaks"`
-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. Rebase against `master` using `git sync` 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
 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, add a comment with the pull request URL
+7. On the Pivotal Tracker story, add a comment with the pull request URL, and optionally change the **Owner** to Bob
 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.
@@ -219,14 +189,14 @@ Rather than immediately submitting a pull request, Alice can also continue by br
 ### Developer #2 (Bob)
 
 1. Select **Pull Requests** at GitHub and review the pull request diffs
-2. If acceptable, merge the branch by clicking on the button at GitHub
+2. If acceptable, merge the branch by clicking on the button at GitHub, and optionally accept the story at Pivotal Tracker
 3. If not acceptable, manually change the state at Pivotal Tracker to **Rejected** and leave a note (at GitHub or at Pivotal Tracker) indicating the reason
 4. If the branch can't be automatically merged, mark the story as **Rejected**
 
 ### Developer #1 (Alice)
 
-1. After getting the GitHub notification that the pull request has been merged, mark the Pivotal Tracker story finished. (In principle, Bob could do this, but Alice probably knows the PR-to-story mapping better than Bob, and experience shows that it is difficult for Bob to remember to update Pivotal Tracker after accepting the pull request.)
-2. If the pull request was rejected, make the necessary changes and follow the previous steps above.
+1. After getting the GitHub notification that the pull request has been merged, mark the Pivotal Tracker story finished (unless assigned to Bob)
+2. If the pull request was rejected, make the necessary changes and follow the previous steps above
 
 
 ## Merge conflicts
@@ -241,12 +211,12 @@ When the branch can't automatically be merged at GitHub, follow these steps:
 
 ### Devleloper #1 (Alice)
 
-1. While on the story branch, run `git story-pull`
+1. While on the story branch, run `git sync`
 2. Rebase against `master` with `git rebase master` **or** merge with `master` using `git merge master`
 4. Either handle resulting conflicts by hand or use the visual merge tool: `git mergetool`
 5. Commit the change: `git commit -a`
 6. Push up the modified branch: `git push`
-7. **(experimental)** Add a Chore to revisit the pull request and assign to Developer #2 (Bob) 
+7. **(experimental)** Add a Chore to revisit the pull request and assign to Developer #2 (Bob)
 
 
 Now Bob should be able to merge in the pull request automatically using the nice big green button at GitHub.

data/lib/pivotal-github.rb

@@ -2,8 +2,6 @@ require "pivotal-github/version"
 require "pivotal-github/options"
 require "pivotal-github/command"
 require "pivotal-github/story_commit"
-require "pivotal-github/story_push"
-require "pivotal-github/story_pull"
 require "pivotal-github/story_merge"
 require "pivotal-github/story_open"
 require "pivotal-github/story_pull_request"

data/lib/pivotal-github/command.rb

@@ -28,7 +28,7 @@ class Command
   # Returns the story id (or ids).
   # We extract the story id(s) from the branch name, so that, e.g.,
   # the branch `add-markdown-support-6283185` gives story_id '6283185'.
-  # New as of version 0.7, we support multiple story ids in a single 
+  # New as of version 0.7, we support multiple story ids in a single
   # branch name, so that `add-markdown-support-6283185-3141592` can be used
   # to update story 6283185 and story 3141592 simultaneously.
   def story_ids
@@ -47,13 +47,14 @@ class Command
     debug = args.delete('--debug')
     command = command_class.new(args)
     if debug
-      puts command.cmd 
+      puts command.cmd
       return 1
     else
+      check_git_utils
       command.run!
       return 0
     end
-  end    
+  end
 
   private
 
@@ -65,6 +66,15 @@ class Command
     def argument_string(args)
       args.inject([]) do |opts, opt|
         opts << (opt =~ /^-/ ? opt : opt.inspect)
-      end.join(' ')      
+      end.join(' ')
+    end
+
+    # Exits if the git-utils aren't installed.
+    def self.check_git_utils
+      if `which git-pull-request`.empty?
+        msg = "Install git-utils (https://github.com/mhartl/git-utils)"
+        $stderr.puts msg
+        exit 1
+      end
     end
 end

data/lib/pivotal-github/story_commit.rb

@@ -24,20 +24,16 @@ class StoryCommit < Command
     end
   end
 
+  # Returns the message for the story id(s) and action (if any).
   def message
-    if story_ids.empty?
-      # Arranges to fall through to regular 'git commit'
-      options.message
+    if finish?
+      label = "Finishes #{message_ids}"
+    elsif deliver?
+      label = "Delivers #{message_ids}"
     else
-      if finish?
-        label = "Finishes #{message_ids}"
-      elsif deliver?
-        label = "Delivers #{message_ids}"
-      else
-        label = message_ids
-      end
-      "[#{label}] #{options.message}"
+      label = message_ids
     end
+    "[#{label}]"
   end
 
   # Returns the story ids formatted for story commits.
@@ -54,7 +50,8 @@ class StoryCommit < Command
   def cmd
     c = ['git commit']
     c << '-a' if all?
-    c << %(-m "#{message}") if message?
+    c << %(-m "#{options.message}") if message?
+    c << %(-m "#{message}") unless story_ids.empty?
     c << argument_string(unknown_options) unless unknown_options.empty?
     c.join(' ')
   end

data/lib/pivotal-github/story_pull_request.rb

@@ -9,9 +9,6 @@ class StoryPullRequest < FinishedCommand
       opts.on("-f", "--force", "override unfinished story warning") do |opt|
         self.options.force = opt
       end
-      opts.on("-s", "--skip", "skip `git story-push`") do |opt|
-        self.options.skip = opt
-      end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
@@ -21,11 +18,7 @@ class StoryPullRequest < FinishedCommand
   # Returns a command appropriate for executing at the command line
   # I.e., 'open https://www.pivotaltracker.com/story/show/6283185'
   def cmd
-    if skip?
-      "open #{uri}"
-    else
-      "git story-push && open #{uri}"
-    end
+    "git pull-request"
   end
 
   def uri
@@ -46,8 +39,4 @@ class StoryPullRequest < FinishedCommand
     def origin_uri
       remote_location.sub(/^git@(.+?):(.+)$/, 'https://\1/\2')
     end
-
-    def skip?
-      options.skip
-    end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/spec/commands/story_commit_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe StoryCommit do
 
-  let(:command) { StoryCommit.new(['-m', 'message', '-a', '-z', '--foo']) }
+  let(:command) { StoryCommit.new(['-m', 'msg', '-a', '-z', '--foo']) }
   before { command.stub(:story_branch).and_return('6283185-tau-manifesto') }
   subject { command }
 
@@ -19,26 +19,26 @@ describe StoryCommit do
     describe "parse" do
       subject { command.options }
 
-      its(:message) { should == 'message' }
+      its(:message) { should == 'msg' }
       its(:all)     { should be_true }
     end
   end
 
   describe "with only known options" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-a']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-a']) }
     it_should_behave_like "story-commit with known options"
   end
 
   describe "with a compound argument" do
-    let(:command) { StoryCommit.new(['-am', 'message']) }
+    let(:command) { StoryCommit.new(['-am', 'msg']) }
     it_should_behave_like "story-commit with known options"
   end
 
   describe "with some unknown options" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-a', '-z', '--foo']) }
-    
+    let(:command) { StoryCommit.new(['-m', 'msg', '-a', '-z', '--foo']) }
+
     it_should_behave_like "story-commit with known options"
-    
+
     it "should not raise an error" do
       expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
     end
@@ -51,7 +51,7 @@ describe StoryCommit do
 
   describe "command with message" do
     its(:cmd) do
-      should == %(git commit -a -m "[##{command.story_id}] message" -z --foo)
+      should == %(git commit -a -m "msg" -m "[##{command.story_id}]" -z --foo)
     end
 
     describe "when used with branches containing multiple stories" do
@@ -60,21 +60,23 @@ describe StoryCommit do
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -a -m "[#{delivered_ids}] message" -z --foo)
+        should == %(git commit -a -m "msg" -m "[#{delivered_ids}]" -z --foo)
       end
     end
   end
 
   describe "command with no message" do
     let(:command) { StoryCommit.new(['-a', '-z', '--foo']) }
-    its(:cmd) { should == %(git commit -a -z --foo) }      
+    its(:cmd) do
+      should == %(git commit -a -m "[##{command.story_id}]" -z --foo)
+    end
   end
 
   describe "command with finish flag" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-f']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-f']) }
     its(:cmd) do
-      should == %(git commit -m "[Finishes ##{command.story_id}] message")
-    end      
+      should == %(git commit -m "msg" -m "[Finishes ##{command.story_id}]")
+    end
 
     describe "when used with branches containing multiple stories" do
       before do
@@ -82,15 +84,15 @@ describe StoryCommit do
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -m "[Finishes #{delivered_ids}] message")
+        should == %(git commit -m "msg" -m "[Finishes #{delivered_ids}]")
       end
     end
   end
 
   describe "command with deliver flag" do
-    let(:command) { StoryCommit.new(['-m', 'message', '-d']) }
+    let(:command) { StoryCommit.new(['-m', 'msg', '-d']) }
     its(:cmd) do
-      should == %(git commit -m "[Delivers ##{command.story_id}] message")
+      should == %(git commit -m "msg" -m "[Delivers ##{command.story_id}]")
     end
 
     describe "when used with branches containing multiple stories" do
@@ -99,7 +101,7 @@ describe StoryCommit do
       end
       its(:cmd) do
         delivered_ids = '#6283185 #3141592'
-        should == %(git commit -m "[Delivers #{delivered_ids}] message")
+        should == %(git commit -m "msg" -m "[Delivers #{delivered_ids}]")
       end
     end
   end
@@ -107,15 +109,15 @@ describe StoryCommit do
   describe "command with no story id" do
     before { command.stub(:story_branch).and_return('tau-manifesto') }
     its(:cmd) do
-      should == %(git commit -a -m "message" -z --foo)
-    end    
+      should == %(git commit -a -m "msg" -z --foo)
+    end
   end
 
   describe "command-line command" do
-    let(:command) { `bin/git-story-commit -a -m "message" -z --debug` }
+    let(:command) { `bin/git-story-commit -a -m "msg" -z --debug` }
     subject { command }
     it { should =~ /git commit -a -m/ }
-    it { should =~ /message/ }
+    it { should =~ /msg/ }
     it { should =~ /-z/ }
     it { should_not =~ /--debug/ }
   end

data/spec/commands/story_merge_spec.rb

@@ -21,14 +21,14 @@ describe StoryMerge do
   end
 
   describe "with a custom development branch" do
-    let(:command) { StoryPull.new(['-d', 'develop']) }
+    let(:command) { StoryMerge.new(['-d', 'develop']) }
     its(:cmd) { should =~ /git checkout develop/ }
   end
 
   describe "with some unknown options" do
-    let(:command) { StoryPull.new(['-d', 'develop', '-a', '-z', '--foo']) }
+    let(:command) { StoryMerge.new(['-d', 'develop', '-a', '-z', '--foo']) }
     it_should_behave_like "story-merge with known options"
-    its(:cmd) { should =~ /git pull -a -z --foo/ }
+    its(:cmd) { should =~ /-a -z --foo/ }
   end
 
   describe "command-line command" do

data/spec/commands/story_pull_request_spec.rb

@@ -10,8 +10,7 @@ describe StoryPullRequest do
   end
   subject { command }
 
-  its(:cmd) { should =~ /open #{command.uri}/ }
-  its(:cmd) { should =~ /git story-push/ }
+  its(:cmd) { should =~ /git pull-request/ }
 
   describe 'origin uri parsing' do
     let(:correct_origin) { 'https://github.com/mhartl/foo' }
@@ -33,13 +32,7 @@ describe StoryPullRequest do
 
   describe "command-line command" do
     subject { `bin/git-story-pull-request --debug` }
-    it { should =~ /pull\/new/ }
     it { should_not =~ /\.git/ }
-    it { should =~ /git story-push/ }
-
-    describe "with a skip option" do
-      subject { `bin/git-story-pull-request --skip --debug` }
-      it { should_not =~ /git story-push/ }
-    end
+    it { should =~ /git pull-request/ }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Add commands for Pivotal Tracker-GitHub integration
 email:
@@ -17,9 +17,7 @@ email:
 executables:
 - git-story-commit
 - git-story-merge
-- git-story-pull
 - git-story-pull-request
-- git-story-push
 - story-open
 extensions: []
 extra_rdoc_files: []
@@ -34,9 +32,7 @@ files:
 - Rakefile
 - bin/git-story-commit
 - bin/git-story-merge
-- bin/git-story-pull
 - bin/git-story-pull-request
-- bin/git-story-push
 - bin/story-open
 - lib/pivotal-github.rb
 - lib/pivotal-github/command.rb
@@ -45,9 +41,7 @@ files:
 - lib/pivotal-github/story_commit.rb
 - lib/pivotal-github/story_merge.rb
 - lib/pivotal-github/story_open.rb
-- lib/pivotal-github/story_pull.rb
 - lib/pivotal-github/story_pull_request.rb
-- lib/pivotal-github/story_push.rb
 - lib/pivotal-github/version.rb
 - pivotal-github.gemspec
 - spec/commands/command_spec.rb
@@ -55,8 +49,6 @@ files:
 - spec/commands/story_merge_spec.rb
 - spec/commands/story_open_spec.rb
 - spec/commands/story_pull_request_spec.rb
-- spec/commands/story_pull_spec.rb
-- spec/commands/story_push_spec.rb
 - spec/options/options_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mhartl/pivotal-github
@@ -89,7 +81,5 @@ test_files:
 - spec/commands/story_merge_spec.rb
 - spec/commands/story_open_spec.rb
 - spec/commands/story_pull_request_spec.rb
-- spec/commands/story_pull_spec.rb
-- spec/commands/story_push_spec.rb
 - spec/options/options_spec.rb
 - spec/spec_helper.rb

data/bin/git-story-pull

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'pivotal-github/story_pull'
-
-exit Command.run!(StoryPull, ARGV.dup)

data/bin/git-story-push

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'pivotal-github/story_push'
-
-exit Command.run!(StoryPush, ARGV.dup)

data/lib/pivotal-github/story_pull.rb

@@ -1,41 +0,0 @@
-require 'pivotal-github/command'
-
-class StoryPull < Command
-
-  def parser
-    OptionParser.new do |opts|
-      opts.banner = "Usage: git story-pull [options]"
-      opts.on("-d", "--development BRANCH",
-              "development branch (defaults to master)") do |opt|
-        self.options.development = opt
-      end
-      opts.on_tail("-h", "--help", "this usage guide") do
-        puts opts.to_s; exit 0
-      end
-    end
-  end
-
-  # Returns a command appropriate for executing at the command line
-  # For example:
-  #   git checkout master
-  #   git pull
-  #   git checkout <story branch>
-  def cmd
-    lines = ["git checkout #{development_branch}"]
-    c = ['git pull']
-    c << argument_string(unknown_options) unless unknown_options.empty?
-    lines << c.join(' ')
-    lines << ["git checkout #{story_branch}"]
-    lines.join("\n")
-  end
-
-  def run!
-    system cmd
-  end
-
-  private
-  
-    def development_branch
-      options.development || 'master'
-    end
-end

data/lib/pivotal-github/story_push.rb

@@ -1,36 +0,0 @@
-require 'pivotal-github/command'
-
-class StoryPush < Command
-
-  def parser
-    OptionParser.new do |opts|
-      opts.banner = "Usage: git story-push [options]"
-      opts.on("-t", "--target TARGET",
-              "push to a given target (defaults to origin)") do |t|
-        self.options.target = t
-      end
-      opts.on_tail("-h", "--help", "this usage guide") do
-        puts opts.to_s; exit 0
-      end
-    end
-  end
-
-  # Returns a command appropriate for executing at the command line
-  def cmd
-    c = ['git push']
-    c << argument_string(unknown_options) unless unknown_options.empty?
-    c << target
-    c << story_branch
-    c.join(' ')
-  end
-
-  def run!
-    system cmd
-  end
-
-  private
-
-    def target
-      options.target || 'origin'
-    end
-end

data/spec/commands/story_pull_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe StoryPull do
-
-  let(:command) { StoryPull.new }
-  before { command.stub(:story_branch).and_return('6283185-tau-manifesto') }
-  subject { command }
-
-  its(:cmd) { should =~ /git pull/ }
-
-  shared_examples "story-pull with known options" do
-    subject { command }
-    it "should not raise an error" do
-      expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
-    end
-  end
-
-  describe "with no options" do
-    its(:cmd) { should =~ /git checkout master/ }
-    its(:cmd) { should =~ /git pull/ }
-    its(:cmd) { should =~ /git checkout #{command.story_branch}/ }
-  end
-
-  describe "with a custom development branch" do
-    let(:command) { StoryPull.new(['-d', 'develop']) }
-    its(:cmd) { should =~ /git checkout develop/ }
-  end
-
-  describe "with some unknown options" do
-    let(:command) { StoryPull.new(['-d', 'develop', '-a', '-z', '--foo']) }
-    it_should_behave_like "story-pull with known options"
-    its(:cmd) { should =~ /git pull -a -z --foo/ }
-  end
-
-  describe "command-line command" do
-    subject { `bin/git-story-pull --debug -z -d develop` }
-    it { should =~ /git checkout develop/ }
-    it { should =~ /git pull -z/ }
-  end
-end

data/spec/commands/story_push_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe StoryPush do
-
-  let(:command) { StoryPush.new }
-  before { command.stub(:story_branch).and_return('6283185-tau-manifesto') }
-  subject { command }
-
-  its(:cmd) { should =~ /git push/ }
-
-  shared_examples "story-push with known options" do
-    subject { command }
-    it "should not raise an error" do
-      expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
-    end
-  end
-
-  describe "with no options" do
-    its(:cmd) { should == "git push origin #{command.story_branch}" }
-  end
-
-  describe "with a target option" do
-    let(:command) { StoryPush.new(['-t', 'heroku']) }
-    its(:cmd) { should =~ /git push heroku/ }
-  end
-
-  describe "with some unknown options" do
-    let(:command) { StoryPush.new(['-p', 'develop', '-a', '-z', '--foo']) }
-    it_should_behave_like "story-push with known options"
-    its(:cmd) { should =~ /-a -z --foo/ }
-  end
-
-  describe "command-line command" do
-    subject { `bin/git-story-push --debug -z -t heroku` }
-    it { should =~ /git push -z heroku/ }
-  end
-end