lobot 0.9.7 → 0.10.0

data/lib/generators/lobot/templates/ci_build.sh

@@ -11,9 +11,12 @@ echo USER=$USER && ruby --version && which ruby && which bundle
 # conditionally install project gems from Gemfile
 bundle check || bundle install || exit 1
 
+test -e config/database.yml || (test -e config/database.yml.example && cp config/database.yml.example config/database.yml)
+test -e config/database.yml || (test -e config/database.example.yml && cp config/database.example.yml config/database.yml)
+
 RAILS_ENV=development rake db:version > /dev/null || rake db:create
 RAILS_ENV=test rake db:version  > /dev/null || rake db:create
 
 RAILS_ENV=development rake db:migrate test:prepare
 
-rake ci:headlessly['rake spec'] && rake ci:headlessly['rake jasmine:ci']
+rake ci:headlessly['rake spec'] --trace && rake ci:headlessly['rake jasmine:ci'] --trace

data/lib/generators/lobot/templates/deploy-ci.rb

@@ -1,5 +1,7 @@
 require 'yaml'
 aws_conf_location = File.expand_path('../../ci.yml', __FILE__)
-ci_server = YAML.load_file(aws_conf_location)["server"]['elastic_ip']
+server_config = YAML.load_file(aws_conf_location)["server"]
+ci_server = server_config['elastic_ip']
+ssh_port = server_config['ssh_port'] || 22
 
-role :ci, ci_server
+role :ci, "#{ci_server}:#{ssh_port}"

data/lib/generators/lobot/templates/dot-gitignore

@@ -0,0 +1 @@
+config/ci.yml

data/lib/generators/lobot/templates/soloistrc

@@ -10,4 +10,4 @@ env_variable_switches:
     recipes: []
   APP_DIR:
     cookbook_paths: []
-    recipes: []
+    recipes: []

data/lib/lobot.rb

@@ -11,4 +11,4 @@ module Lobot
   end
 end
 
-require File.expand_path(File.join('lobot', "railtie"), File.dirname(__FILE__)) if Lobot.rails3?
+require File.expand_path(File.join('lobot', "railtie"), File.dirname(__FILE__)) if Lobot.rails3?

data/lib/lobot/railtie.rb

@@ -17,4 +17,4 @@ module Lobot
       load "lobot/tasks/ci.rake"
     end
   end
-end
+end

data/lib/lobot/tasks/ci.rake

@@ -40,17 +40,18 @@ namespace :ci do
     end
 
     ec2_key_pair_name = ec2_server_access['key_pair_name'] || "ci"
-    public_key_local_path = "#{ec2_server_access['id_rsa_path']}.pub"
+    public_key_local_path = File.expand_path("#{ec2_server_access['id_rsa_path']}.pub")
 
     current_key_pair = aws_connection.key_pairs.get(ec2_key_pair_name)
     if current_key_pair
       puts "Using existing '#{ec2_key_pair_name}' keypair"
     else
+      raise "Unable to upload keypair, missing #{public_key_local_path}!" unless File.exist?(public_key_local_path)
       puts "Creating '#{ec2_key_pair_name}' keypair, uploading #{public_key_local_path} to aws"
 
       aws_connection.key_pairs.new(
         :name => ec2_key_pair_name,
-        :public_key => File.read(File.expand_path("#{public_key_local_path}"))
+        :public_key => File.read("#{public_key_local_path}")
       ).save
     end
 
@@ -76,23 +77,25 @@ namespace :ci do
     aws_connection.associate_address(server.id, aws_conf['server']['elastic_ip'])
 
     socket = false
-    Timeout::timeout(120) do
-      p "Server booted, waiting for SSH."
+    Timeout.timeout(180) do
+      print "Server booted, waiting for SSH to come up on #{aws_conf['server']['elastic_ip']}: "
       until socket
         begin
-          socket = TCPSocket.open(aws_conf['server']['elastic_ip'], 22)
-        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
-          STDOUT << "."
-          STDOUT.flush
-          sleep 1
+          Timeout.timeout(5) do
+            socket = TCPSocket.open(aws_conf['server']['elastic_ip'], 22)
+          end
+        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error
         end
+        putc "."
+        sleep 1
       end
     end
+    puts ""
 
+    puts "Server is ready:"
     p server
-    puts "Server is ready"
 
