thor-ssh 0.1.5 → 0.1.6

data/lib/thor-ssh/actions.rb

@@ -1,3 +1,5 @@
+require 'thor-ssh/local_file'
+require 'thor-ssh/local_server'
 require 'thor-ssh/remote_file'
 require 'thor-ssh/remote_server'
 require 'thor-ssh/actions/empty_directory'
@@ -23,18 +25,22 @@ module ThorSsh
     # 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_files
-      if self.destination_server
+      if self.destination_connection
         return @destination_files ||= RemoteFile.new(self.destination_connection)
       else
-        return File
+        return @destination_files ||= LocalFile.new
       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
+    # Returns a RemoteServer instance or a LocalServer instance.
+    # Makes it so calls to run events can be called the same reguardless of 
+    # the destination.
     def destination_server
-      return @destination_server ||= RemoteServer.new(self.destination_connection)
+      if self.destination_connection
+        return @destination_server ||= RemoteServer.new(self.destination_connection)
+      else
+        return @destination_server ||= LocalServer.new
+      end
     end
     
     def inside(dir='', config={}, &block)

data/lib/thor-ssh/local_file.rb

@@ -0,0 +1,58 @@
+require 'fileutils'
+
+module ThorSsh
+  class LocalFile
+    def exists?(path)
+      File.exists?(path)
+    end
+    
+    def run(command)
+      return system(command)
+    end
+    
+    # Creates the directory at the path on the remote server
+    def mkdir_p(path)
+      FileUtils.mkdir_p(path)
+    end
+    
+    # Remote the file/folder on the remote server
+    def rm_rf(path)
+      FileUtils.rm_rf(path)
+    end
+    alias :unlink :rm_rf
+    
+    def symlink(old_name, new_name)
+      File.symlink(old_name, new_name)
+    end
+
+    def link(old_name, new_name)
+      File.link(old_name, new_name)
+    end
+    
+    def binread(path)
+      data = nil
+      File.open(path, "rb") do |f|
+        data = f.read
+      end
+      
+      return data
+    end
+    
+    # TODO: we should just move this to a more standard thing
+    def binwrite(path, data)
+      File.open(path, 'wb') do |file|
+        file.write(data)
+      end
+    end
+
+    def chmod(mode, file_name)
+      File.chmod(mode, file_name)
+    end
+    
+    # See if these paths point to the same inode
+    def identical?(file1, file2)
+      File.identical?(file1, file2)
+    end
+
+  end
+end

data/lib/thor-ssh/local_server.rb

@@ -0,0 +1,34 @@
+require 'popen4'
+
+module ThorSsh
+  class LocalServer
+    def run_with_codes(command)
+      # pid, stdin, stdout, stderr = Open4::popen4(command)
+      # ignored, status = Process::waitpid2 pid
+      # exit_code = status.to_i
+      exit_signal = nil
+      
+      stdout_data = ''
+      stderr_data = ''
+      status = POpen4::popen4(command) do |stdout, stderr, stdin, pid|
+        stdin.close
+        stdout_data = stdout.read
+        stderr_data = stderr.read.strip
+      end
+
+      exit_code = status.to_i
+
+      return stdout_data, stderr_data, exit_code, exit_signal
+    end
+
+    def run(command, with_codes=false)
+      if with_codes
+        return run_with_codes(command)
+      else
+        stdout, stdin, exit_code, exit_signal = run_with_codes(command)
+        return stdout
+      end
+    end
+    
+  end
+end

data/lib/thor-ssh/remote_file.rb

@@ -85,10 +85,6 @@ module ThorSsh
       connection.sftp.upload!(io, path)
     end
     
-    def file_opened
-      puts "COOL)"
-    end
-    
     def open(file_name, mode, &block)
       # Open file
       file = connection.sftp.open(file_name, 'wb', &method(:file_opened))#, {:chunk_size => 4096})

data/lib/thor-ssh/version.rb

@@ -1,3 +1,3 @@
 module ThorSsh
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/actions_spec.rb

@@ -1,108 +1,149 @@
 require 'spec_helper'
 require 'thor_test'
 require 'vagrant/vagrant_manager'
+require 'fileutils'
 
 
 describe ThorSsh do
   before do
     # Setup the test and connect to a test server
-    @thor_test = ThorTest.new
-    @thor_test.destination_connection = VagrantManager.connect
+    @remote_test = ThorTest.new
+    @remote_test.destination_connection = VagrantManager.connect
+    
+    @local_test = ThorTest.new
+    @local_test.destination_root = File.join(File.dirname(__FILE__), '/tmp/')
   end
   
   after do
     # Close the connection
-    # @thor_test.destination_connection.sftp.session.shutdown!
-    @thor_test.destination_connection.close
+    @remote_test.destination_connection.close
+    
+    # Clear local tmp dir
+    FileUtils.rm_rf(File.join(File.dirname(__FILE__), '/tmp/test/'))
   end
   
   before(:all) do
