dew 0.1.5 → 0.1.6

data/bin/dew

@@ -2,10 +2,10 @@
 require 'dew'
 
 class DewCommand < DewBaseCommand
-  option ['-r', '--region'], "REGION", "AWS region", :default => 'ap-southeast-1'
-  option ['-a', '--account'], "ACCOUNT", "AWS account", :default => 'development'
+  option ['-r', '--region'], "REGION", "AWS region", :default => ENV['DEW_REGION'] || 'ap-southeast-1'
+  option ['-a', '--account'], "ACCOUNT", "AWS account", :default => ENV['DEW_ACCOUNT'] || 'development'
   option ['-q', '--quiet'], :flag, "Quiet mode, disables logging", :default => false
-  option ['-v', '--verbose'], :flag, "Verbose mode, print debug output", :default => false
+  option ['-v', '--verbose'], :flag, "Verbose mode, print debug output", :default => ENV['DEW_VERBOSE']
   option '--debug', :flag, "Show stacktraces on error", :default => false
   option '--version', :flag, "Prints the dew version" do
     puts "dew version #{Dew::VERSION}"

data/config/cucumber.yaml

@@ -1,4 +1,4 @@
-default: features -t~@wip -t~@slow
-slow: features -t~@wip -t@slow
-wip: features -t@wip
-all: features -t~@wip
+default: features -t~@wip -t~@slow -t~@disabled
+slow: features -t~@wip -t@slow -t~@disabled
+wip: features -t@wip -t~@disabled
+all: features -t~@wip -t~@disabled

data/features/create-ami.feature

@@ -6,6 +6,7 @@ Feature: Creating a new AMI
 
   @aws
   @slow
+  @disabled
   Scenario: Creating a new AMI from a puppet configuration
     Given I specify the puppet configuration "blank"
     And I uniquely name my AMI

data/lib/dew.rb

@@ -1,5 +1,8 @@
+require 'clamp'
+require 'gofer'
 require 'inform'
 require 'highline/import'
+require 'opensrs'
 require 'dew/version'
 require 'dew/commands'
 require 'dew/models'
@@ -7,3 +10,5 @@ require 'dew/controllers'
 require 'dew/cloud'
 require 'dew/view'
 require 'dew/password'
+require 'fog' # require fog last - slows down all other require calls
+

data/lib/dew/base_command.rb

@@ -1,5 +1,3 @@
-require 'clamp'
-
 # Monkey patch clamp to remove duplicate options from help
 module Clamp::Option::Declaration
   alias_method :non_uniq_documented_options, :documented_options

data/lib/dew/cloud.rb

@@ -1,4 +1,4 @@
-require 'opensrs'
+# require 'opensrs'
 
 class Cloud
 
@@ -72,7 +72,7 @@ class Cloud
   end
   
   def dns
-    @dns ||= OpenSRS::Server.new(account.opensrs_credentials)
+    # @dns ||= OpenSRS::Server.new(account.opensrs_credentials)
   end
 
   private

data/lib/dew/commands/deploy.rb

@@ -52,12 +52,20 @@ class DeployCommand < Clamp::Command
         env.remove_server_from_elb(server) if env.has_elb?
 
         @ssh = server.ssh
+        is_redhat = ssh.exist?('/etc/redhat-release')
+        if is_redhat
+          Inform.info("RedHat server detected")
+        end
         initial = !ssh.exist?(application_name)
 
         Inform.info("%{app} doesn't exist - initial install", :app => application_name) if initial
 
         Inform.info("Stopping apache") do
-          ssh.run "sudo apache2ctl stop"
+          if is_redhat
+            ssh.run "sudo /etc/init.d/httpd stop"
+          else
+            ssh.run "sudo apache2ctl stop"
+          end
         end
 
         Inform.info("Obtaining version %{v} of %{app}", :v => revision, :app => application_name) do
@@ -70,17 +78,20 @@ class DeployCommand < Clamp::Command
             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
+            check_and_remove_rvmrc unless is_redhat
             ssh.run "cd #{application_name}; git fetch -q"
           end
           
-          check_and_remove_rvmrc
+          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
+          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} "
+        end
 
         Inform.info("Updating/installing gems") do
           ssh.run cd_and_rvm + "bundle install --without development"
@@ -109,7 +120,11 @@ class DeployCommand < Clamp::Command
           end
         end
           
+        
         if use_ssl?
+          if is_redhat
+            raise "SSL not yet supported for redhat"
+          end
           Inform.info "Enabling Mod SSL" do
             ssh.run "sudo a2enmod ssl"
           end
@@ -123,6 +138,9 @@ class DeployCommand < Clamp::Command
         end
 
         if gamej_proxy
+          if is_redhat
+            raise "gamej proxy not yet supported for redhat"
+          end
           Inform.info "Enabling Mod Proxy" do
             ssh.run "sudo a2enmod proxy"
             ssh.run "sudo a2enmod proxy_http"
@@ -130,6 +148,7 @@ class DeployCommand < Clamp::Command
         end
         
         Inform.info("Starting application") do
