thor-ssh 0.1.8 → 0.1.9

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'sahara', :git => 'https://github.com/ryanstout/sahara.git'
+
 # Specify your gem's dependencies in thor-ssh.gemspec
 gemspec

data/lib/thor-ssh/actions.rb

@@ -60,6 +60,12 @@ module ThorSsh
       @run_as_user = old_run_as_user
     end
     
+    def as_root(options={})
+      as_user('root', options) do
+        yield
+      end
+    end
+    
     # The user commands should be run as as the moment
     def run_as_user
       @run_as_user

data/lib/thor-ssh/remote_file.rb

@@ -11,14 +11,23 @@ module ThorSsh
       @base = base
       @connection = connection
     end
+
+    # This is a workaround for bug:
+    # https://github.com/net-ssh/net-sftp/issues/13
+    def close_sftp!
+      connection.sftp.close_channel()
+      connection.instance_variable_set('@sftp', nil)
+    end
     
     def exists?(path)
       begin
-        connection.sftp.stat!(path)
+        res = connection.sftp.stat!(path)
       rescue Net::SFTP::StatusException
+        close_sftp!
         return false
       end
       
+      close_sftp!
       return true
     end
     
@@ -52,10 +61,11 @@ module ThorSsh
         connection.sftp.file.open(path, "rb") do |f|
           data = f.read
         end
+        close_sftp!
       else
         # We just run this as root, when reading we don't need to go back
         # down to the user
-        data = @remote_test.destination_server.run("cat \"#{path}\"")
+        data = @base.destination_server.run("cat \"#{path}\"")
       end
 
       return data
@@ -65,6 +75,7 @@ module ThorSsh
     def binwrite(path, data)
       io = StringIO.new(data)
       connection.sftp.upload!(io, path)
+      close_sftp!
     end
     
     def chmod(mode, file_name)

data/lib/thor-ssh/remote_server.rb

@@ -1,5 +1,5 @@
 require 'net/ssh'
-require 'net/sftp'
+# require 'net/sftp'
 
 module ThorSsh
   class RemoteServer
@@ -16,8 +16,8 @@ module ThorSsh
       stderr_data = ""
       exit_code = nil
       exit_signal = nil
-      connection.open_channel do |channel|
-        channel.exec(command) do |ch, success|
+      channel = connection.open_channel do |cha|
+        cha.exec(command) do |ch, success|
           unless success
             abort "FAILED: couldn't execute command (connection.channel.exec)"
           end
@@ -36,8 +36,15 @@ module ThorSsh
           channel.on_request("exit-signal") do |ch, data|
             exit_signal = data.read_long
           end
+          
+          # channel.on_close do |ch|
+          #   puts "Channel is Closing! #{connection.closed?}"
+          #   channel.close
+          # end
         end
         # channel.wait
+        # puts "Done Loop"
+        # channel.close
       end
       connection.loop
 

data/lib/thor-ssh/version.rb

@@ -1,3 +1,3 @@
 module ThorSsh
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/actions_spec.rb

@@ -4,20 +4,15 @@ require 'vagrant/vagrant_manager'
 require 'fileutils'
 
 
-describe ThorSsh do
+describe "Thor SSH" do
   before do
     # Setup the test and connect to a test server
-    @remote_test = ThorTest.new
-    @remote_test.destination_connection = VagrantManager.connect
-    
+    # @remote_test = ThorTest.new
     @local_test = ThorTest.new
     @local_test.destination_root = File.join(File.dirname(__FILE__), '/tmp/')
   end
   
   after do
-    # Close the connection
-    @remote_test.destination_connection.close
-    
     # Clear local tmp dir
     FileUtils.rm_rf(File.join(File.dirname(__FILE__), '/tmp/test/'))
   end
@@ -29,12 +24,17 @@ describe ThorSsh do
     @remote_test = ThorTest.new
     @remote_test.destination_connection = VagrantManager.connect
     @remote_test.destination_files.rm_rf(@remote_base_path)
+  end
+  
+  after(:all) do
+    # Close the remote connection
     @remote_test.destination_connection.close
-    
   end
+
   
   it 'should create an empty directory remotely' do
     @remote_test.empty_directory(@remote_base_path)
+    @remote_test.empty_directory(@remote_base_path + '2')
     @remote_test.destination_files.exists?(@remote_base_path)
   end
   
@@ -182,6 +182,16 @@ describe ThorSsh do
     stdout, stderr, exit_code, exit_signal = @local_test.exec('true', true)
     exit_code.should == 0
   end
+  
+  it "should switch users" do
+    @remote_test.as_user('root') do
+      @remote_test.exec('whoami').strip.should == 'root'
+    end
+  
+    @remote_test.as_root do
+      @remote_test.exec('whoami').strip.should == 'root'
+    end
+  end
 end
 
 

data/spec/vagrant/vagrant_manager.rb

@@ -27,6 +27,7 @@ class VagrantManager
     # Connect to SSH, giving it a few tries
     return Net::SSH.start(ssh_info[:host], ssh_info[:username], opts)
     
+    
     # return Net::SSH.start("127.0.0.1", "vagrant", {:port=>2222, :keys=>["/Users/ryanstout/.vagrant.d/insecure_private_key"], :keys_only=>true, :user_known_hosts_file=>[], :paranoid=>false, :config=>false, :forward_agent=>false, :verbose=>:debug, :timeout=>1})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -164,6 +164,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rpsec
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1762345843444454679
+      hash: 2434700529121181325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1762345843444454679
+      hash: 2434700529121181325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22