teamcity-rest-client 0.2.0 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/teamcity-rest-client.rb

@@ -73,19 +73,21 @@ module TeamcityRestClient
     end
     
     def latest_builds filter = {}
-      build_types(filter).collect(&:latest_build)
+      build_types(filter).collect(&:latest_build).reject(&:nil?)
     end
     
-    def builds
+    def builds options = {}
       bt_ids = Set.new(build_types.collect(&:id))
-      teamcity.builds.find_all { |b| bt_ids.include? b.build_type_id }
+      teamcity.builds(options).find_all { |b| bt_ids.include? b.build_type_id }
     end
   end
   
   BuildType = Struct.new(:teamcity, :id, :name, :href, :project_name, :project_id, :web_url) do
-    #   httpAuth/app/rest/builds?buildType=id:bt107&count=1
+    def builds options = {}
+      teamcity.builds({:buildType => "id:#{id}"}.merge(options))
+    end
     def latest_build
-      teamcity.builds(:buildType => "id:#{id}", :count => 1)[0]
+      builds(:count => 1)[0]
     end
   end
   

data/spec/teamcity-rest-client_spec.rb

@@ -119,6 +119,7 @@ module TeamcityRestClient
       @bt11 = stub('bt11', :id => "bt11", :name => "project1-build1", :project_id => "project1")
       @bt12 = stub('bt12', :id => "bt12", :name => "project1-build2", :project_id => "project1")
       @bt13 = stub('bt13', :id => "bt13", :name => "project1-build3", :project_id => "project1")
+      @bt14 = stub('bt14', :id => "bt14", :name => "project1-build4-never-been-built", :project_id => "project1")
       @bt21 = stub('bt21', :id => "bt21", :name => "project2-build1", :project_id => "project2")
     
       @bt11_1 = stub('bt11_1', :id => "1", :build_type_id => "bt11")
@@ -127,7 +128,7 @@ module TeamcityRestClient
       @bt13_44 = stub('bt13_44', :id => "44", :build_type_id => "bt13")
       @bt21_666 = stub('bt21_666', :id => "666", :build_type_id => "bt21")
     
-      @tc = stub('teamcity', :build_types => [@bt11, @bt12, @bt13, @bt21], :builds => [@bt11_1, @bt11_2, @bt12_33, @bt13_44, @bt21_666])
+      @tc = mock('teamcity', :build_types => [@bt11, @bt12, @bt13, @bt14, @bt21], :builds => [@bt11_1, @bt11_2, @bt12_33, @bt13_44, @bt21_666])
       @project1 = Project.new @tc, "Project 1", "project1", "http://www.example.com"
     end
   
@@ -137,7 +138,7 @@ module TeamcityRestClient
       end
     
       it "should have only those for project 1" do
-        @build_types.should == [@bt11, @bt12, @bt13]
+        @build_types.should == [@bt11, @bt12, @bt13, @bt14]
       end
     end
 
@@ -156,13 +157,13 @@ module TeamcityRestClient
       
       describe "exclude" do
         it "should match by single project name" do
-          @project1.build_types({ :exclude => "project1-build2" }).should == [@bt11, @bt13]
+          @project1.build_types({ :exclude => "project1-build2" }).should == [@bt11, @bt13, @bt14]
         end
         it "should match by single project id" do
-          @project1.build_types({ :exclude => "bt11" }).should == [@bt12, @bt13]
+          @project1.build_types({ :exclude => "bt11" }).should == [@bt12, @bt13, @bt14]
         end
         it "should match by multiple project id and name" do
-          @project1.build_types({ :exclude => ["bt11","project1-build2"] }).should == [@bt13]
+          @project1.build_types({ :exclude => ["bt11","project1-build2"] }).should == [@bt13, @bt14]
         end
       end
       
@@ -186,12 +187,27 @@ module TeamcityRestClient
     end
     
     describe "asking it for it's builds" do
