engineyard-hudson 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    engineyard-hudson (0.3.0)
+    engineyard-hudson (0.3.1)
       engineyard (~> 1.3.4)
+      hudson (~> 0.5.0)
       ruby-debug
       thor (~> 0.14.6)
 
@@ -12,6 +13,7 @@ GEM
     awesome_print (0.2.1)
     builder (2.1.2)
     columnize (0.3.1)
+    crack (0.1.8)
     cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -35,6 +37,16 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     highline (1.6.1)
+    hpricot (0.8.2)
+    httparty (0.6.1)
+      crack (= 0.1.8)
+    hudson (0.5.0)
+      builder (~> 2.1.2)
+      hpricot
+      httparty (~> 0.6.1)
+      term-ansicolor (>= 1.0.4)
+      thor (~> 0.14.2)
+      yajl-ruby (>= 0.7.6)
     json (1.4.6)
     json_pure (1.4.6)
     linecache (0.43)
@@ -65,6 +77,7 @@ GEM
     term-ansicolor (1.0.5)
     thor (0.14.6)
     tilt (1.1)
+    yajl-ruby (0.7.8)
 
 PLATFORMS
   ruby
@@ -75,6 +88,7 @@ DEPENDENCIES
   engineyard (~> 1.3.4)
   engineyard-hudson!
   fakeweb (~> 1.3.0)
+  hudson (~> 0.5.0)
   json (~> 1.4.0)
   open4
   rake (~> 0.8.7)

data/History.md

@@ -1,5 +1,18 @@
 # History
 
+## 0.3.1 - 2010-12-1
+
+* install_server
+  * Updates the default host for `hudson` CLI to newly created server
+  * Explicitly set $HOME/$USER so Hudson/Java has access to .gitconfig
+
+## 0.3.0 - 2010-11-24
+
+* Renamed task 'server' => 'install_server'
+* install_server does the complete job of setup/installation of Hudson into an environment on AppCloud
+* install_server can take --environment/--account options OR auto-discover which environment to install Hudson into
+
+
 ## 0.2.0 - 2010-10-30
 
 * Initial 'server' task implementation

data/README.md

@@ -16,62 +16,42 @@ And here's some logos:
 
     gem install engineyard-hudson
 
-You might also like the `hudson` CLI to play with your Hudson CI from the command line:
+This will also install the `hudson` CLI to interact with your Hudson CI from the command line.
 
-    gem install hudson
+## Hosting on Engine Yard AppCloud
 
-## Assumptions
+Using Engine Yard AppCloud "Quick Start" wizard, create an application with Git Repo `git://github.com/engineyard/hudson_server.git`, and add your own SSH keys. This will create an environment called `hudson_server_production`. Boot the environment as a Single instance (or Custom cluster with a single instance). 
 
