Bump to version 0.2.0.c

DAddYE · Dec 1, 2011 · 1e765f6 · 1e765f6
1 parent 2c7a97b
commit 1e765f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/lib/do/server.rb b/lib/do/server.rb
@@ -69,6 +69,7 @@ def close
     #
     def run(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
+      options[:pty] = true unless options.has_key?(:pty)
       cmd = args.join(" ")
       if options[:as]
         if options[:as] == 'root'
@@ -80,19 +81,17 @@ def run(*args)
       log cmd
       result = ""
       ssh.open_channel do |channel|
-        channel.request_pty do |c, success|
-          raise "could not request pty" unless success
-          channel.exec cmd
-          channel.on_data do |c_, data|
-            result << data
-            DO_LOGGER.print(data) unless options[:silent]
-            if options[:input]
-              match = options[:match] || /password/i
-              if data =~ match
-                options[:input] += "\n" if options[:input][-1] != ?\n
-                channel.send_data(options[:input])
-                DO_LOGGER.puts(options[:input]) unless options[:silent] || data =~ /password/i
-              end
+        channel.request_pty if options[:input] || options[:pty]
+        channel.exec cmd
+        channel.on_data do |c, data|
+          result << data
+          DO_LOGGER.print(data) unless options[:silent]
+          if options[:input]
+            match = options[:match] || /password/i
+            if data =~ match
+              options[:input] += "\n" if options[:input][-1] != ?\n
+              channel.send_data(options[:input])
+              DO_LOGGER.puts(options[:input]) unless options[:silent] || data =~ /password/i
             end
           end
         end

diff --git a/lib/do/version.rb b/lib/do/version.rb
@@ -1,3 +1,3 @@
 module DO
-  VERSION = "0.2.0.b" unless defined?(DO::VERSION)
+  VERSION = "0.2.0.c" unless defined?(DO::VERSION)
 end