dew 0.1.2 → 0.1.3

data/README.md

@@ -63,6 +63,28 @@ And perform a basic self-test:
 
 ## Creating a Simple Environment
 
+Assuming that you've created (or downloaded) your `~/.dew` directory, you should be ready to create a simple environment.
+
+First, take a look at `~/.dew/profiles/test-light.yaml`. `test-light` is the profile we'll be using to create our environment. You'll see that it contains:
+
+  * AMIs for each region
+  * two instances, using the 'default' keypair and the 'default' security group
+  * an elastic load balancer (elb) with a listener on port 80
+  
+If your keypair isn't called 'default', you'll need to edit this file and change it.
+
+Now, run:
+
+    dew -v environments create test-light my-first-environment
+    
+You'll be shown a summary of the environment that you're about to create. Type 'y' to confirm its creation and watch as it's created.
+
+Once complete you can run the following commands to interact with your environment:
+
+    dew environments ssh my-first-environment
+    dew environments show my-first-environment
+    dew environments destroy my-first-environment
+
 ## Creating an AMI for a new Environment
 
 ## Deploying to an Environment

data/example/dew/profiles/test-full.yaml

@@ -7,7 +7,7 @@ instances:
   size: c1.medium
   count: 2
   security-group: default
-  keypair: devops 
+  keypair: default 
 elb:
   listener_ports:
     - 80

data/example/dew/profiles/test-light.yaml

@@ -25,7 +25,7 @@ instances:
   #security-groups:
   #  - default
 
-  keypair: devops
+  keypair: default
 
 elb:
   listener_ports:

data/features/step_definitions/aws-steps.rb

@@ -84,18 +84,18 @@ end
 Then /^PUGE database environment variables should be set on each server to match the created RDS$/ do
   environment.servers.each do |server|
     ssh = server.ssh
-    %w{PUGE_DB_NAME PUGE_DB_USERNAME PUGE_DB_PASSWORD}.each do |var|
+    %w{DB_NAME DB_USERNAME DB_PASSWORD}.each do |var|
       ssh.run("echo $#{var}").chomp.length.should_not == 0
     end
-    ssh.run("echo $PUGE_DB_HOST").chomp.should == environment.database.public_address
+    ssh.run("echo $DB_HOST").chomp.should == environment.database.public_address
   end
 end
 
 Then /^I should be able to connect to the RDS$/ do
   environment.servers.each do |server|
     ssh = server.ssh
-    #host.run("nc -w 1 $PUGE_DB_HOST 3306 > /dev/null 2>&1 ; echo $?").chomp.should == "0"
+    #host.run("nc -w 1 $DB_HOST 3306 > /dev/null 2>&1 ; echo $?").chomp.should == "0"
     ssh.run("sudo apt-get install -y mysql-client", :quiet_stderr => true)
-    ssh.run("echo show databases | mysql -u$PUGE_DB_USERNAME -p$PUGE_DB_PASSWORD -h$PUGE_DB_HOST").chomp.length.should_not == 0
+    ssh.run("echo show databases | mysql -u$DB_USERNAME -p$DB_PASSWORD -h$DB_HOST").chomp.length.should_not == 0
   end
 end

data/lib/dew/commands/deploy.rb

@@ -16,14 +16,41 @@ class DeployCommand < Clamp::Command
     parameter "ENVIRONMENT_NAME", "Environment to deploy into"
 
     option ['--rails-env'], 'ENVIRONMENT', "Rails environment to use", :default => 'production'
+    option ['--server-name'], 'SERVER_NAME', "Server name for Name-Based Virtual Host"
+    option ['--ssl-certificate'], 'FILE', "SSL Certificate file"
+    option ['--ssl-private-key'], 'FILE', "SSL Private Key file"
+    option ['--[no-]passenger'], :flag, "Use passenger (just server public/* if unset)", :default => true, :attribute_name => :use_passenger
+
+    def check_and_remove_rvmrc
+      if ssh.exist? "#{application_name}/.rvmrc"
+        Inform.debug(".rvmrc discovered - removing to avoid Passenger conflicts")
+        # XXX We need a company-wide standard or a better way of supporting .rvmrc stuffs
+        ssh.run "rm -f #{application_name}/.rvmrc"
+      end
+    end
 
