file_transfer 0.0.7 → 0.0.9

data/lib/file_transfer/file_transfer_handler.rb

@@ -1,97 +1,97 @@
-module FileTransfer
-
-  class FileTransferHandler
-
-    def initialize(type, options)
-      @type = type
-      @options = options
-      @ftp_obj = get_ftp_obj type, options
-    end
-
-    def upload(paths)
-      paths = normalize_paths paths
-      all_file_paths = []
-      # Loop over Path Specs
-      paths.each do |path|
-        # Make sure it's an Array of from-Paths
-        path[:from] = [path[:from]] unless path[:from].kind_of?(Array) && path[:from][0].kind_of?(Array)
-        # Loop over Path From Specs
-        path[:from].each do |path_pattern|
-          path_pattern = [path_pattern] unless path_pattern.kind_of?(Array)
-          file_paths = []
-          if File.exists?(path_pattern[0]) && File.directory?(path_pattern[0])
-            path_pattern[1] = "*.*" if path_pattern.length < 2
-            Dir.chdir(path_pattern[0])
-            file_paths = Dir.glob(path_pattern[1])
-          elsif File.exists?(path_pattern[0])
-            file_paths = [path_pattern[0]]
-          end
-          file_paths.each do |file_path|
-            _upload file_path, path[:to]
-            all_file_paths.push file_path
-          end
-        end
-      end
-      all_file_paths
-    end
-
-    def download(paths)
-      paths = normalize_paths paths
-      all_file_paths = []
-      # Loop over Path Specs
-      paths.each do |path|
-        # Make sure it's an Array of from-Paths
-        path[:from] = [path[:from]] unless path[:from].kind_of?(Array) && path[:from][0].kind_of?(Array)
-        # Loop over Path From Specs
-        path[:from].each do |path_pattern|
-          _download path_pattern, path[:to]
-          all_file_paths.push path_pattern
-        end
-      end
-      all_file_paths
-    end
-
-    def list(path)
-      @ftp_obj.list path
-    end
-
-    def remove(path)
-      @ftp_obj.remove path
-    end
-
-    def rename(from_path, to_path)
-      @ftp_obj.rename from_path, to_path
-    end
-
-    def close
-      @ftp_obj.close
-    end
-
-    private
-
-      def normalize_paths(paths)
-        response = paths.kind_of?(Array) ? paths : [paths]
-        Marshal.load(Marshal.dump(response))
-      end
-
-      def get_ftp_obj(type, options)
-        if type == :ftp
-          Ftp.new options
-        elsif type == :sftp
-          Sftp.new options
-        elsif type == :ftps
-          Ftps.new options
-        end
-      end
-
-      def _upload(from_path, to_path)
-        @ftp_obj.upload from_path, to_path
-      end
-
-      def _download(from_path, to_path)
-        @ftp_obj.download from_path, to_path
-      end
-
-  end
-
+module FileTransfer
+
+  class FileTransferHandler
+
+    def initialize(type, options)
+      @type = type
+      @options = options
+      @ftp_obj = get_ftp_obj type, options
+    end
+
+    def upload(paths)
+      paths = normalize_paths paths
+      all_file_paths = []
+      # Loop over Path Specs
+      paths.each do |path|
+        # Make sure it's an Array of from-Paths
+        path[:from] = [path[:from]] unless path[:from].kind_of?(Array) && path[:from][0].kind_of?(Array)
+        # Loop over Path From Specs
+        path[:from].each do |path_pattern|
+          path_pattern = [path_pattern] unless path_pattern.kind_of?(Array)
+          file_paths = []
+          if File.exists?(path_pattern[0]) && File.directory?(path_pattern[0])
+            path_pattern[1] = "*.*" if path_pattern.length < 2
+            Dir.chdir(path_pattern[0])
+            file_paths = Dir.glob(path_pattern[1])
+          elsif File.exists?(path_pattern[0])
+            file_paths = [path_pattern[0]]
+          end
+          file_paths.each do |file_path|
+            _upload file_path, path[:to]
+            all_file_paths.push file_path
+          end
+        end
+      end
+      all_file_paths
+    end
+
+    def download(paths)
+      paths = normalize_paths paths
+      all_file_paths = []
+      # Loop over Path Specs
+      paths.each do |path|
+        # Make sure it's an Array of from-Paths
+        path[:from] = [path[:from]] unless path[:from].kind_of?(Array) && path[:from][0].kind_of?(Array)
+        # Loop over Path From Specs
+        path[:from].each do |path_pattern|
+          _download path_pattern, path[:to]
+          all_file_paths.push path_pattern
+        end
+      end
+      all_file_paths
+    end
+
+    def list(path)
+      @ftp_obj.list path
+    end
+
+    def remove(path)
+      @ftp_obj.remove path
+    end
+
+    def rename(from_path, to_path)
+      @ftp_obj.rename from_path, to_path
+    end
+
+    def close
+      @ftp_obj.close
+    end
+
+    private
+
+      def normalize_paths(paths)
+        response = paths.kind_of?(Array) ? paths : [paths]
+        Marshal.load(Marshal.dump(response))
+      end
+
+      def get_ftp_obj(type, options)
+        if type == :ftp
+          Ftp.new options
+        elsif type == :sftp
+          Sftp.new options
+        elsif type == :ftps
+          Ftps.new options
+        end
+      end
+
+      def _upload(from_path, to_path)
+        @ftp_obj.upload from_path, to_path
+      end
+
+      def _download(from_path, to_path)
+        @ftp_obj.download from_path, to_path
+      end
+
+  end
+
 end

