em-ftp-client 0.0.1 → 0.0.2

data/.gitignore

@@ -2,5 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-
+.idea
 test_client.rb

data/README

@@ -17,12 +17,14 @@ standard usage would look like:
             ftp.list do |l2|
               puts l2
               puts
-              ftp.stream {|d| puts "STREAMING: #{d.inspect}" }
-              ftp.get("two.txt") do |t1|
-                puts "COMPLETED"
-                puts t1
-                puts
-                EM.stop
+              ftp.put("one.txt") do
+                ftp.stream {|d| puts "STREAMING: #{d.inspect}" }
+                ftp.get("two.txt") do |t1|
+                  puts "COMPLETED"
+                  puts t1
+                  puts
+                  EM.stop
+                end
               end
             end
           end
@@ -32,7 +34,3 @@ standard usage would look like:
 
 This library also includes the class SyncSession, which uses fibers and works
 with em-synchrony.
-
-TODO:
-
-Add support for put/STOR operations

data/lib/em-ftp-client/control_connection.rb

@@ -108,7 +108,7 @@ module EventMachine
       def data_connection_closed(data)
         @data_buffer = data
         @data_connection = nil
-        send(@responder) if @responder
+        send(@responder) if @responder and @response.complete?
       end
 
       def callback(&blk)
@@ -166,6 +166,19 @@ module EventMachine
         @responder = :retr_response
       end
 
+      def stor(filename)
+        send_data("STOR #{filename}\r\n")
+        @responder = :stor_response
+      end
+      
+      def close
+        if @data_connection
+          raise "Can not close connection while data connection is still open"
+        end
+        send_data("QUIT\r\n")
+        @responder = :close_response
+      end
+
       def list
         send_data("LIST\r\n")
         @responder = :list_response
@@ -198,8 +211,10 @@ module EventMachine
 
       # Called when a response for the CWD or CDUP is received
       def cwd_response(response)
-        @responder = nil
-        call_callback
+        if response && response.code != "226"
+          @responder = nil
+          call_callback
+        end
       end
 
       # Called when a response for the PWD verb is received
@@ -235,6 +250,7 @@ module EventMachine
         end
 
         if response && @data_connection
+          @response = response
           #well we still gots to wait for the file
         elsif @data_connection
           #well we need to wait for a response
@@ -246,6 +262,18 @@ module EventMachine
         end
       end
 
+      def stor_response(response=nil)
+        if response && response.code != "226"
+          @data_connection.close_connection
+          @responder = nil
+          error(response)
+        end
+
+        @responder = nil
+        @data_buffer = nil
+        call_callback
+      end
+
       def list_response(response=nil)
         if response && response.code != "226"
           @data_connection.close_connection
@@ -262,13 +290,17 @@ module EventMachine
           old_data_buffer = @data_buffer
           @data_buffer = nil
           # parse it into a real form
-          file_list = old_data_buffer.split("\r\n").map do |line|
-            ::Net::FTP::List.parse(line)
+          file_list = old_data_buffer.split("\n").map do |line|
+            ::Net::FTP::List.parse(line.strip)
           end
           call_callback(file_list)
         end
       end
-        
+      
+      def close_response(response=nil)
+        close_connection
+        call_callback
+      end
     end
   end
 end

data/lib/em-ftp-client/data_connection.rb

@@ -22,6 +22,11 @@ module EventMachine
           @buf = ''
         end
       end
+      
+      def send_file(filename)
+	      send_file_data(filename)
+        close_connection_after_writing
+      end
 
       def unbind
         succeed(@buf)

data/lib/em-ftp-client/session.rb

@@ -47,6 +47,23 @@ module EventMachine
         end
         control_connection.pasv
       end
+
+      def put(file, &cb)
+        filename = File.basename(file)
+	      control_connection.callback do |data_connection|
+          data_connection.send_file(file)
+          control_connection.callback(&cb)
+          control_connection.stor filename
+        end
+        control_connection.pasv
+      end
+
+      def close
+        @control_connection.callback do 
+          yield if block_given?
+        end
+        @control_connection.close
+      end
     end
   end
 end

data/lib/em-ftp-client/version.rb

@@ -1,7 +1,7 @@
 module Em
   module Ftp
     module Client
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/test/control_connection_test.rb

@@ -177,6 +177,7 @@ class ControlConnectionTest < Test::Unit::TestCase
       @control_connection.receive_line(set[2]+"\r\n") if set[2]
     end
 
+    # test RETR
     @control_connection.expects(:send_data).with("RETR foo.txt\r\n")
     @control_connection.retr("foo.txt")
 
@@ -189,6 +190,17 @@ class ControlConnectionTest < Test::Unit::TestCase
     @data_connection.unbind
     assert retr_completed
 
+    # test STOR
+    @control_connection.expects(:send_data).with("STOR foo.txt\r\n")
+    @control_connection.stor("foo.txt")
+
+    stor_completed = false
+    @control_connection.callback {stor_completed = true }
+    assert !stor_completed
+    @data_connection.unbind
+    @control_connection.receive_line("226 Hooray\r\n")
+    assert stor_completed
+
     assert started
     assert_equal "\"/foo\"", working_dir
   end

metadata

@@ -1,117 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-ftp-client
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ftp-list
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ftp-list
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redgreen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An FTP client designed to work well with EventMachine
-email: 
+email:
 - ben@pixelmachine.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -126,40 +128,36 @@ files:
 - lib/em-ftp-client/version.rb
 - test/control_connection_test.rb
 - test/helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1131821477746437581
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1131821477746437581
 requirements: []
-
 rubyforge_project: em-ftp-client
-rubygems_version: 1.4.1
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: EventMachine FTP client
-test_files: 
+test_files:
 - test/control_connection_test.rb
 - test/helper.rb