relevance_rails 0.1.0 → 0.1.1.alpha

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+*v0.1.1.alpha*
+
+* Ruby manager agnostic - can use rvm, system ruby or rbenv
+* new APP --relevance-dev for simple QA development
+* Fix sudo on deploy user
+* provision rvmrc mirrors app's rvmrc
+* existing app users have a deploy that just works
+* fail fast in more places
+* stop and destroy provisioned instances from commandline
+
 *v0.1.0*
 
 * Provisioning can be done on existing apps

data/README.md

@@ -34,11 +34,19 @@ After a `bundle install`, pull in our chef recipes into provision/:
 
 ```sh
 # defaults to mysql
-$ rails g provision_config app_name
+$ rails g provision_config
 # if using postgresql
-$ rails g provision_config app_name postgresql
+$ rails g provision_config postgresql
 ```
 
+Configuring bundled ssh keys
+----------------------------
+
+By default, relevance_rails bundles all your keys from `ssh-add -L` with your instance. For bundling
+additional keys, you can create a ~/.relevance_rails/keys_git_url file and point it to a git repo that
+has additional keys. Keys in that git repo should exist as top level *.pub files. You *MUST* have at
+least one key to provision.
+
 Provisioning on EC2
 -------------------
 
@@ -66,11 +74,7 @@ server:
 Now just provision your instance:
 
 ```sh
-$ rake provision:ec2 NAME=qa
-...
-Server IP: 1.1.1.1
-# Pass IP from previous command as second argument
-$ rails g deployment qa 1.1.1.1
+$ rake provision:ec2_and_generate NAME=qa
 $ cap qa deploy:setup deploy
 ```
 
@@ -91,9 +95,11 @@ Vagrant instance should be up at 172.25.5.5.
 Supported Ruby Versions
 -----------------------
 
-Currently both Ruby 1.9.x and REE 1.8.7 are supported via RVM.  relevance_rails
+Currently both Ruby 1.9.x and REE 1.8.7 are supported. relevance_rails
 configures your Rails app (and Chef provisioning scripts) to require the version
-of Ruby you used to invoke the relevance_rails executable.
+of Ruby you used to invoke the relevance_rails executable. If relevance_rails is run
+in a non-rvm environment, all installation occurs in the current gem environment. If in rvm,
+the app is installed into its own rvm gemset.
 
 Supported Databases
 -------------------
@@ -105,17 +111,11 @@ standard `--database=postgresql` Rails option, relevance_rails will use PostgreS
 Maintainer Notes
 ----------------
 
-When QAing or doing local development of this gem, the gem must be built and installed locally.
-
-In order to test deployment, use the example below to package the relevance_rails gem:
+When QAing or doing local development of this gem, the gem must be built locally and creating
+an app needs an additional flag.
 
-    # Given a relevance_rails app "app" lives in "~/src/app"
-    # And the relevance_rails source lives in "~/src/relevance_rails"
-    ~/src/relevance_rails $ gem build relevance_rails.gemspec
-    ~/src/relevance_rails $ cd ~/src/app
-    ~/src/app $ gem install ../relevance_rails/relevance_rails-0.0.7.gem
-    ~/src/app $ bundle package
-    ~/src/app $ git commit -m "Package gems" vendor/cache
+    $ gem build relevance_rails.gemspec && gem install relevance_rails-VERSION.gem
+    $ relevance_rails new APP --relevance-dev
 
 Caveats
 -------

data/lib/generators/deployment/deployment_generator.rb

@@ -5,6 +5,7 @@ class DeploymentGenerator < Rails::Generators::NamedBase
   def write_stage_file
     create_file "config/deploy/#{name}.rb", <<-DEPLOY_STAGE
 set :user, 'deploy'
+set :use_sudo, false
 
 role :web, "#{hostname}"
 role :app, "#{hostname}"
@@ -20,6 +21,7 @@ role :db,  "#{hostname}", :primary => true
       else
         stages = eval($1)
         stages << name
+        stages.uniq!
         stage_array_contents = stages.map{|stage| "\"#{stage}\""}.join(', ')
         new_contents << "set :stages, [#{stage_array_contents}]\n"
       end

data/lib/generators/fixtures/fixtures_generator.rb

@@ -11,7 +11,9 @@ STR
 %h1 WELCOME HOME
 STR
     create_file "app/views/relevance_rails/db.html.haml", <<-STR
-%h1.database= ActiveRecord::Base.connection.current_database
+= conn = ActiveRecord::Base.connection
+= results = conn.execute("select 4200+42 as advanced_math")
+%h1.advanced_math= results.first["advanced_math"]
 STR
   end
 

data/lib/generators/provision_config/provision_config_generator.rb

@@ -1,7 +1,8 @@
 require 'relevance_rails'
 require 'rails/generators'
 
-class ProvisionConfigGenerator < Rails::Generators::NamedBase
+class ProvisionConfigGenerator < Rails::Generators::Base
+  include RelevanceRails::GeneratorOverrides
 
   desc "This generator configures the provision sub-directory with appropriate files."
 
@@ -11,6 +12,27 @@ class ProvisionConfigGenerator < Rails::Generators::NamedBase
 
   attr_reader :authorized_keys
 
+  # This generator may not receive a working directory;
+  # and we pull data by shelling out to RVM about the ruby
+  # version. This sets the directory explicitly beforehand.
+  def change_directory
+    Dir.chdir(destination_root)
+  end
+
+  def check_authorized_keys
+    if (@authorized_keys = fetch_keys).empty?
+      abort "No ssh keys were found! Check ssh-add -L and your keys_git_url config."
+    end
+  end
+
+  def create_capistrano_files
+    backup_copy_file 'Capfile', 'Capfile'
+    backup_template 'deploy.rb.erb', 'config/deploy.rb'
+    backup_copy_file 'recipes_deploy.rb', 'config/deploy/recipes/deploy.rb'
+    backup_copy_file 'vagrant.rb', 'config/deploy/vagrant.rb'
+    git :commit => '-m "Add Capistrano files"'
+  end
+
   def fetch_elzar
     git :remote => 'add -f elzar git://github.com/relevance/elzar.git'
     git :merge => '-s ours --no-commit elzar/master'
@@ -20,9 +42,6 @@ class ProvisionConfigGenerator < Rails::Generators::NamedBase
   end
 
   def create_authorized_key_data_bag
-    if (@authorized_keys = fetch_keys).empty?
-      abort "No ssh keys were found! Check ssh-add -L and your keys_git_url config."
-    end
     @authorized_keys.map! {|key| "\"#{key}\""}
     template('authorized_keys.json.erb', 'provision/data_bags/deploy/authorized_keys.json', {:force => true})
   end
@@ -31,14 +50,20 @@ class ProvisionConfigGenerator < Rails::Generators::NamedBase
     path = File.expand_path('provision/dna.json', destination_root)
     json = JSON.parse File.binread(path)
     json['rails_app']['name'] = name
-    # This generator may not receive a working directory;
-    # and we pull data by shelling out to RVM about the ruby
-    # version. This sets the directory explicitly beforehand.
-    Dir.chdir(destination_root)
     RelevanceRails::ChefDNA.gene_splice(json,database)
     create_file('provision/dna.json', JSON.generate(json), {:force => true})
   end
 
+  def create_rvmrc
+    if File.exists?(rvmrc = Rails.root.join('.rvmrc'))
+      create_file('provision/.rvmrc', File.read(rvmrc), :force => true)
+      git :add => 'provision/.rvmrc'
+    else
+      remove_file 'provision/.rvmrc'
+      git :rm => 'provision/.rvmrc'
+    end
+  end
+
   def commit_changes
     git :add => 'provision/data_bags/deploy/authorized_keys.json'
     git :add => 'provision/Vagrantfile'
@@ -48,6 +73,32 @@ class ProvisionConfigGenerator < Rails::Generators::NamedBase
 
   private
 
+  def name
+    Rails.application.class.name.split('::').first.underscore
+  end
+
+  def backup_copy_file(source, destination)
+    backup_manip_file(source, destination, :copy_file)
+  end
+
+  def backup_template(source, destination)
+    backup_manip_file(source, destination, :template)
+  end
+
+  def backup_manip_file(source, destination, operation)
+    if File.exists?(destination)
+      backup_file = "#{destination}.bak"
+      say_status :backup, "#{destination} to #{backup_file}"
+      git :mv => "#{destination} #{backup_file}"
+    end
+
+    send(operation, source, destination)
+    # git wasn't picking up current directory
+    change_directory
+    git :add => destination
+  end
+
+
   def fetch_keys
     local_keys = `ssh-add -L`.split("\n")
     local_keys = [] unless $?.success?

data/lib/generators/{relevance_file → provision_config}/templates/deploy.rb.erb

@@ -2,16 +2,17 @@ require 'bundler/capistrano'
 require 'capistrano_colors'
 
 set :application, "<%= name %>"
-set :repository,  "."
-set :deploy_via, :copy
 
 set :scm, :git
+set :repository,  "."
 
 set :deploy_to, "/var/www/apps/#{ application }"
+set :deploy_via, :copy
+set :copy_exclude, '.git/*'
+
 default_run_options[:pty] = true
 set :ssh_options, { :paranoid => false, :forward_agent => true }
 
-set :copy_exclude, '.git/*'
 
 set :stages, %w(vagrant)
 set :default_stage, 'vagrant'

data/lib/generators/{relevance_file → provision_config}/templates/vagrant.rb

@@ -1,4 +1,5 @@
 set :user, 'deploy'
+set :use_sudo, false
 
 role :web, "172.25.5.5"
 role :app, "172.25.5.5"

