lobot 0.9.0 → 0.9.2

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.2-p180@lobot
+rvm use ruby-1.8.7-p299@lobot

data/docs/ci_yml.md

@@ -0,0 +1,47 @@
+# app_name
+A short name for your application.  This will be used as the name of the build in jenkins.
+
+# app_user
+The user created to run jenkins.  This can be set to the same value as app_name if desired.
+
+# git_location
+The location of your remote git repository which Jenkins will poll and pull from on changes.  If it's a public project, use the http://github.com/user/project.git url.  If it's a private project, use the ssh form, git@github.com:user/project.git.
+
+# basic_auth:
+	- username: # The username you will use to access the Jenkins web interface
+	  password: # The password you will use to access the Jenkins web interface
+The basic auth field is an array of hashes containing the usernames and passwords you would like to be able to access jenkins.
+
+# credentials:
+Currently Lobot only supports managing EC2 servers. To start a new instance, the rake task needs to be able to connect to ec2 and ask it to launch a server.
+##  aws_access_key_id:
+The Access Key for your Amazon AWS account.  You can obtain it by visiting 
+https://aws-portal.amazon.com/gp/aws/developer/account/index.html?ie=UTF8&action=access-key
+##  aws_secret_access_key: The Secret Access Key for your Amazon AWS account
+This will be available at the same URL.
+##  provider: AWS
+This tells Lobot to use Amazon web services.  Currently AWS is the only valid value.
+
+# server:
+The server section is where Lobot keeps track of the instance that it launches when you run rake ci:server_start
+##  name:
+The name is the server's machine name - either ip address or DNS name.  Usually you'll just run ci:server_start to populate it.
+#  instance_id:
+The instance_id is also saved, in order to facilitate stopping and starting instances.  Stopping" is AWS's term for shutting down an instance temporarily - when it is started, it will use the same EBS volume and continue where it left off.  However, it will receive a new ip address and DNS name.
+
+# build_command: ./cruise_build.sh
+The build command is the shell script that Jenkins will execute to run your build.  While you could put this script is the Jenkins configuration, it's clearer to have it in a script directly checked into your project.
+
+# ec2_server_access: 
+	key_pair_name: myapp_ci
+	id_rsa_path: ~/.ssh/id_rsa
+
+The EC2 server access section is perhaps the most confusing field in the ci.yml file. This section tells Lobot what ssh keys to use to access the servers it spins up.  When you run rake ci:sever_start, Lobot first looks in your ec2 account to see if they key pair name you specified exists - if it doesn't, it uploads the specified #{id_rsa_path}.pub to amazon, and names it #{key_pair_name}.  It then launches the server, telling EC2 to use the key pair specified.
+
+# id_rsa_for_github_access
+id_rsa_for_github_access: |-
+  -----BEGIN RSA PRIVATE KEY-----
+  SSH KEY WITH ACCESS TO GITHUB GOES HERE
+  -----END RSA PRIVATE KEY-----
+
+This is the rsa key that jenkins will use when connecting to github. Note that it is indented as it's a multiline markdown string.

data/features/ci.feature

@@ -8,9 +8,11 @@ Feature: CI
     When I create a new Rails project using a Rails template
     And I vendor Lobot
     And I put Lobot in the Gemfile
+    And I add a gem with an https://github.com source
     And I run bundle install
     And I run the Lobot generator
     And I enter my info into the ci.yml file
+    And I change my ruby version
     And I push to git
     And I run the server setup
     And I bootstrap

data/features/config/secrets.yml.example

@@ -1,6 +1,7 @@
 --- 
-aws_access_key_id: 
+aws_access_key_id:
 aws_secret_access_key: 
-id_rsa: |-
+id_rsa_for_github_access: |-
   -----BEGIN RSA PRIVATE KEY-----
   -----END RSA PRIVATE KEY-----
+  

data/features/step_definitions/ci_steps.rb

@@ -28,8 +28,13 @@ When /^I put Lobot in the Gemfile$/ do
   system!(%{echo "gem 'lobot'" >> testapp/Gemfile})
 end
 
+When /^I add a gem with an https:\/\/github.com source$/ do
+  system!(%{echo "gem 'greyhawkweather', :git => 'https://github.com/verdammelt/Greyhawk-Weather.git'" >> testapp/Gemfile})
+end
+
 When /^I run bundle install$/ do
   system("cd testapp && gem uninstall lobot")
+  system("cd testapp && gem install bundler")
   system!("cd testapp && bundle install")
   system!('cd testapp && bundle exec gem list | grep lobot')
 end
@@ -59,7 +64,15 @@ When /^I enter my info into the ci\.yml file$/ do
   end
 end
 
+When /^I change my ruby version$/ do
+  system! "cd testapp && echo 'rvm use ruby-1.8.7-p299@lobot' > .rvmrc"
+end
+
+
 When /^I push to git$/ do
+  lobot_dir = File.expand_path('../../', File.dirname(__FILE__))
+  system! "rm testapp/vendor/cache/*"
+  system! "cp #{lobot_dir}/pkg/lobot-#{Lobot::VERSION}.gem testapp/vendor/cache/"
   system! "echo 'config/ci.yml' >> testapp/.gitignore"
   system! "cd testapp && git add ."
   system! "cd testapp && git commit -m'initial commit'"
@@ -73,15 +86,6 @@ When /^I run the server setup$/ do
 end
 
 When /^I bootstrap$/ do
-  server_is_available = false
-  iterations = 0
-  until server_is_available
-    server_is_available = system("cd testapp && cap ci check_for_server_availability")
-    puts "Sleeping for 3 seconds"
-    sleep 3
-    iterations += 1
-    raise "server is not available" if iterations > 10
-  end
   system! "cd testapp && cap ci bootstrap"
 end
 

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/156d0b42feba4922ad04 | tar xvz -C/home/$APP_USER/rvm/src --strip 1
+curl -Lskf http://github.com/wayneeseguin/rvm/tarball/7680ad29b90cfcc59f3588a6d1fc7c2806df9f19 | 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

@@ -3,5 +3,7 @@ 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::ca_cert"
+include_recipe "pivotal_server::node_js"
 include_recipe "pivotal_ci::id_rsa"
 include_recipe "pivotal_ci::jenkins"