standup 0.3.3 → 0.3.4

data/README.md

@@ -4,15 +4,16 @@ Standup is an application deployment and infrastructure management tool for Rail
 
 ## Basic usage
 
-0. Add `gem 'standup'` into Gemfile and install it via `> bundle install`
-0. `> standup init`
-0. Write actual settings in generated `config/standup.yml`
-0. `> standup setup`
-0. `> standup status`
+0. `gem install standup`
+0. `cd path/to/your/rails/project`
+0. `standup init`
+0. Fill in actual settings in generated file `config/standup.yml`
+0. `standup setup`
+0. `standup status`
 
 ## Tweaking default scripts
 
-0. `> standup localize SCRIPT=<script_name>`
+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. You can edit them and standup will use them instead of default.
@@ -20,7 +21,7 @@ Standup is an application deployment and infrastructure management tool for Rail
 
 ## Creating new scripts
 
-0. `> standup generate SCRIPT=<script_name>`
+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.
 
@@ -43,18 +44,12 @@ For example, if you want to add `rescue` to your configuration, you need to:
 
 ## To do
 
-- Redesign node:script running concept:
-`setup` script need to be run for each node
-`shell` script is meant to be run for one specific node
-`init` script does not relate to any node at all.
-
-- If there is more than one node in standup.yml, require node name(s) or `all` explicitly set:
-`standup shell web`
-`standup update db,web`
-`standup setup all`
+- `standup -v`
 
 - **?** Script sequences: rework default script as script sequence
 
+- ERB processing for script files
+
 ## Copyright
 
 Copyright (c) 2010 Ilia Ablamonov, Cloud Castle Inc.

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/bin/standup

@@ -8,14 +8,14 @@ opt_parser = Trollop::Parser.new do
   banner 'Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2.'
   banner ''
   banner 'Usage:'
-  banner '       standup script [options]'
+  banner '       standup [options] <script> [script arguments]'
   banner ''
-  banner 'where script is one of the following:'
+  banner 'where <script> is one of the following:'
   banner ''
   
   offset = Standup.scripts.keys.map(&:length).max + 2
-  Standup.scripts.each do |name, script|
-    banner "#{"%-#{offset}s" % name} #{script.description}"
+  Standup.scripts.keys.sort.each do |name|
+    banner "#{"%-#{offset}s" % name} #{Standup.scripts[name].description}"
   end
   
   banner ''
@@ -33,9 +33,10 @@ end
 exit if ARGV.empty?
 
 script_name = ARGV.shift
+script = Standup.scripts[script_name]
 
-if Standup.scripts.include? script_name
-  Standup.nodes.each {|node| node.run_script script_name}
+if script
+  script.execute
 else
   opt_parser.die "unknown script #{script_name}", nil
 end

data/lib/standup.rb

@@ -10,6 +10,7 @@ require 'standup/settings'
 require 'standup/ec2'
 require 'standup/remoting'
 require 'standup/scripts/base'
+require 'standup/scripts/node'
 require 'standup/node'
 
 module Standup
@@ -44,9 +45,17 @@ module Standup
     @@scripts
   end
   
-  def self.script &block
+  def self.script type = :node, &block
     name = block.__file__.match(/([^\/]*)\.rb$/)[1]
-    script_class = Class.new(Standup::Scripts::Base, &block)
+    superclass = case type
+      when :node
+        Scripts::Node
+      when :local
+        Scripts::Base
+      else
+        raise ArgumentError, "Unknown script type #{type}"
+    end
+    script_class = Class.new(superclass, &block)
     script_class.name = name
     Standup::Scripts.const_set name.camelize, script_class
     scripts[name] = script_class

data/lib/standup/node.rb

@@ -13,7 +13,8 @@ module Standup
     attr_reader :name, :scripts
     
     def run_script script_name
-      scripts[script_name].titled_run
+      scripts[script_name].put_title
+      scripts[script_name].run
       close_remoting
     end
     

data/lib/standup/scripts/base.rb

@@ -3,14 +3,9 @@ require 'active_support/hash_with_indifferent_access'
 module Standup
   module Scripts
     class Base
