jenkins 0.6.4 → 0.6.5

data/.gitignore

@@ -3,4 +3,6 @@ tmp
 var
 *.rbc
 .bundle
-pkg/
+pkg/
+*.swp
+.rvmrc

data/README.md

@@ -58,7 +58,7 @@ To add Jobs/Projects (create a Job) on a Jenkins server:
 
     Usage: jenkins create PROJECT_PATH [options]
         --public-scm                     	  use public scm URL
-        --template [ruby]                	  template of job steps (available: rails,rails3,ruby,rubygem)
+        --template [ruby]                	  template of job steps (available: rails,rails3,ruby,rubygem,erlang)
         --assigned-node [ASSIGNED-NODE]  	  only use slave nodes with this label
         --override                       	  override if job exists
         --no-build                       	  create job without initial build

data/Rakefile

@@ -62,7 +62,7 @@ namespace :jenkins do
         logfile = File.expand_path("../var/jenkins/test.log", __FILE__)
         puts "Launching jenkins test server at http://localhost:#{port}..."
         puts "  output will be logged to #{logfile}"
-        `ruby bin/jenkins server --home #{File.dirname(plugin_dir)} --port #{port} --control #{control} --daemon --logfile #{logfile}`
+        `bundle exec bin/jenkins server --home #{File.dirname(plugin_dir)} --port #{port} --control #{control} --daemon --logfile #{logfile}`
       end
     end
 

data/bin/jenkins

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-$:.unshift(File.expand_path(File.dirname(File.dirname(__FILE__) + "/../lib/jenkins.rb")))
-require File.expand_path(File.dirname(__FILE__) + '/../lib/jenkins')
+require 'jenkins'
 require 'jenkins/cli'
 
 begin

data/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: --drb <%= std_opts %> features
+wip: --drb --tags @wip:3 --wip features
+rerun: --drb <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/features/build_details.feature

@@ -28,15 +28,15 @@ Feature: Show build details
     When I run local executable "jenkins" with arguments "build_details ruby 1 --host localhost --port 3010 --json"
     Then I should see
       """
-      "builtOn":"","result":"FAILURE","number":1,"keepLog":false,
+      "number":1
       """
     And I should see
       """
-      "actions":[{"causes":[{"userName":"anonymous","shortDescription":"Started by user anonymous"},{"userName":"anonymous","shortDescription":"Started by user anonymous"}]}],
+      "actions":[
       """
     And I should see
       """
-      "description":null,"changeSet":{"kind":null,"items":[]},"fullDisplayName":"ruby #1"
+      "changeSet":{
       """
   
   

data/features/configure.feature

@@ -0,0 +1,36 @@
+Feature: Configure host connection information
+
+  Scenario: Configure host connection information and check default host and reconfigure
+    Given I run local executable "jenkins" with arguments "configure --host localhost --port 3010"
+    When I run local executable "jenkins" with arguments "default_host"
+    Then I should see exactly
+      """
+      http://localhost:3010
+      """
+    Given I run local executable "jenkins" with arguments "configure --host localhost --port 3010 --ssl"
+    When I run local executable "jenkins" with arguments "default_host"
+    Then I should see exactly
+      """
+      https://localhost:3010
+      """
+
+  Scenario: Configure host connection authentication information and check auth_info and reconfigure
+    Given I run local executable "jenkins" with arguments "auth_info"
+    Then I should see exactly
+      """
+      """
+    When I run local executable "jenkins" with arguments "configure --username jenkins --password sniknej"
+      And I run local executable "jenkins" with arguments "auth_info"
+    Then I should see exactly
+      """
+      username: jenkins
+      password: sniknej
+      """
+    When I run local executable "jenkins" with arguments "configure --username jenkins1 --password 1sniknej"
+      And I run local executable "jenkins" with arguments "auth_info"
+    Then I should see exactly
+      """
+      username: jenkins1
+      password: 1sniknej
+      """
+

data/features/default_host.feature

@@ -1,19 +1,26 @@
 Feature: Display default host information
 
   Scenario: Display default host information if it is setup
-    Given I run local executable "jenkins" with arguments "list --host localhost --port 3010"
+    Given I run local executable "jenkins" with arguments "configure --host localhost --port 3010"
     When I run local executable "jenkins" with arguments "default_host"
     Then I should see exactly
       """
       http://localhost:3010
       """
 
