standup 0.5.11 → 0.5.13

data/lib/standup/remoting.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'timeout'
 
 module Standup
   class Remoting
@@ -52,7 +53,8 @@ module Standup
              :sudo => opts[:sudo]
     end
 
-    def with_context new_context = {}, replace = false
+    def with_context new_context, replace = false
+      new_context ||= {}
       old_context = @context.dup
       @context = replace ? new_context : @context.merge(new_context).merge(:prefix => "#{old_context[:prefix]} #{new_context[:prefix]}")
       yield(@context).tap { @context = old_context }
@@ -73,7 +75,7 @@ module Standup
       with_context(:prefix => prefix, &block)
     end
 
-    def raw_exec command
+    def raw_exec command, timeout_sec = nil
       bright_p command
 
       result = ''
@@ -98,7 +100,16 @@ module Standup
         end
       end
 
-      main_channel.wait
+      if timeout_sec
+        begin
+          timeout(timeout_sec) { main_channel.wait }
+        rescue Timeout::Error
+          puts "Timeout of #{timeout_sec} happens, connection is closing."
+        end
+      else
+        main_channel.wait
+      end
+
       main_channel.close
 
       result
@@ -118,8 +129,8 @@ module Standup
       command
     end
 
-    def exec command, context = {}
-      with_context(context) { raw_exec(remote_command(command)) }
+    def exec command, context = nil, timeout_sec = nil
+      with_context(context) { raw_exec(remote_command(command), timeout_sec) }
     end
 
     def shell_command
@@ -185,7 +196,7 @@ module Standup
     end
     
     def close
-      @ssh.close if @ssh
+      @ssh.shutdown! if @ssh
       @ssh = nil
     end
     

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = "0.5.11"
+  VERSION = "0.5.13"
 
   def self.version
     VERSION

data/scripts/init/standup.yml

@@ -19,7 +19,6 @@ webapp:
   name: 
   github_user: 
   github_repo: 
-  bootstrap_db: true
 
 # Nodes and their script params
 nodes:

data/scripts/logrotate/logrotate.conf.erb

@@ -0,0 +1,49 @@
+<%
+  common_props = <<-END
+    daily
+    rotate 30
+
+    missingok
+    notifempty
+
+    compress
+    delaycompress
+  END
+%>
+
+<% if scripts.setup.has_script? 'passenger' %>
+  /opt/nginx/logs/*.log {
+<%= common_props %>
+    sharedscripts
+
+    postrotate
+      test ! -f /var/run/nginx.pid || kill -USR1 'cat /var/run/nginx.pid'
+    endscript
+  }
+<% end %>
+
+<% if scripts.setup.has_script? 'webapp' %>
+
+  <%= scripts.webapp.app_path %>log/<%= scripts.webapp.params.rails_env %>.log {
+<%= common_props %>
+    postrotate
+      touch <%= scripts.webapp.app_path %>tmp/restart.txt
+    endscript
+  }
+
+<% end %>
+
+<% if scripts.setup.has_script?('resque') && scripts.webapp.params.has_key?(:resque_queues) %>
+  <% scripts.webapp.params.resque_queues.each_pair do |resque_name, num_of_workers| %>
+    <% 1.upto(num_of_workers) do |num| %>
+
+  <%= scripts.webapp.app_path %>log/<%= "resque_worker_#{resque_name}_#{num}" %>.log {
+<%= common_props %>
+    postrotate
+      /usr/sbin/monit restart <%= "resque_#{resque_name}_#{num}" %>
+    endscript
+  }
+
+    <% end %>
+  <% end %>
+<% end %>

data/scripts/logrotate.rb

@@ -0,0 +1,9 @@
+Standup.script :node do
+  def run
+    with_processed_file script_file('logrotate.conf.erb') do |file|
+      upload file,
+             :to => "/etc/logrotate.d/standup",
+             :sudo => true
+    end
+  end
+end

data/scripts/postgresql.rb

@@ -35,11 +35,11 @@ Standup.script :node do
   end
   
   def create_database name, local = false
-    if exec_sql("select * from pg_database where datname = '#{name}'", local) =~ /1 row/
-      false
-    else
+    if exec_sql("select * from pg_database where datname = '#{name}'", local) =~ /\(0 rows\)/
       exec_sql "create database #{name}", local
       true
+    else
+      false
     end
   end
   

data/scripts/ruby/rvmrc

@@ -0,0 +1 @@
+export rvm_path=/usr/local/rvm

data/scripts/ruby.rb

@@ -6,6 +6,7 @@ Standup.script :node do
       sudo 'usermod -a -G rvm ubuntu'
       sudo 'usermod -a -G rvm www-data'
       sudo 'cd /usr/local/bin && sudo ln -s /usr/local/rvm/bin/rvm-shell'
+      upload script_file('rvmrc'), :to => '/etc/rvmrc', :sudo => true
       exec 'source /usr/local/rvm/scripts/rvm'
       remoting.instance_variable_set :@rvm_installed, true
     end

data/scripts/webapp.rb

@@ -5,7 +5,6 @@ Standup.script :node do
       :server_name => '_',
       :git_branch => 'master',
       :gem_manager => :bundler,
-      :bootstrap_db => false,
       :app_subdir => ''
   }
 
@@ -37,7 +36,7 @@ Standup.script :node do
 
     install_gems
 
-    bootstrap_db if params.bootstrap_db
+    bootstrap_db
 
     #TODO replace rvm ruby with wrapper!!!
     with_processed_file script_file('webapp.conf') do |file|
@@ -116,7 +115,7 @@ Standup.script :node do
       exec "ssh-keygen -t rsa -f ~/.ssh/id_rsa -P '' -C `hostname`"
     end
     
-    while exec('ssh -o StrictHostKeyChecking=no git@github.com') =~ /Permission denied \(publickey\)/
+    while exec('ssh -o StrictHostKeyChecking=no git@github.com', nil, 10) =~ /Permission denied \(publickey\)/
       password = bright_ask("Enter GitGub password for user #{params.github_user}:", false)
 
       github_add_deploy_key params.github_user,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standup
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70335336567100 !ruby/object:Gem::Requirement
+  requirement: &70198872104340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336567100
+  version_requirements: *70198872104340
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70335336563600 !ruby/object:Gem::Requirement
+  requirement: &70198872103840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335336563600
+  version_requirements: *70198872103840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70335336559920 !ruby/object:Gem::Requirement
+  requirement: &70198872103380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336559920
+  version_requirements: *70198872103380
 - !ruby/object:Gem::Dependency
   name: settingslogic
-  requirement: &70335336580740 !ruby/object:Gem::Requirement
+  requirement: &70198872102920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336580740
+  version_requirements: *70198872102920
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
-  requirement: &70335336617660 !ruby/object:Gem::Requirement
+  requirement: &70198872102460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336617660
+  version_requirements: *70198872102460
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70335336628020 !ruby/object:Gem::Requirement
+  requirement: &70198872102000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336628020
+  version_requirements: *70198872102000
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70335336634060 !ruby/object:Gem::Requirement
+  requirement: &70198872101540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335336634060
+  version_requirements: *70198872101540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70335336638160 !ruby/object:Gem::Requirement
+  requirement: &70198872101080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335336638160
+  version_requirements: *70198872101080
 description: ''
 email:
 - ilia@flamefork.ru
@@ -147,6 +147,8 @@ files:
 - scripts/init.rb
 - scripts/init/standup.yml
 - scripts/localize.rb
+- scripts/logrotate.rb
+- scripts/logrotate/logrotate.conf.erb
 - scripts/monit.rb
 - scripts/monit/monit
 - scripts/monit/monitrc
@@ -170,6 +172,7 @@ files:
 - scripts/resque/resque_monit.conf
 - scripts/ruby.rb
 - scripts/ruby/gemrc
+- scripts/ruby/rvmrc
 - scripts/setup.rb
 - scripts/shell.rb
 - scripts/status.rb
@@ -195,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3527928499941133534
+      hash: 2756298026055865495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3527928499941133534
+      hash: 2756298026055865495
 requirements: []
 rubyforge_project: standup
 rubygems_version: 1.8.6