standup 0.5.5 → 0.5.6

data/README.md

@@ -91,7 +91,7 @@ For example, if you want to add `rescue` to your configuration, you need to:
 ## To do
 
 - **?** Script sequences: rework default script as script sequence
-
+- change shell for www-data user
 
 ## Copyright
 

data/lib/standup/remoting.rb

@@ -52,11 +52,10 @@ module Standup
              :sudo => opts[:sudo]
     end
 
-    def with_context new_context = {}
+    def with_context new_context = {}, replace = false
       old_context = @context.dup
-      yield(@context = @context.merge(new_context).merge(:prefix => "#{old_context[:prefix]} #{new_context[:prefix]}")).tap do
-        @context = old_context
-      end
+      @context = replace ? new_context : @context.merge(new_context).merge(:prefix => "#{old_context[:prefix]} #{new_context[:prefix]}")
+      yield(@context).tap { @context = old_context }
     end
 
     def in_dir path, &block
@@ -98,22 +97,27 @@ module Standup
       end
 
       main_channel.wait
+      main_channel.close
 
       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?
+    def remote_command command
+      command = "#{@context[:prefix].strip} #{command}" if @context[:prefix].present?
+      command = "cd #{@context[:path]} && #{command}"   if @context[:path].present?
       command = "#{shell_command} -c \"#{command.gsub(/"/, '\"')}\""
 
-      if context[:user].present?
-        command = "sudo -u #{context[:user]} #{command}"
-      elsif context[:sudo]
+      if @context[:user].present?
+        command = "sudo -u #{@context[:user]} #{command}"
+      elsif @context[:sudo]
         command = "sudo #{command}"
       end
 
-      raw_exec command
+      command
+    end
+
+    def exec command, context = {}
+      with_context(context) { raw_exec(remote_command(command)) }
     end
 
     def shell_command

data/lib/standup/scripts/node.rb

@@ -12,7 +12,7 @@ module Standup
                :to => :@node
     
       delegate :download, :upload, :remote_update, :file_exists?, :install_package, :install_packages, :install_gem, :update_cron,
-               :with_context, :exec, :sudo, :su_exec, :in_dir, :in_temp_dir, :as_user, :with_prefix,
+               :with_context, :exec, :sudo, :su_exec, :in_dir, :in_temp_dir, :as_user, :with_prefix, :remote_command,
                :to => :remoting
     
       attr_accessor :node

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 
   def self.version
     VERSION

data/scripts/appconsole.rb

@@ -3,7 +3,7 @@ Standup.script :node do
   
   def run
     scripts.webapp.with_environment do
-      exec 'rails console'
+      scripts.shell.make_shell(remote_command('rails console'))
     end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 5
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +04:00
+date: 2011-07-13 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
         version: "1.16"
   type: :runtime
   version_requirements: *id001
@@ -43,11 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
   type: :runtime
   version_requirements: *id002
@@ -59,10 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id003
@@ -74,10 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id004
@@ -89,10 +67,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :runtime
   version_requirements: *id005
@@ -104,10 +78,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
         version: "0.5"
   type: :runtime
   version_requirements: *id006
@@ -119,10 +89,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id007
@@ -134,11 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :runtime
   version_requirements: *id008
@@ -237,18 +198,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []