lobot 0.9.2 → 0.9.4

data/README.md

@@ -16,13 +16,17 @@ all you'll need to do is:
 
     rails g lobot:install
     edit config/ci.yml
-    rake ci:server_start && cap ci bootstrap && cap ci chef
+    rake ci:server_start
+    cap ci bootstrap
+    cap ci chef
+	
+Read on for an explanation of what each one of these steps does.
 
 ## Install
 
-Add lobot to your Gemfile
+Add lobot to your Gemfile, in the development group:
 
-    gem "lobot"
+    gem "lobot", :group => :development
 
 ## Generate
 Lobot is a Rails 3 generator.  Rails 2 can be made to work, but you will need to copy the template files into your project.
@@ -58,6 +62,24 @@ Edit config/ci.yml
       
 For security, you can add ci.yml to your .gitignore file and store a ci.yml.example without authentication credentials in your repository
 
+## Modify the soloistrc if necessary
+
+Switch postgres to mysql, or add your own recipes for your own dependencies.
+
+## Let 'er rip
+
+Launch an instance, allocate and associates an elastic IP and updates ci.yml:
+
+    rake ci:server_start
+
+Bootstrap the instance using the boostrap_server.sh script generated by Lobot. The script instals ruby prerequisites, creates the app_user account, and installs RVM for that user:
+
+    cap ci bootstrap
+	
+Upload the contents of your chef/cookbooks/ directory, upload the soloistrc, and run chef:
+
+    cap ci chef
+
 ## Dependencies
 
 * fog

data/features/ci.feature

@@ -18,3 +18,11 @@ Feature: CI
     And I bootstrap
     And I deploy
     Then CI is green
+
+  Scenario: Installing Lobot on a rails3 project
+    When I create a new Rails project using a Rails template
+    And I vendor Lobot
+    And I put Lobot in the Gemfile
+    And I run bundle install
+    And I run the Lobot generator
+    Then rake reports ci tasks as being available

data/features/step_definitions/ci_steps.rb

@@ -100,3 +100,7 @@ Then /^CI is green$/ do
     end
   end
 end
+
+Then /^rake reports ci tasks as being available$/ do
+  `cd testapp && rake -T`.should include("ci:start")
+end

data/lib/generators/lobot/install_generator.rb

@@ -4,7 +4,6 @@ module Lobot
     
     def create_ci_files
       template 'ci.yml', 'config/ci.yml'
-      template 'ci.rake', 'lib/tasks/ci.rake'
       template 'bootstrap_server.sh', 'script/bootstrap_server.sh'
       template 'deploy-ci.rb', 'config/deploy/ci.rb'
       template 'capistrano-ci.rb', 'config/capistrano/ci.rb'

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

@@ -39,7 +39,7 @@ set -e
 export APP_USER=$1
 
 mkdir -p /home/$APP_USER/rvm/src
-curl -Lskf http://github.com/wayneeseguin/rvm/tarball/7680ad29b90cfcc59f3588a6d1fc7c2806df9f19 | tar xvz -C/home/$APP_USER/rvm/src --strip 1
+curl -Lskf http://github.com/wayneeseguin/rvm/tarball/0f7135af8f0b6139716637d242a82442dd7fef09 | tar xvz -C/home/$APP_USER/rvm/src --strip 1
 cd "/home/$APP_USER/rvm/src" && ./install
 
 rvm_include_string='[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"'

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/default.rb

@@ -1,8 +1,9 @@
 include_recipe "pivotal_server::imagemagick"
-include_recipe "pivotal_server::postgres"
 include_recipe "pivotal_server::sqlite"
 include_recipe "pivotal_server::libxml_prereqs"
 include_recipe "pivotal_server::nginx"
+include_recipe "pivotal_server::file"
+include_recipe "pivotal_server::curl_devel"
 include_recipe "pivotal_server::ca_cert"
 include_recipe "pivotal_server::node_js"
 include_recipe "pivotal_ci::id_rsa"

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/xvfb.rb

@@ -1,24 +1,7 @@
-# include_recipe "pivotal_server::daemontools"
-
-# service_name = "xvfb"
-
 execute "install xvfb" do
   command "yum -y install xorg-x11-server-Xvfb"
 end
 
 execute "install firefox" do
   command "yum -y install firefox"
-end
-
-# execute "make daemontools dir" do
-#   command "mkdir -p /service/#{service_name}"
-# end
-# 
-# execute "create run script3" do # srsly! the not_if from mysql was being applied because they had the same name. I kid you not.
-#   command "echo -e '#!/bin/sh\nexec Xvfb :99 -ac -screen 0 1024x768x16' > /service/#{service_name}/run"
-#   # not_if "ls /service/#{service_name}/run"
-# end
-# 
-# execute "make run script executable" do
-#   command "chmod 755 /service/#{service_name}/run"
-# end
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/curl_devel.rb

@@ -0,0 +1,3 @@
+yum_package "curl-devel" do
+  action :install
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/file.rb

@@ -0,0 +1,19 @@
+src_dir = "/usr/local/src/file"
+
+run_unless_marker_file_exists("file") do
+  execute "download file src" do
+    command "mkdir -p #{src_dir} && curl -Lsf ftp://ftp.astron.com/pub/file/file-5.08.tar.gz | tar xvz -C#{src_dir} --strip 1"
+  end
+
+  execute "configure file" do
+    command "cd #{src_dir} && ./configure"
+  end
+
+  execute "make file" do
+    command "cd #{src_dir} && make"
+  end
+
+  execute "install file" do
+    command "cd #{src_dir} && make install"
+  end
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/imagemagick.rb

@@ -35,3 +35,11 @@ run_unless_marker_file_exists("imagemagick_6_6_5") do
     cwd src_dir
   end
 end
+
+file "/etc/ld.so.conf.d/imagemagick.conf" do
+  content "/usr/local/lib"
+end
+
+execute "add imagemagick to ldconf" do
+  command "/sbin/ldconfig"
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/mongo_2_0.rb

@@ -0,0 +1,28 @@
+include_recipe "pivotal_server::daemontools"
+
+install_dir = "/usr/local/mongo"
+
+user "mongo"
+
+run_unless_marker_file_exists("mongo_2_0") do
+  execute "download mongo" do
+    command "mkdir -p #{install_dir} && curl -Lsf http://downloads.mongodb.org/linux/mongodb-linux-i686-2.0.0.tgz | tar xvz -C#{install_dir} --strip 1"
+  end
+
+  execute "mongo owns #{install_dir}/data" do
+    command "mkdir -p #{install_dir}/data && chown -R mongo #{install_dir}/data"
+  end
+end
+
+execute "create daemontools directory" do
+  command "mkdir -p /service/mongo"
+end
+
+execute "create run script" do
+  command "echo -e '#!/bin/sh\nexec /command/setuidgid mongo  /usr/local/mongo/bin/mongod --dbpath #{install_dir}/data' > /service/mongo/run"
+  not_if "ls /service/mongo/run"
+end
+
+execute "make run script executable" do
+  command "chmod 755 /service/mongo/run"
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/mysql_5_1.rb

@@ -18,13 +18,13 @@ end
 
 user "mysql"
 
-run_unless_marker_file_exists("mysql_5_1") do
+run_unless_marker_file_exists("mysql_5_1_with_innodb") do
   execute "download mysql src" do
     command "mkdir -p #{src_dir} && curl -Lsf http://mysql.he.net/Downloads/MySQL-5.1/mysql-5.1.57.tar.gz |  tar xvz -C#{src_dir} --strip 1"
   end
   
   execute "configure" do
-    command "./configure --prefix=/usr/local/mysql"
+    command "./configure --prefix=/usr/local/mysql  --with-plugins=innobase,myisam"
     cwd src_dir
   end
   
@@ -48,6 +48,20 @@ run_unless_marker_file_exists("mysql_5_1") do
   end
 end
 
