standup 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/bin/standup

@@ -1,42 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'trollop'
 require 'standup'
 
-opt_parser = Trollop::Parser.new do
-  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 ''
-  banner 'Usage:'
-  banner '       standup [options] <script> [script arguments]'
-  banner ''
-  banner 'where <script> is one of the following:'
-  banner ''
-  
-  offset = Standup.scripts.keys.map(&:length).max + 2
-  Standup.scripts.keys.sort.each do |name|
-    banner "#{"%-#{offset}s" % name} #{Standup.scripts[name].description}"
-  end
-  
-  banner ''
-  banner "and [options] are:"
-  banner ''
-  
-  stop_on Standup.scripts.keys
-end
-
-Trollop::with_standard_exception_handling opt_parser do
- opt_parser.parse ARGV
- raise Trollop::HelpNeeded if ARGV.empty?
-end
-
-script_name = ARGV.shift
-script = Standup.scripts[script_name]
-
-if script
-  script.execute
-else
-  opt_parser.die "unknown script #{script_name}", nil
-end
+Standup.run_from_command_line

data/lib/standup.rb

@@ -4,6 +4,7 @@ require 'AWS'
 require 'aws/s3'
 require 'net/ssh'
 require 'highline'
+require 'trollop'
 
 require 'standup/core_ext'
 require 'standup/settings'
@@ -62,4 +63,47 @@ module Standup
   def self.version
     File.read(File.expand_path('../../VERSION',  __FILE__)).strip
   end
+  
+  def self.run_from_command_line
+    unless ENV['BUNDLE_GEMFILE']
+      Kernel.exec "bundle exec standup #{ARGV.join(' ')}"
+    end
+    
+    opt_parser = Trollop::Parser.new do
+      version "Standup #{Standup.version} (c) 2010 Ilia Ablamonov, Artem Orlov, Cloud Castle Inc."
+  
+      banner 'Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2.'
+      banner ''
+      banner 'Usage:'
+      banner '       standup [options] <script> [script arguments]'
+      banner ''
+      banner 'where <script> is one of the following:'
+      banner ''
+  
+      offset = Standup.scripts.keys.map(&:length).max + 2
+      Standup.scripts.keys.sort.each do |name|
+        banner "#{"%-#{offset}s" % name} #{Standup.scripts[name].description}"
+      end
+  
+      banner ''
+      banner "and [options] are:"
+      banner ''
+  
+      stop_on Standup.scripts.keys
+    end
+
+    Trollop::with_standard_exception_handling opt_parser do
+     opt_parser.parse ARGV
+     raise Trollop::HelpNeeded if ARGV.empty?
+    end
+
+    script_name = ARGV.shift
+    script = Standup.scripts[script_name]
+
+    if script
+      script.execute
+    else
+      opt_parser.die "unknown script #{script_name}", nil
+    end
+  end
 end

data/scripts/webapp.rb

@@ -2,7 +2,7 @@ Standup.script :node do
   self.default_params = {
       :rails_env => 'production',
       :name => 'webapp',
-      :server_name => 'localhost'
+      :server_name => '_'
   }
 
   def run

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Artem Orlov", "Cloud Castle Inc."]
-  s.date = %q{2010-12-30}
+  s.date = %q{2011-01-02}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +03:00
+date: 2011-01-02 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency