dew 0.1.3 → 0.1.4

data/lib/dew/cloud.rb

@@ -1,3 +1,5 @@
+require 'opensrs'
+
 class Cloud
 
   attr_reader :region, :account_name, :profile_name
@@ -64,6 +66,14 @@ class Cloud
     account_dir = File.join(ENV['HOME'], '.dew','accounts')
     File.join(account_dir, 'keys', account_name, region, "#{key_name}.pem")
   end
+  
+  def has_dns?
+    account.has_dns?
+  end
+  
+  def dns
+    @dns ||= OpenSRS::Server.new(account.opensrs_credentials)
+  end
 
   private
 

data/lib/dew/commands/deploy.rb

@@ -20,6 +20,7 @@ class DeployCommand < Clamp::Command
     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
+    option ['--gamej-proxy'], 'GAMEJ_PROXY', "GameJ Reverse Proxy"
 
     def check_and_remove_rvmrc
       if ssh.exist? "#{application_name}/.rvmrc"
@@ -75,14 +76,14 @@ class DeployCommand < Clamp::Command
           
           check_and_remove_rvmrc
           Inform.debug("Checking out version %{version}", :version => revision)
-          ssh.run "cd #{application_name} && git checkout -q -f origin/#{revision}"
+          ssh.run "cd #{application_name} && git checkout -q -f #{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} "
 
         Inform.info("Updating/installing gems") do
-          ssh.run cd_and_rvm + "bundle install"
+          ssh.run cd_and_rvm + "bundle install --without development"
         end
 
         if ssh.exist?("#{application_name}/config/database.yml")
@@ -109,6 +110,9 @@ class DeployCommand < Clamp::Command
         end
           
         if use_ssl?
+          Inform.info "Enabling Mod SSL" do
+            ssh.run "sudo a2enmod ssl"
+          end
           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"
@@ -117,6 +121,13 @@ class DeployCommand < Clamp::Command
             ssh.run "sudo mv -f /tmp/sslkey /etc/apache2/certs/#{application_name}.key"
           end
         end
+
+        if gamej_proxy
+          Inform.info "Enabling Mod Proxy" do
+            ssh.run "sudo a2enmod proxy"
+            ssh.run "sudo a2enmod proxy_http"
+          end
+        end
         
         Inform.info("Starting application") do
           if ssh.exist?('/etc/apache2/sites-enabled/000-default')
@@ -130,7 +141,8 @@ class DeployCommand < Clamp::Command
             :server_name => server_name,
             :rails_env => rails_env,
             :application_name => application_name,
-            :working_directory => "/home/ubuntu/#{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}"

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

@@ -34,8 +34,21 @@
     LogLevel warn
 
     CustomLog /var/log/apache2/<%= application_name %>-access.log combined
+
+    <% if gamej_proxy %>
+    <Location /api>
+        Order allow,deny
+        Allow from all
+    </Location>
+
+    # Proxy off to the engine
+	ProxyRequests Off
+	ProxyPass /api/ http://<%= gamej_proxy %>/
+	ProxyPassReverse /api/ http://<%= server_name %>/
+    <% end %>
 </VirtualHost>
 <% if use_ssl? %>
+NameVirtualHost *:443
 <VirtualHost *:443>
     ServerAdmin admin@playup.com
 
@@ -77,6 +90,17 @@
 
     CustomLog /var/log/apache2/<%= application_name %>-access.log combined
 
+    <% if gamej_proxy %>
+    <Location /api>
+        Order allow,deny
+        Allow from all
+    </Location>
+        
+    # Proxy off to the engine
+	SSLProxyEngine on
+    ProxyRequests Off
+	ProxyPass /api/ https://<%= gamej_proxy %>/
+	ProxyPassReverse /api/ https://<%= server_name %>/
+    <% end %>
 </VirtualHost>
 <% end %>
-

data/lib/dew/commands/environments.rb

@@ -88,6 +88,34 @@ class EnvironmentsCommand < Clamp::Command
       end
     end
   end