data/lib/file_transfer/ftp.rb

@@ -1,83 +1,83 @@
-require "net/ftp"
-
-module FileTransfer
-  class Ftp < Generic
-
-    def initialize(options = {})
-      super(options)
-    end
-
-    def list(dir, options = {})
-      connect if @ftp.closed?
-      timeout(60) do
-        @ftp.chdir dir
-        result = @ftp.nlst
-        if options.has_key? :file_type
-          result = result.select { |file_name| file_name.end_with? options[:file_type] }
-        end
-        result
-      end
-    end
-
-    def upload(from_path, to_path)
-      to_path = split_path(to_path)
-      connect if @ftp.closed?
-      timeout(timeout_seconds) do
-        @ftp.chdir to_path[:file_path]
-        @ftp.putbinaryfile(from_path)
-      end
-    end
-
-    def download(from_path, to_path)
-      from_path = split_path(from_path)
-      connect if @ftp.closed?
-      timeout(timeout_seconds) do
-        @ftp.chdir from_path[:file_path]
-        @ftp.getbinaryfile(to_path, from_path[:file_name])
-        "#{from_path[:file_path]}/#{from_path[:file_name]}"
-      end
-    end
-
-    def move(from_path, to_path)
-      from_path = split_path(from_path)
-      to_path = split_path(to_path)
-      connect if @ftp.closed?
-      timeout(timeout_seconds) do
-        @ftp.chdir from_path[:file_path]
-        @ftp.rename from_path[:file_name], "#{to_path[:file_path]}/#{to_path[:file_name]}" if exist?("#{from_path[:file_name]}/#{from_path[:file_path]}")
-      end
-    end
-
-    def exist?(file_path)
-      connect if @ftp.closed?
-      timeout(60) do
-        result = @ftp.list "#{file_path}"
-        result && result.size > 0
-      end
-    end
-
-    def close
-      if @ftp && !@ftp.closed?
-        timeout(30) do
-          @ftp.close
-        end
-      end
-    end
-
-    protected
-
-      def closed?
-        !@ftp || @ftp.closed?
-      end
-
-      def connect
-        timeout(30) do
-          @ftp ||= Net::FTP.new
-          @ftp.passive = true
-          @ftp.connect(@host, @port)
-          @ftp.login(@username, @password) if @username && @password
-        end
-      end
-
-  end
+require "net/ftp"
+
+module FileTransfer
+  class Ftp < Generic
+
+    def initialize(options = {})
+      super(options)
+    end
+
+    def list(dir, options = {})
+      connect if @ftp.closed?
+      timeout(60) do
+        @ftp.chdir dir
+        result = @ftp.nlst
+        if options.has_key? :file_type
+          result = result.select { |file_name| file_name.end_with? options[:file_type] }
+        end
+        result
+      end
+    end
+
+    def upload(from_path, to_path)
+      to_path = split_path(to_path)
+      connect if @ftp.closed?
+      timeout(timeout_seconds) do
+        @ftp.chdir to_path[:file_path]
+        @ftp.putbinaryfile(from_path)
+      end
+    end
+
+    def download(from_path, to_path)
+      from_path = split_path(from_path)
+      connect if @ftp.closed?
+      timeout(timeout_seconds) do
+        @ftp.chdir from_path[:file_path]
+        @ftp.getbinaryfile(to_path, from_path[:file_name])
+        "#{from_path[:file_path]}/#{from_path[:file_name]}"
+      end
+    end
+
+    def move(from_path, to_path)
+      from_path = split_path(from_path)
+      to_path = split_path(to_path)
+      connect if @ftp.closed?
+      timeout(timeout_seconds) do
+        @ftp.chdir from_path[:file_path]
+        @ftp.rename from_path[:file_name], "#{to_path[:file_path]}/#{to_path[:file_name]}" if exist?("#{from_path[:file_name]}/#{from_path[:file_path]}")
+      end
+    end
+
+    def exist?(file_path)
+      connect if @ftp.closed?
+      timeout(60) do
+        result = @ftp.list "#{file_path}"
+        result && result.size > 0
+      end
+    end
+
+    def close
+      if @ftp && !@ftp.closed?
+        timeout(30) do
+          @ftp.close
+        end
+      end
+    end
+
+    protected
+
+      def closed?
+        !@ftp || @ftp.closed?
+      end
+
+      def connect
+        timeout(30) do
+          @ftp ||= Net::FTP.new
+          @ftp.passive = true
+          @ftp.connect(@host, @port)
+          @ftp.login(@username, @password) if @username && @password
+        end
+      end
+
+  end
 end

