standup 0.3.5 → 0.3.6

data/README.md

@@ -11,11 +11,55 @@ Standup is an application deployment and infrastructure management tool for Rail
 0. `standup setup`
 0. `standup status`
 
-## Tweaking default scripts
+## Config file
+
+It consists of 3 major parts:
+
+### Amazon Web Services credentials
+
+    aws:
+      account_id: 0123-4567-8910
+      access_key_id: GTFGV123P45DRDKOBBVP
+      secret_access_key: jKkjhkjbb1Bhjh+MBG0GBbmuhdGh/Kgbdhzbd9sd
+      keypair_name: aws
+      availability_zone: us-east-1c
+
+Here, keypair_name is keypair filename, without `.pem` extension.
+By default, Standup searches actual file under `~/.ssh` directory.
+You can override this behavior by specifying `keypair_file` param.
+
+### Global script params
+
+    ec2:
+      image_id: ami-480df921 # Canonical Ubuntu 10.04, EBS boot
+      instance_type: m1.small
+      ssh_user: ubuntu
+    webapp:
+      github_user: supercoder
+      github_repo: superproject
+
+Major part of script params can be set here.
+
+### Nodes and their script params
+
+    nodes:
+      main:
+        ec2:
+          elastic_ip: 123.123.123.123
+      testing:
+      staging:
+
+Here, under `nodes` section, should go actual nodes (server instances) which you want to manage.
+For each node, you can specify additional script params.
+In this example, `elastic_ip` param of `ec2` script is set for node `main`.
+
+Script params are merged in `node-specific || global || script-defaults` manner.
+
+## Tweaking bundled scripts
 
 0. `standup localize <script_name>`
 0. Script file `config/standup/<script_name>.rb` will be copied from gem.
-0. Script's own files, like configs etc. under `config/standup/<script_name>`, if any,  will be copied from gem too. 
+0. Script's own files, like configs etc. under `config/standup/<script_name>`, if any, will be copied from gem too. 
 0. You can edit them and standup will use them instead of default.
 0. You can delete local script's own files, then default ones will be used. 
 
@@ -23,13 +67,13 @@ Standup is an application deployment and infrastructure management tool for Rail
 
 0. `standup generate <script_name>`
 0. Script file `config/standup/<script_name>.rb` will be created with empty script stub.
-0. Edit it as you want, it's now available for standup.
+0. Edit it as you want, it's now available for Standup.
 
 ## Setup script
 
-Setup script is just common Rails application deployment workflow.
+Setup script automates common Rails application deployment workflow.
 
-If you just want to add your script into this workflow, just set it as script param, thus overwriting default.
+If you want to add your script into this workflow, just set it as script param, thus overwriting default.
 
 For example, if you want to add `rescue` to your configuration, you need to:
 
@@ -44,8 +88,6 @@ For example, if you want to add `rescue` to your configuration, you need to:
 
 ## To do
 
-- `standup -v`
-
 - **?** Script sequences: rework default script as script sequence
 
 - ERB processing for script files

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/bin/standup

@@ -5,7 +5,7 @@ require 'trollop'
 require 'standup'
 
 opt_parser = Trollop::Parser.new do
-  version "Standup #{Standup.version} (c) 2010 Ilia Ablamonov, Cloud Castle" # "test 1.2.3 (c) 2008 William Morgan"
+  version "Standup #{Standup.version} (c) 2010 Ilia Ablamonov, Cloud Castle Inc."
   
   banner 'Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2.'
   banner ''
@@ -32,8 +32,6 @@ Trollop::with_standard_exception_handling opt_parser do
  raise Trollop::HelpNeeded if ARGV.empty?
 end
 
-exit if ARGV.empty?
-
 script_name = ARGV.shift
 script = Standup.scripts[script_name]
 

data/lib/standup/node.rb

@@ -1,3 +1,5 @@
+require 'active_support/hash_with_indifferent_access'
+
 module Standup
   class Node
     def initialize name
@@ -24,11 +26,11 @@ module Standup
     
     def ssh_string
       return '' unless instance
-      "ssh -i #{Settings.aws.keypair_file} -q -o StrictHostKeyChecking=no #{params.ec2.ssh_user}@#{instance.external_ip}"
+      "ssh -i #{Settings.aws.keypair_file} -q -o StrictHostKeyChecking=no #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
     end
     
     def params
-      Settings.nodes[@name]
+      Settings.nodes[@name] || ActiveSupport::HashWithIndifferentAccess.new
     end
     
     def remoting

data/lib/standup/remoting.rb

@@ -6,7 +6,7 @@ module Standup
       @node = node
       @host = @node.instance.external_ip
       @keypair_file = Settings.aws.keypair_file
-      @user = @node.params.ec2.ssh_user
+      @user = @node.scripts.ec2.params.ssh_user
       @ssh = nil
       @path = nil
     end

data/scripts/browse.rb

