lobot 0.9.6 → 0.9.7

data/lib/generators/lobot/install_generator.rb

@@ -8,6 +8,8 @@ module Lobot
       template 'deploy-ci.rb', 'config/deploy/ci.rb'
       template 'capistrano-ci.rb', 'config/capistrano/ci.rb'
       template 'soloistrc', 'soloistrc'
+      template 'ci_build.sh', 'script/ci_build.sh'
+      system "chmod a+x #{destination_root}/script/ci_build.sh"
     end
     
     def add_load_path_to_capfile

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

@@ -21,7 +21,7 @@ perl -p -i -e 's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh
 /etc/init.d/sshd reload
 
 # install epel
-rpm -q epel-release-5-4.noarch || rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
+rpm -q epel-release-5-4.noarch || rpm -Uvh http://mirrors.kernel.org/fedora-epel/5/x86_64/epel-release-5-4.noarch.rpm
 
 # install git
 yum -y install git

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

@@ -55,7 +55,7 @@ task :upload_cookbooks do
   run "sudo mkdir -p #{app_dir}"
   run "sudo chown -R #{user} #{app_dir}"
   run "rm #{app_dir}/soloistrc || true"
-  run "rm -r #{app_dir}/chef || true"
+  run "rm -rf #{app_dir}/chef"
   upload("soloistrc", "#{app_dir}/soloistrc")
   upload("config/ci.yml", "#{app_dir}/ci.yml")
   upload("chef/", "#{app_dir}/chef/", :via => :scp, :recursive => true)
@@ -64,5 +64,5 @@ end
 desc "Run soloist"
 task :run_soloist do
   ci_setup
-  run "cd #{app_dir} && PATH=/usr/sbin:$PATH APP_NAME=#{fetch(:app_name)} APP_DIR=#{fetch(:app_dir)} LOG_LEVEL=debug soloist"
+  run "cd #{app_dir} && ROLES=$CAPISTRANO:HOSTROLES$ PATH=/usr/sbin:$PATH APP_NAME=#{fetch(:app_name)} APP_DIR=#{fetch(:app_dir)} LOG_LEVEL=debug soloist"
 end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/templates/default/jenkins-job-config.xml.erb

@@ -5,42 +5,38 @@
   <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><%= CI_CONFIG['git_location'] %></string>
-        <string>tagopt</string>
-        <string></string>
-      </org.spearce.jgit.transport.RemoteConfig>
-    </remoteRepositories>
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name></name>
+        <refspec></refspec>
+        <url><%= CI_CONFIG['git_location'] %></url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
         <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
-    <mergeOptions/>
+    <disableSubmodules>false</disableSubmodules>
     <recursiveSubmodules>false</recursiveSubmodules>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
     <authorOrCommitter>false</authorOrCommitter>
     <clean>false</clean>
     <wipeOutWorkspace>false</wipeOutWorkspace>
     <pruneBranches>false</pruneBranches>
+    <remotePoll>false</remotePoll>
     <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
     <gitTool>Default</gitTool>
     <submoduleCfg class="list"/>
     <relativeTargetDir></relativeTargetDir>
+    <reference></reference>
     <excludedRegions></excludedRegions>
     <excludedUsers></excludedUsers>
+    <gitConfigName></gitConfigName>
+    <gitConfigEmail></gitConfigEmail>
     <skipTag>false</skipTag>
+    <scmName></scmName>
   </scm>
   <canRoam>true</canRoam>
   <disabled>false</disabled>

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

@@ -23,7 +23,7 @@ user "postgres"
 
 run_unless_marker_file_exists("postgres_9_0_4") do
   execute "download postgres src" do
-    command "mkdir -p #{src_dir} && curl -Lsf http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.0.4/postgresql-9.0.4.tar.bz2 |  tar xvj -C#{src_dir} --strip 1"
+    command "mkdir -p #{src_dir} && curl -Lsf http://ftp.postgresql.org/pub/source/v9.1.2/postgresql-9.1.2.tar.bz2 |  tar xvj -C#{src_dir} --strip 1"
   end
   
   execute "config" do

data/lib/generators/lobot/templates/ci.yml

@@ -14,7 +14,7 @@ server:
   security_group: ci_servers
   name:    # run 'rake ci:server_start to populate'
   instance_id:  # run 'rake ci:server_start to populate'
-build_command: ./cruise_build.sh
+build_command: ./script/ci_build.sh
 ec2_server_access:
   key_pair_name: NAME_OF_YOUR_KEY_PAIR # like myapp_ci
   id_rsa_path: ~/.ssh/id_rsa

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

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+source $HOME/.rvm/scripts/rvm && source .rvmrc
+
+# install bundler if necessary
+gem list --local bundler | grep bundler || gem install bundler || exit 1
+
+# debugging info
+echo USER=$USER && ruby --version && which ruby && which bundle
+
+# conditionally install project gems from Gemfile
+bundle check || bundle install || exit 1
+
+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']

data/lib/lobot/tasks/ci.rake

@@ -81,7 +81,7 @@ namespace :ci do
       until socket
         begin
           socket = TCPSocket.open(aws_conf['server']['elastic_ip'], 22)
-        rescue Errno::ECONNREFUSED
+        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
           STDOUT << "."
           STDOUT.flush
           sleep 1
@@ -196,4 +196,18 @@ 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
+    # headless is your friend on linux - http://www.aentos.com/blog/easy-setup-your-cucumber-scenarios-using-headless-gem-run-selenium-your-ci-server
+    Headless.ly(:display => 42) do |headless|
+      begin
+        exit_code = system(args[:command])
+      ensure
+        headless.destroy
+      end
+    end
+    exit exit_code
+  end
 end

data/lib/lobot/version.rb

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

data/spec/install_spec.rb

@@ -22,9 +22,8 @@ describe Lobot::InstallGenerator do
     assert_file "script/ci_build.sh"
   end
   
-  it "appends ci task to Rakefile" do
-    rakefile_contents = File.read("#{destination_root}/lib/tasks/ci.rake")
-    rakefile_contents.should include("task :build")
+  it "makes ci_build.sh executable" do
+    system("test -x #{destination_root}/script/ci_build.sh").should == true
   end
   
   context "Capfile exists" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lobot
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Matthew Kocher & Lee Edwards
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -148,6 +148,7 @@ files:
 - 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.yml
+- lib/generators/lobot/templates/ci_build.sh
 - lib/generators/lobot/templates/deploy-ci.rb
 - lib/generators/lobot/templates/soloistrc
 - lib/lobot.rb