+  
+  subcommand "run", "Run a script or command on each instance in the environment" do
+    parameter "ENVIRONMENT_NAME", "Name of the environment"
+    option ['-s', '--script'], "FILENAME", "Script to run on each instance"
+    option ['-c', '--command'], "COMMAND", "Command to run on each instance"
+    
+    def execute
+      raise "Please supply either -s or -c" unless script or command
+      
+      env = Environment.get(environment_name)
+      
+      Inform.info("Running on %{l} servers", :l => env.servers.length) do
+        env.servers.each do |server|
+          start = Time.now
+          ssh = server.ssh
+          if script
+            ssh.upload(script, '/tmp/script')
+            ssh.run("chmod +x /tmp/script")
+            ssh.run("/tmp/script", :quiet => false)
+            ssh.run("rm /tmp/script")
+          else
+            ssh.run(command, :quiet => false)
+          end
+          Inform.debug("%{s} took %{time} seconds", :s => server.id, :time => (Time.now - start))
+        end
+      end
+    end
+  end
 
   subcommand "destroy", "Destroy an existing environment" do
 

data/lib/dew/models/account.rb

@@ -23,6 +23,26 @@ class Account
   def aws_user_id
     @yaml['aws']['user_id'].gsub('-', '')
   end
+  
+  def has_dns?
+    @yaml.include?('dns')
+  end
+  
+  def dns_username
+    @yaml['dns']['username']
+  end
+  
+  def dns_password
+    @yaml['dns']['password']
+  end
+  
+  def dns_domain
+    @yaml['dns']['domain']
+  end
+  
+  def dns_prefix
+    @yaml['dns']['prefix']
+  end
 
   def initialize(yaml)
     @yaml = yaml

data/lib/dew/version.rb

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

data/spec/dew/cloud_spec.rb

@@ -7,8 +7,8 @@ describe :Cloud do
   let (:profile_name) { 'test-light' }
 
   let (:aws_credentials) { {:aws_access_key_id => '1234', :aws_secret_access_key => '5678', :region => region} }
-  let (:root_aws_credentials) { aws_credentials.merge(:provider => 'AWS')}
-  let (:account) { double('Account', aws_credentials) }
+  let (:root_aws_credentials) { aws_credentials.merge(:provider => 'AWS') }
+  let (:account) { double('Account', aws_credentials.merge(:has_dns? => false)) }
   let (:profile) { double('Profile') }
   
   context "after connect is called" do
@@ -86,5 +86,19 @@ describe :Cloud do
       end
     end
     
+    it { Cloud.has_dns?.should be_false }
+    
+    context "with DNS credentials in the account" do
+      before :each do
+        account.stub(:has_dns? => true)
+      end
+      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'
+      end
+    end
   end
 end

data/spec/dew/models/account_spec.rb

@@ -12,26 +12,43 @@ describe Account do
 
   describe "parsing yaml" do
     before :each do
-      yaml =
+      File.stub(:read).and_return(yaml)
+    end
+
+    subject { Account.read('foo') }
+
+    describe "with an aws section" do
+      let (:yaml) {
         "aws:
           user_id: 9999-3333-2222
           access_key_id: foo
           secret_access_key: bar"
+      }
 
-      File.stub(:read).and_return(yaml)
-      @account = Account.read('foo')
-    end
-
-    it "should have a user_id stripped of dashes" do
-      @account.aws_user_id.should == '999933332222'
-    end
+      it "should have a user_id stripped of dashes" do
+        subject.aws_user_id.should == '999933332222'
+      end
 
-    it "should have an aws access key id" do
-      @account.aws_access_key_id.should == 'foo'
+      it { subject.aws_access_key_id.should == 'foo' }
+      it { subject.aws_secret_access_key.should == 'bar' }
+      it { subject.has_dns?.should be_false }
     end
 
-    it "should have an aws secret access key" do
-      @account.aws_secret_access_key.should == 'bar'
+    describe "with a DNS section" do
+      let (:yaml) {
+        "
+        dns:
+          username: bob
+          domain: mydomain.com
+          password: steve
+          prefix: env
+        "
+      }
+      it { subject.has_dns?.should be_true }
+      it { subject.dns_username.should == 'bob' }
+      it { subject.dns_domain.should == 'mydomain.com' }
+      it { subject.dns_password.should == 'steve' }
+      it { subject.dns_prefix.should == 'env' }
     end
   end
   
@@ -43,5 +60,6 @@ describe Account do
       Account.user_ids.sort.should == ['id1', 'id2']
     end
   end
+  
 
 end

metadata

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