+  Scenario: Display default secure host information if it is setup
+    Given I run local executable "jenkins" with arguments "configure --host localhost --port 3010 --ssl"
+    When I run local executable "jenkins" with arguments "default_host"
+    Then I should see exactly
+      """
+      https://localhost:3010
+      """
+
   Scenario: Display warning if never used Jenkins.rb before
     When I run local executable "jenkins" with arguments "default_host"
     Then I should see exactly
       """
       ERROR: Either use --host or add remote servers.
       """
-  
-  
-  
+
+

data/features/manage_jobs.feature

@@ -151,6 +151,12 @@ Feature: Create and manage jobs
     When I run local executable "jenkins" with arguments "create . --template rails3 --host localhost --port 3010"
     Then I should see "Added rails3 project 'rails-3' to Jenkins."
 
+  Scenario: Select 'erlang' project type (jenkins create --template erlang)
+    Given I am in the "erlang" project folder
+    And the project uses "git" scm
+    When I run local executable "jenkins" with arguments "create . --template erlang --host localhost --port 3010"
+    Then I should see "Added erlang project 'erlang' to Jenkins."
+
   Scenario: Create job without default steps (jenkins create --no-template)
     Given I am in the "non-bundler" project folder
     And the project uses "git" scm

data/fixtures/projects/erlang/rebar.config

@@ -0,0 +1 @@
+% important erlang business here

data/lib/jenkins/api.rb

@@ -13,18 +13,20 @@ module Jenkins
     headers 'content-type' => 'application/json'
     format :json
     # http_proxy 'localhost', '8888'
-    
+
     JobAlreadyExistsError = Class.new(Exception)
 
     def self.setup_base_url(options)
       options = options.with_clean_keys
       # Thor's HashWithIndifferentAccess is based on string keys which URI::HTTP.build ignores
       options = options.inject({}) { |mem, (key, val)| mem[key.to_sym] = val; mem }
+      options = setup_authentication(options)
       options[:host] ||= ENV['JENKINS_HOST']
       options[:port] ||= ENV['JENKINS_PORT']
       options[:port] &&= options[:port].to_i
       return false unless options[:host] || Jenkins::Config.config["base_uri"]
-      uri = options[:host] ? URI::HTTP.build(options) : Jenkins::Config.config["base_uri"]
+      uri_class = options.delete(:ssl) ? URI::HTTPS : URI::HTTP
+      uri = options[:host] ? uri_class.build(options) : Jenkins::Config.config["base_uri"]
       base_uri uri.to_s
       uri
     end
@@ -45,7 +47,7 @@ module Jenkins
           :body => job_config.to_xml, :format => :xml, :headers => { 'content-type' => 'application/xml' }
         }
         if res.code.to_i == 200
-          cache_base_uri
+          cache_configuration!
           true
         else
           require "hpricot"
@@ -66,13 +68,13 @@ module Jenkins
         raise JobAlreadyExistsError.new(name)
       end
     end
-    
+
     # Attempts to delete a job +name+
     def self.delete_job(name)
       res = post_plain "#{job_url name}/doDelete"
       res.code.to_i == 302
     end
-    
+
     def self.build_job(name)
       res = get_plain "/job/#{name}/build"
       res.code.to_i == 302
@@ -80,10 +82,10 @@ module Jenkins
 
     def self.summary
       json = get "/api/json"
-      cache_base_uri
+      cache_configuration!
       json
     end
-    
+
     def self.job_names
       summary["jobs"].map {|job| job["name"]}
     end
@@ -92,7 +94,7 @@ module Jenkins
     def self.job(name)
       begin
         json = get "/job/#{name}/api/json"
-        cache_base_uri
+        cache_configuration!
         json
       rescue Crack::ParseError
         false
@@ -103,7 +105,7 @@ module Jenkins
     def self.build_details(job_name, build_number)
       begin
         json = get "/job/#{job_name}/#{build_number}/api/json"
-        cache_base_uri
+        cache_configuration!
         json
       rescue Crack::ParseError
         false
@@ -112,7 +114,7 @@ module Jenkins
 
     def self.nodes
       json = get "/computer/api/json"
-      cache_base_uri
+      cache_configuration!
       json
     end
 
@@ -142,7 +144,7 @@ module Jenkins
         )
       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]
@@ -198,7 +200,7 @@ module Jenkins
         false
       end
     end
