standup 0.3.15 → 0.3.16

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.authors = ['Ilia Ablamonov', 'Artem Orlov', 'Cloud Castle Inc.']
     
     gem.add_dependency 'trollop', '>= 1.16'
+    gem.add_dependency 'i18n', '>= 0.5.0'
     gem.add_dependency 'activesupport', '>= 3.0'
     gem.add_dependency 'settingslogic', '>= 2.0'
     gem.add_dependency 'amazon-ec2', '>= 0.9'

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.16

data/lib/standup/node.rb

@@ -26,7 +26,7 @@ module Standup
     
     def ssh_string
       return '' unless instance
-      "ssh -i #{Settings.aws.keypair_file} -q -o StrictHostKeyChecking=no #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
+      "ssh -i #{Settings.aws.keypair_file} -C -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
     end
     
     def params

data/lib/standup/remoting.rb

@@ -77,7 +77,7 @@ module Standup
     end
       
     def su_exec user, command
-      sudo "-u #{user} \"#{command.gsub /"/, '\"'}\""
+      sudo "-u #{user} #{command}"
     end
       
     def in_temp_dir &block
@@ -144,7 +144,7 @@ module Standup
     def rsync source, destination, sudo
       command = [
         'rsync -rlptDzP --delete',
-        "-e 'ssh -i #{@keypair_file} -q -o StrictHostKeyChecking=no'",
+        "-e 'ssh -i #{@keypair_file} -C -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'",
         ("--rsync-path='sudo rsync'" if sudo),
         [*source].join(' '),
         destination

data/lib/standup/scripts/base.rb

@@ -67,8 +67,10 @@ module Standup
         script_description = description
         script_name = name
         opt_parser = Trollop::Parser.new do
-          banner script_description
-          banner ''
+          if script_description
+            banner script_description
+            banner ''
+          end
           banner 'Usage:'
           banner "       standup #{script_name} [options] #{arg_pattern}"
           banner ''

data/lib/standup.rb

@@ -44,7 +44,7 @@ module Standup
   end
 
   def self.script type = :node, &block
-    name = block.__file__.match(/([^\/]*)\.rb$/)[1]
+    name = eval("__FILE__", block.binding).match(/([^\/]*)\.rb$/)[1]
     superclass = scripts[name] || case type
       when :node
         Scripts::Node

data/scripts/appconsole.rb

@@ -2,6 +2,6 @@ Standup.script :node do
   self.description = 'Run remote Rails application console'
   
   def run
-    scripts.shell.make_shell "cd #{scripts.webapp.app_path} && rails console #{scripts.webapp.params.rails_env}"
+    scripts.shell.make_shell "cd #{scripts.webapp.app_path} && sudo -u www-data rails console #{scripts.webapp.params.rails_env}"
   end
 end

data/scripts/basics.rb

@@ -10,5 +10,6 @@ Standup.script :node do
     
     sudo 'touch /var/log/cron.log'
     sudo 'chmod 666 /var/log/cron.log'
+    #TODO: add setting localtime zone for server
   end
 end

data/scripts/mysql.rb

@@ -29,7 +29,6 @@ Standup.script :node do
   end
   
   def load_command database, username = 'root', password = 'root'
-    username = 'root' if username == :local
     "mysql -u#{username} -p#{password} #{database}"
   end
 end

data/scripts/shell.rb

@@ -16,6 +16,6 @@ Standup.script :node do
 
   def ssh_string
     return '' unless instance
-    "ssh -i #{Standup::Settings.aws.keypair_file} #{params.extra_options} #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
+    "ssh -i #{Standup::Settings.aws.keypair_file} -C -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{params.extra_options} #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
   end
 end

data/scripts/update.rb

@@ -4,13 +4,32 @@ Standup.script :node do
   def run
     in_dir scripts.webapp.app_path do
       sudo 'chown -R ubuntu:ubuntu .'
-      exec 'git pull'
-      sudo 'bundle install'
-      sudo "RAILS_ENV=#{scripts.webapp.params.rails_env} rake db:migrate"
-      sudo 'mkdir -p tmp'
+      
+      pull_changes
+      
+      update_webapp
+      
       sudo 'chown -R www-data:www-data .'
-      sudo 'touch tmp/restart.txt'
-      scripts.delayed_job.restart if scripts.setup.has_script? 'delayed_job'
+      
+      restart_webapp
     end
   end
+  
+  protected
+  
+  def pull_changes
+    exec 'git pull'
+    exec "git checkout #{scripts.webapp.params.git_branch}"
+  end
+  
+  def update_webapp
+    scripts.webapp.install_gems
+    sudo "RAILS_ENV=#{scripts.webapp.params.rails_env} rake db:migrate"
+  end
+  
+  def restart_webapp
+    sudo 'mkdir -p tmp'
+    sudo 'touch tmp/restart.txt'
+    scripts.delayed_job.restart if scripts.setup.has_script? 'delayed_job'
+  end
 end

data/scripts/webapp.rb

@@ -2,30 +2,37 @@ Standup.script :node do
   self.default_params = {
       :rails_env => 'production',
       :name => 'webapp',
-      :server_name => '_'
+      :server_name => '_',
+      :git_branch => 'master',
+      :gem_manager => :bundler
   }
 
   def run
     install_package 'git-core'
-    install_gem 'bundler'
     install_package params.additional_packages if params.additional_packages.present?
 
-    unless file_exists? scripts.webapp.app_path
-      sudo "mkdir -p #{scripts.webapp.app_path}"
+    unless file_exists? app_path
+      sudo "mkdir -p #{app_path}"
     end
 
-    sudo "chown -R ubuntu:ubuntu #{scripts.webapp.app_path}"
+    sudo "chown -R ubuntu:ubuntu #{app_path}"
 
     ensure_github_access
 
-    unless file_exists? "#{scripts.webapp.app_path}/.git"
-      exec "rm -rf #{scripts.webapp.app_path}/*"
-      exec "git clone git@github.com:#{github_repo}.git #{scripts.webapp.app_path}"
+    unless file_exists? "#{app_path}/.git"
+      exec "rm -rf #{app_path}/*"
+      exec "git clone git@github.com:#{github_repo}.git #{app_path}"
     end
+    
+    in_dir app_path do
+      exec "git checkout #{params.git_branch}"
+    end
+
+    install_gems
 
     bootstrap_db
 
-    sudo "chown -R www-data:www-data #{scripts.webapp.app_path}"
+    sudo "chown -R www-data:www-data #{app_path}"
 
     with_processed_file script_file('webapp.conf') do |file|
       scripts.passenger.add_server_conf file, "#{params.name}.conf"
@@ -53,6 +60,18 @@ Standup.script :node do
   def server_name
     server_names.split(' ').first
   end
+  
+  def install_gems
+    in_dir app_path do
+      case params.gem_manager.to_sym
+        when :bundler
+          install_gem 'bundler'
+          exec 'bundle install'
+        when :rake_gems
+          exec "RAILS_ENV=#{params.rails_env} rake gems:install"
+      end
+    end
+  end
 
   protected
   
@@ -74,8 +93,7 @@ Standup.script :node do
 
   def bootstrap_db
     if db.create_database db_name
-      in_dir scripts.webapp.app_path do
-        sudo 'bundle install'
+      in_dir app_path do
         exec "RAILS_ENV=#{params.rails_env} rake db:schema:load"
         exec "RAILS_ENV=#{params.rails_env} rake db:seed"
       end

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.15"
+  s.version = "0.3.16"
 
   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{2011-01-02}
+  s.date = %q{2011-01-14}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -78,15 +78,15 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/cloudcastle/standup}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, [">= 1.16"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
       s.add_runtime_dependency(%q<settingslogic>, [">= 2.0"])
       s.add_runtime_dependency(%q<amazon-ec2>, [">= 0.9"])
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
     else
       s.add_dependency(%q<trollop>, [">= 1.16"])
+      s.add_dependency(%q<i18n>, [">= 0.5.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0"])
       s.add_dependency(%q<settingslogic>, [">= 2.0"])
       s.add_dependency(%q<amazon-ec2>, [">= 0.9"])
@@ -104,6 +105,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<trollop>, [">= 1.16"])
+    s.add_dependency(%q<i18n>, [">= 0.5.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0"])
     s.add_dependency(%q<settingslogic>, [">= 2.0"])
     s.add_dependency(%q<amazon-ec2>, [">= 0.9"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 15
-  version: 0.3.15
+  - 16
+  version: 0.3.16
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +03:00
+date: 2011-01-14 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: settingslogic
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +80,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +95,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: aws-s3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +110,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,11 +125,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,7 +141,7 @@ dependencies:
         - 2
         version: 1.5.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 description: 
 email: ilia@flamefork.ru
 executables: 
@@ -223,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2