pivotal-github 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa1293580e2c9efd94ee5cc32fc7dc1a29eee87
-  data.tar.gz: 909ff85f5d206d692cd73fbcccc4b5cf03b50fa3
+  metadata.gz: eb23c95f5fd7c9ccb44d99c7769d4d5eb8193edc
+  data.tar.gz: af5aefc3a45d42d5711bc818084f17f71c9aab35
 SHA512:
-  metadata.gz: 609a6d4ca5393d0c492b7452129c8a8118e32aa421db5290ae50d9fdb159594a879a8148602e72875f206cca6e8c51f87efbc22d257d4c229e3fadfce8741688
-  data.tar.gz: 5867e839faacb0c1f17e9444b51dda487fec444f4b74f77fed85d58455af4f6b3c14356b1316748899dac3b0c276e1263b3f98e826cae9e3189c383ed321984c
+  metadata.gz: 171552555c6e801c0ce9e614361ea0e5d47cee06714583998321f26f5a74e2e87e4656e26b50dcce3f8ce426a40c12f804d7cbe597c106cd09eb2f581ce6c41b
+  data.tar.gz: 1e6e7f994761a6b2b01a55dc537a504053be60b2f9c338ce5f7ef4fd9d67e21c73b25295e35cab39e23d89382cfd433a9356561949177fde214a6c82a1c4dc6d

data/lib/pivotal-github/story_accept.rb

@@ -1,8 +1,8 @@
 require 'pivotal-github/command'
-require 'net/http'
-require 'uri'
-require 'nokogiri'
 require 'pivotal-github/story'
+require 'nokogiri'
+require 'net/http'
+require 'cgi'
 
 class StoryAccept < Command
   include Story
@@ -40,29 +40,28 @@ class StoryAccept < Command
   # [Delivers #<story id> #<another story id>]. The difference is handled
   # by the delivered_ids method.
   def git_log_delivered_story_ids
-    pat = '\\[Deliver(s|ed) #'
-    delivered_lines = `git log --grep='#{pat}' | egrep '#{pat}'`.split("\n")
-    delivered_lines.inject([]) do |accept, line|
-      accept << delivered_ids(line)
-    end.uniq
+    delivered_text = `git log -E --grep '\\[Deliver(s|ed) #'`
+    delivered_ids(delivered_text).uniq
   end
 
-  # Returns the ids of delivered stories according to Pivotal Tracker.
-  def pivotal_tracker_delivered_story_ids
-    data = { 'X-TrackerToken' => api_token,
-             'Content-type'   => "application/xml" }
-    uri = URI.parse("#{project_uri}/stories?filter=state%3Adelivered")
+  def pivotal_tracker_ids(filter)
+    uri = URI.parse("#{project_uri}/stories?filter=#{CGI::escape(filter)}")
     response = Net::HTTP.start(uri.host, uri.port) do |http|
-      http.get(uri.path, data)
+      http.get(uri, data)
     end
-    Nokogiri::XML(response.body).css('id').map(&:content)
+    Nokogiri::XML(response.body).css('story > id').map(&:content)
+  end
+
+  # Returns the ids of delivered stories according to Pivotal Tracker.
+  def pivotal_tracker_delivered_story_ids
+    # The Pivotal Tracker API doesn't seem to want to return stories
+    # with a particular state unless the type is also specified.
+    pivotal_tracker_ids('state:delivered type:feature') +
+    pivotal_tracker_ids('state:delivered type:bug')
   end
 
   # Returns true if a story has already been accepted.
   def already_accepted?(story_id)
-    data = { 'X-TrackerToken' => api_token,
-             'Content-type'   => "application/xml" }
-    uri = story_uri(story_id)
     response = Net::HTTP.start(uri.host, uri.port) do |http|
       http.get(uri.path, data)
     end
@@ -141,4 +140,10 @@ class StoryAccept < Command
     def story_uri(story_id)
       URI.parse("#{project_uri}/stories/#{story_id}")
     end
+
+    # Returns data for Pivotal Tracker API calls
+    def data
+      { 'X-TrackerToken' => api_token,
+        'Content-type'   => "application/xml" }
+    end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.1.5"
+    VERSION = "1.1.6"
   end
 end

data/pivotal-github.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_dependency('git-utils')
   gem.add_dependency('nokogiri')
-  gem.add_dependency('httparty', '~> 0.10.0')
 end

data/spec/commands/story_accept_spec.rb

@@ -2,47 +2,53 @@ require 'spec_helper'
 
 describe StoryAccept do
 
-  let(:command) { StoryAccept.new(['-o']) }
+  subject(:command) { StoryAccept.new(['-o']) }
   before do
     command.stub(:story_branch).and_return('62831853-tau-manifesto')
-    command.stub(:git_log_delivered_story_ids).
-            and_return(%w[51204529 51106181 50566167 50566179 60566178])
-    command.stub(:pivotal_tracker_delivered_story_ids).
-            and_return(%w[51204529 51106181 50566167 50566178])
   end
-  subject { command }
 
   it { should respond_to(:ids_to_accept) }
+  its(:git_log_delivered_story_ids) { should include "51204529" }
+  its(:pivotal_tracker_delivered_story_ids) { should_not include "51204529" }
 
-  describe "ids_to_accept" do
-    let(:ids) { command.ids_to_accept }
-    subject { ids }
-
-    it { should_not be_empty }
-    it { should include("51204529") }
-    it { should include("51106181") }
-    it { should include("50566167") }
-    it { should_not include("50566178") }
-    it { should_not include("50566178") }
-    it { should_not include("60566178") }
+  context "with stubbed out story ids" do
+    before do
+      command.stub(:git_log_delivered_story_ids).
+              and_return(%w[51204529 51106181 50566167 50566179 60566178])
+      command.stub(:pivotal_tracker_delivered_story_ids).
+              and_return(%w[51204529 51106181 50566167 50566178])
+    end
 
-    it "should not have duplicate ids" do
-      expect(ids).to eq ids.uniq
+    describe "ids_to_accept" do
+      let(:ids) { command.ids_to_accept }
+      subject { ids }
+
+      it { should_not be_empty }
+      it { should include "51204529" }
+      it { should include "51106181" }
+      it { should include "50566167" }
+      it { should_not include "50566178" }
+      it { should_not include "50566178" }
+      it { should_not include "60566178" }
+
+      it "should not have duplicate ids" do
+        expect(ids).to eq ids.uniq
+      end
     end
-  end
 
 
-  its(:api_token) { should_not be_empty }
+    its(:api_token) { should_not be_empty }
 
-  describe "accept!" do
-    before do
-      command.stub(:accept!)
-    end
+    describe "accept!" do
+      before do
+        command.stub(:accept!)
+      end
 
-    it "should accept each id" do
-      number_accepted = command.ids_to_accept.length
-      command.should_receive(:accept!).exactly(number_accepted).times
-      command.run!
+      it "should accept each id" do
+        number_accepted = command.ids_to_accept.length
+        command.should_receive(:accept!).exactly(number_accepted).times
+        command.run!
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Michael Hartl
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 description: Add commands for Pivotal Tracker-GitHub integration
 email:
 - michael@michaelhartl.com