-    p "Writing server instance_id(#{server.id}) and elastic IP(#{aws_conf['server']['elastic_ip']}) to ci.yml"
+    puts "Writing server instance_id(#{server.id}) and elastic IP(#{aws_conf['server']['elastic_ip']}) to ci.yml"
     aws_conf["server"].merge!("instance_id" => server.id)
 
     f = File.open(aws_conf_location, "w")
@@ -100,8 +103,31 @@ namespace :ci do
     f.close
   end
 
+  desc "terminate the CI Server and release IP"
+  task :terminate do
+    puts "Terminating the CI Server and releasing IP..."
+    require 'fog'
+    require 'yaml'
+    require 'socket'
+
+    aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
+    aws_conf = YAML.load_file(aws_conf_location)
+    aws_credentials = aws_conf['credentials']
+    server_config = aws_conf['server']
+
+    aws_connection = Fog::Compute.new(
+      :provider => aws_credentials['provider'],
+      :aws_access_key_id => aws_credentials['aws_access_key_id'],
+      :aws_secret_access_key => aws_credentials['aws_secret_access_key']
+    )
+
+    aws_connection.release_address(aws_conf['server']['elastic_ip'])
+    aws_connection.servers.new(:id => server_config['instance_id']).destroy
+  end
+
   desc "stop(suspend) the CI Server"
   task :stop do
+    puts "Stopping (suspending) the CI Server..."
     require 'fog'
     require 'yaml'
     require 'socket'
@@ -157,7 +183,10 @@ namespace :ci do
     aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
     aws_conf = YAML.load_file(aws_conf_location)
     server_config = aws_conf['server']
-    exec "ssh -i #{aws_conf['ec2_server_access']['id_rsa_path']} #{aws_conf['app_user']}@#{server_config['elastic_ip']}"
+    ssh_port = server_config['ssh_port'] || 22
+    cmd = "ssh -i #{aws_conf['ec2_server_access']['id_rsa_path']} #{aws_conf['app_user']}@#{server_config['elastic_ip']} -p #{ssh_port}"
+    puts cmd
+    exec cmd
   end
 
   desc "Get build status"
@@ -167,12 +196,16 @@ namespace :ci do
     ci_conf = YAML.load_file(aws_conf_location)
 
     jenkins_rss_feed = `curl -s --user #{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']} --anyauth http://#{ci_conf['server']['elastic_ip']}/rssAll`
-    latest_build = Nokogiri::XML.parse(jenkins_rss_feed.downcase).css('feed entry:first').first
-    status = !!(latest_build.css("title").first.content =~ /success|stable|back to normal/)
+    if latest_build = Nokogiri::XML.parse(jenkins_rss_feed.downcase).css('feed entry:first').first
+      title = latest_build.css("title").first.content
+    else
+      title = "not available yet"
+    end
+    status = !!(title =~ /success|stable|back to normal/)
     if status
-      p "Great Success"
+      puts "Great Success (#{title})"
     else
-      p "Someone needs to fix the build"
+      puts "Someone needs to fix the build (#{title})"
     end
     status ? exit(0) : exit(1)
   end
@@ -196,7 +229,7 @@ namespace :ci do
     puts "CC Menu Config:"
     puts "\tURL:\thttp://#{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']}@#{ci_conf['server']['elastic_ip']}/cc.xml"
   end
-  
+
   desc "Run a command with a virtual frame buffer"
   task :headlessly, :command do |task, args|
     exit_code = nil

data/lib/lobot/version.rb

@@ -1,3 +1,3 @@
 module Lobot
-  VERSION = "0.9.7"
+  VERSION = "0.10.0"
 end

data/lobot.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.version     = Lobot::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matthew Kocher & Lee Edwards"]
-  s.email       = ["pair@pivotallabs.com"]
+  s.email       = ["gems@pivotallabs.com"]
   s.homepage    = ""
-  s.summary     = %q{Lobot provides generators of chef recipes to set up CI easily.}
-  s.description = %q{Description coming soon}
+  s.summary     = %q{CI in the Cloud: Jenkins + EC2 = Lobot}
+  s.description = %q{Rails generators that make it easy to spin up a CI instance in the cloud.}
 
   s.rubyforge_project = "lobot"
 
@@ -18,10 +18,17 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency('fog', '>=0.9.0')
   s.add_dependency('capistrano')
   s.add_dependency('capistrano-ext')
   s.add_dependency('rvm')
+  s.add_dependency('rvm-capistrano')
   s.add_dependency('nokogiri', '>=1.4.4')