+    def use_ssl?
+      ssl_certificate || ssl_private_key
+    end
+    
     def execute
+      if use_ssl?
+        raise "--server-name required if SSL credentials supplied" unless server_name
+        raise "--ssl-private-key required if SSL certificate supplied" unless ssl_private_key
+        raise "--ssl-private-key file #{ssl_private_key} does not exist" unless File.exist?(ssl_private_key)
+        raise "--ssl-certificate required if SSL private key supplied" unless ssl_certificate
+        raise "--ssl-certificate file #{ssl_certificate} does not exist" unless File.exist?(ssl_certificate)
+      end
+       
       env = Environment.get(environment_name)
+      
+      db_managed = false
+      
       env.servers.each do |server|
         Inform.info("Working with server %{id} of %{l} servers", :id => server.id, :l => env.servers.length)
         env.remove_server_from_elb(server) if env.has_elb?
 
-        ssh = server.ssh
+        @ssh = server.ssh
         initial = !ssh.exist?(application_name)
 
         Inform.info("%{app} doesn't exist - initial install", :app => application_name) if initial
@@ -34,17 +61,22 @@ class DeployCommand < Clamp::Command
 
         Inform.info("Obtaining version %{v} of %{app}", :v => revision, :app => application_name) do
           if initial
-            Inform.debug("Writing out ~/.ssh/known_hosts file to allow github clone")
-            ssh.upload template('known_hosts'), ".ssh/known_hosts"
+            unless ssh.exist?('.ssh/known_hosts') && ssh.read('.ssh/known_hosts').include?(File.read(template('known_hosts')))
+              Inform.debug("Writing out ~/.ssh/known_hosts file to allow github clone")
+              ssh.upload template('known_hosts'), ".ssh/known_hosts"
+            end
             Inform.debug("Cloning %{app} in to ~/%{app}", :app => application_name)
             ssh.run "git clone git@github.com:playup/#{application_name}.git #{application_name}"
           else
             Inform.debug("Updating %{app} repository",  :app => application_name)
+            check_and_remove_rvmrc
             ssh.run "cd #{application_name}; git fetch -q"
           end
-
+          
+          check_and_remove_rvmrc
           Inform.debug("Checking out version %{version}", :version => revision)
           ssh.run "cd #{application_name} && git checkout -q -f origin/#{revision}"
+          check_and_remove_rvmrc
         end
 
         cd_and_rvm = "cd #{application_name} && . /usr/local/rvm/scripts/rvm && rvm use ruby-1.9.2 && RAILS_ENV=#{rails_env} "
@@ -54,23 +86,48 @@ class DeployCommand < Clamp::Command
         end
 
         if ssh.exist?("#{application_name}/config/database.yml")
-          Inform.info("config/database.yml exists, creating and/or updating database") do
-            Inform.debug("Creating database") if initial
-            ssh.run cd_and_rvm + "rake db:create" if initial
-            Inform.debug("Updating database")
-            ssh.run cd_and_rvm + "rake db:migrate"
+          if !db_managed
+            Inform.info("config/database.yml exists, creating and/or updating database") do
+              if initial
+                Inform.debug("Creating database")
+                ssh.run cd_and_rvm + "bundle exec rake db:create"
+              end
+              Inform.debug("Updating database")
+              ssh.run cd_and_rvm + "bundle exec rake db:migrate"
+              db_managed = true # don't do database steps more than once
+            end
           end
         else
           Inform.info("No config/database.yml, skipping database step")
         end
-
-        Inform.info("Starting application with passenger") do
+        
+        build_script = 'script/build'
+        if ssh.exist? application_name + '/' + build_script
+          Inform.info("Build script discovered at %{build_script}, running", :build_script => build_script) do
+            ssh.run cd_and_rvm + "bundle exec #{build_script}"
+          end
+        end
+          
+        if use_ssl?
+          Inform.info "Uploading SSL Certificate & Private Key" do
+            ssh.run "sudo mkdir -p /etc/apache2/certs" unless ssh.exist?("/etc/apache2/certs")
+            ssh.upload ssl_certificate, "/tmp/sslcert"
+            ssh.run "sudo mv -f /tmp/sslcert /etc/apache2/certs/#{application_name}.crt"
+            ssh.upload ssl_private_key, "/tmp/sslkey"
+            ssh.run "sudo mv -f /tmp/sslkey /etc/apache2/certs/#{application_name}.key"
+          end
+        end
+        
+        Inform.info("Starting application") do
           if ssh.exist?('/etc/apache2/sites-enabled/000-default')
             Inform.debug("Disabling default apache site")
             ssh.run "sudo a2dissite default"
           end
           Inform.debug("Uploading passenger config")
           passenger_config = ERB.new(File.read template('apache.conf.erb')).result(OpenStruct.new(
+            :use_passenger? => use_passenger?,
+            :use_ssl? => use_ssl?,
+            :server_name => server_name,
             :rails_env => rails_env,
             :application_name => application_name,
             :working_directory => "/home/ubuntu/#{application_name}"
@@ -79,23 +136,33 @@ class DeployCommand < Clamp::Command
           ssh.run "sudo cp /tmp/apache.conf /etc/apache2/sites-available/#{application_name}"
           ssh.run "sudo chmod 0644 /etc/apache2/sites-available/#{application_name}" # yeah, I don't know why it gets written as 0600
           unless ssh.exist?('/etc/apache2/sites-enabled/#{application_name}')
-            Inform.debug("Enabling passenger site in apache")
+            Inform.debug("Enabling site in apache")
             ssh.run "sudo a2ensite #{application_name}"
           end
           Inform.debug("Restarting apache")
           ssh.run "sudo apache2ctl restart"
         end
 
-        status_url = "http://#{server.public_ip_address}/status"
-        Inform.info("Checking status URL at %{u}", :u => status_url) do
-          response = JSON.parse(open(status_url).read)
-          unless response.include?('status') && response['status'] == 'OK'
-            raise "Did not receive an OK status response."
+        unless server_name || !use_passenger?
+          status_url = "http://#{server.public_ip_address}/status"
+          Inform.info("Checking status URL at %{u}", :u => status_url) do
+            response = JSON.parse(open(status_url).read)
+            unless response.include?('status') && response['status'] == 'OK'
+              raise "Did not receive an OK status response."
+            end
           end
+        else
+          Inform.warning "Skipping health check as we don't yet support forcing server_name on HTTP"
         end
         env.add_server_to_elb(server) if env.has_elb?
       end
     end
+    
+    private
+    
+    def ssh
+      @ssh
+    end
 
   end
 

data/lib/dew/commands/deploy/templates/apache.conf.erb

@@ -1,12 +1,65 @@
 <VirtualHost *:80>
     ServerAdmin admin@playup.com
 
-    PassEnv PUGE_DB_HOST PUGE_DB_NAME PUGE_DB_USERNAME PUGE_DB_PASSWORD
+    <% if server_name %>
+      ServerName <%= server_name %>
+    <% end %>
 
-    PassengerFriendlyErrorPages off
-    PassengerMaxRequests 50
+    <% if use_passenger? %>
+      PassEnv DB_HOST DB_NAME DB_USERNAME DB_PASSWORD
 
-    RailsEnv <%= rails_env %>
+      PassengerFriendlyErrorPages off
+      PassengerMaxRequests 50
+
+      RailsEnv <%= rails_env %>
+      <% if server_name %>
+        PassengerPreStart http://<%= server_name %>/status
+      <% else %>
+        PassengerPreStart http://localhost/status
+      <% end %>
+    <% end %>
+
+    DocumentRoot <%= working_directory %>/public
+    <Directory <%= working_directory %>/public>
+        allow from all
+        Options -MultiViews
+        AllowOverride None
+        Order allow,deny
+    </Directory>
+
+    ErrorLog /var/log/apache2/<%= application_name %>-error.log
+
+    # Possible values include: debug, info, notice, warn, error, crit,
+    # alert, emerg.
+    LogLevel warn
+
+    CustomLog /var/log/apache2/<%= application_name %>-access.log combined
+</VirtualHost>
+<% if use_ssl? %>
+<VirtualHost *:443>
+    ServerAdmin admin@playup.com
+
+    <% if server_name %>
+      ServerName <%= server_name %>
+    <% end %>
+
+    <% if use_passenger? %>
+      PassEnv DB_HOST DB_NAME DB_USERNAME DB_PASSWORD
+
+      PassengerFriendlyErrorPages off
+      PassengerMaxRequests 50
+
+      RailsEnv <%= rails_env %>
+      <% if server_name %>
+        PassengerPreStart http://<%= server_name %>/status
+      <% else %>
+        PassengerPreStart http://localhost/status
+      <% end %>
+    <% end %>
+
+      SSLEngine On
+      SSLCertificateFile /etc/apache2/certs/<%= application_name %>.crt
+      SSLCertificateKeyFile /etc/apache2/certs/<%= application_name %>.key
 
     DocumentRoot <%= working_directory %>/public
     <Directory <%= working_directory %>/public>
@@ -24,5 +77,6 @@
 
     CustomLog /var/log/apache2/<%= application_name %>-access.log combined
 
-    PassengerPreStart http://localhost/status
 </VirtualHost>
+<% end %>
+

data/lib/dew/models/database.rb

@@ -22,10 +22,10 @@ class Database < FogModel
   
   def db_environment_file password
     <<-EOF
-PUGE_DB_HOST=#{fog_object.endpoint['Address']}
-PUGE_DB_NAME=#{id}
-PUGE_DB_USERNAME=#{master_username}
-PUGE_DB_PASSWORD=#{password}
+DB_HOST=#{fog_object.endpoint['Address']}
+DB_NAME=#{id}
+DB_USERNAME=#{master_username}
+DB_PASSWORD=#{password}
     EOF
   end
   

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/dew/models/database_spec.rb

@@ -44,10 +44,10 @@ describe Database do
     describe "db_environment_file" do
       it "should return the contents of a file to use as /etc/environment that can be used to connct to this database" do
         data = @database.db_environment_file('password')
-        data.should =~ /PUGE_DB_NAME=#{id}/
-        data.should =~ /PUGE_DB_USERNAME=root/
-        data.should =~ /PUGE_DB_PASSWORD=password/
-        data.should =~ /PUGE_DB_HOST=127.0.0.1/
+        data.should =~ /DB_NAME=#{id}/
+        data.should =~ /DB_USERNAME=root/
+        data.should =~ /DB_PASSWORD=password/
+        data.should =~ /DB_HOST=127.0.0.1/
       end
     end
     describe :public_address do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dew
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - PlayUp Devops
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inform
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +32,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: clamp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +48,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: fog
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +64,11 @@ dependencies:
         - 2
         version: 0.8.2
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: gofer
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +80,11 @@ dependencies:
         - 5
         version: 0.2.5
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +96,11 @@ dependencies:
         - 2
         version: 1.6.2
   type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: terminal-table
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +112,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +126,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,11 +142,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,11 +158,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,11 +174,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -190,11 +190,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: flay
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -206,11 +206,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :development
-  version_requirements: *id012
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   name: geminabox
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -220,7 +220,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  requirement: *id013
 description: |
   Dew is a layer between fog and the ground