data/lib/file_transfer/ftps.rb

@@ -1,5 +1,5 @@
-module FileTransfer
-  class Ftps
-    # To change this template use File | Settings | File Templates.
-  end
+module FileTransfer
+  class Ftps
+    # To change this template use File | Settings | File Templates.
+  end
 end

data/lib/file_transfer/generic.rb

@@ -1,57 +1,58 @@
-module FileTransfer
-
-  class Generic
-
-    attr_accessor :host, :username, :password, :port, :timeout_seconds
-
-    def initialize(options = {})
-      @host = options[:host] || "localhost"
-      @username = options[:username] || "anonymous"
-      @password = options[:password] || ""
-      @port = options[:port] || 21
-      @timeout_seconds = options[:timeout] || 300
-    end
-
-    def list(dir, filter="")
-    end
-
-    def upload(from_path, to_path)
-    end
-
-    def download(from_path, to_path)
-    end
-
-    def move(file_name, from_dir, to_dir)
-    end
-
-    def exist?(file_path)
-    end
-
-    def close
-    end
-
-    def to_s
-      "FtpClient {@host => #{host},  @username => #{username}, @protocol => #{type}, @port => #{port}, @password => ***}"
-    end
-
-    protected
-
-      def split_path(path)
-        {:file_path => File.dirname(path), :file_name => File.basename(path)}
-      end
-
-      def timeout(seconds, &block)
-        Timeout.timeout(seconds.to_i) do
-          block.call(Hash.new)
-        end
-      end
-
-      def connect
-      end
-
-      def closed?
-      end
-
-  end
-
-end
+module FileTransfer
+
+  class Generic
+
+    attr_accessor :host, :username, :password, :keys, :port, :timeout_seconds
+
+    def initialize(options = {})
+      @host = options[:host] || 'localhost'
+      @username = options[:username] || 'anonymous'
+      @password = options[:password] || ''
+      @keys = options[:keys].to_s.split(',') || []
+      @port = options[:port] || 21
+      @timeout_seconds = options[:timeout] || 300
+    end
+
+    def list(dir, filter = '')
+    end
+
+    def upload(from_path, to_path)
+    end
+
+    def download(from_path, to_path)
+    end
+
+    def move(file_name, from_dir, to_dir)
+    end
+
+    def exist?(file_path)
+    end
+
+    def close
+    end
+
+    def to_s
+      "FtpClient {@host => #{host},  @username => #{username}, @protocol => #{type}, @port => #{port}, @password => ***}"
+    end
+
+    protected
+
+      def split_path(path)
+        {:file_path => File.dirname(path), :file_name => File.basename(path)}
+      end
+
+      def timeout(seconds, &block)
+        Timeout.timeout(seconds.to_i) do
+          block.call(Hash.new)
+        end
+      end
+
+      def connect
+      end
+
+      def closed?
+      end
+
+  end
+
+end

