filefm 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.1.1
+
+* Important fixes to the Swift uploader
+
+# 0.1
+
+* Intitial release
+* Swift uploader/downloader
+* Rackspace uploader/downloader
+* Simple HTTP downloader
+* filefm CLI 

data/lib/filefm.rb

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

data/lib/filefm/downloaders/swift.rb

@@ -22,11 +22,11 @@ module FileFM
           :provider => 'Rackspace',
           :rackspace_username => username,
           :rackspace_api_key => password,
-          :rackspace_auth_url => "#{scheme}://#{uri.host}/auth/v1.0"
+          :rackspace_auth_url => "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0"
                         })
 
 
-        out = RestClient.get "#{scheme}://#{uri.host}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
+        out = RestClient.get "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
         storage_url = out.headers[:x_storage_url]
         auth_token = out.headers[:x_auth_token]
         raise "Error authenticating" unless out.code == 200

data/lib/filefm/uploaders/swift.rb

@@ -62,8 +62,8 @@ module FileFM
           auth_token = out["X-Auth-Token"]
         else
           Log.debug "Using Swift legacy auth"
-          Log.debug "Legacy auth URL #{scheme}://#{uri.host}/auth/v1.0"
-          out = RestClient.get "#{scheme}://#{uri.host}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
+          Log.debug "Legacy auth URL #{scheme}://#{uri.host}:#{uri.port}/auth/v1.0"
+          out = RestClient.get "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
           storage_url = out.headers[:x_storage_url]
           auth_token = out.headers[:x_auth_token]
           raise "Error authenticating" unless out.code == 200
@@ -93,7 +93,13 @@ module FileFM
               yield size
             elsif options[:progressbar]
              count += size
-             per = (100*count)/fsize 
+             # take care of divide by zero 
+             per = 0
+             if fsize == 0
+               per = 100
+             else
+               per = (100*count)/fsize rescue 100
+             end
              per = 100 if per > 100
              pbar.set per
             else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filefm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &6997160 !ruby/object:Gem::Requirement
+  requirement: &8730780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6997160
+  version_requirements: *8730780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7067480 !ruby/object:Gem::Requirement
+  requirement: &8625140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7067480
+  version_requirements: *8625140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &7156020 !ruby/object:Gem::Requirement
+  requirement: &8827360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *7156020
+  version_requirements: *8827360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &7166300 !ruby/object:Gem::Requirement
+  requirement: &8838540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7166300
+  version_requirements: *8838540
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &7185640 !ruby/object:Gem::Requirement
+  requirement: &8845300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7185640
+  version_requirements: *8845300
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &7201540 !ruby/object:Gem::Requirement
+  requirement: &8850940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7201540
+  version_requirements: *8850940
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &7225400 !ruby/object:Gem::Requirement
+  requirement: &8860360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7225400
+  version_requirements: *8860360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &7234520 !ruby/object:Gem::Requirement
+  requirement: &8869340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7234520
+  version_requirements: *8869340
 description: Simple library to download/upload files
 email: rubiojr@frameos.org
 executables:
@@ -109,6 +109,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md