+  s.add_development_dependency('cucumber')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('generator_spec')
+  s.add_development_dependency('rails')
+  s.add_development_dependency('jasmine')
+  s.add_development_dependency('headless')
 end

data/spec/install_spec.rb

@@ -1,31 +1,40 @@
 require 'spec_helper'
+require "fileutils"
 
 describe Lobot::InstallGenerator do
   include GeneratorSpec::TestCase
   destination File.expand_path("../tmp", __FILE__)
   # arguments %w(something)
 
-  before(:each) do
+  before do
     prepare_destination
     run_generator
   end
-  
+
+  after :all do
+    FileUtils.rm_rf ::File.expand_path("../tmp", __FILE__)
+  end
+
+  it "creates .gitignore" do
+    assert_file ".gitignore", /config\/ci.yml/
+  end
+
   it "creates ci.yml" do
     assert_file "config/ci.yml", /app_name/
   end
-  
+
   it "create bootstrap_server.sh" do
     assert_file "script/bootstrap_server.sh", /bin\/bash/
   end
-  
+
   it "creates a ci_build.sh file" do
     assert_file "script/ci_build.sh"
   end
-  
+
   it "makes ci_build.sh executable" do
     system("test -x #{destination_root}/script/ci_build.sh").should == true
   end
-  
+
   context "Capfile exists" do
     it "appends a load path to the Capfile" do
       prepare_destination
@@ -34,29 +43,29 @@ describe Lobot::InstallGenerator do
       assert_file "Capfile", "load 'config/capistrano/ci'\nline 2\n"
     end
   end
-  
+
   context "Capfile doesn't exist" do
     it "create a Capfile" do
       assert_file "Capfile", /load 'config\/capistrano\/ci'/
     end
-    
+
     it "give you the capify (default) capfile, but commented out" do
       assert_file "Capfile", /# load 'deploy'/
     end
   end
-  
+
   it "creates config/deploy/ci.rb" do
-    assert_file "config/deploy/ci.rb", /role :ci, ci_server/
+    assert_file "config/deploy/ci.rb", /role :ci, "#\{ci_server\}:#\{ssh_port\}"/
   end
 
   it "creates config/capistrano/ci.rb" do
     assert_file "config/capistrano/ci.rb", /task :ci_setup do/
   end
-  
+
   it "creates soloistrc" do
     assert_file "soloistrc", /cookbook_paths/
   end
-  
+
   it "creates the chef directory" do
     destination_root.should have_structure do
       directory "chef" do

data/spec/spec_helper.rb

@@ -8,4 +8,4 @@ require File.expand_path('../lib/lobot', File.dirname(__FILE__))
 require 'generator_spec/test_case'
 
 require 'generator_spec'
-require File.expand_path('../../lib/generators/lobot/install_generator.rb', __FILE__)
+require File.expand_path('../../lib/generators/lobot/install_generator.rb', __FILE__)

metadata

@@ -1,107 +1,217 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lobot
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 7
-  version: 0.9.7
 platform: ruby
-authors: 
+authors:
 - Matthew Kocher & Lee Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano-ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rvm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rvm-capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id005
-description: Description coming soon
-email: 
-- pair@pivotallabs.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jasmine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: headless
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Rails generators that make it easy to spin up a CI instance in the cloud.
+email:
+- gems@pivotallabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - LICENSE.txt
@@ -113,6 +223,7 @@ files:
 - features/step_definitions/ci_steps.rb
 - features/support/env.rb
 - lib/generators/lobot/USAGE
+- lib/generators/lobot/config_generator.rb
 - lib/generators/lobot/install_generator.rb
 - lib/generators/lobot/templates/Capfile
 - lib/generators/lobot/templates/bootstrap_server.sh
@@ -150,6 +261,7 @@ files:
 - lib/generators/lobot/templates/ci.yml
 - lib/generators/lobot/templates/ci_build.sh
 - lib/generators/lobot/templates/deploy-ci.rb
+- lib/generators/lobot/templates/dot-gitignore
 - lib/generators/lobot/templates/soloistrc
 - lib/lobot.rb
 - lib/lobot/railtie.rb
@@ -158,40 +270,31 @@ files:
 - lobot.gemspec
 - spec/install_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: lobot
-rubygems_version: 1.8.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Lobot provides generators of chef recipes to set up CI easily.
-test_files: 
+summary: ! 'CI in the Cloud: Jenkins + EC2 = Lobot'
+test_files:
 - features/ci.feature
 - features/config/secrets.yml.example
 - features/step_definitions/ci_steps.rb