hudson-remote-api 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/hudson-remote-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson-remote-api}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dru Ibarra"]
-  s.date = %q{2011-09-06}
+  s.authors = [%q{Dru Ibarra}]
+  s.date = %q{2011-10-05}
   s.description = %q{Connect to Hudson's remote web API}
   s.email = %q{Druwerd@gmail.com}
   s.extra_rdoc_files = [
@@ -39,10 +39,10 @@ Gem::Specification.new do |s|
      "test/test_hudson_remote_api.rb"
   ]
   s.homepage = %q{http://github.com/Druwerd/hudson-remote-api}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--charset=UTF-8}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{hudson-remote-api}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Connect to Hudson's remote web API}
   s.test_files = [
     "test/test_hudson_build.rb",
@@ -54,7 +54,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/hudson-remote-api.rb

@@ -3,6 +3,7 @@
 # Author:: Dru Ibarra
 
 require 'net/http'
+require "net/https"
 require 'uri'
 require 'rexml/document'
 require 'cgi'
@@ -21,7 +22,11 @@ module Hudson
     end
     
     load_xml_api
-    
+
+    def self.url_for(path)
+      File.join Hudson[:url], path
+    end
+
     def self.get_xml(url)
       uri = URI.parse(url)
       host = uri.host
@@ -30,7 +35,14 @@ module Hudson
       request = Net::HTTP::Get.new(path)
       request.basic_auth(Hudson[:user], Hudson[:password]) if Hudson[:user] and Hudson[:password]
       request['Content-Type'] = "text/xml"
-      response = Net::HTTP.start(host, port){|http| http.request(request)}
+      response = Net::HTTP.start(host, port) do |http| 
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        http.request(request)
+      end
 
       if response.is_a?(Net::HTTPSuccess) or response.is_a?(Net::HTTPRedirection)
         encoding = response.get_fields("Content-Encoding")
@@ -57,6 +69,7 @@ module Hudson
       request = Net::HTTP::Post.new(path)
       request.basic_auth(Hudson[:user], Hudson[:password]) if Hudson[:user] and Hudson[:password]
       request.set_form_data(data)
+      request.add_field(crumb.name, crumb.value) if crumb
       Net::HTTP.new(host, port).start{|http| http.request(request)}
     end
     
@@ -73,6 +86,7 @@ module Hudson
       request = Net::HTTP::Post.new(path)
       request.basic_auth(Hudson[:user], Hudson[:password]) if Hudson[:user] and Hudson[:password]
       request.set_form_data(data) if data
+      request.add_field(crumb.name, crumb.value) if crumb
       request.body = xml
       Net::HTTP.new(host, port).start{|http| http.request(request)}
     end
@@ -80,6 +94,32 @@ module Hudson
     def send_xml_post_request(url, xml, data=nil)
       self.class.send_xml_post_request(url, xml, data)
     end
+    
+    
+    
+    def self.crumb
+      @@apiCrumb ||= nil
+    end
+    
+    def self.fetch_crumb
+      body = get_xml(url_for '/crumbIssuer/api/xml')
+      doc = REXML::Document.new(body)
+      
+      crumbValue = doc.elements['/defaultCrumbIssuer/crumb'] or begin
+        $stderr.puts "Failure fetching crumb value from server"
+        return
+      end
+      
+      crumbName = doc.elements['/defaultCrumbIssuer/crumbRequestField'] or begin
+        $stderr.puts "Failure fetching crumb field name from server"
+        return
+      end
+      
+      @@apiCrumb = Struct.new(:name,:value).new(crumbName.text,crumbValue.text)
+    rescue
+        $stderr.puts "Failure fetching crumb xml"
+    end
+    
   end
 end
 

data/lib/hudson-remote-api/build.rb

@@ -1,6 +1,6 @@
 module Hudson
 	class Build < HudsonObject
-		attr_reader :number, :job, :revisions, :result
+		attr_reader :number, :job, :revisions, :result, :culprit
 		
 		def initialize(job, build_number=nil)
 			@job = Job.new(job) if job.kind_of?(String)
@@ -18,13 +18,24 @@ module Hudson
 		private
 		def load_build_info
 			
-			build_info_xml = get_xml(@xml_api_build_info_path)
+			build_info_xml = patch_bad_git_xml(get_xml(@xml_api_build_info_path))
       build_info_doc = REXML::Document.new(build_info_xml)
-
-      @result = build_info_doc.elements["/freeStyleBuild/result"].text
+      
+      if build_info_doc.elements["/freeStyleBuild/result"]
+        @result = build_info_doc.elements["/freeStyleBuild/result"].text
+      end
       if !build_info_doc.elements["/freeStyleBuild/changeSet"].nil?
           build_info_doc.elements.each("/freeStyleBuild/changeSet/revision"){|e| @revisions[e.elements["module"].text] = e.elements["revision"].text }
       end
+
+      if build_info_doc.elements['/freeStyleBuild/culprit/fullName']
+        @culprit = build_info_doc.elements['/freeStyleBuild/culprit/fullName'].text
+      end
+
 		end
+
+    def patch_bad_git_xml(xml)
+      xml.gsub(/<(\/?)origin\/([_a-zA-Z0-9\-\.]+)>/, '<\1origin-\2>')
+    end
 	end
 end

data/lib/hudson-remote-api/job.rb

@@ -42,6 +42,7 @@ module Hudson
         
         def initialize(name, config=nil)
             name.strip!
+            Hudson::Job.fetch_crumb
             if Job.list.include?(name)
               @name = name
               load_xml_api
@@ -179,6 +180,10 @@ module Hudson
             @config = @config_doc.to_s
             update
         end
+
+        def url
+          File.join( Hudson[:url], 'job', name) + '/'
+        end
         
         # Start building this job on Hudson server (can't build parameterized jobs)
         def build()
@@ -213,4 +218,4 @@ module Hudson
             response.is_a?(Net::HTTPSuccess) or response.is_a?(Net::HTTPRedirection)
         end
     end
-end
+end

data/test/test_hudson_build.rb

@@ -4,9 +4,22 @@ require 'hudson-remote-api.rb'
 
 class TestHudsonBuild < Test::Unit::TestCase
   
-  def test_init
-    # TODO: load hudson build fixtures
-    #assert Hudson::Build.new('test_job')
+  def setup
+    assert Hudson::Job.new('test_job').build
+    assert Hudson::Build.new('test_job')
+  end
+  
+  def test_build_info
+    build = Hudson::Build.new('test_job')
+    assert_equal build.job.name, 'test_job'
+    
+    assert build.number.to_i > 0, "build number test failed"
+    
+    assert build.revisions, "build revisions test failed"
+    
+    assert_equal build.result, "SUCCESS", "build result test failed"
+    
+    assert_nil build.culprit, "build culprit test failed"
   end
   
 end

data/test/test_hudson_job.rb

@@ -54,4 +54,9 @@ class TestHudsonJob < Test::Unit::TestCase
     assert_equal(new_job.name, 'copy_of_test_job')
     assert new_job.delete
   end
-end
+
+  def test_url
+    job = Hudson::Job.get("test_job")
+    assert_equal(job.url, "http://localhost:8080/job/#{job.name}/")
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hudson-remote-api
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dru Ibarra
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 -07:00
-default_executable: 
+date: 2011-10-05 00:00:00 Z
 dependencies: []
 
 description: Connect to Hudson's remote web API
@@ -49,7 +48,6 @@ files:
 - test/test_hudson_job.rb
 - test/test_hudson_multicast.rb
 - test/test_hudson_remote_api.rb
-has_rdoc: true
 homepage: http://github.com/Druwerd/hudson-remote-api
 licenses: []
 
@@ -79,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hudson-remote-api
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Connect to Hudson's remote web API