file_transfer 0.0.2 → 0.0.4

data/lib/file_transfer/ftp.rb

@@ -5,8 +5,6 @@ module FileTransfer
 
     def initialize(options = {})
       super(options)
-      @ftp = Net::FTP.new
-      @ftp.passive = true
     end
 
     def list(dir, options = {})
@@ -24,7 +22,7 @@ module FileTransfer
     def upload(from_path, to_path)
       to_path = split_path(to_path)
       connect if @ftp.closed?
-      timeout(300) do
+      timeout(timeout_seconds) do
         @ftp.chdir to_path[:file_path]
         @ftp.putbinaryfile(from_path)
       end
@@ -33,7 +31,7 @@ module FileTransfer
     def download(from_path, to_path)
       from_path = split_path(from_path)
       connect if @ftp.closed?
-      timeout(300) do
+      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]}"
@@ -44,7 +42,7 @@ module FileTransfer
       from_path = split_path(from_path)
       to_path = split_path(to_path)
       connect if @ftp.closed?
-      timeout(60) do
+      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
@@ -59,25 +57,27 @@ module FileTransfer
     end
 
     def close
-      unless @ftp.closed?
+      if @ftp && !@ftp.closed?
         timeout(30) do
           @ftp.close
         end
       end
     end
 
-    def to_s
-      "FtpClient {@host => #{@host},  @username => #{@username}, @password => ***}"
-    end
+    protected
 
-    private
-    def connect
-      timeout(30) do
-        @ftp.connect(@host, @port)
-        @ftp.login(@username, @password) if @username && @password
+      def closed?
+        !@ftp || @ftp.closed?
       end
-    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/generic.rb

@@ -2,13 +2,14 @@ module FileTransfer
 
   class Generic
 
-    attr_accessor :host, :username, :password, :port
+    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="")
@@ -29,6 +30,10 @@ module FileTransfer
     def close
     end
 
+    def to_s
+      "FtpClient {@host => #{host},  @username => #{username}, @protocol => #{type}, @port => #{port}, @password => ***}"
+    end
+
     protected
 
       def split_path(path)
@@ -44,6 +49,9 @@ module FileTransfer
       def connect
       end
 
+      def closed?
+      end
+
   end
 
 end

data/lib/file_transfer/sftp.rb

@@ -9,41 +9,33 @@ module FileTransfer
 
     def download(from_path, to_path)
       connect if closed?
-      timeout(300) do
+      timeout(timeout_seconds) do
         @sftp.download! from_path, to_path
       end
     end
 
     def upload(from_path, to_path)
       connect if closed?
-      timeout(300) do
+      timeout(timeout_seconds) do
         @sftp.upload! from_path, to_path
       end
     end
 
     def close
-      if @sftp && !@sftp.closed?
-        timeout(30) do
-          @sftp.close
-        end
-      end
+     # do nothing
     end
 
-    private
+    protected
 
       def connect
-        @sftp = Net::SFTP.start(@host, @username, :password => @password, :port => @port)
+        timeout(60) do
+          @sftp = Net::SFTP.start(host, username, :password => password, :port => port)
+        end
       end
 
       def closed?
         !@sftp || @sftp.closed?
       end
 
-      def timeout(seconds, &block)
-        Timeout.timeout(seconds.to_i) do
-          block.call
-        end
-      end
-
   end
 end

data/lib/file_transfer/version.rb

@@ -1,3 +1,3 @@
 module FileTransfer # :nodoc:
-  VERSION = "0.0.2"  # :nodoc:
+  VERSION = "0.0.4"  # :nodoc:
 end

data/spec/file_transfer/file_transfer_handler_spec.rb

@@ -14,37 +14,37 @@ module FileTransfer
 
     describe "#upload" do
 
-      it "should return an Array of JPG Files from one Folder" do
-        instance = FileTransferHandler.new :ftp, {}
-        this_path = File.dirname(__FILE__)
-        paths = {:from => ["#{this_path}/../test_files/folder2", "*.jpg"], :to => "/remote_path/"}
-        instance.stub(:_upload).and_return(true)
-        result = instance.upload(paths)
-        Dir.chdir(paths[:from][0])
-        result_array = Dir[paths[:from][1]]
-        result.should be_kind_of(Array)
-        result.should match_array(result_array)
-
-        puts "--BEGIN OF TEST"
-        puts result
-        puts "--END OF TEST"
-      end
-
-      it "should return an Array of JPG Files from all Subfolders incl. Root-Folder" do
-        instance = FileTransferHandler.new :ftp, {}
-        this_path = File.dirname(__FILE__)
-        paths = {:from => ["#{this_path}/../test_files/", "**/*.jpg"], :to => "/remote_path/"}
-        instance.stub(:_upload).and_return(true)
-        result = instance.upload(paths)
-        Dir.chdir(paths[:from][0])
-        result_array = Dir[paths[:from][1]]
-        result.should be_kind_of(Array)
-        result.should match_array(result_array)
-
-        puts "--BEGIN OF TEST"
-        puts result
-        puts "--END OF TEST"
-      end
+      #it "should return an Array of JPG Files from one Folder" do
+      #  instance = FileTransferHandler.new :ftp, {}
+      #  this_path = File.dirname(__FILE__)
+      #  paths = {:from => ["#{this_path}/../test_files/folder2", "*.jpg"], :to => "/remote_path/"}
+      #  instance.stub(:_upload).and_return(true)
+      #  result = instance.upload(paths)
+      #  Dir.chdir(paths[:from][0])
+      #  result_array = Dir[paths[:from][1]]
+      #  result.should be_kind_of(Array)
+      #  result.should match_array(result_array)
+      #
+      #  puts "--BEGIN OF TEST"
+      #  puts result
+      #  puts "--END OF TEST"
+      #end
+      #
+      #it "should return an Array of JPG Files from all Subfolders incl. Root-Folder" do
+      #  instance = FileTransferHandler.new :ftp, {}
+      #  this_path = File.dirname(__FILE__)
+      #  paths = {:from => ["#{this_path}/../test_files/", "**/*.jpg"], :to => "/remote_path/"}
+      #  instance.stub(:_upload).and_return(true)
+      #  result = instance.upload(paths)
+      #  Dir.chdir(paths[:from][0])
+      #  result_array = Dir[paths[:from][1]]
+      #  result.should be_kind_of(Array)
+      #  result.should match_array(result_array)
+      #
+      #  puts "--BEGIN OF TEST"
+      #  puts result
+      #  puts "--END OF TEST"
+      #end
 
       it "should upload a test-file to OTTO SFTP" do
         instance = FileTransferHandler.new :sftp, {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_transfer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec