filefm 0.1 → 0.1.1

data/Rakefile

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'filefm'
+require './lib/filefm.rb'
 
 require 'rake'
 

data/lib/filefm.rb

@@ -20,7 +20,7 @@ module FileFM
     Log.debug "Initializing logger"
   end
 
-  VERSION="0.1"
+  VERSION="0.1.1"
 
   def self.download(link, opts={})
     uri = URI.parse link

data/lib/filefm/downloaders/swift.rb

@@ -66,7 +66,11 @@ module FileFM
         puts "unknown file size for #{@filename} but downloading..." if @size.nil?
         #puts @link.to_s
         
-        dest_file = @location + (@filename ||= File.basename(uri.path))
+        if opts[:output]
+          dest_file = opts[:output]
+        else
+          dest_file = @location + (@filename ||= File.basename(uri.path))
+        end
         response = http.request(request) do |response|
           if opts[:progressbar]
             bar = ProgressBar.new("Progress", @size.to_i) unless @size.nil?

data/lib/filefm/streaming_uploader.rb

@@ -16,15 +16,19 @@ module FileFM
 
   require 'net/http'
 
-  class StreamingUploader
-
-    class << self
+  class StreamingUploaderMultipart
 
       def put(to_url, params = {}, &block)
         boundary = '----RubyMultipartClient' + rand(1000000).to_s + 'ZZZZZ'
         parts = []
         content_file = nil
         
+        params.each do |key, value|
+            if value.kind_of?(File)
+              filepath = value.path
+              parts << StreamPart.new(value, File.size(filepath))
+            end
+        end
         unless params.nil? || params.empty?
           params.each do |key, value|
             if value.kind_of?(File)
@@ -52,12 +56,10 @@ module FileFM
         headers = { 'Content-Length' => body_stream.size.to_s, 'Content-Type' => 'application/json' }.merge(params[:headers])
 
         req = Net::HTTP::Put.new(url.path, headers)
-        if ENV["DEBUG"] == "yes"
-          puts "HEADERS: " + headers.inspect
-          puts "HOST:    " + url.host 
-          puts "PORT:    " + url.port.to_s
-          puts "PATH:    " + url.path
-        end
+        Log.debug "HEADERS: " + headers.inspect
+        Log.debug "HOST:    " + url.host 
+        Log.debug "PORT:    " + url.port.to_s
+        Log.debug "PATH:    " + url.path
         
         req.content_length = body_stream.size
         req.content_type = 'multipart/form-data; boundary=' + boundary unless parts.empty?
@@ -65,7 +67,44 @@ module FileFM
         
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = true if url.scheme == "https"
-        #http.verify_mode = OpenSSL::SSL::VERIFY_NONE if url.scheme == "https"
+        res = http.request(req)
+        res
+      end
+  end
+
+  class StreamingUploader
+
+    class << self
+
+      def put(to_url, params = {}, &block)
+        parts = []
+        content_file = nil
+        
+        params.each do |key, value|
+            if value.kind_of?(File)
+              filepath = value.path
+              parts << StreamPart.new(value, File.size(filepath))
+            end
+        end
+        
+        body_stream = MultipartStream.new(parts, block)
+        
+        url = URI.parse(to_url)
+        
+        headers = { 'Content-Length' => body_stream.size.to_s }.merge(params[:headers])
+
+        req = Net::HTTP::Put.new(url.path, headers)
+        Log.debug "HEADERS: " + headers.inspect
+        Log.debug "HOST:    " + url.host 
+        Log.debug "PORT:    " + url.port.to_s
+        Log.debug "PATH:    " + url.path
+        
+        req.content_length = body_stream.size
+        #req.content_type = i
+        req.body_stream = body_stream
+        
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true if url.scheme == "https"
         res = http.request(req)
         res
       end

data/tests/helper.rb

@@ -3,3 +3,24 @@ require 'filefm'
 def test_config
   File.join(File.dirname(__FILE__), 'config.yml')
 end
+
+def swift_server
+  ENV["SWIFT_SERVER"]
+end
+
+def swift_username
+  u = ENV["SWIFT_USERNAME"]
+  u
+end
+
+def swift_password
+  ENV["SWIFT_PASSWORD"]
+end
+
+def swift_test_container
+  ENV["SWIFT_TEST_CONTAINER"] || "filefm-test"
+end
+
+def swift_keystone_url
+  ENV["SWIFT_KEYSTONE_URL"] 
+end

data/tests/swift/swift_tests.rb

@@ -0,0 +1,44 @@
+require 'filefm/uploaders/swift.rb'
+require 'filefm/downloaders/swift.rb'
+
+Shindo.tests('Swift') do
+
+  tests("insecure upload") do
+    test_file = "/tmp/swift-upload-test"
+    returns(true, 'test file') do
+      `dd if=/dev/zero of=#{test_file} bs=1k count=128 2>/dev/null`
+      FileFM::Uploaders::Swift.upload(test_file,
+                                      "swift://#{swift_server}/#{swift_test_container}/#{File.basename(test_file)}", 
+                                      { 
+                                        :username => "#{swift_username}",
+                                        :password => "#{swift_password}",
+                                        :progressbar => true,
+                                        :secure => false
+                                      })
+      true
+    end
+  end
+
+  tests("insecure download") do
+    dest_file = "/tmp/swift-download-test"
+    test_file = "/tmp/swift-upload-test"
+    returns(true, 'download ok') do
+      FileFM::Downloaders::Swift.download(
+        "swift://#{swift_server}/#{swift_test_container}/#{File.basename(test_file)}", 
+        { 
+          :output => dest_file,
+          :username => "#{swift_username}",
+          :password => "#{swift_password}",
+          :progressbar => true,
+          :secure => false
+        }
+      )
+      File.exist?(dest_file)
+    end
+    returns(true, 'MD5 matches') do
+      `md5sum #{dest_file}`.split()[0] == `md5sum #{test_file}`.split()[0]
+    end
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filefm
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &23328280 !ruby/object:Gem::Requirement
+  requirement: &6997160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23328280
+  version_requirements: *6997160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23326980 !ruby/object:Gem::Requirement
+  requirement: &7067480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23326980
+  version_requirements: *7067480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23325780 !ruby/object:Gem::Requirement
+  requirement: &7156020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23325780
+  version_requirements: *7156020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23325260 !ruby/object:Gem::Requirement
+  requirement: &7166300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23325260
+  version_requirements: *7166300
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &23324520 !ruby/object:Gem::Requirement
+  requirement: &7185640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23324520
+  version_requirements: *7185640
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &23323720 !ruby/object:Gem::Requirement
+  requirement: &7201540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23323720
+  version_requirements: *7201540
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &23340420 !ruby/object:Gem::Requirement
+  requirement: &7225400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23340420
+  version_requirements: *7225400
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &23339580 !ruby/object:Gem::Requirement
+  requirement: &7234520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23339580
+  version_requirements: *7234520
 description: Simple library to download/upload files
 email: rubiojr@frameos.org
 executables:
@@ -125,8 +125,8 @@ files:
 - lib/filefm/uploaders/swift.rb
 - tests/config.yml
 - tests/config/config_tests.rb
-- tests/downloaders/swift_tests.rb
 - tests/helper.rb
+- tests/swift/swift_tests.rb
 homepage: http://github.com/rubiojr/filefm
 licenses:
 - MIT

data/tests/downloaders/swift_tests.rb

@@ -1,4 +0,0 @@
-Shindo.tests('Test Swift Downloader') do
-
-end
-