thor-ssh 0.0.8 → 0.0.9

data/lib/thor-ssh/actions.rb

@@ -1,4 +1,5 @@
 require 'thor-ssh/remote_file'
+require 'thor-ssh/remote_server'
 require 'thor-ssh/actions/empty_directory'
 require 'thor-ssh/actions/create_file'
 require 'thor-ssh/actions/create_link'
@@ -9,13 +10,13 @@ module ThorSsh
   module Actions
     
     # Returns a connection to the destination server for this thor class.
-    def destination_server
-      @destination_server
+    def destination_connection
+      @destination_connection
     end
     
-    # Sets the destination server connection
-    def destination_server=(val)
-      @destination_server = val
+    # Sets the connection to the destination server
+    def destination_connection=(val)
+      @destination_connection = val
     end
     
     # Returns a remote file or File object that can used to query
@@ -23,12 +24,19 @@ module ThorSsh
     # it is assumed to be local and a normal File class is returned
     def destination_files
       if self.destination_server
-        return @destination_files ||= RemoteFile.new(self.destination_server)
+        return @destination_files ||= RemoteFile.new(self.destination_connection)
       else
         return File
       end
     end
     
+    # Returns a remote file or File object that can used to query
+    # or change the state of files.  If there is no destination_server
+    # it is assumed to be local and a normal File class is returned
+    def destination_server
+      return @destination_server ||= RemoteServer.new(self.destination_connection)
+    end
+    
     def inside(dir='', config={}, &block)
       raise "inside is not implemented in thor-ssh, please use full paths"
     end
@@ -48,7 +56,7 @@ module ThorSsh
 
       unless options[:pretend]
         # config[:capture] ? `#{command}` : system("#{command}")
-        return destination_files.run(command)
+        return destination_server.run(command)
       end
     end
     

data/lib/thor-ssh/remote_server.rb

@@ -0,0 +1,17 @@
+require 'net/ssh'
+require 'net/sftp'
+
+module ThorSsh
+  class RemoteServer
+    attr_reader :connection
+    
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def run(command)
+      return connection.exec!(command)
+    end
+    
+  end
+end

data/lib/thor-ssh/version.rb

@@ -1,3 +1,3 @@
 module ThorSsh
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/actions_spec.rb

@@ -7,22 +7,22 @@ describe ThorSsh do
   before do
     # Setup the test and connect to a test server
     @thor_test = ThorTest.new
-    @thor_test.destination_server = VagrantManager.connect
-    # @thor_test.destination_server = Net::SSH.start('localhost', 'ubuntu', :port => 2222)
+    @thor_test.destination_connection = VagrantManager.connect
   end
   
   after do
     # Close the connection
-    @thor_test.destination_server.close
+    @thor_test.destination_connection.close
   end
   
   before(:all) do
     @base_path = '/home/vagrant/thortest'
     
     @thor_test = ThorTest.new
-    @thor_test.destination_server = VagrantManager.connect
+    @thor_test.destination_connection = VagrantManager.connect
     @thor_test.destination_files.rm_rf(@base_path)
-    @thor_test.destination_server.close
+    @thor_test.destination_connection.close
+    
   end
   
   it 'should create an empty directory' do
@@ -47,13 +47,14 @@ describe ThorSsh do
   end
   
   def mode(path)
-    ls = @thor_test.destination_files.run("ls -lh \"#{@base_path}/#{path}\"")
+    ls = @thor_test.destination_server.run("ls -lh \"#{@base_path}/#{path}\"")
     mode = ls.strip.split(/ /).first.strip
     return mode
   end
   
   it "should set the mode" do
     @thor_test.create_file("#{@base_path}/modeFile", "More awesome content")
+    @thor_test.chmod("#{@base_path}/modeFile", 0644)
     mode('modeFile').should == '-rw-r--r--'
     @thor_test.chmod("#{@base_path}/modeFile", 0600)
     mode('modeFile').should == '-rw-------'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -144,6 +144,7 @@ files:
 - lib/thor-ssh/actions/file_manipulation.rb
 - lib/thor-ssh/actions/inject_into_file.rb
 - lib/thor-ssh/remote_file.rb
+- lib/thor-ssh/remote_server.rb
 - lib/thor-ssh/version.rb
 - spec/actions_spec.rb
 - spec/remote_file_spec.rb
@@ -169,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1300273360678236015
+      hash: -3815866701832875741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1300273360678236015
+      hash: -3815866701832875741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22