data/lib/file_transfer/sftp.rb

@@ -1,62 +1,66 @@
-module FileTransfer
-
-  class Sftp < Generic
-
-    def initialize(options = {})
-      options[:port] ||= 22
-      super(options)
-    end
-
-    def download(from_path, to_path)
-      connect if closed?
-      timeout(timeout_seconds) do
-        @sftp.download! from_path, to_path
-      end
-    end
-
-    def upload(from_path, to_path)
-      connect if closed?
-      timeout(timeout_seconds) do
-        @sftp.upload! from_path, to_path
-      end
-    end
-
-    def list(path)
-      connect if closed?
-      timeout(60) do
-        @sftp.dir.entries path
-      end
-    end
-
-    def remove(path)
-      connect if closed?
-      timeout(60) do
-        @sftp.remove! path
-      end
-    end
-
-    def rename(from_path, to_path)
-      connect if closed?
-      timeout(60) do
-        @sftp.rename! from_path, to_path
-      end
-    end
-
-    def close
-     # do nothing
-    end
-
-    protected
-
-      def connect
-        timeout(60) do
-          @sftp = Net::SFTP.start(host, username, :password => password, :port => port)
-        end
-      end
-
-      def closed?
-        !@sftp || @sftp.closed?
-      end
-
-  end
+module FileTransfer
+
+  class Sftp < Generic
+
+    def initialize(options = {})
+      options[:port] ||= 22
+      super(options)
+    end
+
+    def download(from_path, to_path)
+      connect if closed?
+      timeout(timeout_seconds) do
+        @sftp.download! from_path, to_path
+      end
+    end
+
+    def upload(from_path, to_path)
+      connect if closed?
+      timeout(timeout_seconds) do
+        @sftp.upload! from_path, to_path
+      end
+    end
+
+    def list(path)
+      connect if closed?
+      timeout(60) do
+        @sftp.dir.entries path
+      end
+    end
+
+    def remove(path)
+      connect if closed?
+      timeout(60) do
+        @sftp.remove! path
+      end
+    end
+
+    def rename(from_path, to_path)
+      connect if closed?
+      timeout(60) do
+        @sftp.rename! from_path, to_path
+      end
+    end
+
+    def close
+     # do nothing
+    end
+
+    protected
+
+      def connect
+        timeout(60) do
+          if keys.empty?
+            @sftp = Net::SFTP.start(host, username, :password => password, :port => port)
+          else
+            @sftp = Net::SFTP.start(host, username, :keys => keys, :port => port)
+          end
+        end
+      end
+
+      def closed?
+        !@sftp || @sftp.closed?
+      end
+
+  end
 end

data/lib/file_transfer/version.rb

@@ -1,3 +1,3 @@
-module FileTransfer # :nodoc:
-  VERSION = "0.0.7"  # :nodoc:
-end
+module FileTransfer # :nodoc:
+  VERSION = '0.0.9'  # :nodoc:
+end