lobot 0.9.7 → 0.10.0

data/lib/generators/lobot/install_generator.rb

@@ -1,9 +1,10 @@
 module Lobot
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-    
+
     def create_ci_files
       template 'ci.yml', 'config/ci.yml'
+      template 'ci.yml', 'config/ci.yml.example'
       template 'bootstrap_server.sh', 'script/bootstrap_server.sh'
       template 'deploy-ci.rb', 'config/deploy/ci.rb'
       template 'capistrano-ci.rb', 'config/capistrano/ci.rb'
@@ -11,15 +12,23 @@ module Lobot
       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
       template 'Capfile', 'Capfile' unless File.exists?("#{destination_root}/Capfile")
       prepend_to_file 'Capfile', "load 'config/capistrano/ci'\n"
     end
-    
+
+    def add_ci_yml_to_gitignore
+      if File.exists?("#{destination_root}/.gitignore")
+        append_to_file '.gitignore', "config/ci.yml\n"
+      else
+        template 'dot-gitignore', '.gitignore'
+      end
+    end
+
     def create_chef_cookbooks
       directory 'chef', 'chef'
     end
-    
+
   end
-end
+end

data/lib/generators/lobot/templates/Capfile

@@ -2,5 +2,5 @@
 
 # load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 # Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-# 
-# load 'config/deploy' # remove this line to skip loading any of the default tasks
+#
+# load 'config/deploy' # remove this line to skip loading any of the default tasks

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

@@ -1,4 +1,5 @@
 #!/bin/bash -e
+RVM_0_12_3_SHA=d6b4de7cfec42f7ce33198f0bd82544af51e8aa5
 
 env | grep -q "APP_USER=" || echo "Please set APP_USER environment variable"
 
@@ -17,7 +18,7 @@ grep -sq "$authorized_keys_string" /home/$APP_USER/.ssh/authorized_keys || cat /
 
 
 ## enable ssh password auth
-perl -p -i -e 's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config 
+perl -p -i -e 's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config
 /etc/init.d/sshd reload
 
 # install epel
@@ -37,9 +38,9 @@ cat <<'BOOTSTRAP_AS_USER' > /home/$APP_USER/bootstrap_as_user.sh
 set -e
 
 export APP_USER=$1
-
+export RVM_0_12_3_SHA=$2
 mkdir -p /home/$APP_USER/rvm/src
-curl -Lskf http://github.com/wayneeseguin/rvm/tarball/0f7135af8f0b6139716637d242a82442dd7fef09 | tar xvz -C/home/$APP_USER/rvm/src --strip 1
+curl -Lskf http://github.com/wayneeseguin/rvm/tarball/$RVM_0_12_3_SHA | 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"'
@@ -53,5 +54,5 @@ RVMRC_CONTENTS
 BOOTSTRAP_AS_USER
 
 chmod a+x /home/$APP_USER/bootstrap_as_user.sh
-su - $APP_USER /home/$APP_USER/bootstrap_as_user.sh $APP_USER
-rm /home/$APP_USER/bootstrap_as_user.sh
+su - $APP_USER /home/$APP_USER/bootstrap_as_user.sh $APP_USER $RVM_0_12_3_SHA
+rm /home/$APP_USER/bootstrap_as_user.sh

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

@@ -1,13 +1,15 @@
 require 'capistrano/ext/multistage'
-require "rvm/capistrano"  # Use the gem, don't unshift RVM onto the load path, that's crazy.
 
 task :ci_setup do
   ci_conf_location ||= File.expand_path('../../../config/ci.yml', __FILE__)
   ci_conf ||= YAML.load_file(ci_conf_location)
-  
-  raise "rvm_ruby_string not set - are you using RVM" unless ENV['rvm_ruby_string']
-  set :rvm_ruby_string, ENV['rvm_ruby_string']
-  set :rvm_type, :user
+
+  if ENV["rvm_path"]
+    require "bundler/capistrano"
+    require "rvm/capistrano"  # Use the gem, don't unshift RVM onto the load path, that's crazy.
+    set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
+    set :rvm_type, :user
+  end
   set :app_name, ci_conf['app_name']
   set(:app_dir) { "/var/#{stage}/#{app_name}" }
   set :user, ci_conf['app_user']
@@ -58,6 +60,10 @@ task :upload_cookbooks do
   run "rm -rf #{app_dir}/chef"
   upload("soloistrc", "#{app_dir}/soloistrc")
   upload("config/ci.yml", "#{app_dir}/ci.yml")
+  ci_config = YAML.load_file("config/ci.yml")
+  if ci_config.has_key?("github_private_ssh_key_path")
+    upload(File.expand_path(ci_config["github_private_ssh_key_path"]), "/home/#{user}/.ssh/id_rsa", {:mode => "0600"})
+  end
   upload("chef/", "#{app_dir}/chef/", :via => :scp, :recursive => true)
 end
 

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/attributes/nginx.rb

@@ -1,2 +1,2 @@
 node["nginx_settings"] ||= {}
