downspout 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -12,14 +12,16 @@ Jeweler::Tasks.new do |gem|
12
12
  gem.name = "downspout"
13
13
  gem.homepage = "http://github.com/sci-phi/downspout"
14
14
  gem.license = "MIT"
15
- gem.summary = %Q{Downspout is an easy-to-use library for downloading files from given URLs.}
16
- gem.description = %Q{Downspout is an easy-to-use library for downloading files from given URLs. HTTP downloads can use either Net::HTTP, or libcurl (via the Curb gem)}
15
+ gem.summary = %Q{Downspout is an easy-to-use ruby library for downloading files from URLs.}
16
+ gem.description = %Q{Downspout is an easy-to-use ruby library for downloading files from URLs, supporting both HTTP & FTP protocols. HTTP downloads can use either Net::HTTP, or libcurl (via the Curb gem)}
17
17
  gem.email = "phi.sanders@sciphi.me"
18
18
  gem.authors = ["Phi.Sanders"]
19
19
  gem.files = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
20
20
  gem.add_development_dependency "jeweler", "~> 1.5.2"
21
- gem.add_development_dependency "shoulda", ">= 0"
22
- gem.add_development_dependency "rcov", ">= 0"
21
+ gem.add_development_dependency "rcov", ">= 0.9.9"
22
+ gem.add_development_dependency "shoulda", ">= 2.11.3"
23
+ gem.add_development_dependency "mocha", ">= 0.9.12"
24
+ gem.add_development_dependency "curb", ">= 0.7.15"
23
25
  end
24
26
  Jeweler::RubygemsDotOrgTasks.new
25
27
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.2
1
+ 0.2.3
data/lib/downspout.rb CHANGED
@@ -6,9 +6,6 @@ require 'uri'
6
6
  require 'net/http'
7
7
  require 'net/ftp'
8
8
 
9
- # unusual dependencies
10
- require 'curb'
11
-
12
9
  # add this directory to the path...
13
10
  $LOAD_PATH.unshift(File.dirname(__FILE__))
14
11
 
@@ -7,6 +7,7 @@ module Downspout
7
7
  @@credentials = []
8
8
  @@curb_allowed = true
9
9
  @@curb_enabled = true
10
+ @@prefix = 'downspout'
10
11
 
11
12
  def self.tmp_dir
12
13
  return @@tmp_dir
@@ -16,6 +17,14 @@ module Downspout
16
17
  @@tmp_dir = some_path
17
18
  end
18
19
 
20
+ def self.default_prefix
21
+ @@prefix
22
+ end
23
+
24
+ def self.default_prefix=( name )
25
+ @@prefix = name
26
+ end
27
+
19
28
  def self.credentials
20
29
  return @@credentials
21
30
  end
@@ -5,7 +5,7 @@ module Downspout
5
5
 
6
6
  class Tmpfile < File
7
7
 
8
- # acepts an options hash which can include either or both of :name and :prefix
8
+ # accepts an options hash which can include either or both of :name and :prefix
9
9
  # then creates a Tempfile with the optionally given name in a unique sub-folder
10
10
  # of the configured directory, optionally named with the prefix string.
11
11
  # The unique folder name includes the prefix, a sortable date, the PID of
@@ -20,7 +20,7 @@ module Downspout
20
20
  # make sure the configured directory exists
21
21
  FileUtils.mkdir_p( Downspout::Config.tmp_dir )
22
22
 
23
- defaults = {:prefix => 'downspout', :name => "downloaded_file.tmp"}
23
+ defaults = {:prefix => Downspout::Config.default_prefix, :name => "downloaded_file.tmp"}
24
24
 
25
25
  # overwrite defaults with given options
26
26
  defaults.merge!( options ) unless options.nil?
data/test/test_helper.rb CHANGED
@@ -9,6 +9,15 @@ rescue LoadError
9
9
  # nice to have, aesthetic, not functional
10
10
  end
11
11
 
