hudson 0.3.1 → 0.5.0

data/lib/hudson.rb

@@ -4,7 +4,7 @@ module Hudson
 end
 
 require 'hudson/version'
-require 'hudson/hudson_version'
 require 'hudson/api'
 require 'hudson/job_config_builder'
 require 'hudson/project_scm'
+require 'hudson/installation'

data/lib/hudson/api.rb

@@ -48,10 +48,17 @@ module Hudson
           cache_base_uri
           true
         else
-          # TODO - what are the errors we get?
-          puts "Server error:"
-          p res.code
-          puts res.body
+          require "hpricot"
+          doc = Hpricot(res.body)
+          error_msg = doc.search("td#main-panel p")
+          unless error_msg.inner_text.blank?
+            $stderr.puts error_msg.inner_text
+          else
+            # TODO - what are the errors we get?
+            puts "Server error:"
+            p res.code
+            puts res.body
+          end
           false
         end
       rescue REXML::ParseException => e
@@ -87,9 +94,7 @@ module Hudson
         json = get "/job/#{name}/api/json"
         cache_base_uri
         json
-      rescue Errno::ECONNREFUSED
-        false
-      rescue Errno::EAFNOSUPPORT
+      rescue Crack::ParseError
         false
       end
     end
@@ -98,30 +103,39 @@ module Hudson
       json = get "/computer/api/json"
       cache_base_uri
       json
-    rescue Errno::ECONNREFUSED => e
-      false
-    rescue Errno::EAFNOSUPPORT
-      false
     end
 
     # Adds SSH nodes only, for now
     def self.add_node(options = {})
       options = options.with_clean_keys
       default_options = Hash.new
-      default_options.merge!(
-        :slave_port  => 22,
-        :master_key  => "/home/deploy/.ssh/id_rsa", # FIXME - hardcoded master username assumption
-        :slave_fs    => "/data/hudson-slave/",
-        :description => "Automatically created by Hudson.rb",
-        :executors   => 2,
-        :exclusive   => true
-      )
-
+      if options[:vagrant]
+        default_options.merge!(
+          :slave_port  => 2222,
+          :slave_user  => 'vagrant',
+          :master_key  => "/Library/Ruby/Gems/1.8/gems/vagrant-0.6.7/keys/vagrant", # FIXME - hardcoded master username assumption
+          :slave_fs    => "/vagrant/tmp/hudson-slave/",
+          :description => "Automatically created by Hudson.rb",
+          :executors   => 2,
+          :exclusive   => true
+        )
+      else
+        default_options.merge!(
+          :slave_port  => 22,
+          :slave_user  => 'deploy',
+          :master_key  => "/home/deploy/.ssh/id_rsa", # FIXME - hardcoded master username assumption
+          :slave_fs    => "/data/hudson-slave/",
+          :description => "Automatically created by Hudson.rb",
+          :executors   => 2,
+          :exclusive   => true
+        )
+      end
+      options    = default_options.merge(options)
+      
       slave_host = options[:slave_host]
       name       = options[:name] || slave_host
+      labels     = options[:labels].split(/\s*,\s*/).join(' ') if options[:labels]
 
