engineyard-jenkins 0.4.0 → 0.5.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    engineyard-jenkins (0.4.0)
+    engineyard-jenkins (0.5.0)
       engineyard (~> 1.3.17)
-      jenkins (~> 0.6.2)
+      jenkins (~> 0.6.4)
       thor (~> 0.14.6)
 
 GEM
@@ -39,10 +39,11 @@ GEM
     hpricot (0.8.4)
     httparty (0.6.1)
       crack (= 0.1.8)
-    jenkins (0.6.2)
-      builder (>= 2.1.2)
+    jenkins (0.6.4)
+      builder (~> 2.1.2)
       hpricot
       httparty (~> 0.6.1)
+      json_pure (>= 1.5.1)
       term-ansicolor (>= 1.0.4)
       thor (~> 0.14.2)
     json (1.4.6)

data/History.md

@@ -1,5 +1,12 @@
 # History
 
+## 0.5.0 - 2011-4-13
+
+Command 'install':
+
+* Can specify alternate host or use default from "jenkins" CLI
+* Pulls master public key via scp
+
 ## 0.4.0 - 2011-4-11
 
 * Rename to engineyard-jenkins

data/README.md

@@ -20,9 +20,9 @@ This will also install the `jenkins` CLI to interact with your Jenkins CI from t
 
 ## Hosting on Engine Yard AppCloud
 
-Using Engine Yard AppCloud "Quick Start" wizard, create an application with Git Repo `git://github.com/engineyard/jenkins_server.git` (options: rails 3, passenger), and add your own SSH keys. This will create an environment called `jenkins_server_production`. Boot the environment as a Single instance (or Custom cluster with a single instance). 
+Using Engine Yard AppCloud "Quick Start" wizard, create an application with Git Repo `git://github.com/engineyard/jenkins_holding_page.git` (options: rails 3, passenger), and add your own SSH keys. This will create an environment called `jenkins_server_production`. Boot the environment as a Single instance (or Custom cluster with a single instance). 
 
-Optionally, though it is quite pretty, deploy/ship the jenkins_server application and visit the HTTP link to see the remaining "Almost there..." instructions.
+Optionally, though it is quite pretty, deploy/ship the `jenkins_holding_page` application and visit the HTTP link to see the remaining "Almost there..." instructions.
 
 Finally, install Jenkins CI and rebuild the environment:
 

data/bin/ey-jenkins

@@ -4,4 +4,14 @@ $:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'engineyard-jenkins'
 require 'engineyard-jenkins/cli'
 
-Engineyard::Jenkins::CLI.start
+begin
+  Engineyard::Jenkins::CLI.start
+rescue EY::Error => e
+  EY.ui.print_exception(e)
+  exit(1)
+rescue Interrupt => e
+  puts
+  EY.ui.print_exception(e)
+  EY.ui.say("Quitting...")
+  exit(1)
+end