+          conf_dest = is_redhat ? "/etc/httpd/conf.d/#{application_name}.conf" : "/etc/apache2/sites-available/#{application_name}"
           if ssh.exist?('/etc/apache2/sites-enabled/000-default')
             Inform.debug("Disabling default apache site")
             ssh.run "sudo a2dissite default"
@@ -140,19 +159,24 @@ class DeployCommand < Clamp::Command
             :use_ssl? => use_ssl?,
             :server_name => server_name,
             :rails_env => rails_env,
+            :log_dir => is_redhat ? '/var/log/httpd' : '/var/log/apache2',
             :application_name => application_name,
             :working_directory => "/home/ubuntu/#{application_name}",
             :gamej_proxy => gamej_proxy
           ).instance_eval {binding})
           ssh.write passenger_config, "/tmp/apache.conf"
-          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}')
+          ssh.run "sudo cp /tmp/apache.conf #{conf_dest}"
+          ssh.run "sudo chmod 0644 #{conf_dest}" # yeah, I don't know why it gets written as 0600
+          unless is_redhat || ssh.exist?('/etc/apache2/sites-enabled/#{application_name}')
             Inform.debug("Enabling site in apache")
             ssh.run "sudo a2ensite #{application_name}"
           end
           Inform.debug("Restarting apache")
-          ssh.run "sudo apache2ctl restart"
+          if is_redhat
+            ssh.run "sudo /etc/init.d/httpd start"
+          else
+            ssh.run "sudo apache2ctl start"
+          end
         end
 
         unless server_name || !use_passenger?

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

@@ -28,13 +28,13 @@
         AddType text/x-component .htc
     </Directory>
 
-    ErrorLog /var/log/apache2/<%= application_name %>-error.log
+    ErrorLog <%= log_dir %>/<%= 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
+    CustomLog <%= log_dir %>/<%= application_name %>-access.log combined
 
     <% if gamej_proxy %>
     <Location /api>

data/lib/dew/models.rb

@@ -1,4 +1,3 @@
-require 'fog'
 require 'dew/models/account'
 require 'dew/models/fog_model'
 require 'dew/models/deploy'

data/lib/dew/models/account.rb

@@ -27,23 +27,15 @@ class Account
   def has_dns?
     @yaml.include?('dns')
   end
-  
-  def dns_username
-    @yaml['dns']['username']
-  end
-  
-  def dns_password
-    @yaml['dns']['password']
+
+  def dns_key
+    @yaml['dns']['key']
   end
   
   def dns_domain
     @yaml['dns']['domain']
   end
   
-  def dns_prefix
-    @yaml['dns']['prefix']
-  end
-
   def initialize(yaml)
     @yaml = yaml
   end

data/lib/dew/models/server.rb

@@ -1,5 +1,3 @@
-require 'gofer'
-
 class Server < FogModel
   TEN_SECONDS = 10
   SIXTY_SECONDS = 60

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/dew/cloud_spec.rb

@@ -95,9 +95,10 @@ describe :Cloud do
       it { Cloud.has_dns?.should be_true }
       
       it "should provide an OpenSRS DNS handle" do
-        Cloud.account.should_receive(:opensrs_credentials).and_return('opensrs creds')
-        OpenSRS::Server.should_receive(:new).with('opensrs creds').and_return('server')
-        Cloud.dns.should == 'server'
+        pending
+        # Cloud.account.should_receive(:opensrs_credentials).and_return('opensrs creds')
+        # OpenSRS::Server.should_receive(:new).with('opensrs creds').and_return('server')
+        # Cloud.dns.should == 'server'
       end
     end
   end

data/spec/dew/models/account_spec.rb

@@ -38,17 +38,13 @@ describe Account do
       let (:yaml) {
         "
         dns:
-          username: bob
           domain: mydomain.com
-          password: steve
-          prefix: env
+          key: a1b2c3d4e5
         "
       }
       it { subject.has_dns?.should be_true }
-      it { subject.dns_username.should == 'bob' }
+      it { subject.dns_key.should == 'a1b2c3d4e5' }
       it { subject.dns_domain.should == 'mydomain.com' }
-      it { subject.dns_password.should == 'steve' }
-      it { subject.dns_prefix.should == 'env' }
     end
   end
   

data/spec/dew/models/deploy/puge_spec.rb

@@ -5,7 +5,7 @@ describe Deploy::Puge do
   let (:tag) { 'puge-1.16.1' }
   let (:rails_env) { 'development' }
   let (:gofer) { double('Gofer').as_null_object }
-  let (:servers) { (0..1).map { |i| double("Server #{i}").as_null_object} }
+  let (:servers) { (0..1).map { |i| double("Server #{i}", :id => nil).as_null_object} }
   let (:environment) {double('Environment', :servers => servers, :database => database)}
   let (:opts) { { 'tag' => tag, 'rails_env' => rails_env } }
   let (:run_on_servers) { servers }

metadata

@@ -2,7 +2,7 @@
 name: dew
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - PlayUp Devops
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +10:00
-default_executable: 
+date: 2011-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inform
@@ -244,7 +243,6 @@ files:
 - features/support/hooks.rb
 - config/cucumber.yaml
 - bin/dew
-has_rdoc: true
 homepage: http://github.com/playup/dew
 licenses: []
 
@@ -268,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Uses fog to access the cloud