-    @base_path = '/home/vagrant/thortest'
+    @remote_base_path = '/home/vagrant/thortest'
+    @local_base_path = File.join(File.dirname(__FILE__), '/tmp/test/')
     
-    @thor_test = ThorTest.new
-    @thor_test.destination_connection = VagrantManager.connect
-    @thor_test.destination_files.rm_rf(@base_path)
-    # @thor_test.destination_connection.sftp.session.shutdown!
-    @thor_test.destination_connection.close
+    @remote_test = ThorTest.new
+    @remote_test.destination_connection = VagrantManager.connect
+    @remote_test.destination_files.rm_rf(@remote_base_path)
+    @remote_test.destination_connection.close
     
   end
   
-  it 'should create an empty directory' do
-    @thor_test.empty_directory(@base_path)
-    @thor_test.destination_files.exists?(@base_path)
+  it 'should create an empty directory remotely' do
+    @remote_test.empty_directory(@remote_base_path)
+    @remote_test.destination_files.exists?(@remote_base_path)
+  end
+
+  it 'should create an empty directory locally' do
+    @local_test.empty_directory(@local_base_path)
+    @local_test.destination_files.exists?(@local_base_path)
   end
   
-  it 'should create an empty directory' do
-    @thor_test.get('http://www.google.com/', "#{@base_path}/google.txt")
-    @thor_test.destination_files.binread("#{@base_path}/google.txt").should match(/Google/)
+  it 'should create get a url remotely' do
+    @remote_test.get('http://www.google.com/', "#{@remote_base_path}/google.txt")
+    @remote_test.destination_files.binread("#{@remote_base_path}/google.txt").should match(/Google/)
+  end
+
+  it 'should create get a url locally' do
+    @local_test.get('http://www.google.com/', "#{@local_base_path}/google.txt")
+    @local_test.destination_files.binread("#{@local_base_path}/google.txt").should match(/Google/)
   end
   
-  it 'should create a file and set the text' do
-    @thor_test.create_file("#{@base_path}/createdFile", "More awesome content\nSecond Line of content")
-    @thor_test.destination_files.binread("#{@base_path}/createdFile").should == "More awesome content\nSecond Line of content"
+  it 'should create a file and set the text remotely' do
+    @remote_test.create_file("#{@remote_base_path}/createdFile", "More awesome content\nSecond Line of content")
+    @remote_test.destination_files.binread("#{@remote_base_path}/createdFile").should == "More awesome content\nSecond Line of content"
+  end
+
+  it 'should create a file and set the text locally' do
+    @local_test.create_file("#{@local_base_path}/createdFile", "More awesome content\nSecond Line of content")
+    @local_test.destination_files.binread("#{@local_base_path}/createdFile").should == "More awesome content\nSecond Line of content"
   end
   
-  it "should copy in text" do
-    @thor_test.destination_root = @base_path + "/"
-    @thor_test.template "templates/test_template.rb.tt"
-    @thor_test.destination_files.binread("#{@base_path}/templates/test_template.rb").should match(/Test Ruby File/)
+  it "should copy in text remotely" do
+    @remote_test.destination_root = @remote_base_path + "/"
+    @remote_test.template "templates/test_template.rb.tt"
+    @remote_test.destination_files.binread("#{@remote_base_path}/templates/test_template.rb").should match(/Test Ruby File/)
+  end
+
+  it "should copy in text locally" do
+    @local_test.destination_root = @local_base_path + "/"
+    @local_test.template "templates/test_template.rb.tt"
+    @local_test.destination_files.binread("#{@local_base_path}/templates/test_template.rb").should match(/Test Ruby File/)
   end
   
-  def mode(path)
-    ls = @thor_test.destination_server.run("ls -lh \"#{@base_path}/#{path}\"")
+  def remote_mode(path)
+    ls = @remote_test.destination_server.run("ls -lh \"#{@remote_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-------'
+  it "should set the mode remotely" do
+    @remote_test.create_file("#{@remote_base_path}/modeFile", "More awesome content")
+    @remote_test.chmod("#{@remote_base_path}/modeFile", 0644)
+    remote_mode('modeFile').should == '-rw-r--r--'
+    @remote_test.chmod("#{@remote_base_path}/modeFile", 0600)
+    remote_mode('modeFile').should == '-rw-------'
+  end
+
+  def local_mode(path)
+    ls = @local_test.destination_server.run("ls -lh \"#{@local_base_path}/#{path}\"")
+    mode = ls.strip.split(/ /).first.strip
+    return mode
+  end
+
+  it "should set the mode locally" do
+    @local_test.create_file("#{@local_base_path}/modeFile", "More awesome content")
+    @local_test.chmod("#{@local_base_path}/modeFile", 0644)
+    local_mode('modeFile').should == '-rw-r--r--'
+    @local_test.chmod("#{@local_base_path}/modeFile", 0600)
+    local_mode('modeFile').should == '-rw-------'
   end
   
   it "should gsub files" do
-    file = "#{@base_path}/gsubFile"
-    @thor_test.create_file(file, "More awesome content")
-    @thor_test.gsub_file file, /awesome/, 'cool'
-    @thor_test.destination_files.binread(file).should == 'More cool content'
+    file = "#{@remote_base_path}/gsubFile"
+    @remote_test.create_file(file, "More awesome content")
+    @remote_test.gsub_file file, /awesome/, 'cool'
+    @remote_test.destination_files.binread(file).should == 'More cool content'
   end
   
   it "should remove files" do
-    file = "#{@base_path}/removeFile"
-    @thor_test.create_file(file, "More awesome content")
-    @thor_test.destination_files.exists?(file).should == true
-    @thor_test.remove_file(file)
-    @thor_test.destination_files.exists?(file).should == false    
+    file = "#{@remote_base_path}/removeFile"
+    @remote_test.create_file(file, "More awesome content")
+    @remote_test.destination_files.exists?(file).should == true
+    @remote_test.remove_file(file)
+    @remote_test.destination_files.exists?(file).should == false    
   end
   
   it "should inject text into files" do
-    file = "#{@base_path}/injectFile"
-    @thor_test.create_file(file, "First line\nSecond Line\nThird Line")
-    @thor_test.insert_into_file(file, "2.5 line\n", :after => "Second Line\n")
-    @thor_test.destination_files.binread(file).should == "First line\nSecond Line\n2.5 line\nThird Line"
+    file = "#{@remote_base_path}/injectFile"
+    @remote_test.create_file(file, "First line\nSecond Line\nThird Line")
+    @remote_test.insert_into_file(file, "2.5 line\n", :after => "Second Line\n")
+    @remote_test.destination_files.binread(file).should == "First line\nSecond Line\n2.5 line\nThird Line"
   end
   
   it "should create links" do
-    file = "#{@base_path}/symFile"
-    link_file = "#{@base_path}/linkedFile"
-    @thor_test.create_file(file, "Text")
+    file = "#{@remote_base_path}/symFile"
+    link_file = "#{@remote_base_path}/linkedFile"
+    @remote_test.create_file(file, "Text")
     
-    @thor_test.create_link(link_file, file)
+    @remote_test.create_link(link_file, file)
     
-    @thor_test.destination_files.binread(link_file).should == "Text"
+    @remote_test.destination_files.binread(link_file).should == "Text"
   end
   
   it "should download a file remotely" do
-    @thor_test.get('http://nginx.org/download/nginx-1.2.0.tar.gz', '/home/vagrant/nginx-1.2.0.tar.gz')
+    @remote_test.get('http://nginx.org/download/nginx-1.2.0.tar.gz', '/home/vagrant/nginx-1.2.0.tar.gz')
   end
   
   it "should run exec with an exit code" do
-    stdout, stderr, exit_code, exit_signal = @thor_test.exec('false', true)
+    stdout, stderr, exit_code, exit_signal = @remote_test.exec('false', true)
     exit_code.should == 1
-
-    stdout, stderr, exit_code, exit_signal = @thor_test.exec('true', true)
+  
+    stdout, stderr, exit_code, exit_signal = @remote_test.exec('true', true)
     exit_code.should == 0
   end
 end

data/thor-ssh.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', '~> 0.15.2'
   gem.add_runtime_dependency 'net-ssh'#, '= 2.2.2'
   gem.add_runtime_dependency 'net-sftp'#, '= 2.0.5'
+  gem.add_runtime_dependency 'popen4', '~> 0.1.2'
   gem.add_development_dependency 'rspec', '~> 2.10'
   gem.add_development_dependency 'vagrant', '= 1.0.3'
-  gem.add_development_dependency 'sahara'
+  gem.add_development_dependency 'sahara', '>= 0.0.11'
   gem.add_development_dependency 'rake', '~> 0.9'
   gem.add_development_dependency 'rdoc', '~> 3.9'
   gem.rdoc_options = ['--charset=UTF-8']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: popen4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +176,8 @@ files:
 - lib/thor-ssh/actions/empty_directory.rb
 - lib/thor-ssh/actions/file_manipulation.rb
 - lib/thor-ssh/actions/inject_into_file.rb
+- lib/thor-ssh/local_file.rb
+- lib/thor-ssh/local_server.rb
 - lib/thor-ssh/remote_file.rb
 - lib/thor-ssh/remote_server.rb
 - lib/thor-ssh/version.rb
@@ -187,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2234182083947585544
+      hash: -1434051545551031789
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2234182083947585544
+      hash: -1434051545551031789
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22