filefm 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,11 @@
1
+ # 0.1.1
2
+
3
+ * Important fixes to the Swift uploader
4
+
5
+ # 0.1
6
+
7
+ * Intitial release
8
+ * Swift uploader/downloader
9
+ * Rackspace uploader/downloader
10
+ * Simple HTTP downloader
11
+ * filefm CLI
@@ -20,7 +20,7 @@ module FileFM
20
20
  Log.debug "Initializing logger"
21
21
  end
22
22
 
23
- VERSION="0.1.1"
23
+ VERSION="0.1.2"
24
24
 
25
25
  def self.download(link, opts={})
26
26
  uri = URI.parse link
@@ -22,11 +22,11 @@ module FileFM
22
22
  :provider => 'Rackspace',
23
23
  :rackspace_username => username,
24
24
  :rackspace_api_key => password,
25
- :rackspace_auth_url => "#{scheme}://#{uri.host}/auth/v1.0"
25
+ :rackspace_auth_url => "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0"
26
26
  })
27
27
 
28
28
 
29
- out = RestClient.get "#{scheme}://#{uri.host}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
29
+ out = RestClient.get "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
30
30
  storage_url = out.headers[:x_storage_url]
31
31
  auth_token = out.headers[:x_auth_token]
32
32
  raise "Error authenticating" unless out.code == 200
@@ -62,8 +62,8 @@ module FileFM
62
62
  auth_token = out["X-Auth-Token"]
63
63
  else
64
64
  Log.debug "Using Swift legacy auth"
65
- Log.debug "Legacy auth URL #{scheme}://#{uri.host}/auth/v1.0"
66
- out = RestClient.get "#{scheme}://#{uri.host}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
65
+ Log.debug "Legacy auth URL #{scheme}://#{uri.host}:#{uri.port}/auth/v1.0"
66
+ out = RestClient.get "#{scheme}://#{uri.host}:#{uri.port}/auth/v1.0", 'X-Storage-User' => username, 'X-Storage-Pass' => password
67
67
  storage_url = out.headers[:x_storage_url]
68
68
  auth_token = out.headers[:x_auth_token]
69
69
  raise "Error authenticating" unless out.code == 200
@@ -93,7 +93,13 @@ module FileFM
93
93
  yield size
94
94
  elsif options[:progressbar]
95
95
  count += size
96
- per = (100*count)/fsize
96
+ # take care of divide by zero
97
+ per = 0
98
+ if fsize == 0
99
+ per = 100
100
+ else
101
+ per = (100*count)/fsize rescue 100
102
+ end
97
103
  per = 100 if per > 100
98
104
  pbar.set per
99
105
  else
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: filefm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-24 00:00:00.000000000 Z
12
+ date: 2012-03-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: shoulda
16
- requirement: &6997160 !ruby/object:Gem::Requirement
16
+ requirement: &8730780 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *6997160
24
+ version_requirements: *8730780
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bundler
27
- requirement: &7067480 !ruby/object:Gem::Requirement
27
+ requirement: &8625140 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *7067480
35
+ version_requirements: *8625140
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jeweler
38
- requirement: &7156020 !ruby/object:Gem::Requirement
38
+ requirement: &8827360 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.6.4
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *7156020
46
+ version_requirements: *8827360
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rcov
49
- requirement: &7166300 !ruby/object:Gem::Requirement
49
+ requirement: &8838540 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *7166300
57
+ version_requirements: *8838540
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: clamp
60
- requirement: &7185640 !ruby/object:Gem::Requirement
60
+ requirement: &8845300 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *7185640
68
+ version_requirements: *8845300
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: fog
71
- requirement: &7201540 !ruby/object:Gem::Requirement
71
+ requirement: &8850940 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *7201540
79
+ version_requirements: *8850940
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: progressbar
82
- requirement: &7225400 !ruby/object:Gem::Requirement
82
+ requirement: &8860360 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *7225400
90
+ version_requirements: *8860360
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rest-client
93
- requirement: &7234520 !ruby/object:Gem::Requirement
93
+ requirement: &8869340 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *7234520
101
+ version_requirements: *8869340
102
102
  description: Simple library to download/upload files
103
103
  email: rubiojr@frameos.org
104
104
  executables:
@@ -109,6 +109,7 @@ extra_rdoc_files:
109
109
  - README.md
110
110
  files:
111
111
  - .document
112
+ - CHANGELOG.md
112
113
  - Gemfile
113
114
  - LICENSE.txt
114
115
  - README.md