-      def initialize node
-        @node = node
-        @remoting = nil
-        @params = if node.params[name].is_a? Hash
-          ActiveSupport::HashWithIndifferentAccess.new self.class.default_params.merge(node.params[name])
-        else
-          node.params[name] || self.class.default_params
-        end
+      def initialize *args
+        merge_params self.class.default_params
+        merge_params Settings[name]
       end
     
       class_attribute :name
@@ -20,21 +15,14 @@ module Standup
       
       class_attribute :description
       
-      delegate :instance, :open_port, :open_ports, :remoting, :scripts,
-               :to => :@node
-    
-      delegate :download, :upload, :remote_update, :exec, :sudo, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem,
-               :to => :remoting
-    
-      attr_accessor :node, :params
+      attr_accessor :params
       
       def name
         self.class.name
       end
       
-      def titled_run
-        bright_p "#{@node.name}:#{name}", HighLine::CYAN
-        run
+      def put_title
+        bright_p name, HighLine::CYAN
       end
       
       def script_file filename
@@ -46,7 +34,55 @@ module Standup
         nil
       end
       
-      def run; end
+      def self.execute
+        new.run
+      end
+      
+      protected
+      
+      def merge_params param_overrides
+        @params = if param_overrides.is_a? Hash
+          ActiveSupport::HashWithIndifferentAccess.new((@params || {}).merge(param_overrides))
+        else
+          param_overrides || @params
+        end
+      end
+      
+      def argument arg_pattern, arg_name = arg_pattern, variants = nil
+        self.class.argument arg_pattern, arg_name, variants
+      end
+
+      def self.argument arg_pattern, arg_name = arg_pattern, variants = nil
+        script_description = description
+        script_name = name
+        opt_parser = Trollop::Parser.new do
+          banner script_description
+          banner ''
+          banner 'Usage:'
+          banner "       standup #{script_name} [options] #{arg_pattern}"
+          banner ''
+          if variants
+            banner "where <#{arg_name}> is one of the following:"
+            banner ''
+            variants.each { |v| banner v }
+            banner ''
+          end
+          banner "and [options] are:"
+          banner ''
+
+          stop_on_unknown
+        end
+        Trollop::with_standard_exception_handling opt_parser do
+          opt_parser.parse ARGV
+          raise Trollop::HelpNeeded if ARGV.empty?
+        end
+        
+        result = ARGV.shift
+        if variants && !variants.include?(result)
+          opt_parser.die "unknown #{arg_name} #{result}", nil
+        end
+        result
+      end
     end
   end
 end

data/lib/standup/scripts/node.rb

@@ -0,0 +1,46 @@
+module Standup
+  module Scripts
+    class Node < Base
+      def initialize node
+        super
+        merge_params node.params[name]
+        @node = node
+        @remoting = nil
+      end
+      
+      delegate :instance, :open_port, :open_ports, :remoting, :scripts,
+               :to => :@node
+    
+      delegate :download, :upload, :remote_update, :exec, :sudo, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem,
+               :to => :remoting
+    
+      attr_accessor :node
+      
+      def put_title
+        bright_p "#{@node.name}:#{name}", HighLine::CYAN
+      end
+      
+      def self.execute
+        all_nodes = Settings.nodes.keys
+        
+        nodes = if all_nodes.length > 1
+          node_args = argument('<node[,node]>', 'node', ['all'] + all_nodes).strip.split(',')
+          
+          if node_args.include? 'all'
+            all_nodes
+          else
+            node_args
+          end
+        else
+          all_nodes
+        end
+        
+        run_on_nodes nodes
+      end
+      
+      def self.run_on_nodes nodes
+        nodes.each {|node| Standup::Node.new(node).run_script name}
+      end
+    end
+  end
+end

data/scripts/allocate_ip.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :local do
   self.description = 'Request new Elasics IP to use in node config'
   
   def run

data/scripts/appconsole.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Run remote Rails application console'
   
   def run

data/scripts/basics.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     sudo 'apt-get -qq update'
     install_packages 'build-essential libreadline5-dev mc'

data/scripts/delayed_job.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     scripts.monit.add_watch script_file('delayed_job_monit.conf')
   end

data/scripts/ec2.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     ensure_security_group
       

data/scripts/generate.rb