-      before :each do
-        @builds = @project1.builds
+      describe 'with no options' do
+        before :each do
+          @tc.should_receive(:builds).with({}).and_return([@bt11_1, @bt11_2, @bt12_33, @bt13_44])
+          @builds = @project1.builds
+        end
+
+        it "should have only builds for project 1" do
+          @builds.should == [@bt11_1, @bt11_2, @bt12_33, @bt13_44]
+        end
       end
-    
-      it "should have only builds for project 1" do
-        @builds.should == [@bt11_1, @bt11_2, @bt12_33, @bt13_44]
+      
+      describe "with some other options" do
+        before :each do
+          @options = {:running => true}
+          @tc.should_receive(:builds).with(@options).and_return([@bt11_1, @bt11_2, @bt12_33, @bt13_44])
+          @builds = @project1.builds @options
+        end
+        
+        it 'should pass through the options to tc' do
+          @builds.should == [@bt11_1, @bt11_2, @bt12_33, @bt13_44]
+        end
       end
     end
     
@@ -200,6 +216,7 @@ module TeamcityRestClient
         @bt11.stub(:latest_build).and_return(@bt11_2)
         @bt12.stub(:latest_build).and_return(@bt12_33)
         @bt13.stub(:latest_build).and_return(@bt13_44)
+        @bt14.stub(:latest_build).and_return(nil)
       end
       
       describe "for all builds in project" do
@@ -302,12 +319,36 @@ module TeamcityRestClient
     end
     
     describe "latest_build" do
+      describe "when there has been at least 1 build" do
+        before :each do
+          @build = mock('build')
+          @tc.should_receive(:builds).with(:buildType => "id:bt123", :count => 1).and_return [@build]
+        end
+        
+        it "should ask teamcity, and return the single build" do
+          @build_type.latest_build.should == @build
+        end
+      end
+      
+      describe "when there hasnt ever been a build" do
+        before :each do
+          @tc.should_receive(:builds).with(:buildType => "id:bt123", :count => 1).and_return []
+        end
+        
+        it "should ask teamcity, and get no build back" do
+          @build_type.latest_build.should   be_nil
+        end
+      end
+    end
+    
+    describe "builds" do
       before :each do
-        @build = mock('build')
-        @tc.should_receive(:builds).with(:buildType => "id:bt123", :count => 1).and_return [@build]
+        @build1 = mock('build1')
+        @build2 = mock('build2')
+        @tc.should_receive(:builds).with({:buildType => "id:bt123", :running => true, :somethingelse => 'here'}).and_return [@build1, @build2]
       end
       it "should ask teamcity" do
-        @build_type.latest_build.should == @build
+        @build_type.builds({ :running => true, :somethingelse => 'here' }).should == [@build1, @build2]
       end
     end
   end
@@ -485,6 +526,18 @@ XML
     end
     
     describe "builds" do
+      describe "when there hasnt been any builds for configuration" do
+        before :each do
+          xml = <<XML
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<builds count="0"/>          
+XML
+        end
+        
+        pending "it should return an empty array" 
+        
+      end
+      
       describe "with options specified" do
           before :each do
             xml = <<XML

data/teamcity-rest-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "teamcity-rest-client"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["simon"]
-  s.date = "2011-10-27"
+  s.date = "2011-11-03"
   s.description = "Teamcity rest api client (readonly)"
   s.email = "simojenki@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamcity-rest-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-11-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159724440 !ruby/object:Gem::Requirement
+  requirement: &2157516220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2159724440
+  version_requirements: *2157516220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2159723960 !ruby/object:Gem::Requirement
+  requirement: &2157515740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2159723960
+  version_requirements: *2157515740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2159723480 !ruby/object:Gem::Requirement
+  requirement: &2157515240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2159723480
+  version_requirements: *2157515240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2159723000 !ruby/object:Gem::Requirement
+  requirement: &2157514760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159723000
+  version_requirements: *2157514760
 description: Teamcity rest api client (readonly)
 email: simojenki@gmail.com
 executables: []
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -677859045905772882
+      hash: 1926460357061401344
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: