dew 0.1.7 → 0.1.8

data/lib/dew/base_command.rb

@@ -1,12 +1,3 @@
-# Monkey patch clamp to remove duplicate options from help
-module Clamp::Option::Declaration
-  alias_method :non_uniq_documented_options, :documented_options
-  def documented_options
-    non_uniq_documented_options.uniq
-  end
-end
-
-
 class DewBaseCommand < Clamp::Command
   def configure
     $debug = debug?

data/lib/dew/commands/deploy.rb

@@ -21,6 +21,7 @@ class DeployCommand < Clamp::Command
     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
     option ['--gamej-proxy'], 'GAMEJ_PROXY', "GameJ Reverse Proxy"
+    option ['--create-database'], :flag, "Create the database, even if this isn't the initial checkout", :default => false
 
     def check_and_remove_rvmrc
       if ssh.exist? "#{application_name}/.rvmrc"
@@ -42,11 +43,11 @@ class DeployCommand < Clamp::Command
         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?
@@ -81,13 +82,13 @@ class DeployCommand < Clamp::Command
             check_and_remove_rvmrc unless is_redhat
             ssh.run "cd #{application_name}; git fetch -q"
           end
-          
+
           check_and_remove_rvmrc unless is_redhat
           Inform.debug("Checking out version %{version}", :version => revision)
           ssh.run "cd #{application_name} && git checkout -q -f #{revision}"
           check_and_remove_rvmrc unless is_redhat
         end
-        
+
         cd_and_rvm = "cd #{application_name} && . /usr/local/rvm/scripts/rvm && rvm use ruby-1.9.2 && RAILS_ENV=#{rails_env} "
         if is_redhat
           cd_and_rvm = "cd #{application_name} && RAILS_ENV=#{rails_env} "
@@ -97,10 +98,16 @@ class DeployCommand < Clamp::Command
           ssh.run cd_and_rvm + "bundle install --without development"
         end
 
+        if ssh.exist?("#{application_name}/config/database.dew.yml")
+          Inform.info("config/database.dew.yml found, linking to database.yml") do
+            ssh.run cd_and_rvm + "ln -sf database.dew.yml config/database.yml"
+          end
+        end
+
         if ssh.exist?("#{application_name}/config/database.yml")
           if !db_managed
             Inform.info("config/database.yml exists, creating and/or updating database") do
-              if initial
+              if initial || create_database?
                 Inform.debug("Creating database")
                 ssh.run cd_and_rvm + "bundle exec rake db:create"
               end

data/lib/dew/models/environment.rb

@@ -105,7 +105,7 @@ class Environment
   end
 
   def add_server ami, size, keypair, groups, username
-    Inform.info "Adding server using AMI %{ami} of size %{size}, keypair %{keypair} and security groups %{groups}",
+    Inform.info "Adding server using AMI %{ami} of size %{size}, keypair %{keypair} and security groups %{groups.join(',')}",
       :ami => ami, :size => size, :keypair => keypair, :groups => groups do
       server = Server.create!( ami, size, keypair, groups )
       server.add_tag('Environment', name)

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: dew
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - PlayUp Devops
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inform
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency