teamcity-rest-client 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/teamcity-rest-client.rb

@@ -98,6 +98,15 @@ module TeamcityRestClient
   end
   
   class Authentication
+  
+  	def initialize openuri_options
+  		@openuri_options = openuri_options
+  	end 
+
+    def get path, params = {}
+      open(url(path, params), @openuri_options).read
+    end
+
     def query_string_for params
       pairs = []
       params.each_pair { |k,v| pairs << "#{k}=#{v}" }
@@ -106,14 +115,12 @@ module TeamcityRestClient
   end
 
   class HttpBasicAuthentication < Authentication
-    def initialize host, port, user, password
+  
+    def initialize host, port, user, password, openuri_options = {}
+    	super({:http_basic_authentication => [user, password]}.merge(openuri_options))
       @host, @port, @user, @password = host, port, user, password
     end
 
-    def get path, params = {}
-      open(url(path, params), :http_basic_authentication => [@user, @password]).read
-    end
-
     def url path, params = {}
       auth_path = path.start_with?("/httpAuth/") ? path : "/httpAuth#{path}"
       query_string = !params.empty? ? "?#{query_string_for(params)}" : ""
@@ -126,14 +133,12 @@ module TeamcityRestClient
   end
 
   class Open < Authentication
-    def initialize host, port
+  
+    def initialize host, port, options = {}
+    	super(options)
       @host, @port = host, port
     end
 
-    def get path, params = {}
-      open(url(path, params)).read
-    end
-
     def url path, params = {}
       query_string = !params.empty? ? "?#{query_string_for(params)}" : ""
       "http://#{@host}:#{@port}#{path}#{query_string}"
@@ -160,12 +165,12 @@ class Teamcity
   
   attr_reader :host, :port, :authentication
   
-  def initialize host, port, user = nil, password = nil
+  def initialize host, port, options = {}
     @host, @port = host, port
-    if user != nil && password != nil
-      @authentication = TeamcityRestClient::HttpBasicAuthentication.new host, port, user, password
+    if options[:user] && options[:password]
+      @authentication = TeamcityRestClient::HttpBasicAuthentication.new(host, port, options[:user], options[:password], options)
     else
-      @authentication = TeamcityRestClient::Open.new host, port
+      @authentication = TeamcityRestClient::Open.new(host, port, options)
     end
   end
   

data/spec/teamcity-rest-client_spec.rb

@@ -253,8 +253,9 @@ module TeamcityRestClient
 
   describe HttpBasicAuthentication do
     before :each do
+      @openuri_options = { :proxy => 'http://proxy:9999' }
       @host, @port, @user, @password = "auth.example.com", 2233, "john", "wayne"
-      @auth = HttpBasicAuthentication.new @host, @port, @user, @password
+      @auth = HttpBasicAuthentication.new @host, @port, @user, @password, @openuri_options
       @io = stub(:read => "<xml/>")
     end
     
@@ -273,11 +274,11 @@ module TeamcityRestClient
     end
     
     describe "get" do
-      it "should call open with http basic auth options" do
+      it "should call open with http basic auth options, and openuri option" do
         path, options = "/something", {:id => 1}
         url = "http://localhost:1324"
         @auth.should_receive(:url).with(path, options).and_return url
-        @auth.should_receive(:open).with(url, :http_basic_authentication=>[@user, @password]).and_return(@io)
+        @auth.should_receive(:open).with(url, {:http_basic_authentication=>[@user, @password], :proxy => 'http://proxy:9999'}).and_return(@io)
         @auth.get(path, options)
       end
     end
@@ -286,7 +287,8 @@ module TeamcityRestClient
   describe Open do
     before :each do
       @host, @port = "auth.example.com", 2233
-      @auth = Open.new @host, @port
+      @openuri_options = { :proxy => 'http://localhost:1234' }
+      @auth = Open.new @host, @port, @openuri_options
       @io = stub(:read => "<xml/>")
     end
     
@@ -305,7 +307,7 @@ module TeamcityRestClient
         path, options = "/something", {:id => 1}
         url = "http://localhost:1324"
         @auth.should_receive(:url).with(path, options).and_return url
-        @auth.should_receive(:open).with(url).and_return(@io)
+        @auth.should_receive(:open).with(url, @openuri_options).and_return(@io)
         @auth.get(path, options)
       end
     end