+file "/etc/ld.so.conf.d/mysql-64.conf" do
+  content "/usr/local/mysql/lib/mysql/"
+end
+
+execute "add mysql to ldconf" do
+  command "/sbin/ldconfig"
+end
+
+template "/etc/my.cnf" do
+  source "my-conf.erb"
+  owner "mysql"
+  mode "0644"
+end
+
 execute "create daemontools directory" do
   command "mkdir -p /service/mysql"
 end
@@ -87,4 +101,8 @@ end
 
 execute "grant user all rights (this maybe isn't a great idea)" do
   command "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"GRANT ALL on *.* to '#{mysql_user_name}'@'localhost'\""
-end
+end
+
+execute "insert time zone info" do
+  command "#{install_dir}/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo | #{install_dir}/bin/mysql -uroot -p#{mysql_root_password} mysql"
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/my-conf.erb

@@ -0,0 +1,2 @@
+[mysqld]
+default-storage-engine = innodb

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

@@ -1,5 +1,5 @@
 require 'yaml'
 aws_conf_location = File.expand_path('../../ci.yml', __FILE__)
-ci_server = YAML.load_file(aws_conf_location)["server"]['name']
+ci_server = YAML.load_file(aws_conf_location)["server"]['elastic_ip']
 
 role :ci, ci_server

data/lib/generators/lobot/templates/soloistrc

@@ -1,6 +1,8 @@
 cookbook_paths:
 - ./chef/cookbooks/
 recipes:
+# - pivotal_server::mysql_5_5
+- pivotal_server::postgres
 - pivotal_ci::default
 env_variable_switches:
   APP_NAME:

data/lib/lobot.rb

@@ -1,4 +1,14 @@
 require File.expand_path('lobot/version', File.dirname(__FILE__))
 
 module Lobot
+  def self.rails3?
+    return Rails.version.split(".").first.to_i == 3 if defined? Rails
+    begin
+      Gem::Specification::find_by_name "rails", ">= 3.0"
+    rescue
+      Gem.available? "rails", ">= 3.0"
+    end
+  end
 end
+
+require File.expand_path(File.join('lobot', "railtie"), File.dirname(__FILE__)) if Lobot.rails3?

data/lib/lobot/railtie.rb

@@ -0,0 +1,20 @@
+require "rails/railtie"
+module Lobot
+  class Railtie < Rails::Railtie
+
+    config.before_configuration do
+      old_lobot_rakefile = ::Rails.root.join('lib', 'tasks', 'ci.rake')
+      if old_lobot_rakefile.exist? && !ENV["USE_CI_RAKE"]
+        puts %Q{
+            You no longer need to have ci.rake in your project, as it is now automatically loaded
+            from the Lobot gem. To silence this warning, set "USE_CI_RAKE=true" in your environment
+            or remove ci.rake.
+          }
+      end
+    end
+
+    rake_tasks do
+      load "lobot/tasks/ci.rake"
+    end
+  end
+end

data/lib/{generators/lobot/templates → lobot/tasks}/ci.rake

@@ -5,7 +5,7 @@ namespace :ci do
     require 'yaml'
     require 'socket'
 
-    aws_conf_location = File.expand_path('../../../config/ci.yml', __FILE__)
+    aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
     aws_conf = YAML.load_file(aws_conf_location)
     aws_credentials = aws_conf['credentials']
     ec2_server_access = aws_conf['ec2_server_access']
@@ -64,14 +64,23 @@ namespace :ci do
       :key_name => ec2_key_pair_name,
       :groups => [security_group_name]
     )
+    
+    unless aws_conf['server']['elastic_ip'] =~ /\d.\.\d.\.\d.\.\d./
+      elastic_ip = aws_connection.addresses.create
+      aws_conf['server']['elastic_ip'] = elastic_ip.public_ip
+      puts "Allocated elastic IP address #{aws_conf['server']['elastic_ip']}"
+    end
+    
     server.wait_for { ready? }
     
+    aws_connection.associate_address(server.id, aws_conf['server']['elastic_ip'])
+    
     socket = false
     Timeout::timeout(120) do
       p "Server booted, waiting for SSH."
       until socket
         begin
-          socket = TCPSocket.open(server.dns_name, 22)        
+          socket = TCPSocket.open(aws_conf['server']['elastic_ip'], 22)
         rescue Errno::ECONNREFUSED
           STDOUT << "."
           STDOUT.flush
@@ -83,38 +92,82 @@ namespace :ci do
     p server
     puts "Server is ready"
     
-    p "Writing server public IP (#{server.dns_name}) to ci.yml"
-    aws_conf["server"].merge!("name" => server.dns_name, "instance_id" => server.id)
+    p "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")
     f.write(aws_conf.to_yaml)
     f.close
   end
   
+  desc "stop(suspend) the CI Server"
+  task :stop do
+    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.servers.new(:id => server_config['instance_id']).stop
+  end
+  
+  desc "start(resume) the CI Server"
+  task :start do
+    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']
+    )
+    
+    server = aws_connection.servers.new(:id => server_config['instance_id'])
+    # server.start
+    server.wait_for { ready? }
+    
+    aws_connection.associate_address(server_config['instance_id'], server_config['elastic_ip']) if server_config['elastic_ip']
+  end
+  
   desc "open the CI interface in a browser"
   task :open do
-    aws_conf_location = File.expand_path('../../../config/ci.yml', __FILE__)
+    aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
     aws_conf = YAML.load_file(aws_conf_location)
     server_config = aws_conf['server']
-    exec "open http://#{server_config['name']}"
+    exec "open http://#{server_config['elastic_ip']}"
   end
   
   desc "ssh to CI"
   task :ssh do
-    aws_conf_location = File.expand_path('../../../config/ci.yml', __FILE__)
+    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['name']}"
+    exec "ssh -i #{aws_conf['ec2_server_access']['id_rsa_path']} #{aws_conf['app_user']}@#{server_config['elastic_ip']}"
   end
   
   desc "Get build status"
   task :status do
     require 'nokogiri'
-    ci_conf_location = File.expand_path('../../../config/ci.yml', __FILE__)
-    ci_conf = YAML.load_file(ci_conf_location)
+    aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
+    ci_conf = YAML.load_file(aws_conf_location)
     
-    hudson_rss_feed = `curl -s --user #{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']} --anyauth http://#{ci_conf['server']['name']}/rssAll`
-    latest_build = Nokogiri::XML.parse(hudson_rss_feed.downcase).css('feed entry:first').first
+    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 status
       p "Great Success"

data/lib/lobot/version.rb

@@ -1,3 +1,3 @@
 module Lobot
-  VERSION = "0.9.2"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lobot
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Matthew Kocher & Lee Edwards
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -128,9 +128,12 @@ files:
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/files/default/cacert.pem
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/libraries/marker.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/ca_cert.rb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/curl_devel.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/daemontools.rb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/file.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/imagemagick.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/libxml_prereqs.rb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/mongo_2_0.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/mysql_5_1.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/mysql_5_5.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/nginx.rb
@@ -138,16 +141,18 @@ files:
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/postgres.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/sqlite.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/recipes/swap.rb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/my-conf.erb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-conf.erb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-htaccess.erb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-mime-types.erb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-run-script.erb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/postgres-run-script.erb
-- lib/generators/lobot/templates/ci.rake
 - lib/generators/lobot/templates/ci.yml
 - lib/generators/lobot/templates/deploy-ci.rb
 - lib/generators/lobot/templates/soloistrc
 - lib/lobot.rb
+- lib/lobot/railtie.rb
+- lib/lobot/tasks/ci.rake
 - lib/lobot/version.rb
 - lobot.gemspec
 - spec/install_spec.rb
@@ -181,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lobot
-rubygems_version: 1.8.11
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Lobot provides generators of chef recipes to set up CI easily.