12
+ begin
13
+ require 'curb'
14
+ rescue LoadError => e
15
+ puts ""
16
+ puts "The Curb library is required for development & testing"
17
+ puts ""
18
+ raise e
19
+ end
20
+
12
21
  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
13
22
  $LOAD_PATH.unshift(File.dirname(__FILE__))
14
23
 
@@ -24,6 +24,12 @@ class ConfigTest < Test::Unit::TestCase
24
24
  assert Downspout::Config.respond_to?("disable_networking!")
25
25
  end
26
26
 
27
+ should "allow setting Default Prefix" do
28
+ assert_equal "downspout", Downspout::Config.default_prefix
29
+ Downspout::Config.default_prefix = "fu-manchu"
30
+ assert_equal "fu-manchu", Downspout::Config.default_prefix
31
+ end
32
+
27
33
  should "support disabling network operations" do
28
34
  assert Downspout::Config.network_enabled?
29
35
  assert Downspout::Config.disable_networking!
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: downspout
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
4
+ hash: 17
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 2
10
- version: 0.2.2
9
+ - 3
10
+ version: 0.2.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Phi.Sanders
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-03-29 00:00:00 -04:00
18
+ date: 2011-03-30 00:00:00 -04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -35,34 +35,70 @@ dependencies:
35
35
  type: :development
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
38
- name: shoulda
38
+ name: rcov
39
39
  prerelease: false
40
40
  requirement: &id002 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ">="
44
44
  - !ruby/object:Gem::Version
45
- hash: 3
45
+ hash: 41
46
46
  segments:
47
47
  - 0
48
- version: "0"
48
+ - 9
49
+ - 9
50
+ version: 0.9.9
49
51
  type: :development
50
52
  version_requirements: *id002
51
53
  - !ruby/object:Gem::Dependency
52
- name: rcov
54
+ name: shoulda
53
55
  prerelease: false
54
56
  requirement: &id003 !ruby/object:Gem::Requirement
55
57
  none: false
56
58
  requirements:
57
59
  - - ">="
58
60
  - !ruby/object:Gem::Version
59
- hash: 3
61
+ hash: 37
60
62
  segments:
61
- - 0
62
- version: "0"
63
+ - 2
64
+ - 11
65
+ - 3
66
+ version: 2.11.3
63
67
  type: :development
64
68
  version_requirements: *id003
65
- description: Downspout is an easy-to-use library for downloading files from given URLs. HTTP downloads can use either Net::HTTP, or libcurl (via the Curb gem)
69
+ - !ruby/object:Gem::Dependency
70
+ name: mocha
71
+ prerelease: false
72
+ requirement: &id004 !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ">="
76
+ - !ruby/object:Gem::Version
77
+ hash: 35
78
+ segments:
79
+ - 0
80
+ - 9
81
+ - 12
82
+ version: 0.9.12
83
+ type: :development
84
+ version_requirements: *id004
85
+ - !ruby/object:Gem::Dependency
86
+ name: curb
87
+ prerelease: false
88
+ requirement: &id005 !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ">="
92
+ - !ruby/object:Gem::Version
93
+ hash: 29
94
+ segments:
95
+ - 0
96
+ - 7
97
+ - 15
98
+ version: 0.7.15
99
+ type: :development
100
+ version_requirements: *id005
101
+ description: Downspout is an easy-to-use ruby library for downloading files from URLs, supporting both HTTP & FTP protocols. HTTP downloads can use either Net::HTTP, or libcurl (via the Curb gem)
66
102
  email: phi.sanders@sciphi.me
67
103
  executables: []
68
104
 
@@ -128,7 +164,7 @@ rubyforge_project:
128
164
  rubygems_version: 1.4.2
129
165
  signing_key:
130
166
  specification_version: 3
131
- summary: Downspout is an easy-to-use library for downloading files from given URLs.
167
+ summary: Downspout is an easy-to-use ruby library for downloading files from URLs.
132
168
  test_files:
133
169
  - test/downspout_test.rb
134
170
  - test/servlet.rb