data/engineyard-jenkins.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "engineyard-jenkins"
-  s.version     = '0.4.0'
+  s.version     = '0.5.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Dr Nic Williams"]
   s.email       = ["drnicwilliams@gmail.com"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("thor", ["~> 0.14.6"])
   s.add_dependency("engineyard", ["~> 1.3.17"])
-  s.add_dependency("jenkins", ["~> 0.6.2"])
+  s.add_dependency("jenkins", ["~> 0.6.4"])
 
   s.add_development_dependency("rake", ["~> 0.8.7"])
   s.add_development_dependency("cucumber", ["~> 0.9.4"])

data/features/install.feature

@@ -1,13 +1,25 @@
 Feature: Managing a rails project as a Jenkins CI job on AppCloud
   I want to build/test my project in the same environment I run in Engine Yard AppCloud
+
+  Scenario: Fail to setup Jenkins slave if no default Jenkins server
+    Given I am in the "rails" project folder
+    When I run local executable "ey-jenkins" with arguments "install ."
+    Then I should see exactly
+      """
+      USAGE: ey-jenkins install . --host HOST --port PORT
+      
+      HOST:PORT default to current jenkins CLI host (set by 'jenkins list --host HOST')
+      """
   
   Scenario: Setup first project as a slave for Jenkins
     Given I am in the "rails" project folder
-    When I run local executable "ey-jenkins" with arguments "install ."
+    And I have public key "PUBLIC_KEY" on host "ci.mycompany.com"
+    When I run local executable "ey-jenkins" with arguments "install . --host ci.mycompany.com"
     Then file "cookbooks/jenkins_slave/attributes/default.rb" is created
     And file "cookbooks/jenkins_slave/recipes/default.rb" is created
     And file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/main/libraries/ruby_block.rb" is created
+    And file "cookbooks/jenkins_slave/attributes/default.rb" contains "ci.mycompany.com"
     And I should see exactly
       """
             create  cookbooks
@@ -29,12 +41,15 @@ Feature: Managing a rails project as a Jenkins CI job on AppCloud
   
   Scenario: Setup project with existing cookbooks as a slave for Jenkins
     Given I am in the "rails" project folder
+    And I set "ci.mycompany.com" as the default Jenkins server
+    And I have public key "PUBLIC_KEY" on host "ci.mycompany.com"
     And I already have cookbooks installed
     When I run local executable "ey-jenkins" with arguments "install ."
     Then file "cookbooks/jenkins_slave/attributes/default.rb" is created
     And file "cookbooks/jenkins_slave/recipes/default.rb" is created
     And file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/redis/recipes/default.rb" is created
+    And file "cookbooks/jenkins_slave/attributes/default.rb" contains "ci.mycompany.com"
     And I should see exactly
       """
             create  cookbooks/jenkins_slave/attributes/default.rb

data/features/install_server.feature

@@ -10,7 +10,7 @@ Feature: Managing ey jenkins server
     When I run local executable "ey-jenkins" with arguments "install_server . --account account_2 --environment giblets"
     Then file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/jenkins_master/recipes/default.rb" is created
-    And file "cookbooks/jenkins_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs envfile]"
+    And file "cookbooks/jenkins_master/attributes/default.rb" contains ":plugins => %w[git-1.1.6 github-0.4 rake-1.7.6 ruby-1.2 greenballs-1.10 envfile-1.1]"
     And I should see exactly
       """
             create  cookbooks
@@ -36,10 +36,10 @@ Feature: Managing ey jenkins server
   
   @wip
   Scenario: Install Jenkins CI server with additional Jenkins plugins
-    When I run local executable "ey-jenkins" with arguments "install_server . -p ' chucknorris , googleanalytics ' -c account_2 -e giblets"
+    When I run local executable "ey-jenkins" with arguments "install_server . -p ' chucknorris-1.2.3 , googleanalytics-1.2.3 ' -c account_2 -e giblets"
     Then file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/jenkins_master/recipes/default.rb" is created
-    And file "cookbooks/jenkins_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs envfile chucknorris googleanalytics]"
+    And file "cookbooks/jenkins_master/attributes/default.rb" contains ":plugins => %w[git-1.1.6 github-0.4 rake-1.7.6 ruby-1.2 greenballs-1.10 envfile-1.1 chucknorris-1.2.3 googleanalytics-1.2.3]"
 
   Scenario: Display example explicit calls if multiple accounts/options
     When I run local executable "ey-jenkins" with arguments "install_server . -e giblets"

data/features/step_definitions/jenkins_steps.rb

@@ -7,3 +7,15 @@ Given /^I want to fake out the boot sequence of Jenkins$/ do
   ])
 end
 
+Given /^I have public key "([^"]*)" on host "([^"]*)"$/ do |public_key_value, host|
+  mock_target = File.expand_path("../../../tmp/scp_mock", __FILE__)
+  File.open(mock_target, "w") { |file| file << public_key_value }
+end
+
+Given /^I set "([^"]*)" as the default Jenkins server$/ do |host|
+  require "jenkins"
+  require "jenkins/config"
+  Jenkins::Api.setup_base_url(:host => host, :port => 80)
+  Jenkins::Api.send(:cache_base_uri)
+end
+

data/features/support/env.rb

@@ -2,6 +2,8 @@ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
 require 'bundler/setup'
 require 'engineyard-jenkins'
 
+path = ENV['PATH']
+
 Before do
   @tmp_root      = File.dirname(__FILE__) + "/../../tmp"
   @active_project_folder = @tmp_root
@@ -11,4 +13,6 @@ Before do
   FileUtils.rm_rf   @tmp_root
   FileUtils.mkdir_p @home_path
   ENV['HOME'] = @home_path
+  fixture_bin_path = File.expand_path('../../../fixtures/bin', __FILE__)
+  ENV['PATH'] = fixture_bin_path + ":" + path
 end

data/fixtures/bin/README.md

@@ -0,0 +1,4 @@
+# Stubbed bin scripts
+
+If a bin/executable script is used by the CLI, a fake version is provided here during the test suites, as necessary.
+

data/fixtures/bin/scp

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "fileutils"
+
+mock_target = File.expand_path("../../../tmp/scp_mock", __FILE__)
+FileUtils.cp_r(mock_target, ARGV[-1])

data/lib/engineyard-jenkins/appcloud_env.rb

@@ -42,7 +42,9 @@ module Engineyard
       # Currently the engineyard gem has badly formed URLs in its same data
       # This method cleans app_master_hostname.compute-1.amazonaws.com -> app-master-hostname.compute-1.amazonaws.com
       def clean_host_name(environment)
-        environment.instances.first.public_hostname.gsub!(/_/,'-') if environment.instances.first
+        if environment.instances.first && environment.instances.first.public_hostname
+          environment.instances.first.public_hostname.gsub!(/_/,'-')
+        end
       end
     end
   end

data/lib/engineyard-jenkins/cli.rb

@@ -7,9 +7,23 @@ module Engineyard
     class CLI < Thor
 
       desc "install PROJECT_PATH", "Install Jenkins node/slave recipes into your project."
+      method_option :host, :aliases => ['-h'], :desc => "Override Jenkins CI server host"
+      method_option :port, :aliases => ['-p'], :desc => "Override Jenkins CI server port"
       def install(project_path)
-        require 'engineyard-jenkins/cli/install_generator'
-        Engineyard::Jenkins::InstallGenerator.start(ARGV.unshift(project_path))
+        host, port = host_port(options)
+        unless host && port
+          say "USAGE: ey-jenkins install . --host HOST --port PORT", :red
+          say ""
+          say "HOST:PORT default to current jenkins CLI host (set by 'jenkins list --host HOST')"
+        else
+          tmp_file   = File.join(Dir.tmpdir, "server_pub_key")
+          user       = "deploy"
+          `scp #{user}@#{host}:~/.ssh/id_rsa.pub #{tmp_file}` # stubbed in fixtures/bin/scp
+          public_key = File.read(tmp_file)
+        
+          require 'engineyard-jenkins/cli/install_generator'
+          Engineyard::Jenkins::InstallGenerator.start(ARGV.unshift(project_path, host, port, public_key))
+        end
       end
       
       desc "install_server [PROJECT_PATH]", "Install Jenkins CI into an AppCloud environment."
@@ -45,7 +59,7 @@ module Engineyard
           require 'engineyard/cli/recipes'
           environment.upload_recipes
           
-          if status == "running"
+          if status == "running" || status == "error"
             say "Environment is rebuilding..."
             environment.run_custom_recipes
             watch_page_while public_hostname, 80, "/" do |req|
@@ -96,6 +110,20 @@ module Engineyard
         exit
       end
       
+      # Returns the [host, port] for the target Jenkins CI server
+      def host_port(options)
+        require "jenkins"
+        require "jenkins/config"
+        if base_uri = ::Jenkins::Config.config['base_uri']
+          uri = URI.parse(::Jenkins::Config.config['base_uri'])
+          host = uri.host
+          port = uri.port
+        end
+        host = options["host"] if options["host"]
+        port = options["port"] || port || '80'
+        [host, port]
+      end
+      
       def no_environments_discovered
         say "No environments with name jenkins, jenkins_server, jenkins_production, jenkins_server_production.", :red
         say "Either:"

data/lib/engineyard-jenkins/cli/install_generator.rb

@@ -6,6 +6,9 @@ module Engineyard
       include Thor::Actions
       
       argument :project_path
+      argument :host
+      argument :port
+      argument :public_key
       
       def self.source_root
         File.join(File.dirname(__FILE__), "install_generator", "templates")

data/lib/engineyard-jenkins/cli/install_generator/templates/attributes.rb.tt

@@ -5,13 +5,12 @@
 
 jenkins_slave({
   :master => {
-    :host => "ec2-174-129-24-134.compute-1.amazonaws.com",
-    :port => 80,
-    :public_key => "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6AWDDDJcsIrY0KA99KPg+UmSjxjPz7+Eu9mO5GaSNn0vvVdsgrgjkh+35AS9k8Gn/DPaQJoNih+DpY5ZHsuY1zlvnvvk+hsCUHOATngARNs6yQMf2IrQqf38SlBPJ/xjt4oopLyqZuZ59xbFMFa0Yr/B7cCpxNpeIMCbwmc8YOtztOG1ZazlxB6eMTwp1V25TxFPh3PqUz9s37NmBEhkRiEyiJzlDSrKwz2y+77VWztQByM30lYAEXc5GwJD1LTaQwlv/thjhwveAzKLIpxzC5TbUjii7L+4iJF/JrjtXAEYmkegXj6lGBpRIdwXTYWMm3jG6gG+MV2nfWmocDzg3Q==",
+    :host => <%= host.inspect %>,
+    :port => <%= port %>,
+    :public_key => <%= public_key.strip.inspect %>,
     :master_key_location => "/home/deploy/.ssh/id_rsa"
   },
   :gem => {
-    :install => "jenkins --pre",
-    :version => "jenkins-0.3.0.beta.16"
+    :install => "jenkins"
   }
 })

data/lib/engineyard-jenkins/cli/install_generator/templates/recipes.rb

@@ -14,7 +14,7 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /(ci|jenk
 
   execute "install_jenkins_in_resin" do
     command "/usr/local/ey_resin/ruby/bin/gem install #{node[:jenkins_slave][:gem][:install]}"
-    not_if { FileTest.directory?("/usr/local/ey_resin/ruby/gems/1.8/gems/#{node[:jenkins_slave][:gem][:version]}") }
+    # not_if { FileTest.directory?("/usr/local/ey_resin/ruby/gems/1.8/gems/#{node[:jenkins_slave][:gem][:version]}") }
   end
   
   ruby_block "authorize_jenkins_master_key" do
@@ -49,7 +49,7 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /(ci|jenk
         :slave_host  => node[:engineyard][:environment][:instances].first[:public_hostname],
         :slave_user  => username,
         :executors   => [node[:applications].size, 1].max,
-        :label       => node[:applications].keys.join(" ")
+        :labels      => node[:applications].keys.join(" ")
       )
     end
     action :create
@@ -73,7 +73,8 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /(ci|jenk
             c.envfile       = "/data/#{app_name}/shared/config/git-env"
             c.steps         = [
               [:build_shell_step, "bundle install"],
-              [:build_ruby_step, <<-RUBY.gsub(/^            /, '')],
+              [:build_ruby_step, <<-RUBY.gsub(/^                /, '')],
+                require "fileutils"
                 appcloud_database = "/data/#{app_name}/shared/config/database.yml"
                 FileUtils.cp appcloud_database, "config/database.yml"
                 RUBY

data/lib/engineyard-jenkins/cli/install_server_generator.rb

@@ -16,7 +16,7 @@ module Engineyard
       end
       
       def attributes
-        @plugins = %w[git github rake ruby greenballs envfile] + (options[:plugins] || '').strip.split(/\s*,\s*/)
+        @plugins = %w[git-1.1.6 github-0.4 rake-1.7.6 ruby-1.2 greenballs-1.10 envfile-1.1] + (options[:plugins] || '').strip.split(/\s*,\s*/)
         template "attributes.rb.tt", "cookbooks/jenkins_master/attributes/default.rb"
       end
       

data/lib/engineyard-jenkins/cli/install_server_generator/templates/cookbooks/jenkins_master/recipes/default.rb

@@ -40,7 +40,7 @@ if ['solo'].include?(node[:instance_role])
   end
 
   remote_file "#{jenkins_home}/jenkins.war" do
-    source "http://jenkins-ci.org/latest/jenkins.war"
+    source "http://mirrors.jenkins-ci.org/war/latest/jenkins.war"
     owner jenkins_user
     group jenkins_user
     not_if { FileTest.exists?("#{jenkins_home}/jenkins.war") }
@@ -59,14 +59,16 @@ if ['solo'].include?(node[:instance_role])
     )
   end
 
-  plugins.each do |plugin|
-    remote_file "#{jenkins_home}/plugins/#{plugin}.hpi" do
-      source "http://jenkins-ci.org/latest/#{plugin}.hpi"
-      owner jenkins_user
-      group jenkins_user
-      not_if { FileTest.exists?("#{jenkins_home}/plugins/#{plugin}.hpi") }
+  plugins.each do |plugin_version| # 'git-1.2.3'
+    plugin, version = plugin_version.split(/-/)
+    if version
+      remote_file "#{jenkins_home}/plugins/#{plugin}.hpi" do
+        source "http://mirrors.jenkins-ci.org/plugins/#{plugin}/#{version}/#{plugin}.hpi"
+        owner jenkins_user
+        group jenkins_user
+        not_if { FileTest.exists?("#{jenkins_home}/plugins/#{plugin}.hpi") }
+      end
     end
-
   end
 
   template "/data/nginx/servers/jenkins_reverse_proxy.conf" do

data/lib/engineyard-jenkins/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Jenkins
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: engineyard-jenkins
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -173,6 +173,8 @@ files:
 - features/support/engineyard.rb
 - features/support/env.rb
 - features/support/matchers.rb
+- fixtures/bin/README.md
+- fixtures/bin/scp
 - fixtures/cookbooks/main/recipes/default.rb
 - fixtures/cookbooks/redis/recipes/default.rb
 - fixtures/jenkins_boot_sequence/jenkins_booting.html
@@ -219,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2707218013729594709
+      hash: -394096763024262056
       segments: 
       - 0
       version: "0"
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2707218013729594709
+      hash: -394096763024262056
       segments: 
       - 0
       version: "0"