-    
+
     def self.delete_node(name)
       post_plain("#{base_uri}/computer/#{CGI::escape(name).gsub('+', '%20')}/doDelete/api/json")
     end
@@ -207,7 +209,7 @@ module Jenkins
     def self.post_plain(path, data = "", options = {})
       options = options.with_clean_keys
       uri = URI.parse base_uri
-      res = Net::HTTP.start(uri.host, uri.port) do |http| 
+      res = Net::HTTP.start(uri.host, uri.port) do |http|
         if RUBY_VERSION =~ /1.8/
           http.post(path, options)
         else
@@ -215,20 +217,32 @@ module Jenkins
         end
       end
     end
-    
+
     # Helper for GET that don't barf at Jenkins's crappy API responses
     def self.get_plain(path, options = {})
       options = options.with_clean_keys
       uri = URI.parse base_uri
       res = Net::HTTP.start(uri.host, uri.port) { |http| http.get(path, options) }
     end
-    
-    private
-    def self.cache_base_uri
+
+    def self.cache_configuration!
       Jenkins::Config.config["base_uri"] = base_uri
+      Jenkins::Config.config["basic_auth"] = default_options[:basic_auth]
       Jenkins::Config.store!
     end
-    
+
+    private
+    def self.setup_authentication(options)
+      username, password = options.delete(:username), options.delete(:password)
+      if username && password
+        basic_auth username, password
+      elsif Jenkins::Config.config["basic_auth"]
+        basic_auth Jenkins::Config.config["basic_auth"]["username"],
+                   Jenkins::Config.config["basic_auth"]["password"]
+      end
+      options
+    end
+
     def self.job_url(name)
       "#{base_uri}/job/#{name}"
     end

data/lib/jenkins/cli.rb

@@ -11,8 +11,11 @@ module Jenkins
     map "-v" => :version, "--version" => :version, "-h" => :help, "--help" => :help
 
     def self.common_options
-      method_option :host, :desc => 'connect to jenkins server on this host'
-      method_option :port, :desc => 'connect to jenkins server on this port'
+      method_option :host,     :desc => 'connect to jenkins server on this host'
+      method_option :port,     :desc => 'connect to jenkins server on this port'
+      method_option :ssl,      :desc => 'connect to jenkins server with ssl', :type => :boolean, :default => false
+      method_option :username, :desc => 'connect to jenkins server with username'
+      method_option :password, :desc => 'connect to jenkins server with password'
     end
 
     desc "server [options]", "run a jenkins server"
@@ -50,7 +53,7 @@ module Jenkins
         unless scm = Jenkins::ProjectScm.discover(options[:scm])
           error "Cannot determine project SCM. Currently supported: #{Jenkins::ProjectScm.supported}"
         end
-        unless (options[:template] == "none" || options[:"no-template"]) || File.exists?("Gemfile")
+        unless (options[:template] == "none" || options[:template] == "erlang" || options[:"no-template"]) || File.exists?("Gemfile")
           error "Ruby/Rails projects without a Gemfile are currently unsupported."
         end
         begin
@@ -86,7 +89,7 @@ module Jenkins
         end
       end
     end
-    
+
     desc "build [PROJECT_PATH]", "trigger build of this project's build job"
     common_options
     def build(project_path = ".")
@@ -100,7 +103,7 @@ module Jenkins
         end
       end
     end
-    
+
     desc "remove PROJECT_PATH", "remove this project's build job from Jenkins"
     common_options
     def remove(project_path)
@@ -114,7 +117,7 @@ module Jenkins
         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'
@@ -193,7 +196,7 @@ module Jenkins
         shell.say node["displayName"], color
       end
     end
-    
+
     desc "add_node SLAVE_HOST", "add a URI (user@host:port) server as a slave node"
     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 Jenkins to connect to slave node (default: deploy)'
@@ -211,7 +214,7 @@ module Jenkins
         error "Failed to add slave node #{slave_host}"
       end
     end
-    
+
     desc "default_host", "display current default host:port URI"
     def default_host
       if select_jenkins_server({})
@@ -221,6 +224,21 @@ module Jenkins
       end
     end
 
+    desc "configure", "configure host connection information"
+    common_options
+    def configure
+      Jenkins::Api.setup_base_url(options)
+      Jenkins::Api.cache_configuration!
+    end
+
+    desc "auth_info", "display authentication information"
+    def auth_info
+      if auth = Jenkins::Config.config['basic_auth']
+        shell.say "username: #{auth["username"]}"
+        shell.say "password: #{auth["password"]}"
+      end
+    end
+
     desc "help [command]", "show help for jenkins or for a specific command"
     def help(*args)
       super(*args)
