standup 0.5.1 → 0.5.3

data/lib/standup/remoting.rb

@@ -73,10 +73,40 @@ module Standup
       with_context(:prefix => prefix, &block)
     end
 
+    def raw_exec command
+      bright_p command
+
+      result = ''
+
+      collect_output = lambda do |data|
+        result << data
+        print(data)
+        STDOUT.flush
+      end
+
+      main_channel = ssh.open_channel do |ch|
+        ch.exec("bash -l") do |ch2, _|
+          ch2.on_data { |_, data| collect_output.call(data) }
+
+          ch2.on_extended_data { |_, _, data| collect_output.call(data) }
+
+          ch2.send_data "export TERM=vt100\n"
+
+          ch2.send_data "#{command}\n"
+
+          ch2.send_data "exit\n"
+        end
+      end
+
+      main_channel.wait
+
+      result
+    end
+
     def exec command, context = @context
       command = "#{context[:prefix].strip} #{command}"            if context[:prefix].present?
       command = "cd #{context[:path]} && #{command}"              if context[:path].present?
-      command = "/usr/local/rvm/bin/rvm-shell -c \"#{command}\""  if rvm_installed?
+      command = "#{shell_command} -c \"#{command.gsub(/"/, '\"')}\""
 
       if context[:user].present?
         command = "sudo -u #{context[:user]} #{command}"
@@ -84,15 +114,13 @@ module Standup
         command = "sudo #{command}"
       end
 
-      bright_p command
-      ssh.exec! command do |ch, _, data|
-        ch[:result] ||= ""
-        ch[:result] << data
-        print data
-        STDOUT.flush
-      end
+      raw_exec command
     end
-      
+
+    def shell_command
+      rvm_installed? ? 'rvm-shell' : 'bash'
+    end
+
     def sudo command = nil, &block
       block = Proc.new { exec command } unless block_given?
       with_context(:sudo => true, &block)
@@ -112,10 +140,10 @@ module Standup
       result
     end
       
-    def file_exists? path
-      exec("if [ -e #{path} ]; then echo 'true'; fi") == "true\n"
+    def file_exists? path, raw = false
+      send(:"#{raw ? 'raw_' : ''}exec", "if [ -e #{path} ]; then echo 'true'; fi") == "true\n"
     end
-      
+
     def install_packages packages, opts = {}
       input = opts[:input] ? "echo \"#{opts[:input].join("\n")}\" | sudo " : ''
       sudo "#{input}apt-get -qqy install #{packages}"
@@ -157,7 +185,10 @@ module Standup
     end
     
     def rvm_installed?
-      @rvm_installed ||= ssh.exec!("if [ -e /usr/local/rvm/bin/rvm ]; then echo 'true'; fi") == "true\n"
+      unless instance_variable_defined? :@rvm_installed
+        @rvm_installed = file_exists?('/usr/local/rvm/bin/rvm', true)
+      end
+      @rvm_installed
     end
 
     protected
@@ -166,7 +197,8 @@ module Standup
       @ssh ||= Net::SSH.start @host, @user,
                               :keys => @keypair_file,
                               :paranoid => false,
-                              :timeout => 10
+                              :timeout => 10,
+                              :compression => 'zlib'
     end
     
     def rsync source, destination, sudo

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 
   def self.version
     VERSION

data/scripts/db_backup.rb

@@ -1,4 +1,4 @@
-Standup.script :node do
+klnblkblkbklblkcdStandup.script :node do
   def run
     exec "s3cmd mb #{bucket}"
     

data/scripts/init/standup.yml

@@ -12,6 +12,9 @@ ec2:
   instance_type: m1.small
   ssh_user: ubuntu
 
+shell:
+  extra_options: -L 5433:localhost:5432
+
 webapp:
   name: 
   github_user: 

data/scripts/ruby.rb

@@ -1,17 +1,19 @@
 Standup.script :node do
   def run
-    return if remoting.rvm_installed?
-    
-    install_package 'git-core'
-    
-    sudo 'bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)'
-    
-    exec "rvm install #{version}"
-    exec "rvm use #{version} --default"
-    
-    sudo 'usermod -a -G rvm www-data'
-    
-    remoting.instance_variable_set :@rvm_installed, true
+    unless remoting.rvm_installed?
+      install_package 'git-core'
+      sudo 'bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)'
+      sudo 'usermod -a -G rvm www-data'
+      exec 'source /usr/local/rvm/scripts/rvm'
+      remoting.instance_variable_set :@rvm_installed, true
+    end
+
+    unless exec('rvm list')[version]
+      install_packages 'build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev'
+
+      sudo "rvm install #{version}"
+      exec "rvm use #{version} --default"
+    end
   end
 
   def version

metadata

@@ -2,7 +2,7 @@
 name: standup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +04:00
+date: 2011-07-06 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency