thor-ssh 0.1.7 → 0.1.8

data/README.md

@@ -4,6 +4,9 @@ ThorSsh takes thor and allows it to run from local to remote.
 It assumes that the sources are always local and the remotes
 are always remote.
 
+## ThorSsh Assumptions
+For running as_user('other_user') the assumption is that your connection is logged in either as 1) root, or 2) a user who can sudo to root
+
 ## Use
 		gem 'thor-ssh'
 
@@ -24,7 +27,7 @@ This is still a work in progress.  The main issue is that calling #inside or any
 TODO: Get #inside working
 TODO: Add other features needed for provisioning system
 TODO: Make way to copy remote to remote
-TODO: Make local #run and #exec work
+TODO: Update method blacklist
 
 ## Running Tests
 The test run through vagrant, which seemed logical since we want to test ssh stuff.

data/lib/thor-ssh/actions.rb

@@ -26,9 +26,9 @@ module ThorSsh
     # it is assumed to be local and a normal File class is returned
     def destination_files
       if self.destination_connection
-        return @destination_files ||= RemoteFile.new(self.destination_connection)
+        return @destination_files ||= RemoteFile.new(self, self.destination_connection)
       else
-        return @destination_files ||= LocalFile.new
+        return @destination_files ||= LocalFile.new(self)
       end
     end
     
@@ -37,12 +37,34 @@ module ThorSsh
     # the destination.
     def destination_server
       if self.destination_connection
-        return @destination_server ||= RemoteServer.new(self.destination_connection)
+        return @destination_server ||= RemoteServer.new(self, self.destination_connection)
       else
-        return @destination_server ||= LocalServer.new
+        return @destination_server ||= LocalServer.new(self)
       end
     end
     
+    
+    # As user takes a block and runs the code inside the block as the
+    # specified user.  All actions are run as the user
+    #
+    # === Parameters
+    # username<String>:: Who to run as
+    # options<String>:: A hash of options for how to get to this user
+    #
+    # === Options
+    # :shell  - Boolean, should this be invoked in the shell for the user 
+    def as_user(username, options={})
+      old_run_as_user = @run_as_user
+      @run_as_user = username
+      yield
+      @run_as_user = old_run_as_user
+    end
+    
+    # The user commands should be run as as the moment
+    def run_as_user
+      @run_as_user
+    end
+    
     def inside(dir='', config={}, &block)
       raise "inside is not implemented in thor-ssh, please use full paths"
     end

data/lib/thor-ssh/local_file.rb

@@ -2,6 +2,12 @@ require 'fileutils'
 
 module ThorSsh
   class LocalFile
+    attr_reader :base
+    
+    def initialize(base)
+      @base = base
+    end
+    
     def exists?(path)
       File.exists?(path)
     end

data/lib/thor-ssh/local_server.rb

@@ -2,6 +2,12 @@ require 'popen4'
 
 module ThorSsh
   class LocalServer
+    attr_reader :base
+    
+    def initialize(base)
+      @base = base
+    end
+    
     def run_with_codes(command)
       # pid, stdin, stdout, stderr = Open4::popen4(command)
       # ignored, status = Process::waitpid2 pid

data/lib/thor-ssh/remote_file.rb

@@ -2,29 +2,13 @@ require 'net/ssh'
 require 'net/sftp'
 require 'stringio'
 
-module ThorSsh
-  class RemoteFileWriter
-    def initialize(connection, file)
-      @connection = connection
-      @file = file
-      @offset = 0
-    end
-    
-    def write(data)
-      puts "WRITE: #{data.size} @ #{@offset}"
-      # io = StringIO.new(data)
-      @connection.sftp.write!(@file, @offset, data)
-      
-      puts "WROTE1"
-      
-      @offset += data.size
-    end
-  end
-  
+module ThorSsh  
   class RemoteFile
     attr_reader :connection
+    attr_reader :base
     
-    def initialize(connection)
+    def initialize(base, connection)
+      @base = base
       @connection = connection
     end
     
@@ -39,7 +23,7 @@ module ThorSsh
     end
     
     def run(command)
-      return connection.exec!(command)
+      return base.exec(command)
     end
     
     # Creates the directory at the path on the remote server
@@ -62,45 +46,27 @@ module ThorSsh
     end
     
     def binread(path)
-      data = nil
-      connection.sftp.file.open(path, "rb") do |f|
-        data = f.read
+      # If we first logged in as the running user
+      if base.destination_server.running_as_current_user?
+        data = nil
+        connection.sftp.file.open(path, "rb") do |f|
+          data = f.read
+        end
+      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}\"")
       end
-      
+
       return data
     end
     
     # TODO: we should just move this to a more standard thing
     def binwrite(path, data)
-      # puts "DATA: #{data.size}"
-      # file = connection.sftp.open!(path, 'wb')
-      # 
-      # # Write
-      # connection.sftp.write!(file, 0, data)
-      # 
-      # # Close
-      # connection.sftp.close!(file)
-
       io = StringIO.new(data)
       connection.sftp.upload!(io, path)
     end
     
-    def open(file_name, mode, &block)
-      # Open file
-      file = connection.sftp.open(file_name, 'wb', &method(:file_opened))#, {:chunk_size => 4096})
-      
-      file_writer = RemoteFileWriter.new(connection, file)
-      
-      yield(file_writer)
-      
-      # Close
-      connection.sftp.close(file)
-      
-      # , {:chunk_size => 4096}
-      # connection.sftp.file.open(file_name, mode, &block)
-      
-    end
-    
     def chmod(mode, file_name)
       if mode.is_a?(Integer)
         # Mode is an integer, convert to octal

data/lib/thor-ssh/remote_server.rb

@@ -4,8 +4,10 @@ require 'net/sftp'
 module ThorSsh
   class RemoteServer
     attr_reader :connection
+    attr_reader :base
     
-    def initialize(connection)
+    def initialize(base, connection)
+      @base = base
       @connection = connection
     end
     
@@ -41,12 +43,29 @@ module ThorSsh
 
       return stdout_data, stderr_data, exit_code, exit_signal
     end
+    
+    def running_as_current_user?
+      base.run_as_user && connection.options[:user] != base.run_as_user
+    end
 
     def run(command, with_codes=false)
+      if running_as_current_user?
+        # We need to change to a different user
+        if base.run_as_user == 'root'
+         # We need to go up to root
+         command = "sudo #{command}"
+       else
+         # We need to go up to root, then down to this user
+         # This involves running sudo (to go up to root), then running
+         # sudo again as the new user, then running the command
+         command = "sudo sudo -u #{base.run_as_user} #{command}"
+        end
+      end
+      results = run_with_codes(command)
       if with_codes
-        return run_with_codes(command)
+        return results
       else
-        return connection.exec!(command)
+        return results.first
       end
     end
     

data/lib/thor-ssh/version.rb

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

data/spec/actions_spec.rb

@@ -182,7 +182,6 @@ describe ThorSsh do
     stdout, stderr, exit_code, exit_signal = @local_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.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1900233715508289127
+      hash: 1762345843444454679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1900233715508289127
+      hash: 1762345843444454679
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22