@@ -1,14 +1,11 @@
-Standup.script do
+Standup.script :local do
   self.description = 'Generate script'
   
   def run
-    unless ENV['SCRIPT']
-      bright_p "Specify script name with SCRIPT=name argument"
-      return
-    end
+    script_name = argument '<script name>'
     
     FileUtils.mkdir_p(Standup.local_scripts_path)
     FileUtils.copy script_file('script.rb'),
-                   File.expand_path("#{ENV['SCRIPT']}.rb",  Standup.local_scripts_path)
+                   File.expand_path("#{script_name}.rb",  Standup.local_scripts_path)
   end
 end

data/scripts/generate/script.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Put description here'
   
   def run

data/scripts/init.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :local do
   self.description = 'Generate config file'
   
   def run

data/scripts/localize.rb

@@ -1,14 +1,12 @@
-Standup.script do
+Standup.script :local do
   self.description = 'Put specified script into project configuration'
   
   def run
-    unless ENV['SCRIPT']
-      bright_p "Specify script name with SCRIPT=name argument"
-      return
-    end
+    variants = Standup.scripts.keys.sort.select{|script_name| File.exists? File.expand_path("#{script_name}.rb", Standup.gem_scripts_path)}
+    script_name = argument '<script name>', 'script name', variants
     
     FileUtils.mkdir_p(Standup.local_scripts_path)
-    [ENV['SCRIPT'], "#{ENV['SCRIPT']}.rb"].each do |path|
+    [script_name, "#{script_name}.rb"].each do |path|
       path = File.expand_path(path, Standup.gem_scripts_path)
       if File.exists? path
         FileUtils.cp_r path, Standup.local_scripts_path

data/scripts/monit.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     install_package 'monit'
     

data/scripts/passenger.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     scripts.ec2.open_port 80
     

data/scripts/postgresql.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     install_package 'postgresql-8.4 libpq-dev'
   

data/scripts/ruby.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   def run
     return if exec('ruby -v') =~ /Ruby Enterprise Edition 2010.02/
     

data/scripts/setup.rb

@@ -1,11 +1,12 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Do all setup from scratch and/or incrementally'
   
   self.default_params =  'ec2 basics monit ruby postgresql passenger webapp update'
   
   def run
     params.strip.split.each do |name|
-      scripts[name].titled_run
+      scripts[name].put_title
+      scripts[name].run
     end
   end
   

data/scripts/shell.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Run remote shell (e.g. bash)'
   
   def run
@@ -6,6 +6,7 @@ Standup.script do
   end
   
   def make_shell shell_command = ''
+    return unless instance
     command = "#{node.ssh_string} -t '#{shell_command}'"
     bright_p command
     Kernel.exec command

data/scripts/status.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Check nodes status and display useful info'
   
   def run
@@ -6,10 +6,13 @@ Standup.script do
       puts "Node:        #{node.name}"
       puts "State:       #{instance.state}"
       puts "IP:          #{instance.external_ip}"
-      puts "SSH String:  #{node.ssh_string}"
     else
       puts "Node:        #{node.name}"
       puts "State:       not running"
     end
   end
+      
+  def self.execute
+    run_on_nodes Standup::Settings.nodes.keys
+  end
 end

data/scripts/terminate.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Terminate nodes'
   
   def run

data/scripts/update.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Update working application'
   
   def run

data/scripts/watchlog.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.description = 'Watch remote Rails application log'
   
   def run

data/scripts/webapp.rb

@@ -1,4 +1,4 @@
-Standup.script do
+Standup.script :node do
   self.default_params = {
       :rails_env => 'production'
   }

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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-10}
+  s.date = %q{2010-11-11}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/standup/node.rb",
      "lib/standup/remoting.rb",
      "lib/standup/scripts/base.rb",
+     "lib/standup/scripts/node.rb",
      "lib/standup/settings.rb",
      "scripts/allocate_ip.rb",
      "scripts/appconsole.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +03:00
+date: 2010-11-11 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,6 +152,7 @@ files:
 - lib/standup/node.rb
 - lib/standup/remoting.rb
 - lib/standup/scripts/base.rb
+- lib/standup/scripts/node.rb
 - lib/standup/settings.rb
 - scripts/allocate_ip.rb
 - scripts/appconsole.rb