go_cd_feed 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    go_cd_feed (1.0.0)
+    go_cd_feed (1.1.0)
       nokogiri
 
 GEM

data/go_cd_feed.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "go_cd_feed"
-  s.version     = '1.1.0'
+  s.version     = '1.1.1'
   s.authors     = ["Nikhil Mungel", "Ketan Padegaonkar", "Shishir Das", "Bill DePhillips"]
   s.email       = ["hyfather@gmail.com", "KetanPadegaonkar@gmail.com", "shishir.das@gmail.com", "bill.dephillips@gmail.com"]
   s.homepage    = "http://github.com/rearadmiral/go-api-client.git"

data/lib/go_api_client.rb

@@ -10,6 +10,7 @@ require 'go_api_client/atom'
 require 'go_api_client/pipeline'
 require 'go_api_client/stage'
 require 'go_api_client/job'
+require 'go_api_client/git_material'
 require 'go_api_client/commit'
 require 'go_api_client/dependency_material'
 require 'go_api_client/user'
@@ -24,7 +25,7 @@ module GoApiClient
 
     feed_url = "#{options[:protocol]}://#{options[:host]}:#{options[:port]}/go/api/pipelines/#{options[:pipeline_name]}/stages.xml"
 
-    feed = GoApiClient::Atom::Feed.new(feed_url, options[:latest_atom_entry_id])
+    feed = GoApiClient::Atom::Feed.new(feed_url, options[:latest_atom_entry_id], options[:page_fetch_limit])
     feed.fetch!(http_fetcher)
 
     pipelines = {}

data/lib/go_api_client/atom/feed.rb

@@ -6,7 +6,7 @@ module GoApiClient
       def initialize(atom_feed_url, last_entry_id=nil, page_fetch_limit=nil)
         @atom_feed_url = atom_feed_url
         @last_entry_id = last_entry_id
-        @page_fetch_limit = page_fetch_limit
+        @page_fetch_limit = page_fetch_limit.to_i
       end
 
       def fetch!(http_fetcher = HttpFetcher.new)
@@ -17,10 +17,10 @@ module GoApiClient
         begin
           doc = Nokogiri::XML(http_fetcher.get_response_body(feed_url))
           pages_fetched += 1
-          if @page_fetch_limit && pages_fetched > @page_fetch_limit
+          if @page_fetch_limit > 0 && pages_fetched > @page_fetch_limit
             puts "=" * 100
             puts ""
-            puts "[GoApiClient] not fetching past #{page_fetch_limit} pages of the Go.CD event feed."
+            puts "[GoApiClient] not fetching past #{@page_fetch_limit} pages of the Go.CD event feed."
             puts "If there is no green build in those pages, your app may not work properly."
             puts "Get your build green first!"
             puts ""

data/lib/go_api_client/git_material.rb

@@ -0,0 +1,25 @@
+require_relative 'commit'
+
+module GoApiClient
+
+  class GitMaterial
+
+    attr_reader :commits, :repository_url
+
+    def initialize(root)
+      @root = root
+    end
+
+    def parse!
+      @repository_url = @root['url']
+      @commits = @root.xpath('./modifications/changeset').collect do |changeset|
+        Commit.new(changeset).parse!
+      end
+      @root = nil
+      self
+    end
+
+  end
+
+
+end

data/lib/go_api_client/pipeline.rb

@@ -1,6 +1,6 @@
 module GoApiClient
   class Pipeline
-    attr_accessor :url, :commits, :label, :counter, :authors, :stages, :name, :http_fetcher, :identifier, :schedule_time, :dependencies
+    attr_accessor :url, :label, :counter, :authors, :stages, :name, :http_fetcher, :identifier, :schedule_time, :dependencies, :materials
 
     include GoApiClient::Helpers::SimpleAttributesSupport
 
@@ -28,8 +28,8 @@ module GoApiClient
       self.url        = href_from(@root.xpath("./link[@rel='self']"))
       self.identifier = @root.xpath("./id").first.content
       self.schedule_time = Time.parse(@root.xpath('./scheduleTime').first.content).utc
-      self.commits    = @root.xpath('./materials/material[@type != "DependencyMaterial"]/modifications/changeset').collect do |changeset|
-        Commit.new(changeset).parse!
+      self.materials = @root.xpath('./materials/material[@type="GitMaterial"]').collect do |git_material|
+        GitMaterial.new(git_material).parse!
       end
       self.dependencies = @root.xpath('./materials/material[@type="DependencyMaterial"]').collect do |dependency|
         DependencyMaterial.new(dependency).parse!

data/test/go_api_client/commit_test.rb

@@ -3,8 +3,9 @@ require "test_helper"
 module GoApiClient
   class CommitTest < Test::Unit::TestCase
 
-    test "should parse a changeset xml node" do
-      doc = Nokogiri::XML.parse %q{<changeset changesetUri="http://localhost:8153/go/api/materials/1/changeset/9f77888d7a594699894a17f4d61fc9dfac3cfb74.xml">
+    test "should parse a material with changeset xml node" do
+      doc = Nokogiri::XML.parse %q{
+      <changeset changesetUri="http://localhost:8153/go/api/materials/1/changeset/9f77888d7a594699894a17f4d61fc9dfac3cfb74.xml">
         <bar>
           <revision>jhgasdfjkhgads</revision>
           <message>some message</message>

data/test/go_api_client/git_material_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+module GoApiClient
+  class GitMaterialTest < Test::Unit::TestCase
+
+    test "should parse a material xml with 2 changesets" do
+      doc = Nokogiri::XML.parse %q{
+  <material materialUri="https://go.thoughtworks.com/go/api/materials/18170.xml" type="GitMaterial" url="https://studios-scm.thoughtworks.com/saas" branch="master">
+    <modifications>
+      <changeset changesetUri="http://localhost:8153/go/api/materials/1/changeset/9f77888d7a594699894a17f4d61fc9dfac3cfb74.xml">
+        <user><![CDATA[osito <osito@bonito.com>]]></user>
+        <checkinTime>2012-02-21T15:42:30+05:30</checkinTime>
+        <revision><![CDATA[9f77888d7a594699894a17f4d61fc9dfac3cfb74]]></revision>
+        <message><![CDATA[Update README]]></message>
+        <file name="README" action="modified"/>
+      </changeset>
+      <changeset changesetUri="http://localhost:8153/go/api/materials/1/changeset/abcd123.xml">
+        <user><![CDATA[zorro <zorro@poms.net>]]></user>
+        <checkinTime>2012-02-20T15:41:30+05:30</checkinTime>
+        <revision><![CDATA[abcd123]]></revision>
+        <message><![CDATA[fixin' the bugs]]></message>
+        <file name="buggy_code.rb" action="modified"/>
+      </changeset>
+    </modifications>
+  </material>
+
+      }
+
+      material = GitMaterial.new(doc.root).parse!
+
+      assert_equal "https://studios-scm.thoughtworks.com/saas", material.repository_url
+      assert_equal 2, material.commits.size
+    end
+
+  end
+end

data/test/go_api_client/pipeline_test.rb

@@ -16,7 +16,7 @@ module GoApiClient
       assert_equal 99, pipeline.counter
       assert_equal "defaultPipeline", pipeline.name
       assert_equal "http://localhost:8153/go/api/pipelines/defaultPipeline/1.xml", pipeline.url
-      assert_equal ["Update README", "Fixed build"], pipeline.commits.collect(&:message)
+      assert_equal ["Update README", "Fixed build"], pipeline.materials.map { |material| material.commits.collect(&:message) }.flatten
       assert_equal "urn:x-go.studios.thoughtworks.com:job-id:defaultPipeline:1", pipeline.identifier
       assert_equal Time.parse('2012-02-23 11:46:15 UTC'), pipeline.schedule_time
     end
@@ -35,7 +35,7 @@ module GoApiClient
       link = 'http://localhost:8153/go/api/pipelines/defaultPipeline/2.xml'
       pipeline = GoApiClient::Pipeline.from(link)
 
-      assert_equal 1, pipeline.commits.size
+      assert_equal 1, pipeline.materials.size
       assert_equal 1, pipeline.dependencies.size
 
     end

data/test/go_api_client/stage_test.rb

@@ -38,7 +38,7 @@ module GoApiClient
 
       assert_equal "http://localhost:8153/go/api/stages/1.xml", stages.first.url
       assert_equal "http://localhost:8153/go/api/stages/2.xml", stages.last.url
-      
+
       assert_equal 1, stages.first.counter
       assert_equal 1, stages.last.counter
 
@@ -56,7 +56,7 @@ module GoApiClient
       assert_equal "Units", stages.first.name
       assert_equal "Acceptance", stages.last.name
 
-      assert_equal ["Update README", "Fixed build"], pipelines.first.commits.collect(&:message)
+      assert_equal ["Update README", "Fixed build"], pipelines.first.materials.map { |material| material.commits.collect(&:message) }.flatten
 
       assert_equal "http://localhost:8153/go/files/defaultPipeline/1/Units/1/Test/cruise-output/console.log", stages.first.jobs.first.console_log_url
       assert_equal "http://localhost:8153/go/files/defaultPipeline/1/Acceptance/1/Test/cruise-output/console.log", stages.last.jobs.first.console_log_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_cd_feed
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -124,6 +124,7 @@ files:
 - lib/go_api_client/atom/feed_page.rb
 - lib/go_api_client/commit.rb
 - lib/go_api_client/dependency_material.rb
+- lib/go_api_client/git_material.rb
 - lib/go_api_client/helpers.rb
 - lib/go_api_client/helpers/simple_attribute_support.rb
 - lib/go_api_client/http_fetcher.rb
@@ -194,6 +195,7 @@ files:
 - test/go_api_client/building_test.rb
 - test/go_api_client/commit_test.rb
 - test/go_api_client/dependency_material_test.rb
+- test/go_api_client/git_material_test.rb
 - test/go_api_client/job_test.rb
 - test/go_api_client/pipeline_test.rb
 - test/go_api_client/stage_test.rb
@@ -283,6 +285,7 @@ test_files:
 - test/go_api_client/building_test.rb
 - test/go_api_client/commit_test.rb
 - test/go_api_client/dependency_material_test.rb
+- test/go_api_client/git_material_test.rb
 - test/go_api_client/job_test.rb
 - test/go_api_client/pipeline_test.rb
 - test/go_api_client/stage_test.rb