standup 0.3.8 → 0.3.9

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/standup/core_ext.rb

@@ -4,7 +4,6 @@ module Kernel
   end
   
   def bright_ask message, echo = true
-    require 'highline'
     bright_p message, HighLine::GREEN
     HighLine.new.ask('') {|q| q.echo = echo}
   end

data/lib/standup/remoting.rb

@@ -23,22 +23,27 @@ module Standup
     
     def remote_update file, body, opts = {}
       tmpfile = Tempfile.new('file')
-  
-      download file,
-               :to => tmpfile.path,
-               :sudo => opts[:sudo]
+
+      success = download file,
+                         :to => tmpfile.path,
+                         :sudo => opts[:sudo]
+      unless success 
+        bright_p 'error during file upload'
+        return
+      end
   
       opts[:delimiter] ||= '# standup remote_update fragment'
       
       initial = File.read(tmpfile.path)
       
-      if initial.empty?
-        bright_p "error during file upload. skipping", Highline::RED
-        return
-      end
-      
       to_change = "#{opts[:delimiter]}\n#{body}#{opts[:delimiter]}\n"
-      changed = initial.gsub /#{opts[:delimiter]}.*#{opts[:delimiter]}\n?/m, to_change
+      pattern = /#{opts[:delimiter]}.*#{opts[:delimiter]}\n?/m
+      
+      changed = if initial.match pattern
+        initial.gsub pattern, to_change
+      else
+        "#{initial}\n#{to_change}"
+      end
       
       File.open(tmpfile.path, 'w') {|f| f.write changed}
       
@@ -77,7 +82,7 @@ module Standup
       
     def in_temp_dir &block
       tmp_dirname = "/tmp/standup_tmp_#{rand 10000}"
-      exec "mkdir #{tmp_dirname}"
+      exec "mkdir -m 777 #{tmp_dirname}"
       result = in_dir tmp_dirname, &block
       exec "rm -rf #{tmp_dirname}"
       result
@@ -103,6 +108,22 @@ module Standup
       end
     end
     
+    def update_cron schedule, commands, opts = {}
+      raise ArgumentError, ":section option is required" unless opts[:section]
+      user = opts[:user] || @node.scripts.ec2.params.ssh_user
+      commands = commands.strip.split("\n") if commands.is_a? String
+      commands = commands.map(&:strip).join(' && ')
+    
+      in_temp_dir do |dir|
+        sudo "crontab -l -u #{user} > crontab.txt"
+        remote_update "#{dir}/crontab.txt",
+                      "#{schedule} #{commands} > /var/log/cron.log 2>&1\n",
+                      :delimiter => "# standup update_cron: #{opts[:section]}",
+                      :sudo => true
+        sudo "crontab -u #{user} - < crontab.txt"
+      end
+    end
+    
     def close
       @ssh.close if @ssh
       @ssh = nil
@@ -128,8 +149,9 @@ module Standup
       
       3.times do
         bright_p command
-        break if system command
+        return true if system command
       end
+      false
     end
     
     def wrap_to_remote files

data/lib/standup/scripts/node.rb

@@ -11,7 +11,7 @@ module Standup
       delegate :instance, :open_port, :open_ports, :remoting, :scripts,
                :to => :@node
     
-      delegate :download, :upload, :remote_update, :exec, :sudo, :su_exec, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem,
+      delegate :download, :upload, :remote_update, :exec, :sudo, :su_exec, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem, :update_cron,
                :to => :remoting
     
       attr_accessor :node

data/scripts/basics/s3cfg

@@ -0,0 +1,3 @@
+[default]
+access_key = <%= Settings.aws.access_key_id %>
+secret_key = <%= Settings.aws.secret_access_key %>

data/scripts/basics.rb

@@ -1,6 +1,11 @@
 Standup.script :node do
   def run
     sudo 'apt-get -qq update'
-    install_packages 'build-essential libreadline5-dev mc'
+    install_packages 'build-essential libreadline5-dev mc s3cmd'
+    
+    with_processed_file script_file('s3cfg') do |file|
+      upload file,
+             :to => "/home/#{scripts.ec2.params.ssh_user}/.s3cfg"
+    end
   end
 end

data/scripts/db_backup.rb

@@ -0,0 +1,25 @@
+Standup.script :node do
+  self.description = 'Rails application database periodic backup to S3'
+  
+  def run
+    exec "s3cmd mb #{bucket}"
+    
+    update_cron '@hourly', <<-CMD, :section => name
+      touch dump.gz
+      sudo chmod 666 dump.gz
+      sudo su -c "pg_dump -c #{scripts.webapp.db_name} | gzip > dump.gz" postgres
+      s3cmd put dump.gz #{path_prefix}/`date -u +%Y-%M-%d/%H_%m_%S`.gz
+      rm dump.gz
+    CMD
+  end
+  
+  protected
+  
+  def bucket
+    's3://standup-backup'
+  end
+  
+  def path_prefix
+    "#{bucket}/db/#{scripts.webapp.db_name}"
+  end
+end

data/scripts/download_db.rb

@@ -3,7 +3,6 @@ Standup.script :node do
   
   def run
     in_temp_dir do |dir|
-      exec 'chmod 777 .'
       su_exec 'postgres', "pg_dump -c #{scripts.webapp.db_name} > dump.sql"
       local_exec "mkdir -p tmp/db"
       download "#{dir}/dump.sql",

data/scripts/setup.rb

@@ -1,7 +1,7 @@
 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'
+  self.default_params =  'ec2 basics monit ruby postgresql passenger webapp db_backup update'
   
   def run
     params.strip.split.each do |name|

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   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-15}
+  s.date = %q{2010-11-16}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -40,7 +40,9 @@ Gem::Specification.new do |s|
      "scripts/allocate_ip.rb",
      "scripts/appconsole.rb",
      "scripts/basics.rb",
+     "scripts/basics/s3cfg",
      "scripts/browse.rb",
+     "scripts/db_backup.rb",
      "scripts/delayed_job.rb",
      "scripts/delayed_job/delayed_job_monit.conf",
      "scripts/download_db.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +03:00
+date: 2010-11-16 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,7 +157,9 @@ files:
 - scripts/allocate_ip.rb
 - scripts/appconsole.rb
 - scripts/basics.rb
+- scripts/basics/s3cfg
 - scripts/browse.rb
+- scripts/db_backup.rb
 - scripts/delayed_job.rb
 - scripts/delayed_job/delayed_job_monit.conf
 - scripts/download_db.rb