pivotal-github 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb65422d4145e0558694e16e86efeee2ba8e6fe
-  data.tar.gz: 0e30c9e9dfb790c7d60dbb13b2f27c85b8d9a318
+  metadata.gz: 76c6eb2dc161943529e3884e271773d40e013c30
+  data.tar.gz: 97250a952a1db4399123fc95d30944ffeeafd661
 SHA512:
-  metadata.gz: b96f438c08b356a7732c32171e73e39688e39cdf9f543bab53cadf78873fc60d574f03c2ffc0cf23b334f037b0959c6b6366603bede72b282e55f1a5941a3a68
-  data.tar.gz: 00340e88ce75f377f22b081f6f02b49af6ee7e284396fa56a89a4df488cf193dfe990dfb2081d29213d13271caee5c2bc6f89f40428836ee94419efc414d82d6
+  metadata.gz: 8ac8e989aeab986c04ee7248f5a58d48be96d9903be492d46d05410f9d6d281e20180318fad9b8de4b6c819c23b9503057aad6580e432d61236e3d271e546fea
+  data.tar.gz: 53310a883ab3444f317a1d59fd00aa4e389939be844f8a4b8dd451161675e7902ffa808f0ccd4caf081e471b741a4ee19d6e3cd1f1e332da9c5063d8f3416e90

data/README.md

@@ -137,11 +137,11 @@ In order to avoid reading the entire Git log every time it's run, by default `gi
 
 #### Options
 
-    Usage: git story-accept
+    Usage: git story-accept [options]
         -o, --override                   override master branch requirement
+        -q, --quiet                      suppress display of accepted story ids
         -a, --all                        process all stories (entire log)
         -h, --help                       this usage guide
-
 ### story-open
 
 The `story-open` command (no `git`) opens the current story in the default browser (OS X–only):

data/lib/pivotal-github/command.rb

@@ -22,7 +22,7 @@ class Command
   end
 
   def story_branch
-    `git rev-parse --abbrev-ref HEAD`.strip
+    @story_branch ||= `git rev-parse --abbrev-ref HEAD`.strip
   end
 
   # Returns the story id (or ids).

data/lib/pivotal-github/story_accept.rb

@@ -8,10 +8,13 @@ class StoryAccept < Command
 
   def parser
     OptionParser.new do |opts|
-      opts.banner = "Usage: git story-accept"
+      opts.banner = "Usage: git story-accept [options]"
       opts.on("-o", "--override", "override master branch requirement") do |opt|
         self.options.override = opt
       end
+      opts.on("-q", "--quiet", "suppress display of accepted story ids") do |opt|
+        self.options.quiet = opt
+      end
       opts.on("-a", "--all", "process all stories (entire log)") do |opt|
         self.options.all = opt
       end
@@ -21,6 +24,12 @@ class StoryAccept < Command
     end
   end
 
+  # The story_id has a different meaning in this context, so raise an
+  # error if it's called accidentally.
+  def story_id
+    raise 'Invalid reference to Command#story_id'
+  end
+
   # Returns the ids to accept.
   # These ids are of the form [Delivers #<story id>] or
   # [Delivers #<story id> #<another story id>].
@@ -47,8 +56,9 @@ class StoryAccept < Command
   def already_accepted?(story_id)
     data = { 'X-TrackerToken' => api_token,
              'Content-type' => "application/xml" }
-    response = Net::HTTP.start(story_uri.host, story_uri.port) do |http|
-      http.get(story_uri.path, data)
+    uri = story_uri(story_id)
+    response = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.get(uri.path, data)
     end
     Nokogiri::XML(response.body).at_css('current_state').content == "accepted"
   end
@@ -67,9 +77,9 @@ class StoryAccept < Command
   def project_id
     project_id_filename = '.project_id'
     if File.exist?(project_id_filename)
-      @project_id_filename ||= File.read(project_id_filename)
+      @project_id ||= File.read(project_id_filename).strip
     else
-      puts "Please create a file called '#{project_id}'"
+      puts "Please create a file called '.project_id'"
       puts "containing the Pivotal Tracker project number."
       exit 1
     end
@@ -79,10 +89,12 @@ class StoryAccept < Command
   def accept!(story_id)
     accepted = "<story><current_state>accepted</current_state></story>"
     data =  { 'X-TrackerToken' => api_token,
-              'Content-type' => "application/xml" }
-    Net::HTTP.start(story_uri.host, story_uri.port) do |http|
-      http.put(story_uri.path, accepted, data)
+              'Content-type'   => "application/xml" }
+    uri = story_uri(story_id)
+    Net::HTTP.start(uri.host, uri.port) do |http|
+      http.put(uri.path, accepted, data)
     end
+    puts "Accepted story ##{story_id}" unless options.quiet
   end
 
   def run!
@@ -100,7 +112,8 @@ class StoryAccept < Command
       'http://www.pivotaltracker.com/services/v3'
     end
 
-    def story_uri
-      URI.parse("#{api_base}/projects/#{project_id}/stories/#{story_id}")
+    def story_uri(story_id)
+      uri = "#{api_base}/projects/#{project_id}/stories/#{story_id}"
+      URI.parse(uri)
     end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Michael Hartl