remote-session 0.0.3 → 0.0.4

data/lib/remote/session/send.rb

@@ -0,0 +1,51 @@
+module Remote
+
+  class Session
+  
+    class Send
+
+      attr_accessor :remote_path
+      attr_accessor :chunk_size
+
+      def initialize( remote_path )
+        @remote_path = remote_path
+        @chunk_size  = 1024
+        @file        = nil
+      end
+
+      def read
+        open if ! open?
+        
+        @file.read( @chunk_size )
+      end
+
+      def eof?
+        return true if ! open?
+        @file.eof?
+      end
+
+      def open?
+        ! @file.nil?
+      end
+
+      def open
+        if open?
+          @file.rewind
+          return
+        end
+
+        _open
+      end
+
+      def close
+        return if ! open?
+        @file.close
+        @file = nil
+      end
+
+    end
+
+  end
+
+end
+

data/lib/remote/session/send_file.rb

@@ -2,42 +2,18 @@ module Remote
 
   class Session
 
-    class SendFile
+    class SendFile < Send
 
       attr_accessor :local_path
-      attr_accessor :remote_path
-      attr_accessor :chunk_size
 
       def initialize( local_path, remote_path )
         @local_path  = local_path
-        @remote_path = remote_path
-        @chunk_size  = 1024
-        @file        = nil
+        super( remote_path )
       end
 
-      def open?
-        ! @file.nil?
-      end
-
-      def eof?
-        return true if ! open?
-        @file.eof?
-      end
-
-      def read
-        open if ! open?
-        
-        @file.read( @chunk_size )
-      end
-
-      def close
-        return if ! open?
-        @file.close
-        @file = nil
-      end
+      private
 
-      def open
-        close if open?
+      def _open
         @file = File.open( @local_path, 'r' )
       end
 

data/lib/remote/session/send_string.rb

@@ -0,0 +1,27 @@
+require 'stringio'
+
+module Remote
+
+  class Session
+
+    class SendString < Send
+
+      attr_accessor :string
+
+      def initialize( string, remote_path )
+        @string = string
+        super( remote_path )
+      end
+
+      private
+
+      def _open
+        @file = StringIO.new( @string )
+      end
+      
+    end
+    
+  end
+
+end
+

data/lib/remote/session/version.rb

@@ -1,6 +1,9 @@
 module Remote
   class Session
-    VERSION = "0.0.3"
+    MAJOR    = 0
+    MINOR    = 0
+    REVISION = 4
+    VERSION  = [ MAJOR, MINOR, REVISION ].map( &:to_s ).join( '.' )
   end
 end
 

data/lib/remote/session.rb

@@ -1,4 +1,6 @@
+require 'remote/session/send'
 require 'remote/session/send_file'
+require 'remote/session/send_string'
 require 'remote/session/version'
 require 'net/sftp'
 require 'net/ssh'
@@ -45,7 +47,7 @@ module Remote
 
     def sudo( commands )
       raise "Session is closed" if @session.nil?
-      commands = [ *commands ]
+      commands = [ *commands ] + [ 'exit' ]
 
       @session.open_channel do |ch|
         ch.request_pty do |ch, success|
@@ -113,13 +115,10 @@ module Remote
 
       $stdout.write( data )
 
-      if ch[ :commands ].size == 0
-        ch.send_data "exit\n"
-        return
-      end
+      return if ch[ :commands ].size == 0
 
       command = ch[ :commands ].shift
-      if command.is_a?( Remote::Session::SendFile )
+      if command.is_a?( Remote::Session::Send )
         send_file_chunk( ch, command )
       else
         ch.send_data "#{command}\n"

data/spec/unit/send_file_spec.rb

@@ -5,7 +5,7 @@ describe Remote::Session::SendFile do
 
   context '#initialize' do
 
-    it 'should require two parameters'do
+    it 'should require two parameters' do
       expect do
         Remote::Session::SendFile.new( 'foo' )
       end.to raise_error( ArgumentError, 'wrong number of arguments (1 for 2)' )
@@ -18,16 +18,12 @@ describe Remote::Session::SendFile do
 
     specify( 'local_path' )  { subject.local_path.should  == 'foo' }
     specify( 'remote_path' ) { subject.remote_path.should == 'bar' }
-    specify( 'chunk_size' )  { subject.chunk_size.should  == 1024 }
+    specify( 'chunk_size' )  { subject.chunk_size.should  == 1024  }
   end
 
   context 'instance_methods' do
     subject { Remote::Session::SendFile.new( '/local/path', '/remote/path' ) }
 
-    context '#open?' do
-      specify { subject.open?.should be_false }
-    end
-
     context '#eof?' do
       specify { subject.eof?.should be_true }
 
@@ -42,6 +38,18 @@ describe Remote::Session::SendFile do
       end
     end
 
+    context '#open' do
+      it 'should rewind the file, if already open' do
+        @file = stub( 'file', :eof? => false )
+        File.should_receive( :open ).with( '/local/path', 'r' ).and_return( @file )
+        @file.should_receive( :rewind )
+
+        subject.open
+
+        subject.open
+      end
+    end
+
     context '#close' do
 
       before :each do

data/spec/unit/send_spec.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
+
+describe Remote::Session::Send do
+
+  context '#initialize' do
+
+    it 'should require one parameter'do
+      expect do
+        Remote::Session::Send.new( 'foo', 'bar' )
+      end.to raise_error( ArgumentError, 'wrong number of arguments (2 for 1)' )
+    end
+
+  end
+
+  context 'attributes' do
+    subject { Remote::Session::Send.new( 'foo' ) }
+
+    specify( 'remote_path' ) { subject.remote_path.should == 'foo' }
+    specify( 'chunk_size' )  { subject.chunk_size.should  == 1024 }
+  end
+
+  context 'instance_methods' do
+    subject { Remote::Session::Send.new( '/remote/path' ) }
+
+    context '#open?' do
+      specify { subject.open?.should be_false }
+    end
+
+  end
+
+end
+

data/spec/unit/send_string_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
+
+describe Remote::Session::SendString do
+
+  context 'attributes' do
+    subject { Remote::Session::SendString.new( 'foo', 'bar' ) }
+
+    specify( 'string' )      { subject.string.should      == 'foo' }
+    specify( 'remote_path' ) { subject.remote_path.should == 'bar' }
+    specify( 'chunk_size' )  { subject.chunk_size.should  == 1024  }
+  end
+
+  context 'instance_methods' do
+
+    subject { Remote::Session::SendString.new( 'foo', 'remote/path' ) }
+
+    context '#open' do
+
+      it 'should instantiate a StringIO' do
+        @stringio = stub( 'stringio' )
+        StringIO.should_receive( :new ).with( 'foo' ).and_return( @stringio )
+
+        subject.open
+      end
+
+    end
+
+  end
+
+end
+

data/spec/unit/session_spec.rb

@@ -288,7 +288,7 @@ describe Remote::Session do
                   block.call( @ch, 'root_prompt#' )
                 end
 
-                @sf.should_receive( :is_a? ).with( Remote::Session::SendFile ).twice.and_return( true )
+                @sf.should_receive( :is_a? ).with( Remote::Session::Send ).twice.and_return( true )
                 @sf.should_receive( :remote_path ).twice.and_return( '/remote/path' )
 
                 chunk = 0
@@ -338,7 +338,7 @@ describe Remote::Session do
                   block.call( @ch, 'root_prompt#' )
                 end
 
-                @sf.stub!( :is_a? ).with( Remote::Session::SendFile ).and_return( true )
+                @sf.stub!( :is_a? ).with( Remote::Session::Send ).and_return( true )
                 @sf.stub!( :open? => false )
                 @sf.stub!( :remote_path ).and_return( '/remote/path' )
                 @sf.stub!( :eof? => true )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote-session
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joe Yates
@@ -110,12 +110,16 @@ files:
 - README.md
 - Rakefile
 - lib/remote/session.rb
+- lib/remote/session/send.rb
 - lib/remote/session/send_file.rb
+- lib/remote/session/send_string.rb
 - lib/remote/session/version.rb
 - remote-session.gemspec
 - spec/gather_rspec_coverage.rb
 - spec/spec_helper.rb
 - spec/unit/send_file_spec.rb
+- spec/unit/send_spec.rb
+- spec/unit/send_string_spec.rb
 - spec/unit/session_spec.rb
 homepage: ""
 licenses: []
@@ -154,4 +158,6 @@ test_files:
 - spec/gather_rspec_coverage.rb
 - spec/spec_helper.rb
 - spec/unit/send_file_spec.rb
+- spec/unit/send_spec.rb
+- spec/unit/send_string_spec.rb
 - spec/unit/session_spec.rb