@@ -364,12 +366,13 @@ describe Teamcity do
   describe "specifying username and password" do
     before :each do
       @host, @port, @user, @password = "authtc.example.com", 8877, "bob", "marley"
+      @options = {:user => @user, :password => @password, :proxy => 'dog'}
       @authentication = mock('authentication')
-      TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).with(@host, @port, @user, @password).and_return(@authentication)
-      @tc = Teamcity.new @host, @port, @user, @password
+      TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).with(@host, @port, @user, @password, @options).and_return(@authentication)
+      @tc = Teamcity.new @host, @port, @options
     end
     
-    it "should create HttpBasicAuthentication" do
+    it "should create HttpBasicAuthentication, passing through the options" do
       @tc.authentication.should === @authentication
     end
   end
@@ -377,12 +380,13 @@ describe Teamcity do
   describe "specifying no username and password" do
     before :each do
       @host, @port = "authtc.example.com", 8877
+      @options = { :proxy => 'cat' }
       @authentication = mock('authentication')
-      TeamcityRestClient::Open.should_receive(:new).with(@host, @port).and_return(@authentication)
-      @tc = Teamcity.new @host, @port
+      TeamcityRestClient::Open.should_receive(:new).with(@host, @port, @options).and_return(@authentication)
+      @tc = Teamcity.new @host, @port, @options
     end
     
-    it "should create HttpBasicAuthetication" do
+    it "should create Open authentication" do
       @tc.authentication.should === @authentication
     end
   end
@@ -460,7 +464,7 @@ HTML
 XML
         @authentication.should_receive(:get).with("/app/rest/projects", {}).and_return(xml)
         TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).and_return(@authentication)
-        @tc = Teamcity.new @host, @port, @user, @password
+        @tc = Teamcity.new @host, @port, { :user => @user, :password => @password }
         @projects = @tc.projects
       end
       
@@ -496,7 +500,7 @@ XML
 XML
         @authentication.should_receive(:get).with("/app/rest/buildTypes", {}).and_return(xml)
         TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).and_return(@authentication)
-        @tc = Teamcity.new @host, @port, @user, @password
+        @tc = Teamcity.new @host, @port, :user => @user, :password => @password
         @build_types = @tc.build_types
       end
       
@@ -550,7 +554,7 @@ XML
             @options = {:buildType => "id:bt212", :count => 1}
             @authentication.should_receive(:get).with("/app/rest/builds", @options).and_return(xml)
             TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).and_return(@authentication)
-            @tc = Teamcity.new @host, @port, @user, @password
+            @tc = Teamcity.new @host, @port, :user => @user, :password => @password
             @builds = @tc.builds @options
           end
 
@@ -570,7 +574,7 @@ XML
 XML
             @authentication.should_receive(:get).with("/app/rest/builds", {}).and_return(xml)
             TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).and_return(@authentication)
-            @tc = Teamcity.new @host, @port, @user, @password
+            @tc = Teamcity.new @host, @port, :user => @user, :password => @password
             @builds = @tc.builds
           end
 
@@ -604,7 +608,7 @@ XML
 XML
             @authentication.should_receive(:get).with("/app/rest/builds", {}).and_return(xml)
             TeamcityRestClient::HttpBasicAuthentication.should_receive(:new).and_return(@authentication)
-            @tc = Teamcity.new @host, @port, @user, @password
+            @tc = Teamcity.new @host, @port, :user => @user, :password => @password
             @builds = @tc.builds
           end
 
@@ -638,4 +642,4 @@ XML
         end
     end
   end
-end
+end

data/teamcity-rest-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "teamcity-rest-client"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["simon"]
-  s.date = "2011-11-03"
+  s.date = "2012-01-20"
   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.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157516220 !ruby/object:Gem::Requirement
+  requirement: &80597140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157516220
+  version_requirements: *80597140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157515740 !ruby/object:Gem::Requirement
+  requirement: &80596870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157515740
+  version_requirements: *80596870
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157515240 !ruby/object:Gem::Requirement
+  requirement: &80596630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2157515240
+  version_requirements: *80596630
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2157514760 !ruby/object:Gem::Requirement
+  requirement: &80596360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157514760
+  version_requirements: *80596360
 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: 1926460357061401344
+      hash: -787692387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: