lobot 0.10.1 → 0.10.2

data/README.md

@@ -2,21 +2,21 @@ Lobot: Your Chief Administrative Aide on Cloud City
 ============================
 
 ![Lobot](http://i.imgur.com/QAkd7.jpg)
-###A "one click" solution for deploying CI to EC2
+###Easily create your CI server on EC2
 
-Lando Calrissian relies on Lobot to keep Cloud City afloat, and now you can rely on Lobot to keep your continuous integration server running in the cloud. Lobot is a gem that will help you spin-up, bootstrap, and install Jenkins for CI for your Rails app on Amazon EC2.
+Lando Calrissian relies on Lobot to keep Cloud City afloat, and now you can rely on Lobot to get your continuous integration server running in the cloud. Lobot is a gem that will help you spin-up, bootstrap, and install Jenkins or TeamCity for CI for your Rails app on Amazon EC2.
 
 # What do I get?
 
-* rake tasks for starting a CI instance
-* capistrano tasks for bootstrapping and deploying to an EC2 instance
-* chef recipes for configuring a Centos server to run Jenkins and build Rails projects.
+* Rake tasks for creating, starting, stopping, or destroying your CI srever on EC2
+* Capistrano tasks for bootstrapping the Centos EC2 instance
+* Chef recipes for configuring the instance to run Jenkins and build Rails projects
 
-all you'll need to do is run the following commands:
+After you add lobot to your Gemfile, all you'll need to do is run the following commands:
 
-    rails g lobot:install
+    rails g lobot:install [jenkins|teamcity]
     rails g lobot:config
-    rake ci:server_start
+    rake ci:create_server
     cap ci bootstrap
     cap ci chef
 
@@ -31,10 +31,17 @@ Add lobot to your Gemfile, in the development group:
 ## 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.
 
-    rails g lobot:install
+### For Jenkins:
+
+    rails g lobot:install jenkins
+
+### For TeamCity:
+Lobot only creates your EC2 instance and installs the build server. Configuration for TeamCity still needs to be done manually.
+
+    rails g lobot:install teamcity
 
 ## Setup
-You can use a generator to interactively generate the config/ci.yml that includes some reasonable defaults and explanations
+You can use a generator to interactively generate the config/ci.yml that includes some reasonable defaults and explanations.
 
     rails g lobot:config
 
@@ -52,18 +59,25 @@ Alternatively, manually edit config/ci.yml
       aws_secret_access_key: The Secret Access Key for your Amazon AWS account
       provider: AWS # leave this one alone
     server:
-      name: run 'rake ci:server_start to populate'
-      instance_id: run 'rake ci:server_start to populate'
+      name: run 'rake ci:create_server to populate'
+      instance_id: run 'rake ci:create_server to populate'
     build_command: ./script/ci_build.sh
     ec2_server_access:
       key_pair_name: myapp_ci
       id_rsa_path: ~/.ssh/id_rsa
     github_private_ssh_key_path: ~/.ssh/id_rsa
 
+## Adjust Defaults (Optional)
+In your ci.yml, there are defaults set for values that have the recommened value. For example, the instance size used for EC2 is set to "m1.large", which costs $230/month.
+If you don't need to increase your memory size for Jenkins or TeamCity, you could elect to use "c1.medium" instead which costs about half that.
+You can also save on EC2 costs by using a tool like cimonitor or ylastic to schedule when your instances are online.
+
 For security, the lobot:install task added config/ci.yml to the .gitignore file since it includes sensitive AWS credentials and your CI users password.
 Keep in mind that the default build script ci_build.sh uses the headless gem and jasmine. You'll want to add those to your Gemfile or change your build command.
 
-At this point you will need to create a commit of the files generated or modified and push those changes to your remote git repository so jenkins can execute your build command.
+## Commit and push your changes
+
+At this point you will need to create a commit of the files generated or modified and push those changes to your remote git repository so Jenkins can execute your build command.
 
 ## Modify the soloistrc if necessary
 
@@ -73,17 +87,17 @@ Switch postgres to mysql, or add your own recipes for your own dependencies.
 
 1. Launch an instance, allocate and associates an elastic IP and updates ci.yml:
 
-    rake ci:server_start
+        rake ci:create_server
 
 2. 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
+        cap ci bootstrap
 
 3. Upload the contents of your chef/cookbooks/ directory, upload the soloistrc, and run chef:
 
-    cap ci chef
+        cap ci chef
 
-Your lobot instance should now be up and running. You will be able to access your CI server at: http://<your instance address>/ with the username and password you chose during configuration.
+Your lobot instance should now be up and running. You will be able to access your CI server at: http://&lt;your instance address&gt;/ with the username and password you chose during configuration.
 For more information about Jenkins CI, see http://jenkins-ci.org/
 
 ## Troubleshooting
@@ -94,11 +108,15 @@ Shell access for your instance
 
 Terminating your instance and deallocating the elastic IP
 
-    rake ci:terminate
+    rake ci:destroy_server
 
 Suspending your instance
 
-    rake ci:stop
+    rake ci:stop_server
+
+Rstarting a server
+
+    rake ci:start_server
 
 ## Add your new CI instance to [cimonitor](http://github.com/pivotal/cimonitor) and CCMenu
 

data/features/ci.feature

@@ -9,17 +9,17 @@ Feature: CI
     And I vendor Lobot
     And I put Lobot in the Gemfile
     And I run bundle install
-    And I run the Lobot generator
+    And I run the Lobot generator for "Jenkins"
     Then rake reports ci tasks as being available
 
   @aws
-  Scenario: Install CI on Amazon AWS using new Rails template
+  Scenario: Install Jenkins CI on Amazon AWS using new Rails template
     When I create a new Rails project
     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 run the Lobot generator for "Jenkins"
     And I enter my info into the ci.yml file
     And I make changes to be committed
     And I push to git
@@ -27,3 +27,19 @@ Feature: CI
     And I bootstrap
     And I deploy
     Then CI is green
+
+  @aws
+  Scenario: Install TeamCity CI on Amazon AWS using new Rails template
+    When I create a new Rails project
+    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 for "TeamCity"
+    And I enter my info into the ci.yml file
+    And I make changes to be committed
+    And I push to git
+    And I start the server
+    And I bootstrap
+    And I deploy
+    Then TeamCity is installed

data/features/step_definitions/ci_steps.rb

@@ -37,8 +37,8 @@ When /^I run bundle install$/ do
   system!('cd testapp && bundle exec gem list | grep lobot')
 end
 
-When /^I run the Lobot generator$/ do
-  system!('cd testapp && rails generate lobot:install')
+When /^I run the Lobot generator for "([^"]*)"$/ do |build_server_name|
+  system!("cd testapp && rails generate lobot:install #{build_server_name}")
   system!('ls testapp | grep -s soloistrc')
 end
 
@@ -92,7 +92,7 @@ When /^I push to git$/ do
 end
 
 When /^I start the server$/ do
-  system! "cd testapp && bundle exec rake ci:server_start"
+  system! "cd testapp && bundle exec rake ci:create_server"
 end
 
 When /^I bootstrap$/ do
@@ -113,5 +113,17 @@ Then /^CI is green$/ do
 end
 
 Then /^rake reports ci tasks as being available$/ do
-  `cd testapp && bundle exec rake -T`.should include("ci:start")
+  `cd testapp && bundle exec rake -T`.should include("ci:start_server")
 end
+
+Then /^TeamCity is installed$/ do
+  ci_conf_location = 'testapp/config/ci.yml'
+  ci_yml = YAML.load_file(ci_conf_location)
+
+  Timeout::timeout(400) do
+    until system("wget http://#{ci_yml['server']['elastic_ip']}:8111")
+      sleep 5
+    end
+  end
+end
+

data/features/support/env.rb

@@ -8,5 +8,5 @@ def system!(str)
 end
 
 After '@aws' do
-  system "cd #{LOBOT_TEMP_DIRECTORY}/testapp && rake ci:terminate" unless ENV["KEEP_INSTANCE"]
+  system "cd #{LOBOT_TEMP_DIRECTORY}/testapp && rake ci:destroy_server" unless ENV["KEEP_INSTANCE"]
 end

data/lib/generators/lobot/config_generator.rb

