hudson 0.3.0.beta.4 → 0.3.0.beta.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hudson (0.3.0.beta.3)
+    hudson (0.3.0.beta.5)
       builder (~> 2.1.2)
       hpricot
       httparty (~> 0.5.2)
@@ -56,7 +56,7 @@ DEPENDENCIES
   hudson!
   json (~> 1.4.0)
   rake (~> 0.8.7)
-  rspec (~> 2.0.0.beta)
+  rspec (~> 2.0.0)
   term-ansicolor (>= 1.0.4)
   thor (= 0.14.2)
   yajl-ruby (>= 0.7.6)

data/features/create_jobs.feature

@@ -31,3 +31,13 @@ Feature: Create jobs
     Given I am in the "ruby" project folder
     When I run local executable "hudson" with arguments "create . --host localhost --port 3010"
     Then I should see "Cannot determine project SCM. Currently supported:"
+
+  Scenario: Recreate job
+    Given I am in the "ruby" project folder
+    When I create a job
+    Then I should see "Added project 'ruby' to Hudson."
+    When I recreate a job
+    Then I should see "Added project 'ruby' to Hudson."
+  
+  
+  

data/features/step_definitions/hudson_steps.rb

@@ -89,3 +89,13 @@ Then /^I should see a hudson server on port (\d+)$/ do |port|
   end
 end
 
+When /^I (re|)create a job$/ do |override|
+  override = override.blank? ? "" : " --override"
+  steps <<-CUCUMBER
+    When the project uses "git" scm
+    When I run local executable "hudson" with arguments "create . --host localhost --port 3010#{override}"
+  CUCUMBER
+end
+
+
+

data/features/step_definitions/scm_steps.rb

@@ -1,10 +1,12 @@
 Given /^the project uses "git" scm$/ do
   repo = "git://some.host/drnic/ruby.git"
   in_project_folder do
-    %x[ git init ]
-    %x[ git add . ]
-    %x[ git commit -m "initial commit" ]
-    %x[ git remote add origin #{repo} ]
+    unless File.exist?(".git")
+      %x[ git init ]
+      %x[ git add . ]
+      %x[ git commit -m "initial commit" ]
+      %x[ git remote add origin #{repo} ]
+    end
   end
 end
 

data/hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.4"
+  s.version = "0.3.0.beta.5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]

data/lib/hudson.rb

@@ -1,5 +1,5 @@
 module Hudson
-  VERSION        = "0.3.0.beta.4"
+  VERSION        = "0.3.0.beta.5"
   HUDSON_VERSION = "1.380"
   WAR            = File.expand_path(File.dirname(__FILE__) + "/hudson/hudson.war")
   PLUGINS        = File.expand_path(File.dirname(__FILE__) + "/hudson/plugins")

data/lib/hudson/api.rb

@@ -12,6 +12,8 @@ module Hudson
     headers 'content-type' => 'application/json'
     format :json
     # http_proxy 'localhost', '8888'
+    
+    JobAlreadyExistsError = Class.new(Exception)
 
     def self.setup_base_url(options)
       # Thor's HashWithIndifferentAccess is based on string keys which URI::HTTP.build ignores
@@ -26,7 +28,14 @@ module Hudson
     end
 
     # returns true if successfully create a new job on Hudson
-    def self.create_job(name, job_config)
+    # +job_config+ is a Hudson::JobConfigBuilder instance
+    # +options+ are:
+    #   :override - true, will delete any existing job with same name, else error
+    #
+    # returns true if successful, else false
+    #
+    # TODO Exceptions?
+    def self.create_job(name, job_config, options = {})
       res = post "/createItem/api/xml?name=#{CGI.escape(name)}", {
         :body => job_config.to_xml, :format => :xml, :headers => { 'content-type' => 'application/xml' }
       }
@@ -34,12 +43,27 @@ module Hudson
         cache_base_uri
         true
       else
-        require "hpricot"
-        puts "Server error:"
-        puts Hpricot(res.body).search("//body").text
+        if res.body =~ /A job already exists with the name/
+          if options[:override]
+            delete_job(name)
+            return create_job(name, job_config)
+          else
+            raise JobAlreadyExistsError.new(name)
+          end
+        else
+          require "hpricot"
+          puts "Server error:"
+          puts Hpricot(res.body).search("//body").text
+        end
         false
       end
     end
+    
+    # Attempts to delete a job +name+
+    def self.delete_job(name)
+      post "/job/#{name}/doDelete/api/json"
+    rescue Crack::ParseError
+    end
 
     def self.summary
       begin

data/lib/hudson/cli.rb

@@ -49,6 +49,7 @@ module Hudson
     desc "create [project_path] [options]", "create a continuous build for your project"
     common_options
     method_option :name, :banner => "dir_name", :desc => "name of the build"
+    method_option :override, :desc => "override if job exists", :type => :boolean, :default => false
     def create(project_path = ".")
       select_hudson_server(options)
       FileUtils.chdir(project_path) do
@@ -59,7 +60,7 @@ module Hudson
           c.scm = scm.url
         end
         name = options[:name] || File.basename(FileUtils.pwd)
-        if Hudson::Api.create_job(name, job_config)
+        if Hudson::Api.create_job(name, job_config, {:override => options[:override]})
           build_url = "#{@uri}/job/#{name.gsub(/\s/,'%20')}/build"
           puts "Added project '#{name}' to Hudson."
           puts "Trigger builds via: #{build_url}"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196379
+  hash: 62196377
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 4
-  version: 0.3.0.beta.4
+  - 5
+  version: 0.3.0.beta.5
 platform: ruby
 authors: 
 - Charles Lowell