hudson 0.3.0.beta.5 → 0.3.0.beta.6

data/README.md

@@ -53,12 +53,11 @@ To list Jobs/Projects on a Hudson server:
 To add Project (create a Job) on a Hudson server:
 
     Usage: hudson create [project_path] [options]
-        -n, --name [dir_name]            name of hudson job
         -p, --port [3001]                find hudson on specified port
             --host [localhost]           find hudson on specified host
         -h, --help
 
-For all commands, if flags for `host:port` are not provided, it will use `$HUDSON_HOST` and `$HUDSON_PORT` if available.
+For all commands, if flags for `host:port` are not provided, it will use either `$HUDSON_HOST` and `$HUDSON_PORT` or the previous target Hudson CI server.
 
 Developer Instructions
 ======================

data/features/{create_jobs.feature → manage_jobs.feature}

@@ -32,12 +32,24 @@ Feature: Create jobs
     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
+  Scenario: Recreate a 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."
   
+  Scenario: Remove a 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 run local executable "hudson" with arguments "remove . --host localhost --port 3010"
+    Then I should see "Removed project 'ruby' from Hudson."
+  
+  Scenario: Remove a job that doesn't exist gives error
+    Given I am in the "ruby" project folder
+    When I run local executable "hudson" with arguments "remove . --host localhost --port 3010"
+    Then I should see "ERROR: Failed to delete project 'ruby'."
+  
   
   

data/hudson.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.5"
+  s.version = "0.3.0.beta.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]
-  s.date = %q{2010-10-27}
+  s.date = %q{2010-10-28}
   s.default_executable = %q{hudson}
   s.description = %q{A suite of utilities for bringing continous integration to your projects (not the other way around) with hudson CI}
   s.email = ["cowboyd@thefrontside.net", "drnicwilliams@gmail.com"]
   s.executables = ["hudson"]