@@ -23,6 +23,8 @@ module Lobot
           'provider' => "AWS"
         },
         'server' => {
+          'name' => nil,
+          'instance_id' => nil,
           'flavor_id' => "m1.large",
           'security_group' => "ci_servers",
           'ssh_port' => "22"
@@ -93,7 +95,7 @@ module Lobot
 * For a tutorial on this see: http://open.bsdcow.org/histerical/tutorials/ssh_pubkey_auth#1.2
       EOS
       while true do
-        id_rsa_path = ask("Path to SSH Private Key for EC2 Access [#{config['ec2_server_access']['id_rsa_path']}]:", :bold)
+        id_rsa_path = ask("SSH Private Key for EC2 Access [#{config['ec2_server_access']['id_rsa_path'].split('/').last}]:", :bold)
         config['ec2_server_access']['id_rsa_path'] = id_rsa_path if id_rsa_path != ""
         if config['ec2_server_access']['id_rsa_path'] != File.expand_path(config['ec2_server_access']['id_rsa_path'])
           config['ec2_server_access']['id_rsa_path'] = File.expand_path(File.join(ENV['HOME'], '.ssh', config['ec2_server_access']['id_rsa_path']))
@@ -111,7 +113,7 @@ module Lobot
 * repository you entered above. On github this will be listed here: https://github.com/settings/ssh
       EOS
       while true do
-        github_private_ssh_key_path = ask("Path to SSH Private Key for Github [#{config['github_private_ssh_key_path']}]:", :bold)
+        github_private_ssh_key_path = ask("SSH Private Key for Github [#{config['github_private_ssh_key_path'].split('/').last}]:", :bold)
         config['github_private_ssh_key_path'] = github_private_ssh_key_path if github_private_ssh_key_path != ""
         if config['github_private_ssh_key_path'] != File.expand_path(config['github_private_ssh_key_path'])
           config['github_private_ssh_key_path'] = File.expand_path(File.join(ENV['HOME'], '.ssh', config['github_private_ssh_key_path']))
@@ -132,8 +134,8 @@ module Lobot
 
       say "\n\nconfig/ci.yml configured:\n#{File.read(Rails.root.join('config/ci.yml'))}\n"
       say "You can edit this file to change any additional defaults."
-      say "Before continuing, be sure to push uncommitted changes to your git repository.", :red
-      say "For next steps, see README.md"
+      say "Before continuing, be sure to push uncommitted changes to your git repository.", :green
+      say "For next steps, see the lobot README.md"
     end
   end
 end

data/lib/generators/lobot/install_generator.rb

@@ -1,6 +1,7 @@
 module Lobot
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    argument :build_server, :type => :string, :default => "Jenkins"
 
     def create_ci_files
       template 'ci.yml', 'config/ci.yml'
@@ -30,5 +31,13 @@ module Lobot
       directory 'chef', 'chef'
     end
 
+    def add_ci_recipe_to_default
+      server_name = build_server.downcase
+      server_name = "jenkins" if build_server.blank?
+
+      # append jenkins or teamcity recipe based on the user's choice
+      append_to_file "chef/cookbooks/pivotal_ci/recipes/default.rb", %Q{include_recipe "pivotal_ci::#{server_name}"}
+    end
+
   end
 end

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

@@ -8,4 +8,3 @@ include_recipe "pivotal_server::ca_cert"
 include_recipe "pivotal_server::node_js"
 include_recipe "pivotal_ci::id_rsa"
 include_recipe "pivotal_ci::fonts"
-include_recipe "pivotal_ci::jenkins"

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

@@ -19,7 +19,7 @@ execute "download git plugin" do
   user username
 end
 
-execute "make projec#t dir" do
+execute "make project dir" do
   command "mkdir -p /home/#{username}/.jenkins/jobs/#{ENV['APP_NAME']}"
   user username
 end

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

@@ -0,0 +1,43 @@
+include_recipe "pivotal_server::daemontools"
+include_recipe "pivotal_ci::xvfb"
+include_recipe "pivotal_ci::git_config"
+
+username = ENV['SUDO_USER'].strip
+user_home = ENV['HOME']
+
+install_dir = "#{user_home}"
+tar_location = "#{install_dir}/teamcity.tar.gz"
+
+execute "download teamcity" do
+  command "mkdir -p #{install_dir} && curl -Lsf http://download.jetbrains.com/teamcity/TeamCity-7.0.2a.tar.gz -o #{tar_location}"
+  user username
+  not_if { File.exists?(tar_location) }
+end
+
+execute "unpack teamcity" do
+  command "cd #{install_dir} && tar xfz #{tar_location} && mkdir -p #{install_dir}/TeamCity/logs"
+  user username
+  group username
+  not_if { File.exists?("#{install_dir}/TeamCity") }
+end
+
+template "/etc/init.d/teamcity" do
+  source "teamcity-initd.erb"
+  variables(
+    :username => username
+  )
+  mode 0755
+end
+
+execute "Start TeamCity" do
+  # while this runs successfully, it doesn't successfully start TeamCity.  Rebooting instead.
+  command "/etc/init.d/teamcity start"
+end
+
+execute "Adding TeamCity to init.d" do
+  command "chkconfig --add teamcity"
+end
+
+execute "Reboot the instance to bring up TeamCity" do
+  command "sudo reboot"
+end

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/templates/default/teamcity-initd.erb

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# chkconfig: 345 86 16
+
+# description: TeamCity service #
+#
+
+export JAVA_HOME=/usr/lib/jvm/jre-1.6.0-openjdk.x86_64
+
+start(){
+  echo "Starting TeamCity"
+  /command/setuidgid <%= @username %> /home/<%= @username %>/TeamCity/bin/startup.sh
+  /command/setuidgid <%= @username %> /home/<%= @username %>/TeamCity/buildAgent/bin/agent.sh start
+}
+
+stop(){
+  echo "Stopping TeamCity"
+  /command/setuidgid <%= @username %> /home/<%= @username %>/TeamCity/bin/shutdown.sh
+  /command/setuidgid <%= @username %> /home/<%= @username %>/TeamCity/buildAgent/bin/agent.sh stop kill
+}
+
+restart(){
+  echo "Restarting TeamCity"
+  stop
+  start
+}
+
+case "$1" in
+  start)
+    start;;
+
+  stop)
+    stop;;
+
+  restart)
+    restart;;
+*)
+
+echo $"Usage: $0 {start|stop|restart}"
+exit 1
+esac
+
+exit 0
+

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

