thor-ssh 0.1.3 → 0.1.4

data/lib/thor-ssh/actions.rb

@@ -42,17 +42,11 @@ module ThorSsh
     end
     
     # Similar to run, but silent and always executes on the remote server
-    def exec(command)
-      return destination_server.run(command)
-    end
-
-    # Similar to run, but silent and always executes on the remote server
-    # Also returns the stderr, exit_code, and exit_signal seperate
-    def exec_with_codes(command)
-      return destination_server.run_with_codes(command)
+    def exec(command, with_codes=false)
+      return destination_server.run(command, with_codes)
     end
     
-    def run(command, config={})
+    def run(command, with_codes=false, config={})
       return unless behavior == :invoke
 
       destination = relative_to_original_destination_root(destination_root, false)
@@ -67,7 +61,7 @@ module ThorSsh
 
       unless options[:pretend]
         # config[:capture] ? `#{command}` : system("#{command}")
-        return exec(command)
+        return exec(command, with_codes)
       end
     end
     

data/lib/thor-ssh/remote_server.rb

@@ -20,7 +20,6 @@ module ThorSsh
             abort "FAILED: couldn't execute command (connection.channel.exec)"
           end
           channel.on_data do |ch,data|
-            puts data
             stdout_data += data
           end
 
@@ -43,8 +42,12 @@ module ThorSsh
       return stdout_data, stderr_data, exit_code, exit_signal
     end
 
-    def run(command)
-      return connection.exec!(command)
+    def run(command, with_codes=false)
+      if with_codes
+        return run_with_codes(command)
+      else
+        return connection.exec!(command)
+      end
     end
     
   end

data/lib/thor-ssh/version.rb

@@ -1,3 +1,3 @@
 module ThorSsh
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/actions_spec.rb

@@ -99,10 +99,10 @@ describe ThorSsh do
   end
   
   it "should run exec with an exit code" do
-    stdout, stderr, exit_code, exit_signal = @thor_test.exec_with_codes('false')
+    stdout, stderr, exit_code, exit_signal = @thor_test.exec('false', true)
     exit_code.should == 1
 
-    stdout, stderr, exit_code, exit_signal = @thor_test.exec_with_codes('true')
+    stdout, stderr, exit_code, exit_signal = @thor_test.exec('true', true)
     exit_code.should == 0
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -169,12 +169,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4561132812708336947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4561132812708336947
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22