data/lib/generators/relevance_file/relevance_file_generator.rb

@@ -21,7 +21,9 @@ class RelevanceFileGenerator < Rails::Generators::NamedBase
   end
 
   def create_rvmrc
-    create_file ".rvmrc", "rvm use #{RelevanceRails.rvm_version}@#{name}"
+    if ENV['rvm_path']
+      create_file ".rvmrc", "rvm use #{RelevanceRails.ruby_version}@#{name}"
+    end
   end
 
   def create_rspec
@@ -32,14 +34,6 @@ class RelevanceFileGenerator < Rails::Generators::NamedBase
     copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
   end
 
-  def copy_capfile
-    copy_file 'Capfile', 'Capfile'
-  end
-
-  def create_deploy
-    template 'deploy.rb.erb', 'config/deploy.rb'
-  end
-
   def create_database_example_yml
     if database == 'mysql'
       template 'database.example.yml.mysql.erb', 'config/database.example.yml'
@@ -50,14 +44,6 @@ class RelevanceFileGenerator < Rails::Generators::NamedBase
     end
   end
 
-  def copy_deploy_recipes
-    copy_file 'recipes_deploy.rb', 'config/deploy/recipes/deploy.rb'
-  end
-
-  def copy_vagrant_stage
-    copy_file 'vagrant.rb', 'config/deploy/vagrant.rb'
-  end
-
   def fix_session_store
     gsub_file 'config/initializers/session_store.rb', 'key:', ':key =>'
   end

data/lib/relevance_rails/chef_dna.rb

@@ -15,14 +15,16 @@ module RelevanceRails::ChefDNA
   end
 
   def self.set_ruby(json)
-    if RelevanceRails.rvm_version =~ /^ree-(.*)/i
+    if RelevanceRails.ruby_version =~ /^ree-(.*)/i
       json['ruby_enterprise']['version'] = $1
       json['ruby_enterprise']['url'] = "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-#{$1}"
       appstack_index = json['run_list'].find_index {|e| e[/^role\[.*_appstack\]$/] }
       json['run_list'][appstack_index] = 'role[enterprise_appstack]'
-    elsif RelevanceRails.rvm_version =~ /^ruby-(.*)/i
-      json['ruby']['version'] = $1
-      json['ruby']['url'] = "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-#{$1}.tar.gz"
+    elsif RelevanceRails.ruby_version =~ /^ruby-(.*)/i
+      full_version = $1
+      json['ruby']['version'] = full_version
+      major_version = full_version[/(\d\.\d).*/, 1]
+      json['ruby']['url'] = "http://ftp.ruby-lang.org/pub/ruby/#{major_version}/ruby-#{full_version}.tar.gz"
       appstack_index = json['run_list'].find_index {|e| e[/^role\[.*_appstack\]$/] }
       json['run_list'][appstack_index] = 'role[ruby_appstack]'
     else

data/lib/relevance_rails/generator_overrides.rb

@@ -0,0 +1,13 @@
+module RelevanceRails
+  module GeneratorOverrides
+    def git(commands={})
+      super
+      if !$?.success?
+        command_string = commands.is_a?(Symbol) ? "git #{commands}" :
+          commands.map {|cmd, options| "git #{cmd} #{options}" }.join("; ")
+        msg = "Generator failed with command(s): #{command_string}"
+        abort "\n#{'*' * msg.size}\n#{msg}\n#{'*' * msg.size}"
+      end
+    end
+  end
+end

data/lib/relevance_rails/provision.rb

@@ -1,40 +1,97 @@
 require 'fog'
+require 'thor'
+require 'timeout'
 
 module RelevanceRails
   module Provision
     def self.create_ec2(name = nil)
       abort "Please provide a $NAME" unless name
-      provision_ec2_instances(name)
+      server = provision_ec2_instances(name)
+      wait_for_ssh server
+      run_commands server
+    end
+
+    def self.stop_ec2
+      return unless ENV["FORCE"] == "true" || Thor::Shell::Basic.new.yes?("Are you sure you want to shut down EC2 instance #{instance_id}?")
+      puts "Shutting down EC2 instance #{instance_id}..."
+      server = fog_connection.servers.get(instance_id)
+      server.stop
+      server.wait_for { state == "stopped" }
+      puts "Done!"
+    end
+
+    def self.destroy_ec2
+      return unless ENV["FORCE"] == "true" || Thor::Shell::Basic.new.yes?("Are you sure you want to destroy EC2 instance #{instance_id}?")
+      puts "Destroying EC2 instance #{instance_id}..."
+      server = fog_connection.servers.get(instance_id)
+      server.destroy
+      server.wait_for { state == "terminated" }
+      puts "Removing config/ec2_instance.txt..."
+      File.delete('config/ec2_instance.txt')
+      puts "Done!"
+    end
+
+    def self.current_dns
+      server = fog_connection.servers.get(instance_id)
+      puts server.reload.dns_name
     end
 
     private
+
+    def self.instance_id
+      @instance_id ||= File.read('config/ec2_instance.txt').chomp
+    end
+
+    def self.config
+      @config ||= YAML::load(File.read(File.expand_path("~/.relevance_rails/aws_config.yml")))
+    end
+
+    def self.fog_connection
+      @fog_connection ||= Fog::Compute.new(config['aws_credentials'].merge(:provider => 'AWS'))
+    end
+
     def self.provision_ec2_instances(name)
-      config = YAML::load(File.read(File.expand_path("~/.relevance_rails/aws_config.yml")))
-      fog = Fog::Compute.new(config['aws_credentials'].merge(:provider => 'AWS'))
-      server = fog.servers.create(config['server']['creation_config'])
-      fog.tags.create(:key => 'Name',
+      puts "Provisioning an instance..."
+      server = fog_connection.servers.create(config['server']['creation_config'])
+      fog_connection.tags.create(:key => 'Name',
                       :value => "#{Rails.application.class.parent_name} #{name}",
                       :resource_id => server.id)
       server.private_key = config['server']['private_key']
-      wait_for_ssh server
-      jobs = []
+      
+      File.open("config/ec2_instance.txt", "w") do |f|
+        f.puts(server.id)
+      end
+
+      puts "Provisioned!"
+      server
+    end
+    
+    def self.run_commands(server)
       puts "Updating apt cache..."
-      jobs += server.ssh('sudo apt-get update')
+      run_command(server, 'sudo apt-get update')
       puts "Installing ruby..."
-      jobs += server.ssh('sudo apt-get -y install ruby')
+      run_command(server, 'sudo apt-get -y install ruby')
       puts "Installing rubygems..."
-      jobs += server.ssh('sudo apt-get -y install rubygems1.8')
+      run_command(server, 'sudo apt-get -y install rubygems1.8')
       puts "Installing chef..."
-      jobs += server.ssh('sudo gem install chef --no-ri --no-rdoc --version 0.10.8')
+      run_command(server, 'sudo gem install chef --no-ri --no-rdoc --version 0.10.8')
       puts "Copying chef resources from provision directory.."
       server.scp("#{Rails.root.join('provision')}/", '/tmp/chef-solo', :recursive => true)
       puts "Converging server, this may take a while (10-20 minutes)"
-      jobs += server.ssh('cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json')
-      print_errors(jobs)
+      run_command(server, 'cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json')
+
+      puts "Server Instance: #{server.id}"
       puts "Server IP: #{server.public_ip_address}"
+      server
+    end
+
+    def self.run_command(server, command)
+      jobs = server.ssh(command)
+      exit 1 unless jobs_succeeded?(jobs)
     end
 
     def self.wait_for_ssh(server)
+      puts "Waiting for ssh connectivity..."
       server.wait_for { ready? }
       succeeded = false
       attempts = 0
@@ -42,27 +99,29 @@ module RelevanceRails
       until succeeded || attempts > 4
         sleep 10
         begin
-          server.ssh('ls')
+          # Should be checked for compatability across rubies
+          Timeout.timeout(60) { server.ssh('ls') }
           succeeded = true
-        rescue Errno::ECONNREFUSED => e
-          puts "Connection #{attempts} refused, retrying..."
+        rescue Errno::ECONNREFUSED, Timeout::Error => e
+          puts "Connecting to Amazon refused. Attempt #{attempts+1}..."
           attempts += 1
           last_error = e
         end
       end
       raise last_error unless succeeded
-      puts "Server up and listening for SSH..."
+      puts "Server up and listening for SSH!"
     end
 
-    def self.print_errors(jobs)
-      return if jobs.all? { |job| job.status == 0 }
+    def self.jobs_succeeded?(jobs)
+      return true if jobs.all? { |job| job.status == 0 }
       jobs.each do |job|
         puts "----------------------"
-        puts "Running #{job.command}"
+        puts "Command '#{job.command}'"
         puts "STDOUT: #{job.stdout}"
         puts "STDERR: #{job.stderr}"
         puts "----------------------"
       end
+      false
     end
 
   end

data/lib/relevance_rails/relevance_rails_template.rb

@@ -1,11 +1,6 @@
 require 'relevance_rails'
 require 'json'
 
-def rvm_run(command)
-  say_status :rvm_run, command
-  RelevanceRails.rvm_run(command)
-end
-
 db = ['postgresql','mysql'].include?(options[:database]) ? options[:database] : 'mysql'
 
 remove_file 'README.rdoc'
@@ -19,13 +14,17 @@ remove_file 'app/views/layouts/application.html.erb'
 
 generate(:relevance_file, app_name, db)
 
-run "rvm gemset create #{app_name}"
-rvm_run "gem install bundler"
-rvm_run "bundle install"
+inside destination_root do
+  run "gem install bundler"
+  run "bundle install"
+end
 
 git :init
 append_file ".gitignore", "config/database.yml\n"
 run 'cp config/database.example.yml config/database.yml'
 git :add => "."
 git :commit => "-a -m 'Initial commit'"
-generate(:provision_config, app_name, db)
+
+inside destination_root do
+  generate(:provision_config, db)
+end

data/lib/relevance_rails/runner.rb

@@ -5,14 +5,45 @@ module RelevanceRails
     def self.start(argv=ARGV)
       if argv.delete '--version'
         puts "RelevanceRails #{RelevanceRails::VERSION}"
-      else
+      elsif argv[0] == 'new'
         add_default_options! argv
-        exec 'rails', *argv
+        if ENV['rvm_path'].nil?
+          exec 'rails', *argv
+        else
+          app_name = argv[1]
+          env = setup_rvm app_name
+
+          new_rvm_string = "#{env.environment_name.split('@')[0]}@#{app_name}"
+          install_relevance_rails argv, new_rvm_string, env.environment_name
+          exec new_rvm_string,'-S','rails', *argv
+        end
       end
     end
 
     private
 
+    def self.setup_rvm(app_name)
+      $LOAD_PATH.unshift "#{ENV['rvm_path']}/lib"
+      require 'rvm'
+
+      env = RVM::Environment.current
+      env.gemset_create(app_name)
+      env
+    end
+
+    def self.install_relevance_rails(argv, new_rvm_string, current_gemset)
+      child_env = RVM::Environment.new(new_rvm_string)
+      puts "Installing relevance_rails into the app's gemset..."
+
+      result = if argv.delete '--relevance-dev'
+        rubygem = "#{ENV['rvm_path']}/gems/#{current_gemset}/cache/relevance_rails-#{RelevanceRails::VERSION}.gem"
+        child_env.run('gem', 'install', rubygem)
+      else
+        child_env.run('gem', 'install', 'relevance_rails', '-v', RelevanceRails::VERSION)
+      end
+      abort "Unable to install relevance_rails into the new gemset" if result.exit_status != 0
+    end
+
     def self.add_default_options!(argv)
       unless argv.any? =~ /^-d$/
         template = File.join(File.dirname(__FILE__), "relevance_rails_template.rb")

data/lib/relevance_rails/version.rb

@@ -1,3 +1,3 @@
 module RelevanceRails
-  VERSION = "0.1.0"
+  VERSION = "0.1.1.alpha"
 end

data/lib/relevance_rails.rb

@@ -2,30 +2,16 @@ require "relevance_rails/version"
 require "relevance_rails/public_key_fetcher"
 require "relevance_rails/chef_dna"
 require 'relevance_rails/railtie' if defined? Rails
+require 'relevance_rails/generator_overrides'
 
 module RelevanceRails
-  def self.rvm_gemset
-    @rvm_gemset ||= rvm_current.split('@')[1] || 'global'
-  end
-
-  def self.rvm_version
-    @rvm_version ||= rvm_current.split('@')[0] || 'ruby-1.9.3-p0'
-  end
-
-  def self.rvm_current
-    @rvm_current ||= rvm_exec('rvm current').chomp
-  end
-
-  # rvm_current SHOULD be in $PATH and execute ruby for the
-  # correct version and gemset
-  def self.rvm_run(command)
-    ret = `#{rvm_current} -S #{command}`
-    unless $?.success?
-      abort "\n     Command '#{command}' failed with:\n#{ret}"
+  def self.ruby_version
+    @ruby_version ||= begin
+      if RUBY_DESCRIPTION[/Ruby Enterprise Edition (\d{4}\.\d\d)/, 1]
+        "ree-#{RUBY_VERSION}-#{$1}"
+      else
+        "ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+      end
     end
   end
-  
-  def self.rvm_exec(command)
-    `bash -c 'source ~/.rvm/scripts/rvm > /dev/null && #{command}'`
-  end
 end

data/lib/tasks/provision.rake

@@ -1,8 +1,29 @@
 require 'relevance_rails/provision'
 
 namespace :provision do
+  desc 'Provision a deployable EC2 instance and generate Capistrano config'
+  task :ec2_and_generate do
+    server = RelevanceRails::Provision.create_ec2(ENV['NAME'])
+    system('rails', 'generate', 'deployment', ENV['NAME'], server.public_ip_address)
+  end
+
   desc 'Provision a deployable EC2 instance'
   task :ec2 do
     RelevanceRails::Provision.create_ec2(ENV['NAME'])
   end
+
+  desc 'Stop your previously-provisioned EC2 instance'
+  task :stop do
+    RelevanceRails::Provision.stop_ec2
+  end
+
+  desc 'Destroy your previously-provisioned EC2 instance'
+  task :destroy do
+    RelevanceRails::Provision.destroy_ec2
+  end
+  
+  desc 'Return the current public DNS name for your previously-provisioned EC2 instance'
+  task :current_dns do
+    RelevanceRails::Provision.current_dns
+  end
 end

data/relevance_rails.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |s|
   s.executables   = ['relevance_rails']
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "rails", "~> 3.2"
+  s.add_runtime_dependency 'rails', '~> 3.2'
   s.add_runtime_dependency 'fog', '~> 1.3.0'
+  s.add_runtime_dependency 'thor', '~> 0.14.6'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'rspec'

data/script/ci

@@ -1,40 +1,66 @@
-#!/bin/bash -v
+#!/bin/bash
+
+# Function to sanity-check generators since Rails 3.x does not
+# give a non-zero exist code if generators fail
+function files_must_exist {
+  for checked_file in "$@"; do
+    if [ ! -e "$checked_file" ]; then
+      echo "'$checked_file' didn't exist!"
+      exit 1
+    fi
+  done
+}
+
+# Function to sanity-check generators since Rails 3.x does not
+# give a non-zero exist code if generators fail
+function files_must_NOT_exist {
+  for checked_file in "$@"; do
+    if [ -e "$checked_file" ]; then
+      echo "'$checked_file' still exists!"
+      exit 1
+    fi
+  done
+}
 
 RAILS_APP="app_for_ci"
 TARGET_HOST="placeholder.example.com"
 
+# Setup RVM
 source "$HOME/.rvm/scripts/rvm"
 rvm use "ruby-1.9.2@relevance_rails"
+echo "RVM is now using:` rvm current`"
+
+# exit if any statement fails;
+# must be set AFTER loading RVM
+set -e
 
 gem install bundler
 bundle install
 bundle exec rake spec
 
-# exit if any statement fails; must be set AFTER loading RVM
-set -e
-
 echo "Building new relevance_rails gem..."
 rm -Rf relevance_rails-*.gem
-gem build --verbose relevance_rails.gemspec 
+gem build --verbose relevance_rails.gemspec
 echo "Done"
 
-# NOTE: Manual install of just-built gem to workaround bundler wanting 
-# it to live on rubygems.org. 
+# NOTE: Manual install of just-built gem to workaround bundler wanting
+# it to live on rubygems.org.
 # NOTE: RVM 1.x doesn't work with "set -e", so you have to unset/set it.
 set +e
 rvm --force gemset delete $RAILS_APP
 rvm gemset create $RAILS_APP
 rvm gemset use $RAILS_APP
+echo "RVM is now using:` rvm current`"
 set -e
 
-if [ `gem list relevance_rails --installed` = "true" ]; then
+if $(gem list relevance_rails --installed); then
   echo "Removing old relevance_rails gem..."
-  gem uninstall --verbose --all --executables relevance_rails 
+  gem uninstall --verbose --all --executables relevance_rails
   echo "Done"
 fi
 
 echo "Installing relevance_rails gem into $RAILS_APP gemset..."
-gem install relevance_rails-*.gem 
+gem install relevance_rails-*.gem
 echo "Done."
 
 rm -Rf ./$RAILS_APP
@@ -42,16 +68,21 @@ relevance_rails new $RAILS_APP --database=postgresql
 
 # NOTE: this does NOT change the RVM gemset; we set it manually above
 builtin cd $RAILS_APP
+echo "RVM is now using:` rvm current`"
 
-echo "Generating relevance_rails deployment scripts..."
-./script/rails generate deployment staging $TARGET_HOST
-git add .
-git commit -m "Generated relevance_rails deployment scripts."
-echo "Done."
+files_must_NOT_exist public/index.html
+files_must_exist config/database.yml provision/dna.json config/deploy.rb config/deploy/recipes/deploy.rb
 
 echo "Generating relevance_rails fixtures..."
 ./script/rails generate fixtures
 git add .
 git commit -m "Generated relevance_rails fixtures."
+files_must_exist app/assets/javascripts/relevance_rails.js.coffee app/assets/stylesheets/relevance_rails.css.scss
 echo "Done."
 
+echo "Generating relevance_rails deployment scripts..."
+./script/rails generate deployment staging $TARGET_HOST
+git add .
+git commit -m "Generated relevance_rails deployment scripts for $TARGET_HOST."
+files_must_exist config/deploy/staging.rb
+echo "Done."

data/script/ci_nightly

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Set the DISPLAY variable if not already set
+: ${DISPLAY:=":1"}
+# Allows firefox to use display
+export DISPLAY
+
+RAILS_APP="app_for_ci"
+EC2_MEMENTO_FILE="config/ec2_instance.txt"
+
+function stop_server_and_exit {
+  if [ -f $EC2_MEMENTO_FILE ]; then
+    echo "Stopping newly-created server..."
+    bundle exec rake provision:stop FORCE=true --trace
+    echo "Done."
+  fi  
+
+  echo "BUILD FAILED"
+  exit 1
+}
+
+echo "RVM is now using:` rvm current`"
+
+set -e
+./script/ci 
+set +e 
+
+source "$HOME/.rvm/scripts/rvm"
+rvm use "ruby-1.9.2@$RAILS_APP"
+echo "RVM is now using:` rvm current`"
+
+builtin cd $RAILS_APP
+
+echo "Provisioning an EC2 instance..."
+rm -f $EC2_MEMENTO_FILE
+server_name="Nightly Build Testing - `date "+%Y-%m-%d %H:%M:%S"` "
+bundle exec rake --trace provision:ec2 NAME="$server_name"
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done!"
+
+echo "Determine the EC2 instance's DNS name..."
+TARGET_HOST=`bundle exec rake provision:current_dns`
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done."
+
+echo "Generating relevance_rails deployment scripts..."
+./script/rails generate deployment staging $TARGET_HOST --force
+[ $? -ne 0 ] && stop_server_and_exit
+git add .
+git commit -m "Generated relevance_rails deployment scripts for $TARGET_HOST."
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done."
+ 
+echo "Capistrano: setup..."
+bundle exec cap staging deploy:setup
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done."
+ 
+echo "Capistrano: deploying..."
+bundle exec cap staging deploy:cold
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done."
+
+builtin cd -
+rvm gemset use relevance_rails
+echo "RVM is now using:` rvm current`"
+
+echo "Running the acceptance tests against our newly-created server..."
+ACCEPTANCE_HOST=$TARGET_HOST rake acceptance --trace
+[ $? -ne 0 ] && stop_server_and_exit
+echo "Done."
+
+builtin cd $RAILS_APP
+rvm gemset use $RAILS_APP
+
+echo "Terminating our newly-created server..."
+bundle exec rake provision:destroy FORCE=true --trace 
+echo "Done!"
+

data/spec/acceptance_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe 'App is alive', :js => true, :acceptance => true do
-  it 'verifies coffeescript served up as js' do
-    visit '/assets/relevance_rails.js'
-    page.should have_content "console.log('Hello from Relevance, Inc!');"
-  end
-
   it "verifies haml is served up" do
     visit '/relevance_rails'
     page.should have_content 'WELCOME HOME'
   end
 
+  it 'verifies coffeescript served up as js' do
+    visit '/assets/application.js'
+    page.should have_content 'console.log("Hello from Relevance, Inc!")'
+  end
+
   it "verifies scss is served up as css" do
-    visit '/assets/relevance_rails.css'
-    page.should have_content "background-color: blue;"
+    visit '/assets/application.css'
+    page.should have_content "background-color:blue"
   end
 
   it "verifies a working database connection" do
     visit '/relevance_rails/db'
-    within ('h1.database') do
-      page.should have_content '_development'
+    within ('h1.advanced_math') do
+      page.should have_content '4242'
     end
   end
 end

data/spec/lib/provision_config_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'generators/provision_config/provision_config_generator'
 
 describe ProvisionConfigGenerator do
-  context '#create_authorized_key_data_bag' do
+  context '#check_authorized_keys' do
     subject { ProvisionConfigGenerator.new(['name']) }
 
     it "aborts if no ssh-keys are found" do
@@ -14,14 +14,13 @@ describe ProvisionConfigGenerator do
       RelevanceRails::PublicKeyFetcher.should_receive(:public_keys).and_return([])
 
       should_abort_with(/^No ssh keys were found!/) do
-        subject.create_authorized_key_data_bag
+        subject.check_authorized_keys
       end
     end
 
     it "doesn't abort if ssh-keys are found" do
       subject.should_receive(:fetch_keys).and_return(['ssh-rsa ZZZZ'])
-      subject.should_receive(:template)
-      expect { subject.create_authorized_key_data_bag }.to_not raise_error
+      expect { subject.check_authorized_keys }.to_not raise_error
     end
   end
 end

data/spec/lib/provision_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'relevance_rails/provision'
+
+describe RelevanceRails::Provision do
+  describe '.run_commands' do
+    it "fails fast if a command fails" do
+      job = mock(:status => 1, :stdout => '', :stderr => 'FAIL WHALE', :command => 'exit 1')
+      server = mock(:ssh => [job])
+      capture_stdout do
+        expect do
+          RelevanceRails::Provision.run_commands server
+        end.to raise_error SystemExit
+      end.should =~ /STDERR: FAIL WHALE/
+    end
+  end
+end

data/spec/lib/runner_spec.rb

@@ -13,9 +13,13 @@ describe RelevanceRails::Runner do
     end
 
     it "new calls exec" do
-      RelevanceRails::Runner.should_receive(:exec).with('rails', 'new', 'the_app', '-m',
+      RelevanceRails::Runner.should_receive(:exec).with(anything,
+        '-S', 'rails', 'new', 'the_app', '-m',
         File.expand_path(File.dirname(__FILE__) +
                          "/../../lib/relevance_rails/relevance_rails_template.rb"))
+      RelevanceRails::Runner.should_receive(:install_relevance_rails)
+      env = mock :environment_name => '1.9.3@default'
+      RelevanceRails::Runner.should_receive(:setup_rvm).and_return(env)
       start('new', 'the_app')
     end
   end

data/spec/spec_helper.rb

@@ -55,5 +55,4 @@ end
 
 Capybara.current_driver = :selenium
 Capybara.run_server = false
-#Capybara.app_host = 'http://' + (ENV["ACCEPTANCE_HOST"] || 'localhost:3000')
-Capybara.app_host = ENV["ACCEPTANCE_HOST"] || 'http://localhost:3000'
+Capybara.app_host = 'http://' + (ENV["ACCEPTANCE_HOST"] || 'localhost:3000')

data/techdebt.md

@@ -6,8 +6,13 @@
 ** cleaner rvm version detection - intermittenly picks up no version
 ** intermittent mysql::server failures (mysql server not up yet) on `vagrant up`. Attempt fix in site_cookbooks
 ** intermittent setup failure - apt-get update fails with 404s or ruby not found
+** when generating an app with --database=postgresql, provision_config
+   generator intermittently fails at the beginning with different gem not found
+   errors. Generating the app more than once or inspecting the problem solves it
+** provision_config generator intermittently can't detect current working directory which breaks
+   git commands. Current solution of sprinkling Dir.chdir is a bandaid at best.
 
-* deployment generator
+* Provisioning an instance
 ** Don't hardcode path to chef binstub, caused by ubuntu installing weirdness
 ** Make the deployment generator idempotent
 ** Better error handling when the aws.yml is not present

metadata

@@ -1,122 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: relevance_rails
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1.alpha
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Alex Redington
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
   name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id006
-description: A Rails 3 wrapper which forces template use and includes a plethora of generators for standard Relevance bits.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+description: A Rails 3 wrapper which forces template use and includes a plethora of
+  generators for standard Relevance bits.
+email:
 - alex.redington@thinkrelevance.com
-executables: 
+executables:
 - relevance_rails
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -129,20 +144,21 @@ files:
 - lib/generators/deployment/deployment_generator.rb
 - lib/generators/fixtures/fixtures_generator.rb
 - lib/generators/provision_config/provision_config_generator.rb
+- lib/generators/provision_config/templates/Capfile
 - lib/generators/provision_config/templates/authorized_keys.json.erb
+- lib/generators/provision_config/templates/deploy.rb.erb
+- lib/generators/provision_config/templates/recipes_deploy.rb
+- lib/generators/provision_config/templates/vagrant.rb
 - lib/generators/relevance_file/relevance_file_generator.rb
-- lib/generators/relevance_file/templates/Capfile
 - lib/generators/relevance_file/templates/Gemfile.erb
 - lib/generators/relevance_file/templates/README.markdown.erb
 - lib/generators/relevance_file/templates/application.html.haml.erb
 - lib/generators/relevance_file/templates/database.example.yml.mysql.erb
 - lib/generators/relevance_file/templates/database.example.yml.postgresql.erb
-- lib/generators/relevance_file/templates/deploy.rb.erb
-- lib/generators/relevance_file/templates/recipes_deploy.rb
 - lib/generators/relevance_file/templates/spec_helper.rb
-- lib/generators/relevance_file/templates/vagrant.rb
 - lib/relevance_rails.rb
 - lib/relevance_rails/chef_dna.rb
+- lib/relevance_rails/generator_overrides.rb
 - lib/relevance_rails/provision.rb
 - lib/relevance_rails/public_key_fetcher.rb
 - lib/relevance_rails/railtie.rb
@@ -152,48 +168,35 @@ files:
 - lib/tasks/provision.rake
 - relevance_rails.gemspec
 - script/ci
+- script/ci_nightly
 - spec/acceptance_spec.rb
 - spec/lib/provision_config_generator_spec.rb
-- spec/lib/relevance_rails_spec.rb
+- spec/lib/provision_spec.rb
 - spec/lib/runner_spec.rb
 - spec/spec_helper.rb
 - techdebt.md
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: relevance_rails
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Rails 3 Relevance style, with all infrastructure bits automated away.
-test_files: 
-- spec/acceptance_spec.rb
-- spec/lib/provision_config_generator_spec.rb
-- spec/lib/relevance_rails_spec.rb
-- spec/lib/runner_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/lib/relevance_rails_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe RelevanceRails do
-  context '.rvm_run' do
-    it 'aborts when the command fails' do
-      should_abort_with(/Command '.+' failed with/) do
-        subject.rvm_run('-e "exit 1"')
-      end
-    end
-
-    it 'succeeds when the command passes' do
-      expect { subject.rvm_run('-e "exit 0"') }.to_not raise_error
-    end
-  end
-end