-node["nginx_settings"]["basic_auth_users"] = CI_CONFIG['basic_auth']
+node["nginx_settings"]["basic_auth_users"] = CI_CONFIG['basic_auth']

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_ci/libraries/ci_config.rb

@@ -1,2 +1,2 @@
 ci_conf_location = File.expand_path('../../../../../ci.yml', __FILE__)
-::CI_CONFIG = YAML.load_file(ci_conf_location)
+::CI_CONFIG = YAML.load_file(ci_conf_location)

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

@@ -7,4 +7,4 @@ include_recipe "pivotal_server::curl_devel"
 include_recipe "pivotal_server::ca_cert"
 include_recipe "pivotal_server::node_js"
 include_recipe "pivotal_ci::id_rsa"
-include_recipe "pivotal_ci::jenkins"
+include_recipe "pivotal_ci::jenkins"

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

@@ -8,4 +8,4 @@ end
 execute "set git user" do
   command "git config --global user.name 'Jenkins CI Server'"
   user username
-end
+end

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

@@ -8,7 +8,7 @@ file "/home/#{username}/.ssh/id_rsa" do
 end
 
 execute "add github to known hosts if necessary" do
-  github_string = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' 
+  github_string = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
   command "echo '#{github_string}' >> /home/#{username}/.ssh/known_hosts"
   not_if "grep '#{github_string}' /home/#{username}/.ssh/known_hosts"
-end
+end

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

@@ -42,4 +42,4 @@ end
 
 execute "make run script executable" do
   command "chmod 755 /service/#{service_name}/run"
-end
+end

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

@@ -4,4 +4,4 @@ end
 
 execute "install firefox" do
   command "yum -y install firefox"
-end
+end

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

@@ -55,4 +55,4 @@
   </builders>
   <publishers/>
   <buildWrappers/>
-</project>
+</project>

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/files/default/cacert.pem

@@ -3718,4 +3718,4 @@ mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
 QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
 T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
 Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
+-----END CERTIFICATE-----

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/libraries/marker.rb

@@ -1,10 +1,10 @@
 class Chef::Recipe
-  
+
   MARKER_DIR = "#{ENV['HOME']}/.install_markers"
-  
+
   #Regarding marker files:
   #
-  #The idea here is you have a simple "signal" on disk that tells you when you've 
+  #The idea here is you have a simple "signal" on disk that tells you when you've
   #successfully run something, and you don't want to run it again if you don't have to.
   #
   #Also, the decision to rerun a unit of work becomes explicit - and owned by you.
@@ -15,28 +15,28 @@ class Chef::Recipe
   #i.e. what markers are there and what are their timestamps?
   #
   #And reinstalls are easy - just rm the relevant marker file.
-  
+
   def run_unless_marker_file_exists(marker_file_name)
 
     directory MARKER_DIR do
       # owner WS_USER
       recursive true
     end
-    
+
     marker_path = File.join(MARKER_DIR, marker_file_name)
     if File.exists?(marker_path)
       log "skipping #{marker_file_name}: marker file found (#{marker_path}), detail: #{`ls -la #{marker_path}`.strip}"
     else
-      
+
       log "no marker file found for #{marker_file_name} in #{MARKER_DIR}, running"
-      
+
       yield
-      
+
       execute "touching marker file #{marker_path} after successful run" do
         # user WS_USER
         command "touch #{marker_path}"
       end
-      
+
     end
   end
-end
+end

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

@@ -1,4 +1,4 @@
 cookbook_file "/etc/pki/tls/certs/ca-bundle.crt" do
   source "cacert.pem"
   mode "0444"
-end
+end

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

@@ -12,4 +12,4 @@ end
 
 execute "make sure daemontools is installed" do
   command "ls /command/svscanboot"
-end
+end

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

@@ -9,4 +9,4 @@
       # arch arch_string
     end
   end
-end
+end

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

@@ -22,26 +22,26 @@ 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  --with-plugins=innobase,myisam"
     cwd src_dir
   end
-  
+
   execute "make" do
     command "make"
     cwd src_dir
   end
-  
+
   execute "make install" do
     command "make install"
     cwd src_dir
   end
-  
+
   execute "mysql owns #{install_dir}" do
     command "chown -R mysql #{install_dir}"
   end
-  
+
   execute "install db" do
     command "#{install_dir}/bin/mysql_install_db --user=mysql"
     cwd install_dir
@@ -93,7 +93,7 @@ end
 execute "create app_user user" do
   command "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"CREATE USER '#{mysql_user_name}'@'localhost'\""
   not_if "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"SELECT * FROM user where User='#{mysql_user_name}' and Host = 'localhost'\" | grep -q #{mysql_user_name}"
-end 
+end
 
 execute "set password for app_user" do
   command "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"SET PASSWORD FOR '#{mysql_user_name}'@'localhost' = PASSWORD('#{mysql_user_password}')\""

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

@@ -21,7 +21,7 @@ user "mysql"
 
 run_unless_marker_file_exists("mysql_5_5_11") do
   execute "download mysql src" do