@@ -19,4 +19,4 @@ RAILS_ENV=test rake db:version  > /dev/null || rake db:create
 
 RAILS_ENV=development rake db:migrate test:prepare
 
-rake ci:headlessly['rake spec'] --trace && rake ci:headlessly['rake jasmine:ci'] --trace
+rake ci:headlessly['rake'] --trace

data/lib/lobot/tasks/ci.rake

@@ -1,6 +1,6 @@
 namespace :ci do
   desc "Spin up CI server on amazon"
-  task :server_start do
+  task :create_server do
     require 'fog'
     require 'yaml'
     require 'socket'
@@ -29,7 +29,7 @@ namespace :ci do
       p security_group
     end
 
-    PORTS_TO_OPEN = [22, 443, 80]
+    PORTS_TO_OPEN = [22, 443, 80, 8111]
     PORTS_TO_OPEN.each do |port|
       is_in_security_group = !!security_group.ip_permissions.detect{|group| (group['fromPort']..group['toPort']).include?(port) && group['ipRanges'].detect{|range| range["cidrIp"]== "0.0.0.0/0" } }
 
@@ -104,7 +104,7 @@ namespace :ci do
   end
 
   desc "terminate the CI Server and release IP"
-  task :terminate do
+  task :destroy_server do
     puts "Terminating the CI Server and releasing IP..."
     require 'fog'
     require 'yaml'
@@ -126,7 +126,7 @@ namespace :ci do
   end
 
   desc "stop(suspend) the CI Server"
-  task :stop do
+  task :stop_server do
     puts "Stopping (suspending) the CI Server..."
     require 'fog'
     require 'yaml'
@@ -147,7 +147,7 @@ namespace :ci do
   end
 
   desc "start(resume) the CI Server"
-  task :start do
+  task :start_server do
     require 'fog'
     require 'yaml'
     require 'socket'
@@ -258,4 +258,11 @@ namespace :ci do
     end
     exit exit_code
   end
+
+  #aliases
+  desc "maybe"
+  task "server:create" => "ci:create_server"
+  task "server:start" => "ci:start_server"
+  task "server:destroy" => "ci:destroy_server"
+  task "server:stop" => "ci:stop_server"
 end

