hudson-remote-api 0.4.2 → 0.5.0

data/README

@@ -20,4 +20,9 @@ Hudson::Job.list_active
 
 # print the last build number of a job
 j = Hudson::Job.new('jobname')
-puts j.last_build
+puts j.last_build
+
+# if you are using hudson.plugins.git.GitSCM
+j.repository_url = { :url => 'https://github.com/beeplove/hudson-remote-api-mkhan.git', :branch => 'origin/master' }
+# or, only to change branch
+j.repository_url = { :branch => 'origin/master' }

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'rake/testtask'
 
 begin
   require 'jeweler'
@@ -17,12 +18,9 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
 end
 
-namespace :test do
-   desc "Run all tests"
-   task :all do
-      test_files = Dir.glob("test/*.rb")
-      test_files.each{|f| require f}
-   end
+Rake::TestTask.new do |t|
+ t.libs << 'test'
 end
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+desc "Run tests"
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/hudson-remote-api.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{hudson-remote-api}
-  s.version = "0.4.2"
+  s.name = "hudson-remote-api"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Dru Ibarra}]
-  s.date = %q{2012-03-02}
-  s.description = %q{Connect to Hudson's remote web API}
-  s.email = %q{Druwerd@gmail.com}
+  s.authors = ["Dru Ibarra"]
+  s.date = "2012-06-26"
+  s.description = "Connect to Hudson's remote web API"
+  s.email = "Druwerd@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README"
@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
     "test/test_hudson_job.rb",
     "test/test_hudson_multicast.rb"
   ]
-  s.homepage = %q{http://github.com/Druwerd/hudson-remote-api}
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{hudson-remote-api}
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Connect to Hudson's remote web API}
+  s.homepage = "http://github.com/Druwerd/hudson-remote-api"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "hudson-remote-api"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Connect to Hudson's remote web API"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

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

@@ -6,6 +6,24 @@ module Hudson
         attr_reader :color, :last_build, :last_completed_build, :last_failed_build, :last_stable_build, :last_successful_build, :last_unsuccessful_build, :next_build_number
         attr_reader :builds_list
         
+SVN_SCM_CONF = <<-SVN_SCM_STRING
+  <scm class="hudson.scm.SubversionSCM">
+  <locations>
+  <hudson.scm.SubversionSCM_-ModuleLocation>
+  <remote>%s</remote>
+  <local>.</local>
+  </hudson.scm.SubversionSCM_-ModuleLocation>
+  </locations>
+  <excludedRegions/>
+  <includedRegions/>
+  <excludedUsers/>
+  <excludedRevprop/>
+  <excludedCommitMessages/>
+  <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/>
+  </scm>
+SVN_SCM_STRING
+        
+        
         # List all Hudson jobs
         def self.list()
             xml = get_xml(@@hudson_xml_api_path)
@@ -44,7 +62,7 @@ module Hudson
         def initialize(name, config=nil)
             name.strip!
             Hudson::Job.fetch_crumb
-            if Job.list.include?(name)
+            if Job.list.include?(name) # job already in Jenkins
               @name = name
               load_xml_api
               load_config
@@ -71,24 +89,38 @@ module Hudson
         end
         
         # Load data from Hudson's Job configuration settings into class variables
-        def load_config()
+        def load_config
             @config = get_xml(@xml_api_config_path)
             @config_doc = REXML::Document.new(@config)
-            
-            @config_doc = REXML::Document.new(@config)
-            if !@config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].nil?
-                @repository_url = @config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].text || ""
-            end
+
             @repository_urls = []
-            if !@config_doc.elements["/project/scm/locations"].nil?
-                @config_doc.elements.each("/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation"){|e| @repository_urls << e.elements["remote"].text }
-            end
-            if !@config_doc.elements["/project/scm/browser/location"].nil?
-                @repository_browser_location = @config_doc.elements["/project/scm/browser/location"].text
-            end
-            if !@config_doc.elements["/project/description"].nil?
+            if @config_doc.elements["/project/description"]
                 @description = @config_doc.elements["/project/description"].text || ""
             end
+
+            if @config_doc.elements["/project/scm"].attributes['class'] == "hudson.plugins.git.GitSCM"
+                @git = true
+                @repository_url = {}
+                if @config_doc.elements["/project/scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url"]
+                    @repository_url[:url] = @config_doc.elements['/project/scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url'].text || ""
+                end
+                if @config_doc.elements['/project/scm/branches/hudson.plugins.git.BranchSpec/name']
+                    @repository_url[:branch] = @config_doc.elements['/project/scm/branches/hudson.plugins.git.BranchSpec/name'].text || ""
+                end
+                if @config_doc.elements['/project/scm/browser/url']
+                    @repository_browser_location = @config_doc.elements['/project/scm/browser/url'].text || ""
+                end
+            else
+                if !@config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].nil?
+                    @repository_url = @config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].text || ""
+                end
+                if !@config_doc.elements["/project/scm/locations"].nil?
+                    @config_doc.elements.each("/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation"){|e| @repository_urls << e.elements["remote"].text }
+                end
+                if !@config_doc.elements["/project/scm/browser/location"].nil?
+                    @repository_browser_location = @config_doc.elements["/project/scm/browser/location"].text
+                end
+            end
         end
         
         def load_info()
@@ -150,10 +182,27 @@ module Hudson
         
         # Set the repository url and update on Hudson server
         def repository_url=(repository_url)
-            return false if @repository_url.nil?
+            #return false if @repository_url.nil?
+
             @repository_url = repository_url
-            @config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].text = repository_url
+
+            if @git
+                if repository_url[:url]
+                    @config_doc.elements['/project/scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url'].text = repository_url[:url]
+                end
+                if repository_url[:branch]
+                    @config_doc.elements['/project/scm/branches/hudson.plugins.git.BranchSpec/name'].text = repository_url[:branch]
+                end
+            else
+                if @config_doc.elements["/project/scm"].attributes['class'] == "hudson.scm.NullSCM"
+                  @config_doc.elements["/project/scm"].replace_with REXML::Document.new(SVN_SCM_CONF % repository_url)
+                else
+                  @config_doc.elements["/project/scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote"].text = repository_url
+                end
+            end
+
             @config = @config_doc.to_s
+
             update
         end
         
@@ -174,7 +223,11 @@ module Hudson
         # Set the repository browser location and update on Hudson server
         def repository_browser_location=(repository_browser_location)
             @repository_browser_location = repository_browser_location
-            @config_doc.elements["/project/scm/browser/location"].text = repository_browser_location
+            if @git
+                @config_doc.elements['/project/scm/browser/url'].text = repository_browser_location
+            else
+                @config_doc.elements["/project/scm/browser/location"].text = repository_browser_location
+            end
             @config = @config_doc.to_s
             update
         end
@@ -182,6 +235,8 @@ module Hudson
         # Set the job description and update on Hudson server
         def description=(description)
             @description = description
+            @config_doc.elements["/project"] << REXML::Element.new("description") if @config_doc.elements["/project/description"].nil?
+            
             @config_doc.elements["/project/description"].text = description
             @config = @config_doc.to_s
             update

data/test/test_hudson_build.rb

@@ -11,14 +11,14 @@ class TestHudsonBuild < Test::Unit::TestCase
   
   def test_build_info
     build = Hudson::Build.new('test_job')
-    assert_equal build.job.name, 'test_job'
+    assert_equal 'test_job', build.job.name
     
     assert build.number.to_i > 0, "build number test failed"
     
     assert build.revisions, "build revisions test failed"
     assert build.revisions.kind_of?(Hash), "build revisions is not an Hash"
     
-    assert_equal build.result, "SUCCESS", "build result test failed"
+    assert_equal "SUCCESS", build.result, "build result test failed"
     
     assert_nil build.culprit, "build culprit test failed"
   end

data/test/test_hudson_job.rb

@@ -3,6 +3,7 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'hudson-remote-api.rb'
 
 class TestHudsonJob < Test::Unit::TestCase
+  TEST_SVN_REPO_URL = "http://svn.apache.org/repos/asf/subversion/trunk/doc/user/"
   
   def setup
     Hudson[:url] = "http://localhost:8080"
@@ -32,8 +33,17 @@ class TestHudsonJob < Test::Unit::TestCase
   
   def test_desc_update
     job = Hudson::Job.new('test_job')
-    assert job.description
     assert job.description = "test"
+    assert job.description != nil, "Job description should not be nil"
+  end
+  
+  def test_scm_url
+    job = Hudson::Job.new('test_svn_job')
+    job.build
+    assert job.repository_url = TEST_SVN_REPO_URL
+    
+    job = Hudson::Job.new('test_svn_job')
+    assert_equal TEST_SVN_REPO_URL, job.repository_url
   end
   
   def test_new

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hudson-remote-api
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Dru Ibarra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-02 00:00:00 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies: []
-
 description: Connect to Hudson's remote web API
 email: Druwerd@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
+files:
 - LICENSE
 - README
 - Rakefile
@@ -48,36 +39,26 @@ files:
 - test/test_hudson_multicast.rb
 homepage: http://github.com/Druwerd/hudson-remote-api
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hudson-remote-api
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Connect to Hudson's remote web API
 test_files: []
-