@@ -265,7 +283,7 @@ USEAGE
       shell.say "ERROR: #{text}", :red
       exit
     end
-    
+
     def cmd
       ENV['CUCUMBER_RUNNING'] ? 'jenkins' : $0
     end

data/lib/jenkins/job_config_builder.rb

@@ -11,7 +11,7 @@ module Jenkins
     
     InvalidTemplate = Class.new(StandardError)
     
-    VALID_JOB_TEMPLATES = %w[none rails rails3 ruby rubygem]
+    VALID_JOB_TEMPLATES = %w[none rails rails3 ruby rubygem erlang]
     
     # +job_type+ - template of default steps to create with the job
     # +steps+ - array of [:method, cmd], e.g. [:build_shell_step, "bundle initial"]
@@ -216,6 +216,11 @@ module Jenkins
           [:build_shell_step, "bundle install"],
           [:build_shell_step, "bundle exec rake"]
         ]
+      when :erlang
+        [
+          [:build_shell_step, "rebar compile"],
+          [:build_shell_step, "rebar ct"]
+        ]
       else
         [ [:build_shell_step, 'echo "THERE ARE NO STEPS! Except this one..."'] ]
       end

data/lib/jenkins/version.rb

@@ -1,3 +1,3 @@
 module Jenkins
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

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

@@ -0,0 +1,59 @@
+<?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>
+    <localBranch/>
+    <mergeOptions/>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <clean>false</clean>
+    <wipeOutWorkspace>false</wipeOutWorkspace>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir/>
+    <excludedRegions/>
+    <excludedUsers/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>rebar compile</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>rebar ct</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/spec/job_config_builder_spec.rb

@@ -134,4 +134,17 @@ describe Jenkins::JobConfigBuilder do
       Hpricot.XML(@config.to_xml).search("buildWrappers").to_s.should == xml_bite.strip
     end
   end
+
+  describe "erlang job; single axis" do
+    before do
+      @config = Jenkins::JobConfigBuilder.new(:erlang) do |c|
+        c.scm = "git://codebasehq.com/mocra/misc/mocra-web.git"
+      end
+    end
+    it "builds config.xml" do
+      config_xml("erlang", "single").should == @config.to_xml
+    end
+  end
+  
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jenkins
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Charles Lowell
@@ -16,13 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-05-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +33,11 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +49,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,11 +65,11 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,11 +81,11 @@ dependencies:
         - 14
         - 2
         version: 0.14.2
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hpricot
   prerelease: false
-  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +95,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +111,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jenkins-war
   prerelease: false
-  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +126,11 @@ dependencies:
         - 1
         - 396
         version: "1.396"
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +142,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +158,11 @@ dependencies:
         - 10
         - 0
         version: 0.10.0
+  type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,11 +174,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: awesome_print
   prerelease: false
-  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,6 +188,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
   version_requirements: *id011
 description: A suite of utilities for bringing continous integration to your projects (not the other way around) with jenkins CI
 email: 
@@ -208,7 +208,9 @@ files:
 - README.md
 - Rakefile
 - bin/jenkins
+- cucumber.yml
 - features/build_details.feature
+- features/configure.feature
 - features/default_host.feature
 - features/development.feature
 - features/launch_server.feature
@@ -230,6 +232,7 @@ files:
 - fixtures/jenkins/greenballs.hpi
 - fixtures/jenkins/rake.hpi
 - fixtures/jenkins/ruby.hpi
+- fixtures/projects/erlang/rebar.config
 - fixtures/projects/non-bundler/Rakefile
 - fixtures/projects/rails-3/.gitignore
 - fixtures/projects/rails-3/Gemfile
@@ -292,6 +295,7 @@ files:
 - lib/jenkins/remote.rb
 - lib/jenkins/version.rb
 - spec/fixtures/ec2_global.config.xml
+- spec/fixtures/erlang.single.config.xml
 - spec/fixtures/rails.multi.config.xml
 - spec/fixtures/rails.single.config.triggers.xml
 - spec/fixtures/rails.single.config.xml
@@ -332,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jenkins
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Painless Continuous Integration with Jenkins Server