pivotal-github 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091af9ded0530e42a30625af563e7dcebfcb97b6
-  data.tar.gz: caf99d0c43663d578bad073cc546aa16dcbf235a
+  metadata.gz: e16466ce0f0728a4075215b06ef480c66e358698
+  data.tar.gz: a03a52a01808c51a758e707c8f656b4c1c23459d
 SHA512:
-  metadata.gz: 902f24ae87b0b379371a2e2110d87d8bd24573b3305856566419627e17026db3621b2a97958255bb4f31862beb2109a583b6e0930064e014f6fbbed59e76d7a7
-  data.tar.gz: bd03cd55db1985473f41226dcf59d78f7da727deae4f0e967bce299def4b89301d5a01a686f957068251badd455b0143f716eab0b0cfbe4969f36225cafff7b8
+  metadata.gz: 86bf5def499250269ebfab7e37c6183c83791da68cffda22a3a1632fc27ddda4d3295dfa8bd8581fb9daf25d8ce1236d298e077e7d59b8c945eb4b95f9cdc659
+  data.tar.gz: 81bed8ce18450aabac4cea63ebd84d1573e24c820ea6867a7ec1788e266ad26115ed099925aaaf2f14a744cc3c618db6acce68288ab95cb4a91f4574ee0e1b19

data/lib/pivotal-github/story.rb

@@ -0,0 +1,17 @@
+module Story
+
+  # Returns the URL for the story at Pivotal Tracker.
+  def story_url(story_id)
+    "https://www.pivotaltracker.com/story/show/#{story_id}"
+  end
+
+  # Returns the ids of delivered stories found in the given text.
+  def delivered_ids(text)
+    delivered  = text.scan(/\[Deliver(?:s|ed) (.*?)\]/).flatten
+    # Handle multiple ids, i.e., '[Delivers #<id 1> #<id 2>]'
+    delivered.inject([]) do |ids, element|
+      ids.concat(element.scan(/[0-9]{8,}/).flatten)
+      ids
+    end
+  end
+end

data/lib/pivotal-github/story_accept.rb

@@ -3,8 +3,10 @@ require 'git'
 require 'net/http'
 require 'uri'
 require 'nokogiri'
+require 'pivotal-github/story'
 
 class StoryAccept < Command
+  include Story
 
   def parser
     OptionParser.new do |opts|
@@ -34,21 +36,14 @@ class StoryAccept < Command
   # These ids are of the form [Delivers #<story id>] or
   # [Delivers #<story id> #<another story id>].
   def ids_to_accept
-    delivered_regex = /\[Deliver(?:s|ed) (.*?)\]/
     n_commits = `git rev-list HEAD --count`
-    Git.open('.').log(n_commits).inject([]) do |delivered_ids, commit|
-      message = commit.message
-      delivered = message.scan(delivered_regex).flatten
-      commit_ids = delivered.inject([]) do |ids, element|
-        ids.concat(element.scan(/[0-9]{8,}/).flatten)
-        ids
+    Git.open('.').log(n_commits).inject([]) do |accept, commit|
+      delivered_ids(commit.message).each do |commit_id|
+        return accept if already_accepted?(commit_id) && !options.all
+        accept << commit_id
+        accept.uniq!
       end
-      commit_ids.each do |commit_id|
-        return delivered_ids if already_accepted?(commit_id) && !options['all']
-        delivered_ids << commit_id
-        delivered_ids.uniq!
-      end
-      delivered_ids
+      accept
     end
   end
 

data/lib/pivotal-github/story_open.rb

@@ -1,13 +1,13 @@
 require 'pivotal-github/command'
+require 'pivotal-github/story'
 
 class StoryOpen < Command
+  include Story
 
   # Returns a command appropriate for executing at the command line
   # I.e., 'open https://www.pivotaltracker.com/story/show/62831853'
   def cmd
-    story_ids.map do |id|
-      "open https://www.pivotaltracker.com/story/show/#{id}"
-    end.join(' ; ')
+    story_ids.map { |id| "open #{story_url(id)}" }.join(' ; ')
   end
 
   def run!

data/lib/pivotal-github/story_pull_request.rb

@@ -1,11 +1,16 @@
 require 'pivotal-github/command'
 require 'pivotal-github/finished_command'
+require 'pivotal-github/story'
 
 class StoryPullRequest < FinishedCommand
+  include Story
 
   def parser
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-pull-request [options]"
+      opts.on("-b", "--base-branch", "base branch for delivered ids") do |opt|
+        self.options.base_branch = opt
+      end
       opts.on("-o", "--override", "override unfinished story warning") do |opt|
         self.options.override = opt
       end
@@ -15,28 +20,30 @@ class StoryPullRequest < FinishedCommand
     end
   end
 
-  # Returns a command appropriate for executing at the command line
-  # I.e., 'open https://www.pivotaltracker.com/story/show/62831853'
-  def cmd
-    "git pull-request"
+  # Returns the (Markdown) link for a delivered story id.
+  def delivers_url(id)
+    "[Delivers ##{id}](#{story_url(id)})"
   end
 
-  def uri
-    "#{origin_uri}/pull/new/#{story_branch}"
+  # Returns a commit message with links to all the delivered stories.
+  def commit_message
+    ids = delivered_ids(`git log #{base_branch}..HEAD`)
+    ids.map { |id| delivers_url(id) }.join("\n")
   end
 
-  private
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    Dir.mkdir '.pull_requests' unless File.directory?('.pull_requests')
+    c =  ["touch .pull_requests/`date '+%s'`"]
+    c << "git add ."
+    c << %(git commit -m "Pull request" -m "#{commit_message}")
+    c << "git pull-request"
+    c.join("\n")
+  end
 
-    # 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
+  private
 
-    # 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')
+    def base_branch
+      options.base_branch || 'master'
     end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/spec/commands/story_pull_request_spec.rb

@@ -7,27 +7,15 @@ describe StoryPullRequest do
   before do
     command.stub(:remote_location).
             and_return('https://github.com/mhartl/foo')
+    command.stub(:delivered_ids).and_return(['62831853', '31415926'])
+    command.stub(:write_pr_file).and_return('')
   end
   subject { command }
 
   its(:cmd) { should match /git pull-request/ }
-
-  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
+  its(:commit_message) do
+    should include '[Delivers #62831853]'
+    should include '[Delivers #31415926]'
   end
 
   describe "command-line command" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-utils
@@ -54,6 +54,7 @@ files:
 - lib/pivotal-github/command.rb
 - lib/pivotal-github/finished_command.rb
 - lib/pivotal-github/options.rb
+- lib/pivotal-github/story.rb
 - lib/pivotal-github/story_accept.rb
 - lib/pivotal-github/story_commit.rb
 - lib/pivotal-github/story_merge.rb