data/lib/lobot/version.rb

@@ -1,3 +1,3 @@
 module Lobot
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/spec/install_spec.rb

@@ -8,72 +8,106 @@ describe Lobot::InstallGenerator 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
+  context "without requiring input" do
+    before { run_generator }
 
-  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 .gitignore" do
+      assert_file ".gitignore", /config\/ci.yml/
+    end
 
-  it "creates a ci_build.sh file" do
-    assert_file "script/ci_build.sh"
-  end
+    it "creates ci.yml" do
+      assert_file "config/ci.yml", /app_name/
+    end
 
-  it "makes ci_build.sh executable" do
-    system("test -x #{destination_root}/script/ci_build.sh").should == true
-  end
+    it "create bootstrap_server.sh" do
+      assert_file "script/bootstrap_server.sh", /bin\/bash/
+    end
 
-  context "Capfile exists" do
-    it "appends a load path to the Capfile" do
-      prepare_destination
-      system("echo 'line 2' > #{destination_root}/Capfile")
-      run_generator
-      assert_file "Capfile", "load 'config/capistrano/ci'\nline 2\n"
+    it "creates a ci_build.sh file" do
+      assert_file "script/ci_build.sh"
     end
-  end
 
-  context "Capfile doesn't exist" do
-    it "create a Capfile" do
-      assert_file "Capfile", /load 'config\/capistrano\/ci'/
+    it "makes ci_build.sh executable" do
+      system("test -x #{destination_root}/script/ci_build.sh").should == true
     end
 
-    it "give you the capify (default) capfile, but commented out" do
-      assert_file "Capfile", /# load 'deploy'/
+    context "Capfile exists" do
+      it "appends a load path to the Capfile" do
+        prepare_destination
+        system("echo 'line 2' > #{destination_root}/Capfile")
+        run_generator
+        assert_file "Capfile", "load 'config/capistrano/ci'\nline 2\n"
+      end
     end
-  end
 
-  it "creates config/deploy/ci.rb" do
-    assert_file "config/deploy/ci.rb", /role :ci, "#\{ci_server\}:#\{ssh_port\}"/
-  end
+    context "Capfile doesn't exist" do
+      it "create a Capfile" do
+        assert_file "Capfile", /load 'config\/capistrano\/ci'/
+      end
 
-  it "creates config/capistrano/ci.rb" do
-    assert_file "config/capistrano/ci.rb", /task :ci_setup do/
-  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\}:#\{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 soloistrc" do
-    assert_file "soloistrc", /cookbook_paths/
+    it "creates the chef directory" do
+      destination_root.should have_structure do
+        directory "chef" do
+          directory "cookbooks" do
+            directory "pivotal_ci"
+            directory "pivotal_server"
+          end
+        end
+      end
+    end
   end
 
-  it "creates the chef directory" do
-    destination_root.should have_structure do
-      directory "chef" do
-        directory "cookbooks" do
-          directory "pivotal_ci"
-          directory "pivotal_server"
+  context "when asking for which app" do
+    context "with valid input" do
+      before do
+        run_generator [input]
+      end
+
+      context "when selecting Jenkins" do
+        let(:input) { "Jenkins" }
+        it "adds jenkins recipe to default recipe" do
+          assert_file "chef/cookbooks/pivotal_ci/recipes/default.rb", /include_recipe "pivotal_ci::jenkins"/
+        end
+      end
+
+      context "when selecting TeamCity" do
+        let(:input) { "TeamCity" }
+        it "adds teamcity recipe to default recipe" do
+          assert_file "chef/cookbooks/pivotal_ci/recipes/default.rb", /include_recipe "pivotal_ci::teamcity"/
+        end
+      end
+
+      context "when selecting the default" do
+        let(:input) { "" }
+        it "adds jenkins recipe to default recipe" do
+          assert_file "chef/cookbooks/pivotal_ci/recipes/default.rb", /include_recipe "pivotal_ci::jenkins"/
         end
       end
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobot
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -235,8 +235,10 @@ files:
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/git_config.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/id_rsa.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/jenkins.rb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/teamcity.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/recipes/xvfb.rb
 - lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/templates/default/jenkins-job-config.xml.erb
+- lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/templates/default/teamcity-initd.erb
 - 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