thor-ssh 0.1.0 → 0.1.1

data/README.md

@@ -42,4 +42,9 @@ The test run through vagrant, which seemed logical since we want to test ssh stu
 		
 ### When you're done
 		cd spec/vagrant
-		vagrant halt
+		vagrant halt
+		
+		
+### TODO:
+
+Add upload progress: https://github.com/net-ssh/net-sftp/blob/master/lib/net/sftp/operations/upload.rb

data/lib/thor-ssh/actions/create_file.rb

@@ -10,6 +10,7 @@ class Thor
         invoke_with_conflict_check do
           @base.destination_files.mkdir_p(File.dirname(destination))
           @base.destination_files.binwrite(destination, render)
+          # @base.destination_files.open(destination, 'wb') { |f| f.write render }
         end
         given_destination
       end

data/lib/thor-ssh/actions/download_file.rb

@@ -0,0 +1,61 @@
+require 'thor-ssh/actions/create_file'
+require 'open-uri'
+
+
+# Class to download a file instead of creating it
+class Thor
+  module Actions
+    class DownloadFile < CreateFile
+      attr_accessor :source
+      
+      def initialize(base, source, destination, config={})
+        @source = source
+        super(base, destination, config)
+      end
+      
+      # def exists?
+      #   puts "CHECK EXISTS"
+      #   false
+      # end
+      
+      def identical?
+        # TODO: find a good way to check if these are identical, then move the file
+        # into place depending on user action
+        # exists? && @base.destination_files.binread(destination) == render
+
+        puts "CHECK IDENTICAL"
+        false
+      end
+      
+      def render
+        puts "RENDER: #{source}"
+        @render ||= open(source) {|input| input.binmode.read }
+      end
+      
+      
+      def download
+        # Check for wget
+        if @base.exec("which wget").strip != ''
+          # We have wget, download with that
+          @base.exec("wget \"#{source}\" -O \"#{destination}\"")
+        elsif @base.exec("which curl").strip != ''
+          # We have curl, download
+          @base.exec("curl -o \"#{destination}\" \"#{source}\"")
+        else
+          # No program to download remotely
+          raise "To download files you need either wget or curl on the remote server"
+        end
+      end
+  
+      # TODO: invoke_with_conflict_check workes except for diff
+      def invoke!
+        # invoke_with_conflict_check do
+          @base.say_status :download, source
+          @base.destination_files.mkdir_p(File.dirname(destination))
+          download()
+        # end
+        given_destination
+      end
+    end
+  end
+end

data/lib/thor-ssh/actions/file_manipulation.rb

@@ -1,3 +1,5 @@
+require 'thor-ssh/actions/download_file'
+
 class Thor
   module Actions
     # TODO: link_file doesn't make since for links into the gem
@@ -9,6 +11,20 @@ class Thor
     #   create_link destination, source, config
     # end
     
+    # Modifies #get to download files remotely, removes the ability to
+    # pass a blcok
+    def get(source, *args)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first
+
+      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^https?\:\/\//
+      render = open(source) {|input| input.binmode.read }
+
+      destination ||= File.basename(source)
+
+      action DownloadFile.new(self, source, destination, config)
+    end
+    
     
     def chmod(path, mode, config={})
       return unless behavior == :invoke

data/lib/thor-ssh/remote_file.rb

@@ -1,7 +1,26 @@
 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
+  
   class RemoteFile
     attr_reader :connection
     
@@ -53,13 +72,37 @@ module ThorSsh
     
     # TODO: we should just move this to a more standard thing
     def binwrite(path, data)
-      file = connection.sftp.open!(path, 'wb')
+      # 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 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})
       
-      # Write
-      connection.sftp.write!(file, 0, data)
+      file_writer = RemoteFileWriter.new(connection, file)
+      
+      yield(file_writer)
       
       # Close
-      connection.sftp.close!(file)
+      connection.sftp.close(file)
+      
+      # , {:chunk_size => 4096}
+      # connection.sftp.file.open(file_name, mode, &block)
+      
     end
     
     def chmod(mode, file_name)

data/lib/thor-ssh/version.rb

@@ -1,3 +1,3 @@
 module ThorSsh
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/actions_spec.rb

@@ -12,6 +12,7 @@ describe ThorSsh do
   
   after do
     # Close the connection
+    # @thor_test.destination_connection.sftp.session.shutdown!
     @thor_test.destination_connection.close
   end
   
@@ -21,6 +22,7 @@ describe ThorSsh do
     @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
     
   end
@@ -92,6 +94,10 @@ describe ThorSsh do
     @thor_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')
+  end
+  
 end
 
 

data/spec/vagrant/vagrant_manager.rb

@@ -17,6 +17,8 @@ class VagrantManager
       :paranoid              => false,
       :config                => false,
       :forward_agent         => ssh_info[:forward_agent]
+      # :verbose => :debug,
+      # :timeout => 1
     }
 
     # Check that the private key permissions are valid
@@ -24,6 +26,8 @@ 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
 

data/thor-ssh.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.name          = "thor-ssh"
   gem.require_paths = ["lib"]
   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 'net-ssh'#, '= 2.2.2'
+  gem.add_runtime_dependency 'net-sftp'#, '= 2.0.5'
   gem.add_development_dependency 'rspec', '~> 2.10'
   gem.add_development_dependency 'vagrant', '= 1.0.3'
   gem.add_development_dependency 'rake', '~> 0.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,7 @@ files:
 - lib/thor-ssh/actions.rb
 - lib/thor-ssh/actions/create_file.rb
 - lib/thor-ssh/actions/create_link.rb
+- lib/thor-ssh/actions/download_file.rb
 - lib/thor-ssh/actions/empty_directory.rb
 - lib/thor-ssh/actions/file_manipulation.rb
 - lib/thor-ssh/actions/inject_into_file.rb
@@ -170,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1305954903121655553
+      hash: 1765081219719402067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1305954903121655553
+      hash: 1765081219719402067
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22