-  s.files = ["bin", "bin/hudson", "bin/hudson.compiled.rbc", "features", "features/adding_slave_nodes.feature", "features/create_jobs.feature", "features/development.feature", "features/fixtures", "features/fixtures/projects", "features/fixtures/projects/ruby", "features/fixtures/projects/ruby/Rakefile", "features/listing_jobs.feature", "features/managing_remote_servers.feature", "features/server.feature", "features/step_definitions", "features/step_definitions/common_steps.rb", "features/step_definitions/fixture_project_steps.rb", "features/step_definitions/hudson_steps.rb", "features/step_definitions/scm_steps.rb", "features/support", "features/support/common.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/matchers.rb", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/api.rbc", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/core_ext", "lib/hudson/core_ext/object", "lib/hudson/core_ext/object/blank.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "lib/hudson/plugins/git.hpi", "lib/hudson/plugins/github.hpi", "lib/hudson/plugins/greenballs.hpi", "lib/hudson/plugins/rake.hpi", "lib/hudson/plugins/ruby.hpi", "lib/hudson/project_scm.rb", "lib/hudson/remote.rb", "lib/hudson.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb"]
+  s.files = ["bin", "bin/hudson", "features", "features/development.feature", "features/fixtures", "features/fixtures/projects", "features/fixtures/projects/ruby", "features/fixtures/projects/ruby/Rakefile", "features/listing_jobs.feature", "features/manage_jobs.feature", "features/manage_remote_servers.feature", "features/manage_slave_nodes.feature", "features/server.feature", "features/step_definitions", "features/step_definitions/common_steps.rb", "features/step_definitions/fixture_project_steps.rb", "features/step_definitions/hudson_steps.rb", "features/step_definitions/scm_steps.rb", "features/support", "features/support/common.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/matchers.rb", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/core_ext", "lib/hudson/core_ext/object", "lib/hudson/core_ext/object/blank.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "lib/hudson/plugins/git.hpi", "lib/hudson/plugins/github.hpi", "lib/hudson/plugins/greenballs.hpi", "lib/hudson/plugins/rake.hpi", "lib/hudson/plugins/ruby.hpi", "lib/hudson/project_scm.rb", "lib/hudson/remote.rb", "lib/hudson.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.triggers.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/cowboyd/hudson.rb}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hudson}

data/lib/hudson.rb

@@ -1,5 +1,5 @@
 module Hudson
-  VERSION        = "0.3.0.beta.5"
+  VERSION        = "0.3.0.beta.6"
   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

@@ -43,6 +43,7 @@ module Hudson
         cache_base_uri
         true
       else
+        puts res.body
         if res.body =~ /A job already exists with the name/
           if options[:override]
             delete_job(name)
@@ -61,8 +62,9 @@ module Hudson
     
     # Attempts to delete a job +name+
     def self.delete_job(name)
-      post "/job/#{name}/doDelete/api/json"
-    rescue Crack::ParseError
+      uri = URI.parse base_uri
+      res = Net::HTTP.start(uri.host, uri.port) { |http| http.post("#{job_url name}/doDelete", {}) }
+      res.code.to_i == 302
     end
 
     def self.summary
@@ -154,5 +156,9 @@ module Hudson
       Hudson::Config.config["base_uri"] = base_uri
       Hudson::Config.store!
     end
+    
+    def self.job_url(name)
+      "#{base_uri}/job/#{name}"
+    end
   end
 end

data/lib/hudson/cli.rb

@@ -46,11 +46,10 @@ module Hudson
       exec(*cmd)
     end
 
-    desc "create [project_path] [options]", "create a continuous build for your project"
+    desc "create project_path [options]", "create a 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 = ".")
+    def create(project_path)
       select_hudson_server(options)
       FileUtils.chdir(project_path) do
         unless scm = Hudson::ProjectScm.discover
@@ -59,7 +58,7 @@ module Hudson
         job_config = Hudson::JobConfigBuilder.new(:rubygem) do |c|
           c.scm = scm.url
         end
-        name = options[:name] || File.basename(FileUtils.pwd)
+        name = File.basename(FileUtils.pwd)
         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."
@@ -69,6 +68,20 @@ module Hudson
         end
       end
     end
+    
+    desc "remove PROJECT_PATH", "remove this project's build job from Hudson"
+    common_options
+    def remove(project_path)
+      select_hudson_server(options)
+      FileUtils.chdir(project_path) do
+        name = File.basename(FileUtils.pwd)
+        if Hudson::Api.delete_job(name)
+          puts "Removed project '#{name}' from Hudson."
+        else
+          error "Failed to delete project '#{name}'."
+        end
+      end
+    end
 
     desc "list [options]", "list jobs on a hudson server"
     common_options

data/lib/hudson/job_config_builder.rb

@@ -27,10 +27,10 @@ module Hudson
         b.properties
         build_scm b
         b.assignedNode assigned_node if assigned_node
-        b.canRoam true
+        b.canRoam !assigned_node
         b.disabled false
         b.blockBuildWhenUpstreamBuilding false
-        build_triggers b
+        # build_triggers b
         b.concurrentBuild false
         build_axes b if matrix_project
         build_steps b

data/spec/fixtures/rails.multi.config.xml

@@ -36,12 +36,6 @@
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <hudson.triggers.SCMTrigger>
-      <spec># every minute
-* * * * *</spec>
-    </hudson.triggers.SCMTrigger>
-  </triggers>
   <concurrentBuild>false</concurrentBuild>
   <axes>
   </axes>

data/spec/fixtures/rails.single.config.triggers.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>1</configVersion>
+    <remoteRepositories>
+      <org.spearce.jgit.transport.RemoteConfig>
+        <string>origin</string>
+        <int>5</int>
+        <string>fetch</string>
+        <string>+refs/heads/*:refs/remotes/origin/*</string>
+        <string>receivepack</string>
+        <string>git-upload-pack</string>
+        <string>uploadpack</string>
+        <string>git-upload-pack</string>
+        <string>url</string>
+        <string>git@codebasehq.com:mocra/misc/mocra-web.git</string>
+        <string>tagopt</string>
+        <string/>
+      </org.spearce.jgit.transport.RemoteConfig>
+    </remoteRepositories>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <mergeOptions/>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <clean>false</clean>
+    <choosingStrategy>Default</choosingStrategy>
+    <submoduleCfg class="list"/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec># every minute
+* * * * *</spec>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.ruby.Ruby>
+      <command>
+unless File.exist?(&quot;config/database.yml&quot;)
+  require &apos;fileutils&apos;
+  example = Dir[&quot;config/database*&quot;].first
+  puts &quot;Using #{example} for config/database.yml&quot;
+  FileUtils.cp example, &quot;config/database.yml&quot;
+end
+      </command>
+    </hudson.plugins.ruby.Ruby>
+    <hudson.plugins.rake.Rake>
+      <rakeInstallation>(Default)</rakeInstallation>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
+      <tasks>db:schema:load</tasks>
+      <silent>false</silent>
+    </hudson.plugins.rake.Rake>
+    <hudson.plugins.rake.Rake>
+      <rakeInstallation>(Default)</rakeInstallation>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
+      <tasks>features</tasks>
+      <silent>false</silent>
+    </hudson.plugins.rake.Rake>
+    <hudson.plugins.rake.Rake>
+      <rakeInstallation>(Default)</rakeInstallation>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
+      <tasks>spec</tasks>
+      <silent>false</silent>
+    </hudson.plugins.rake.Rake>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/spec/fixtures/rails.single.config.xml

@@ -36,12 +36,6 @@
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <hudson.triggers.SCMTrigger>
-      <spec># every minute
-* * * * *</spec>
-    </hudson.triggers.SCMTrigger>
-  </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.plugins.ruby.Ruby>

data/spec/fixtures/rubygem.config.xml

@@ -36,12 +36,6 @@
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <hudson.triggers.SCMTrigger>
-      <spec># every minute
-* * * * *</spec>
-    </hudson.triggers.SCMTrigger>
-  </triggers>
   <concurrentBuild>false</concurrentBuild>
   <axes/>
   <builders>

data/spec/job_config_builder_spec.rb

@@ -37,6 +37,7 @@ describe Hudson::JobConfigBuilder do
     it "builds config.xml" do
       Hpricot.XML(@config.to_xml).search("assignedNode").size.should == 1
       Hpricot.XML(@config.to_xml).search("assignedNode").text.should == "my-slave"
+      Hpricot.XML(@config.to_xml).search("canRoam").text.should == "false"
     end
   end
   

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196377
+  hash: 62196383
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 5
-  version: 0.3.0.beta.5
+  - 6
+  version: 0.3.0.beta.6
 platform: ruby
 authors: 
 - Charles Lowell
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -07:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,13 +205,12 @@ extra_rdoc_files: []
 
 files: 
 - bin/hudson
-- bin/hudson.compiled.rbc
-- features/adding_slave_nodes.feature
-- features/create_jobs.feature
 - features/development.feature
 - features/fixtures/projects/ruby/Rakefile
 - features/listing_jobs.feature
-- features/managing_remote_servers.feature
+- features/manage_jobs.feature
+- features/manage_remote_servers.feature
+- features/manage_slave_nodes.feature
 - features/server.feature
 - features/step_definitions/common_steps.rb
 - features/step_definitions/fixture_project_steps.rb
@@ -225,7 +224,6 @@ files:
 - Gemfile.lock
 - hudson.gemspec
 - lib/hudson/api.rb
-- lib/hudson/api.rbc
 - lib/hudson/cli/formatting.rb
 - lib/hudson/cli.rb
 - lib/hudson/config.rb
@@ -245,6 +243,7 @@ files:
 - README.md
 - spec/fixtures/ec2_global.config.xml
 - spec/fixtures/rails.multi.config.xml
+- spec/fixtures/rails.single.config.triggers.xml
 - spec/fixtures/rails.single.config.xml
 - spec/fixtures/rubygem.config.xml
 - spec/fixtures/therubyracer.config.xml

data/bin/hudson.compiled.rbc

@@ -1,197 +0,0 @@
-!RBIX
-0
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-89
-5
-7
-0
-64
-47
-49
-1
-1
-15
-99
-43
-2
-7
-3
-49
-4
-1
-45
-5
-6
-45
-5
-7
-45
-5
-8
-65
-49
-9
-0
-49
-10
-1
-7
-11
-64
-81
-12
-49
-10
-1
-49
-13
-1
-49
-14
-1
-15
-5
-45
-5
-15
-65
-49
-9
-0
-49
-10
-1
-7
-16
-64
-81
-12
-47
-49
-1
-1
-15
-5
-7
-17
-64
-47
-49
-1
-1
-15
-45
-18
-19
-43
-20
-49
-21
-0
-15
-2
-11
-I
-5
-I
-0
-I
-0
-I
-0
-n
-p
-22
-s
-8
-rubygems
-x
-7
-require
-x
-7
-Globals
-x
-2
-$:
-x
-2
-[]
-x
-4
-File
-n
-n
-n
-x
-11
-active_path
-x
-7
-dirname
-s
-17
-/../lib/hudson.rb
-x
-1
-+
-x
-11
-expand_path
-x
-7
-unshift
-n
-s
-14
-/../lib/hudson
-s
-10
-hudson/cli
-x
-6
-Hudson
-n
-x
-3
-CLI
-x
-5
-start
-p
-11
-I
-0
-I
-2
-I
-9
-I
-3
-I
-30
-I
-4
-I
-45
-I
-5
-I
-4e
-I
-7
-I
-59
-x
-47
-/Users/drnic/Projects/gems/hudson.rb/bin/hudson
-p
-0