-    command "mkdir -p #{src_dir} && curl -Lsf http://mysql.he.net/Downloads/MySQL-5.5/mysql-5.5.14.tar.gz |  tar xvz -C#{src_dir} --strip 1"
+    command "mkdir -p #{src_dir} && curl -Lsf http://mysql.he.net/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz |  tar xvz -C#{src_dir} --strip 1"
   end
 
   execute "cmake" do
@@ -33,7 +33,7 @@ run_unless_marker_file_exists("mysql_5_5_11") do
     command "make install"
     cwd src_dir
   end
-  
+
   execute "mysql owns #{install_dir}/data" do
     command "chown -R mysql #{install_dir}/data"
   end
@@ -75,7 +75,7 @@ end
 execute "create app_user user" do
   command "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"CREATE USER '#{mysql_user_name}'@'localhost'\""
   not_if "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"SELECT * FROM user where User='#{mysql_user_name}' and Host = 'localhost'\" | grep -q #{mysql_user_name}"
-end 
+end
 
 execute "set password for app_user" do
   command "#{install_dir}/bin/mysql -u root -p#{mysql_root_password} -D mysql -r -B -N -e \"SET PASSWORD FOR '#{mysql_user_name}'@'localhost' = PASSWORD('#{mysql_user_password}')\""
@@ -83,4 +83,4 @@ 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

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

@@ -10,6 +10,6 @@ script "compile & install node" do
   code "./configure && make install"
   not_if "which node"
 end
-  
-   
-    
+
+
+

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

@@ -25,26 +25,26 @@ run_unless_marker_file_exists("postgres_9_0_4") do
   execute "download postgres src" do
     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
     command "./configure --disable-debug --enable-thread-safety --with-gssapi --with-krb5 --with-openssl --with-libxml --with-libxslt --with-perl --bindir=/usr/local/bin"
     cwd src_dir
   end
-  
+
   execute "make" do
     command "make"
     cwd src_dir
   end
-  
+
   execute "make install" do
     command "make install"
     cwd src_dir
   end
-  
+
   directory "#{install_dir}/data/" do
     owner "postgres"
   end
-  
+
   execute "init db" do
     command "initdb -E UTF8 #{install_dir}/data/"
     user "postgres"
@@ -77,4 +77,4 @@ ruby_block "wait for postgres to come up" do
       end
     end
   end
-end
+end

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

@@ -17,4 +17,4 @@ run_unless_marker_file_exists("sqlite_0") do
   execute "install sqlite" do
     command "cd #{src_dir} && make install"
   end
-end
+end

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

@@ -14,4 +14,4 @@ end
 execute "swapon" do
   command "swapon #{swapfile_location}"
   not_if "cat /proc/swaps  | grep -q '/swapfile'"
-end
+end

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

@@ -16,16 +16,16 @@ http {
   sendfile        on;
   keepalive_timeout  65;
   tcp_nodelay        on;
- 
+
   upstream app_server {
     server 127.0.0.1:8080;
   }
- 
+
   server {
     root         /usr/local/nginx/html/;
- 
+
     try_files $uri @app_server;
- 
+
     location @app_server {
       proxy_set_header  X-Real-IP        $remote_addr;
       proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
@@ -39,4 +39,4 @@ http {
       root   html;
     }
   }
-}
+}

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-htaccess.erb

@@ -1,3 +1,3 @@
 <% node["nginx_settings"]["basic_auth_users"].each do |user| %>
 <%= "#{user["username"]}:#{user["password"].crypt("AA")}" %>
-<% end %>
+<% end %>

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/nginx-run-script.erb

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf
+exec /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf

data/lib/generators/lobot/templates/chef/cookbooks/pivotal_server/templates/default/postgres-run-script.erb

@@ -1,2 +1,2 @@
 #!/bin/sh
-/command/setuidgid postgres postgres -D /usr/local/pgsql/data
+/command/setuidgid postgres postgres -D /usr/local/pgsql/data

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

@@ -1,24 +1,22 @@
---- 
+---
 app_name: SHORT_APPLICATION_NAME
 app_user: APPLICATION_USER
 git_location: GIT CLONE URL
-basic_auth: 
+basic_auth:
 - username: BASIC_AUTH_LOGIN_NAME
   password: BASIC_AUTH_PASSWORD
-credentials: 
+credentials:
   aws_access_key_id: AWS_ACCESS_KEY #https://aws-portal.amazon.com/gp/aws/developer/account/index.html?ie=UTF8&action=access-key
   aws_secret_access_key: AWS_SECRET
   provider: AWS # leave this one
-server: 
+server:
   flavor_id: m1.large
   security_group: ci_servers
   name:    # run 'rake ci:server_start to populate'
   instance_id:  # run 'rake ci:server_start to populate'
+  ssh_port: # default to 22, but override here
 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
-id_rsa_for_github_access: |-
-  -----BEGIN RSA PRIVATE KEY-----
-  SSH KEY WITH ACCESS TO GITHUB GOES HERE
-  -----END RSA PRIVATE KEY-----
+github_private_ssh_key_path: ~/.ssh/id_rsa