@@ -0,0 +1,13 @@
+Standup.script :node do
+  self.description = 'Open Web browser with specified node address'
+  
+  def run
+    return unless node.instance
+    ['x-www-browser', 'open'].each do |cmd|
+      if `which #{cmd}`.present?
+        `#{cmd} http://#{node.instance.external_ip}/`
+        return
+      end
+    end
+  end
+end

data/scripts/init/standup.yml

@@ -1,3 +1,4 @@
+# Amazon Web Services credentials
 aws:
   account_id: 
   access_key_id: 
@@ -5,13 +6,17 @@ aws:
   keypair_name: 
   availability_zone: us-east-1a
 
+# Global script params
+ec2:
+  image_id: ami-480df921 # Canonical Ubuntu 10.04, EBS boot, i386
+  instance_type: m1.small
+  ssh_user: ubuntu
+webapp:
+  github_user: 
+  github_repo: 
+
+# Nodes and their script params
 nodes:
   main:
     ec2:
-      image_id: ami-480df921 # Canonical Ubuntu 10.04, EBS boot
-      instance_type: m1.small
-      ssh_user: ubuntu
-      # elastic_ip: 
-    webapp:
-      github_user: 
-      github_repo: 
+      elastic_ip:

data/scripts/passenger/nginx.conf

@@ -29,6 +29,5 @@ http {
     
     passenger_max_pool_size 10;
 
-    # standup place server fragments here
-    # standup place server fragments here
+    include  servers/*.conf;
 }

data/scripts/passenger.rb

@@ -9,6 +9,8 @@ Standup.script :node do
       sudo 'passenger-install-nginx-module --auto --auto-download --prefix=/opt/nginx'
     end
     
+    sudo 'mkdir -p /opt/nginx/conf/servers'
+    
     upload script_file('nginx.conf'),
            :to =>'/opt/nginx/conf/nginx.conf',
            :sudo => true
@@ -25,6 +27,14 @@ Standup.script :node do
     restart_nginx
   end
   
+  def add_server_conf file, name = File.basename(file), restart = true
+    upload file,
+           :to   => "/opt/nginx/conf/servers/#{name}",
+           :sudo => true
+    
+    restart_nginx if restart
+  end
+  
   def restart_nginx
     scripts.monit.restart_watch 'nginx'
   end

data/scripts/webapp/webapp.conf

@@ -0,0 +1,11 @@
+server {
+    server_name "";
+    listen 80;
+    
+    root /opt/webapp/public;
+    
+    passenger_enabled on;
+    passenger_min_instances 3;
+}
+
+passenger_pre_start http://127.0.0.1/;

data/scripts/webapp.rb

@@ -21,15 +21,10 @@ Standup.script :node do
     end
 
     bootstrap_db
-    
-    remote_update '/opt/nginx/conf/nginx.conf',
-                  File.read(script_file('nginx-server-fragment.conf')),
-                  :delimiter => '# standup place server fragments here',
-                  :sudo => true
-    
+
     sudo 'chown -R nobody:nogroup /opt/webapp'
     
-    scripts.passenger.restart_nginx
+    scripts.passenger.add_server_conf script_file('webapp.conf')
   end
   
   protected

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Cloud Castle Inc."]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-13}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "scripts/allocate_ip.rb",
      "scripts/appconsole.rb",
      "scripts/basics.rb",
+     "scripts/browse.rb",
      "scripts/delayed_job.rb",
      "scripts/delayed_job/delayed_job_monit.conf",
      "scripts/ec2.rb",
@@ -66,7 +67,7 @@ Gem::Specification.new do |s|
      "scripts/update.rb",
      "scripts/watchlog.rb",
      "scripts/webapp.rb",
-     "scripts/webapp/nginx-server-fragment.conf",
+     "scripts/webapp/webapp.conf",
      "standup.gemspec"
   ]
   s.homepage = %q{http://github.com/Flamefork/standup}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +03:00
+date: 2010-11-13 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,6 +157,7 @@ files:
 - scripts/allocate_ip.rb
 - scripts/appconsole.rb
 - scripts/basics.rb
+- scripts/browse.rb
 - scripts/delayed_job.rb
 - scripts/delayed_job/delayed_job_monit.conf
 - scripts/ec2.rb
@@ -183,7 +184,7 @@ files:
 - scripts/update.rb
 - scripts/watchlog.rb
 - scripts/webapp.rb
-- scripts/webapp/nginx-server-fragment.conf
+- scripts/webapp/webapp.conf
 - standup.gemspec
 has_rdoc: true
 homepage: http://github.com/Flamefork/standup

data/scripts/webapp/nginx-server-fragment.conf

@@ -1,12 +0,0 @@
-    server {
-        server_name "";
-        listen 80;
-        
-        root /opt/webapp/public;
-        
-        passenger_enabled on;
-        passenger_min_instances 3;
-    }
-
-    passenger_pre_start http://127.0.0.1/;
-