-      options    = default_options.merge(options)
-      
       type = "hudson.slaves.DumbSlave$DescriptorImpl"
 
       fields = {
@@ -133,7 +147,7 @@ module Hudson
           "nodeDescription"   => options[:description],
           "numExecutors"      => options[:executors],
           "remoteFS"          => options[:slave_fs],
-          "labelString"       => options[:label],
+          "labelString"       => labels,
           "mode"              => options[:exclusive] ? "EXCLUSIVE" : "NORMAL",
           "type"              => type,
           "retentionStrategy" => { "stapler-class"  => "hudson.slaves.RetentionStrategy$Always" },
@@ -158,7 +172,7 @@ module Hudson
       response = http.request(req)
       case response
       when Net::HTTPFound
-        true
+        { :name => name, :slave_host => slave_host }
       else
         # error message looks like:
         # <td id="main-panel">

data/lib/hudson/cli.rb

@@ -16,63 +16,61 @@ module Hudson
     end
 
     desc "server [options]", "run a hudson server"
-    method_option :home, :type => :string, :default => File.join(ENV['HOME'], ".hudson", "server"), :banner => "PATH", :desc => "use this directory to store server data"
-    method_option :port, :type => :numeric, :default => 3001, :desc => "run hudson server on this port", :aliases => "-p"
-    method_option :control, :type => :numeric, :default => 3002, :desc => "set the shutdown/control port", :aliases => "-c"
-    method_option :daemon, :type => :boolean, :default => false, :desc => "fork into background and run as a daemon"
-    method_option :kill, :type => :boolean, :desc => "send shutdown signal to control port", :aliases => "-k"
-    method_option :logfile, :type => :string, :banner => "PATH", :desc => "redirect log messages to this file"
+    method_option :home, :desc    => "use this directory to store server data", :type => :string, :default => File.join(ENV['HOME'], ".hudson", "server"), :banner => "PATH"
+    method_option :port, :desc    => "run hudson server on this port", :type => :numeric, :default => 3001, :aliases => "-p"
+    method_option :control, :desc => "set the shutdown/control port", :type => :numeric, :default => 3002, :aliases => "-c"
+    method_option :daemon, :desc  => "fork into background and run as a daemon", :type => :boolean, :default => false
+    method_option :kill, :desc    => "send shutdown signal to control port", :type => :boolean, :aliases => "-k"
+    method_option :logfile, :desc => "redirect log messages to this file", :type => :string, :banner => "PATH"
+    method_option :upgrade, :desc => "upgrade hudson server and plugins to latest version", :type => :boolean
     def server
+      installation = Hudson::Installation.new(shell, options)
       if options[:kill]
-        require 'socket'
-        TCPSocket.open("localhost", options[:control]) do |sock|
-          sock.write("0")
-        end
-        exit
+        installation.kill!
+        exit(0)
+      elsif options[:upgrade]
+        installation.upgrade!
+        exit(0)
+      else
+        installation.launch!
       end
-
-      serverhome = File.join(options[:home])
-      javatmp = File.join(serverhome, "javatmp")
-      FileUtils.mkdir_p serverhome
-      FileUtils.mkdir_p javatmp
-      FileUtils.cp_r Hudson::PLUGINS, serverhome
-      ENV['HUDSON_HOME'] = serverhome
-      cmd = ["java", "-Djava.io.tmpdir=#{javatmp}", "-jar", Hudson::WAR]
-      cmd << "--daemon" if options[:daemon]
-      cmd << "--logfile=#{File.expand_path(options[:logfile])}" if options[:logfile]
-      cmd << "--httpPort=#{options[:port]}"
-      cmd << "--controlPort=#{options[:control]}"
-      shell.say cmd.join(" ")
-      exec(*cmd)
     end
 
     desc "create project_path [options]", "create a build for your project"
     common_options
-    method_option :"no-build", :desc => "create job without initial build", :type => :boolean, :default => false
-    method_option :override, :desc => "override if job exists", :type => :boolean, :default => false
-    method_option :"public-scm", :desc => "use public scm URL", :type => :boolean, :default => false
-    method_option :"assigned-node", :desc => "only use slave nodes with this label"
-    method_option :template, :desc => "template of job steps (available: #{JobConfigBuilder::VALID_JOB_TEMPLATES.join ','})", :default => 'ruby'
+    method_option :rubies, :desc          => "run tests against multiple explicit rubies via RVM", :type => :string
+    method_option :"node-labels", :desc   => "run tests against multiple slave nodes by their label (comma separated)"
+    method_option :"assigned-node", :desc => "only use slave nodes with this label (similar to --node-labels)"
+    method_option :"no-build", :desc      => "create job without initial build", :type => :boolean, :default => false
+    method_option :override, :desc        => "override if job exists", :type => :boolean, :default => false
+    method_option :"scm", :desc           => "specific SCM URI", :type => :string
+    method_option :"scm-branches", :desc  => "list of branches to build from (comma separated)", :type => :string, :default => "master"
+    method_option :"public-scm", :desc    => "use public scm URL", :type => :boolean, :default => false
+    method_option :template, :desc        => "template of job steps (available: #{JobConfigBuilder::VALID_JOB_TEMPLATES.join ','})", :default => 'ruby'
+    method_option :"no-template", :desc   => "do not use a template of default steps; avoids Gemfile requirement", :type => :boolean, :default => false
     def create(project_path)
       select_hudson_server(options)
       FileUtils.chdir(project_path) do
-        unless scm = Hudson::ProjectScm.discover
+        unless scm = Hudson::ProjectScm.discover(options[:scm])
           error "Cannot determine project SCM. Currently supported: #{Hudson::ProjectScm.supported}"
         end
-        unless File.exists?("Gemfile")
+        unless (options[:template] == "none" || options[:"no-template"]) || File.exists?("Gemfile")
           error "Ruby/Rails projects without a Gemfile are currently unsupported."
         end
         begin
-          template = options[:template]
+          template = options[:"no-template"] ? 'none' : options[:template]
           job_config = Hudson::JobConfigBuilder.new(template) do |c|
-            c.scm = scm.url
+            c.rubies        = options[:rubies].split(/\s*,\s*/) if options[:rubies]
+            c.node_labels   = options[:"node-labels"].split(/\s*,\s*/) if options[:"node-labels"]
+            c.scm           = scm.url
+            c.scm_branches  = options[:"scm-branches"].split(/\s*,\s*/)
             c.assigned_node = options[:"assigned-node"] if options[:"assigned-node"]
-            c.public_scm = options[:"public-scm"]
+            c.public_scm    = options[:"public-scm"]
           end
           name = File.basename(FileUtils.pwd)
           if Hudson::Api.create_job(name, job_config, options)
             build_url = "#{@uri}/job/#{name.gsub(/\s/,'%20')}/build"
-            shell.say "Added #{template} project '#{name}' to Hudson.", :green
+            shell.say "Added#{' ' + template unless template == 'none'} project '#{name}' to Hudson.", :green
             unless options[:"no-build"]
               shell.say "Triggering initial build..."
               Hudson::Api.build_job(name)
@@ -120,6 +118,30 @@ module Hudson
         end
       end
     end
+    
+    desc "job NAME", "Display job details"
+    method_option :hash, :desc => 'Dump as formatted Ruby hash format'
+    method_option :json, :desc => 'Dump as JSON format'
+    method_option :yaml, :desc => 'Dump as YAML format'
+    common_options
+    def job(name)
+      select_hudson_server(options)
+      if job = Hudson::Api.job(name)
+        if options[:hash]
+          require "ap"
+          ap job.parsed_response
+        elsif options[:json]
+          puts job.parsed_response.to_json
+        elsif options[:yaml]
+          require "yaml"
+          puts job.parsed_response.to_yaml
+        else
+          error "Select an output format: --json, --xml, --yaml, --hash"
+        end
+      else
+        error "Cannot find project '#{name}'."
+      end
+    end
 
     desc "list [options]", "list jobs on a hudson server"
     common_options
@@ -129,11 +151,10 @@ module Hudson
       unless summary["jobs"].blank?
         shell.say "#{@uri}:", :bold
         summary["jobs"].each do |job|
-          color = job['color']
-          bold  = color =~ /anime/
-          color = 'red' if color == 'red_anime'
-          color = 'green' if color == 'blue' || color == 'blue_anime'
-          color = 'yellow' if color == 'grey' || color == 'disabled'
+          bold  = job['color'] =~ /anime/
+          color = 'red' if job['color'] =~ /red/
+          color = 'green' if job['color'] =~ /(blue|green)/
+          color ||= 'yellow' # if color =~ /grey/ || color == 'disabled'
           shell.say "* "; shell.say(shell.set_color(job['name'], color.to_sym, bold), nil, true)
         end
         shell.say ""
@@ -154,21 +175,31 @@ module Hudson
     end
     
     desc "add_node SLAVE_HOST", "add a URI (user@host:port) server as a slave node"
-    method_option :label, :desc => 'Labels for a job --assigned_node to match against to select a slave. Space separated list.'
-    method_option :"slave-user", :desc => 'SSH user for Hudson to connect to slave node', :default => "deploy"
-    method_option :"slave-port", :desc => 'SSH port for Hudson to connect to slave node', :default => 22
+    method_option :labels, :desc       => 'Labels for a job --assigned_node to match against to select a slave (comma separated)'
+    method_option :"slave-user", :desc => 'SSH user for Hudson to connect to slave node (default: deploy)'
+    method_option :"slave-port", :desc => 'SSH port for Hudson to connect to slave node (default: 22)'
     method_option :"master-key", :desc => 'Location of master public key or identity file'
-    method_option :"slave-fs", :desc => 'Location of file system on slave for Hudson to use'
-    method_option :name, :desc => 'Name of slave node (default SLAVE_HOST)'
+    method_option :"slave-fs", :desc   => 'Location of file system on slave for Hudson to use'
+    method_option :name, :desc         => 'Name of slave node (default SLAVE_HOST)'
+    method_option :vagrant, :desc      => 'Use settings for a Vagrant VM', :type => :boolean, :default => false
     common_options
     def add_node(slave_host)
       select_hudson_server(options)
-      if Hudson::Api.add_node({:slave_host => slave_host}.merge(options))
-        shell.say "Added slave node #{slave_host}", :green
+      if results = Hudson::Api.add_node({:slave_host => slave_host}.merge(options))
+        shell.say "Added slave node '#{results[:name]}' to #{results[:slave_host]}", :green
       else
         error "Failed to add slave node #{slave_host}"
       end
     end
+    
+    desc "default_host", "display current default host:port URI"
+    def default_host
+      if select_hudson_server({})
+        display Hudson::Api.base_uri
+      else
+        display "No default host yet. Use '--host host --port port' on your first request."
+      end
+    end
 
     desc "help [command]", "show help for hudson or for a specific command"
     def help(*args)
@@ -177,7 +208,7 @@ module Hudson
 
     desc "version", "show version information"
     def version
-      shell.say "#{Hudson::VERSION} (Hudson Server #{Hudson::HUDSON_VERSION})"
+      shell.say "#{Hudson::VERSION}"
     end
 
     def self.help(shell, *)
@@ -202,6 +233,7 @@ USEAGE
       unless @uri = Hudson::Api.setup_base_url(options)
         error "Either use --host or add remote servers."
       end
+      @uri
     end
 
     def display(text)

data/lib/hudson/installation.rb

@@ -0,0 +1,136 @@
+module Hudson
+  class Installation
+    attr_reader :directory
+
+    def initialize(shell, opts = {})
+      @shell = shell
+      @options = opts
+      @serverhome = File.expand_path(@options[:home])
+      @warfile = File.join(File.dirname(@serverhome), "hudson.war")
+      @versionfile = "#{@serverhome}/version.txt"
+      @control_port = opts[:control]
+    end
+
+    def launch!
+      unless warfile?
+        @shell.say "no server currently installed."
+        upgrade!
+      end
+      javatmp = File.join(@serverhome, "javatmp")
+      FileUtils.mkdir_p javatmp
+      ENV['HUDSON_HOME'] = @serverhome
+      cmd = ["java", "-Djava.io.tmpdir=#{javatmp}", "-jar", @warfile]
+      cmd << "--daemon" if @options[:daemon]
+      cmd << "--logfile=#{File.expand_path(@options[:logfile])}" if @options[:logfile]
+      cmd << "--httpPort=#{@options[:port]}"
+      cmd << "--controlPort=#{@control_port}"
+      @shell.say cmd.join(" ")
+      exec(*cmd)
+    end
+
+    def kill!
+      require 'socket'
+      TCPSocket.open("localhost", @control_port) do |sock|
+        sock.write("0")
+      end
+      exit
+    end
+
+    def upgrade!
+      FileUtils.mkdir_p @serverhome
+      hudson_stock ? upgrade_from_fixture_stock : upgrade_from_network_stock
+    end
+    
+    def hudson_stock
+      ENV['HUDSON_STOCK']
+    end
+
+    private
+
+    def warfile?
+      File.exists?(@warfile) && system("unzip -l #{@warfile} > /dev/null 2>/dev/null")
+    end
+    
+    def upgrade_from_fixture_stock
+      FileUtils.cp File.join(hudson_stock, "hudson.war"), @warfile
+      FileUtils.cp_r File.join(hudson_stock, "plugins"), @serverhome
+    end
+
+    def upgrade_from_network_stock
+      require 'ostruct'
+      progress = Progress.new
+      latest = progress.means "grabbing the latest metadata from hudson-ci.org" do |step|
+        JSON.parse(HTTParty.get("http://hudson-ci.org/update-center.json").lines.to_a[1..-2].join("\n"))
+      end
+      progress.means "downloading hudson server" do |step|
+        latest_version = latest["core"]["version"]
+        if latest_version > current_server_version
+          puts
+          `curl -L --progress-bar #{latest["core"]["url"]} -o #{@warfile}`
+          self.current_server_version = latest_version
+          step.ok("#{current_server_version} -> #{latest_version}")
+        else
+          step.ok("Up-to-date at #{current_server_version}")
+        end
+      end
+      
+      plugins_dir = File.join(@serverhome, 'plugins')
+      plugins = if File.exists?(plugins_dir)
+        Dir.chdir(plugins_dir) do
+          Dir['*.hpi'].map {|entry| File.basename(entry,".hpi")}
+        end
+      else
+        %w(envfile git github greenballs rake ruby)
+      end
+      FileUtils.mkdir_p(plugins_dir)
+      for plugin in plugins do
+        metadata = OpenStruct.new(latest['plugins'][plugin])
+        progress.means "downloading #{plugin} plugin" do |step|
+          system("curl -L --silent #{metadata.url} > #{plugins_dir}/#{plugin}.hpi")
+          step.ok(metadata.version)
+        end
+      end unless progress.aborted
+    end
+
+    def current_server_version
+      File.exists?(@versionfile) ? File.read(@versionfile) : "0"
+    end
+    
+    def current_server_version=(version)
+      File.open(@versionfile, "w") do |f|
+        f.write(version)
+      end
+    end
+
+    class Progress
+      attr_reader :aborted
+      def initialize
+        @shell = Thor::Shell::Color.new
+        @aborted = false
+      end
+
+      def means(step)
+        return if @aborted
+        begin
+          @shell.say(step + "... ")
+          yield(self).tap do
+            @shell.say("[OK]", :green)
+          end
+        rescue Ok => ok
+          @shell.say("[OK#{ok.message ? " - #{ok.message}" : ''}]", :green)
+        rescue StandardError => e
+          @shell.say("[FAIL - #{e.message}]", :red)
+          @aborted = true
+          false
+        end
+      end
+
+      def ok(msg = nil)
+        raise Ok.new(msg)
+      end
+      
+      class Ok < StandardError
+      end
+    end
+  end
+end

data/lib/hudson/job_config_builder.rb

@@ -2,29 +2,31 @@ require "builder"
 
 module Hudson
   class JobConfigBuilder
-    attr_accessor :job_type, :matrix_project
-    attr_accessor :steps
+    attr_accessor :job_type
+    attr_accessor :steps, :rubies
+    attr_accessor :scm, :public_scm, :scm_branches
     attr_accessor :scm, :public_scm, :git_branches
-    attr_accessor :assigned_node
+    attr_accessor :assigned_node, :node_labels # TODO just one of these
     attr_accessor :envfile
     
     InvalidTemplate = Class.new(StandardError)
     
-    VALID_JOB_TEMPLATES = %w[rails rails3 ruby rubygem]
+    VALID_JOB_TEMPLATES = %w[none rails rails3 ruby rubygem]
     
     # +job_type+ - template of default steps to create with the job
     # +steps+ - array of [:method, cmd], e.g. [:build_shell_step, "bundle initial"]
     #   - Default is based on +job_type+.
     # +scm+           - URL to the repository. Currently only support git URLs.
     # +public_scm+    - convert the +scm+ URL to a publicly accessible URL for the Hudson job config.
-    # +git_branches+  - array of branches to run builds. Default: ['master']
+    # +scm_branches+  - array of branches to run builds. Default: ['master']
+    # +rubies+        - list of RVM rubies to run tests (via Hudson Axes).
     # +assigned_node+ - restrict this job to running on slaves with these labels (space separated)
     def initialize(job_type = :ruby, &block)
       self.job_type = job_type.to_s if job_type
       
       yield self
 
-      self.git_branches ||= ["master"]
+      self.scm_branches ||= ["master"]
       raise InvalidTemplate unless VALID_JOB_TEMPLATES.include?(job_type.to_s)
     end
   
@@ -41,7 +43,7 @@ module Hudson
         b.canRoam !assigned_node
         b.disabled false
         b.blockBuildWhenUpstreamBuilding false
-        # build_triggers b
+        b.triggers :class => "vector"
         b.concurrentBuild false
         build_axes b if matrix_project?
         build_steps b
@@ -57,11 +59,6 @@ module Hudson
   
     protected
     
-    def matrix_project?
-      matrix_project ||
-        %w[rubygem].include?(job_type)
-    end
-  
     # <scm class="hudson.plugins.git.GitSCM"> ... </scm>
     def build_scm(b)
       if scm && scm =~ /git/
@@ -85,9 +82,9 @@ module Hudson
             end
           end
         
-          if git_branches
+          if scm_branches
             b.branches do
-              git_branches.each do |branch|
+              scm_branches.each do |branch|
                 b.tag! "hudson.plugins.git.BranchSpec" do
                   b.name branch
                 end
@@ -112,9 +109,49 @@ module Hudson
       end
     end
 
-    # TODO
+    def matrix_project?
+      !(rubies.blank? && node_labels.blank?)
+    end
+  
+    # <hudson.matrix.TextAxis>
+    #   <name>RUBY_VERSION</name>
+    #   <values>
+    #     <string>1.8.7</string>
+    #     <string>1.9.2</string>
+    #     <string>rbx-head</string>
+    #     <string>jruby</string>
+    #   </values>
+    # </hudson.matrix.TextAxis>
+    # <hudson.matrix.LabelAxis>
+    #   <name>label</name>
+    #   <values>
+    #     <string>1.8.7</string>
+    #     <string>ubuntu</string>
+    #   </values>
+    # </hudson.matrix.LabelAxis>
     def build_axes(b)
-      b.axes
+      b.axes do
+        unless rubies.blank?
+          b.tag! "hudson.matrix.TextAxis" do
+            b.name "RUBY_VERSION"
+            b.values do
+              rubies.each do |rvm_name|
+                b.string rvm_name
+              end
+            end
+          end
+        end
+        unless node_labels.blank?
+          b.tag! "hudson.matrix.LabelAxis" do
+            b.name "label"
+            b.values do
+              node_labels.each do |label|
+                b.string label
+              end
+            end
+          end
+        end
+      end
     end
     
     # Example:
@@ -152,7 +189,7 @@ module Hudson
     end
     
     def default_steps(job_type)
-      case job_type.to_sym
+      steps = case job_type.to_sym
       when :rails, :rails3
         [
           [:build_shell_step, "bundle install"],
@@ -174,20 +211,30 @@ module Hudson
             RUBY
           [:build_shell_step, "bundle exec rake"]
         ]
-      else
+      when :ruby, :rubygems
         [
           [:build_shell_step, "bundle install"],
           [:build_shell_step, "bundle exec rake"]
         ]
+      else
+        [ [:build_shell_step, 'echo "THERE ARE NO STEPS! Except this one..."'] ]
       end
+      rubies.blank? ? steps : default_rvm_steps + steps
     end
-  
+    
+    def default_rvm_steps
+      [
+        [:build_shell_step, "rvm $RUBY_VERSION"],
+        [:build_shell_step, "rvm gemset create ruby-$RUBY_VERSION && rvm gemset use ruby-$RUBY_VERSION"]
+      ]
+    end
+    
     # <hudson.tasks.Shell>
-    #   <command>bundle install</command>
+    #   <command>echo &apos;THERE ARE NO STEPS! Except this one...&apos;</command>
     # </hudson.tasks.Shell>
     def build_shell_step(b, command)
       b.tag! "hudson.tasks.Shell" do
-        b.command command.to_xs.gsub(%r{"}, '&quot;').gsub(%r{'}, '&apos;')
+        b.command command.to_xs.gsub("&amp;", '&') #.gsub(%r{"}, '&quot;').gsub(%r{'}, '&apos;')
       end
     end