-It is assumed you are familiar with the [engineyard](http://github.com/engineyard/engineyard) CLI gem.
+Optionally, though it is quite pretty, deploy/ship the hudson_server application and visit the HTTP link to see the remaining "Almost there..." instructions.
 
-You **do not** need to be familiar with custom chef recipes. Just follow the simple commands. Easy peasy.
+Finally, install Hudson CI and rebuild the environment:
 
-## Warning (aka TODO list)
+    $ ey-hudson install_server
 
-In the very first release of `engineyard-hudson`:
+When this completes, visit the URL or refresh the "Almost there..." page to see your Hudson CI server.
 
-* There is no support for authentication/authorization of Hudson CI. It _will_ use the deploy keys already installed on your AppCloud instance, as described in engineyard-serverside [#set_up_git_ssh](http://github.com/engineyard/engineyard-serverside/blob/master/lib/engineyard-serverside/strategies/git.rb#L106-134)
-* No mail server configured for Hudson CI build failure notifications.
-
-## Hosting Hudson CI
-
-Hosting Hudson CI on Engine Yard AppCloud is optional; yet delightfully simple. Hudson CI can be hosted anywhere.
-
-### Hosting on Engine Yard AppCloud
-
-Using Engine Yard AppCloud "Quick Start" wizard, create an application with Git Repo `git://github.com/drnic/ci_demo_app.git` (any arbitrary rails/rack application), and add your own SSH keys. Name the environment `hudson` (or similar) and boot it as a Single instance (or Custom cluster with a single instance).
-
-Just a few steps and you will have your own Hudson CI:
-
-    $ mkdir hudson_server
-    $ cd hudson_server
-    $ ey-hudson server . --plugins 'googleanalytics,chucknorris'
-    $ ey recipes upload -e hudson
-    $ ey recipes apply -e hudson
+Using the `hudson list` CLI task you can also test there is a working server with no jobs:
 
 *For the Hudson slaves' configuration, you'll need:*
 
-The `hudson` instance public key:
-
-    $ ey ssh -e hudson
-    $ cat /home/deploy/.ssh/id_rsa.pub
-
-The `hudson` instance URI:
-
-    $ sudo ruby -rubygems -e "require 'json'; puts JSON.parse(File.read('/etc/chef/dna.json'))['engineyard']['environment']['instances'].first['public_hostname']"
+The `hudson_server_production` instance public key:
 
+    $ ey ssh -e hudson_server_production
+    # cat /home/deploy/.ssh/id_rsa.pub
 
 Do those steps, copy down the configuration and you're done! Now, you either visit your Hudson CI site or use `hudson list` to see the status of your projects being tested.
 
-### Hosting elsewhere
+## Hosting elsewhere
+
+Hosting Hudson CI on Engine Yard AppCloud is optional; yet delightfully simple. Hudson CI can be hosted anywhere.
 
-You need the following information about your Hudson CI:
+If you host your Hudson CI elsewhere then you need the following information about your Hudson CI environment to be able to add EngineYard AppCloud instances as Hudson nodes/slaves:
 
 * Hudson CI public host & port
 * Hudson CI's user's public key (probably at `/home/deploy/.ssh/id_rsa.pub`)
 * Hudson CI's user's private key path (probably `/home/deploy/.ssh/id_rsa`)
 
-## Running your tests in Hudson against Engine Yard AppCloud
+## Running your CI tests on Engine Yard AppCloud
 
 This is the exciting part - ensuring that your CI tests are being run in the same environment as your production applications. In this case, on Engine Yard AppCloud.
 
@@ -97,10 +77,10 @@ Boot your `ci_demo_app_ci` environment, visit your Hudson CI and WOW! jobs have
 
 At any time from the command line you can use `hudson list` to see the status of your jobs
 
-### Conventions/Requirements
+## Conventions/Requirements
 
 * Do not use your production environment as your Hudson CI slave. There are no guarantees what will happen. I expect bad things.
-* You must name your CI environment with a suffix of `_ci` or `_hudson_slave`.
+* You must name your CI environments with a suffix of `_ci` or `_hudson_slave`.
 * You should not name any other environments with a suffix of `_ci` or `_hudson_slave`; lest they offer themselves to your Hudson CI as slave nodes.
 * Keep your production and CI environments exactly the same. Use the same Ruby implementation/version, same database, and include the same RubyGems and Unix packages. Why? This is the entire point of the exercise: to run your CI tests in the same environment as your production application runs.
 
@@ -108,7 +88,7 @@ For example, note the naming convention of the two CI environments below (one en
 
 <img src="http://img.skitch.com/20101031-dxnk7hbn32yce9rum1ctwjwt1w.png" style="width: 100%">
 
-### What happens?
+## What happens?
 
 When you boot your Engine Yard AppCloud CI environments, each resulting EC2 instance executes a special "hudson_slave" recipe (see `cookbooks/hudson_slave/recipes/default.rb` in your project). This does three things:
 

data/bin/ey-hudson

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.dirname(__FILE__) + "/../lib")
+$:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'engineyard-hudson'
 require 'engineyard-hudson/cli'
 

data/engineyard-hudson.gemspec

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

data/features/{server.feature → install_server.feature}

@@ -28,9 +28,11 @@ Feature: Managing ey hudson server
       Environment is rebuilding...
       ..
       Hudson is starting...
-      
+      .
       Done! Hudson CI hosted at http://app-master-hostname.compute-1.amazonaws.com
       """
+    When I run executable "hudson" with arguments "default_host"
+    Then I should see "http://app-master-hostname.compute-1.amazonaws.com"
   
   @wip
   Scenario: Install Hudson CI server with additional Hudson plugins

data/lib/engineyard-hudson/cli.rb

@@ -9,69 +9,60 @@ module Engineyard
       desc "install PROJECT_PATH", "Install Hudson node/slave recipes into your project."
       def install(project_path)
         require 'engineyard-hudson/cli/install'
-        Engineyard::Hudson::Install.start(ARGV[1..-1])
+        Engineyard::Hudson::Install.start(project_path)
       end
       
       desc "install_server [PROJECT_PATH]", "Install Hudson CI into an AppCloud environment."
       method_option :verbose, :aliases     => ["-V"], :desc => "Display more output"
       method_option :environment, :aliases => ["-e"], :desc => "Environment in which to deploy this application", :type => :string
       method_option :account, :aliases     => ["-c"], :desc => "Name of the account you want to deploy in"
+      # Generates a chef recipe cookbook, uploads it to AppCloud, and waits until Hudson CI has launched
       def install_server(project_path=nil)
         environments = Engineyard::Hudson::AppcloudEnv.new.find_environments(options)
         if environments.size == 0
-          say "No environments with name hudson, hudson_server, hudson_production, hudson_server_production.", :red
-          say "Either:"
-          say "  * Create an AppCloud environment called hudson, hudson_server, hudson_production, hudson_server_production"
-          say "  * Use --environment/--account flags to select AppCloud environment"
-          return
+          no_environments_discovered and return
         elsif environments.size > 1
-          say "Multiple environments possible, please be more specific:", :red
-          say ""
-          environments.each do |env_name, account_name, environment|
-            say "  ey-hudson install_server --environment "; say "'#{env_name}' ", :yellow; 
-              say "--account "; say "'#{account_name}'", :yellow
-          end
-          return
+          too_many_environments_discovered(environments) and return
         end
         
         env_name, account_name, environment = environments.first
-        public_hostname, status = environment.instances.first.public_hostname, environment.instances.first.status if environment.instances.first
+        if environment.instances.first
+          public_hostname = environment.instances.first.public_hostname
+          status          = environment.instances.first.status
+        end
         
         temp_project_path = File.expand_path(project_path || File.join(Dir.tmpdir, "temp_hudson_server"))
         shell.say "Temp installation dir: #{temp_project_path}" if options[:verbose]
+        
         FileUtils.mkdir_p(temp_project_path)
         FileUtils.chdir(FileUtils.mkdir_p(temp_project_path)) do
+          # 'install_server' generator
           require 'engineyard-hudson/cli/install_server'
           Engineyard::Hudson::InstallServer.start(ARGV.unshift(temp_project_path))
 
-          require 'engineyard/cli/recipes'
           say ""
           say "Uploading to "; say "'#{env_name}' ", :yellow; say "environment on "; say "'#{account_name}' ", :yellow; say "account..."
+          require 'engineyard/cli/recipes'
           environment.upload_recipes
           
           if status == "running"
-            environment.run_custom_recipes
             say "Environment is rebuilding..."
-            waiting = true
-            while waiting
-              begin
-                Net::HTTP.start(public_hostname, 80) do |http|
-                  waiting = (body = http.get("/").body) !~ /Please wait while Hudson is getting ready to work/
-                end
-                sleep 1; print '.'; $stdout.flush
-              rescue SocketError => e
-                sleep 1; print 'x'; $stdout.flush
-              rescue Exception
-                sleep 1; print '.'; $stdout.flush
-              end
+            environment.run_custom_recipes
+            watch_page_while public_hostname, 80, "/" do |req|
+              req.body !~ /Please wait while Hudson is getting ready to work/
             end
+
             say ""
             say "Hudson is starting..."
-            Net::HTTP.start(public_hostname, 80) do |http|
-              while http.get("/").body =~ /Please wait while Hudson is getting ready to work/
-                sleep 1; print '.'; $stdout.flush
-              end
+            watch_page_while public_hostname, 80, "/" do |req|
+              req.body =~ /Please wait while Hudson is getting ready to work/
             end
+            
+            require 'hudson'
+            require 'hudson/config'
+            ::Hudson::Config.config["base_uri"] = public_hostname
+            ::Hudson::Config.store!
+            
             say ""
             say "Done! Hudson CI hosted at "; say "http://#{public_hostname}", :green
           else
@@ -104,6 +95,40 @@ module Engineyard
         shell.say "ERROR: #{text}", :red
         exit
       end
+      
+      def no_environments_discovered
+        say "No environments with name hudson, hudson_server, hudson_production, hudson_server_production.", :red
+        say "Either:"
+        say "  * Create an AppCloud environment called hudson, hudson_server, hudson_production, hudson_server_production"
+        say "  * Use --environment/--account flags to select AppCloud environment"
+      end
+      
+      def too_many_environments_discovered(environments)
+        say "Multiple environments possible, please be more specific:", :red
+        say ""
+        environments.each do |env_name, account_name, environment|
+          say "  ey-hudson install_server --environment "; say "'#{env_name}' ", :yellow; 
+            say "--account "; say "'#{account_name}'", :yellow
+        end
+      end
+      
+      def watch_page_while(host, port, path)
+        waiting = true
+        while waiting
+          begin
+            Net::HTTP.start(host, port) do |http|
+              req = http.get(path)
+              waiting = yield req
+            end
+            sleep 1; print '.'; $stdout.flush
+          rescue SocketError => e
+            sleep 1; print 'x'; $stdout.flush
+          rescue Exception => e
+            puts e.message
+            sleep 1; print '.'; $stdout.flush
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/engineyard-hudson/cli/install_server/templates/cookbooks/hudson_master/recipes/default.rb

@@ -57,7 +57,6 @@ if ['solo'].include?(node[:instance_role])
       :home => hudson_home,
       :pid  => hudson_pid
     )
-    not_if { FileTest.exists?("/etc/init.d/hudson") }
   end
 
   plugins.each do |plugin|
@@ -78,7 +77,6 @@ if ['solo'].include?(node[:instance_role])
     variables(
       :port => hudson_port
     )
-    not_if { FileTest.exists?("/data/nginx/servers/hudson_reverse_proxy.conf") }
   end
 
   execute "ensure-hudson-is-running" do

data/lib/engineyard-hudson/cli/install_server/templates/cookbooks/hudson_master/templates/default/init.sh.erb

@@ -3,15 +3,17 @@
 # Start/stop script for hudson
 
 PIDFILE=<%= @pid %>
-HUDSON_HOME=<%= @home %>
+HUDSON_HOME="<%= @home %>"
 COMMAND=/usr/bin/java
 ARGUMENTS="-Djava.io.tmpdir=${HUDSON_HOME}/tmp -jar ${HUDSON_HOME}/hudson.war --webroot=${HUDSON_HOME}/war --httpPort=<%= @port %> ajp13ListenAddress=127.0.0.1"
-RUN_AS=<%= @user %>
+RUN_AS="<%= @user %>"
 NAME=Hudson-CI
 
 start() {
   ebegin "Starting $NAME"
-  export HUDSON_HOME=${HUDSON_HOME}
+  export HUDSON_HOME="${HUDSON_HOME}"
+  export HOME="/home/${RUN_AS}"
+  export USER="${RUN_AS}"
   start-stop-daemon -b --start --make-pidfile --pidfile $PIDFILE --chuid $RUN_AS --exec $COMMAND -- $ARGUMENTS &>$HUDSON_HOME/logs/hudson_log
   eend $?
 }

data/lib/engineyard-hudson/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Hudson
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-hudson
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: hudson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +81,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +97,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +113,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,11 +129,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: awesome_print
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,11 +143,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: realweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,11 +159,11 @@ dependencies:
         - 6
         version: 0.1.6
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -157,11 +173,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,11 +187,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -187,11 +203,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -201,7 +217,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 description: Run your continuous integration (CI) tests against your Engine Yard AppCloud environments - the exact same configuration you are using in production!
 email: 
 - drnicwilliams@gmail.com
@@ -221,7 +237,7 @@ files:
 - bin/ey-hudson
 - engineyard-hudson.gemspec
 - features/install.feature
-- features/server.feature
+- features/install_server.feature
 - features/step_definitions/api_steps.rb
 - features/step_definitions/common_steps.rb
 - features/step_definitions/fixture_project_steps.rb
@@ -298,7 +314,7 @@ specification_version: 3
 summary: Easier to do CI than not to. Use Hudson CI with Engine Yard AppCloud.
 test_files: 
 - features/install.feature
-- features/server.feature
+- features/install_server.feature
 - features/step_definitions/api_steps.rb
 - features/step_definitions/common_steps.rb
 - features/step_definitions/fixture_project_steps.rb