ftpd 0.7.0 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Changelog.md +11 -0
- data/Gemfile +2 -2
- data/Gemfile.lock +25 -27
- data/README.md +6 -2
- data/VERSION +1 -1
- data/ftpd.gemspec +11 -11
- data/spec/connection_throttle_spec.rb +2 -2
- data/spec/connection_tracker_spec.rb +1 -1
- metadata +15 -15
data/Changelog.md
CHANGED
@@ -1,3 +1,14 @@
|
|
1
|
+
This is the change log for the main branch of ftpd, which supports
|
2
|
+
Ruby 1.9 and greater. For ruby 1.8.7, please use the latest version
|
3
|
+
before 0.8.0.
|
4
|
+
|
5
|
+
### 0.8.0
|
6
|
+
|
7
|
+
Administration
|
8
|
+
|
9
|
+
* Split Ruby 1.8 into separate branch
|
10
|
+
* Upgraded gems
|
11
|
+
|
1
12
|
### 0.7.0
|
2
13
|
|
3
14
|
Bug fixes
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,51 +1,49 @@
|
|
1
|
-
GIT
|
2
|
-
remote: git@github.com:wconrad/double-bag-ftps.git
|
3
|
-
revision: c546429689618e1757bb2dfe1fa35a386e7aebb2
|
4
|
-
specs:
|
5
|
-
double-bag-ftps (0.1.0)
|
6
|
-
|
7
1
|
GEM
|
8
2
|
remote: http://rubygems.org/
|
9
3
|
specs:
|
10
|
-
builder (3.2.
|
11
|
-
cucumber (1.
|
4
|
+
builder (3.2.2)
|
5
|
+
cucumber (1.3.8)
|
12
6
|
builder (>= 2.1.2)
|
13
7
|
diff-lcs (>= 1.1.3)
|
14
|
-
gherkin (~> 2.
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
8
|
+
gherkin (~> 2.12.1)
|
9
|
+
multi_json (>= 1.7.5, < 2.0)
|
10
|
+
multi_test (>= 0.0.2)
|
11
|
+
diff-lcs (1.2.4)
|
12
|
+
double-bag-ftps (0.1.1)
|
13
|
+
gherkin (2.12.1)
|
14
|
+
multi_json (~> 1.3)
|
19
15
|
git (1.2.5)
|
20
16
|
jeweler (1.8.4)
|
21
17
|
bundler (~> 1.0)
|
22
18
|
git (>= 1.2.5)
|
23
19
|
rake
|
24
20
|
rdoc
|
25
|
-
json (1.
|
21
|
+
json (1.8.0)
|
26
22
|
memoizer (1.0.1)
|
27
|
-
|
23
|
+
multi_json (1.8.0)
|
24
|
+
multi_test (0.0.2)
|
25
|
+
rake (10.1.0)
|
28
26
|
rdoc (4.0.0)
|
29
27
|
json (~> 1.4)
|
30
|
-
redcarpet (
|
31
|
-
rspec (2.
|
32
|
-
rspec-core (~> 2.
|
33
|
-
rspec-expectations (~> 2.
|
34
|
-
rspec-mocks (~> 2.
|
35
|
-
rspec-core (2.
|
36
|
-
rspec-expectations (2.
|
28
|
+
redcarpet (3.0.0)
|
29
|
+
rspec (2.14.1)
|
30
|
+
rspec-core (~> 2.14.0)
|
31
|
+
rspec-expectations (~> 2.14.0)
|
32
|
+
rspec-mocks (~> 2.14.0)
|
33
|
+
rspec-core (2.14.5)
|
34
|
+
rspec-expectations (2.14.2)
|
37
35
|
diff-lcs (>= 1.1.3, < 2.0)
|
38
|
-
rspec-mocks (2.
|
39
|
-
timecop (0.
|
40
|
-
yard (0.8.
|
36
|
+
rspec-mocks (2.14.3)
|
37
|
+
timecop (0.6.3)
|
38
|
+
yard (0.8.7.1)
|
41
39
|
|
42
40
|
PLATFORMS
|
43
41
|
ruby
|
44
42
|
|
45
43
|
DEPENDENCIES
|
46
44
|
cucumber
|
47
|
-
double-bag-ftps
|
48
|
-
jeweler
|
45
|
+
double-bag-ftps
|
46
|
+
jeweler (= 1.8.4)
|
49
47
|
memoizer (~> 1.0.1)
|
50
48
|
rake
|
51
49
|
redcarpet
|
data/README.md
CHANGED
@@ -212,8 +212,8 @@ And register your class with the ftp_server before starting it:
|
|
212
212
|
|
213
213
|
### Logging
|
214
214
|
|
215
|
-
Ftpd can write to an instance of
|
216
|
-
standard out:
|
215
|
+
Ftpd can write to an instance of
|
216
|
+
{http://www.ruby-doc.org/stdlib-2.0.0/libdoc/logger/rdoc/Logger.html Logger} that you provide. To log to standard out:
|
217
217
|
|
218
218
|
server.log = Logger.new($stdout)
|
219
219
|
|
@@ -247,6 +247,10 @@ The tests pass with these Rubies:
|
|
247
247
|
* ruby-1.9.3-p392
|
248
248
|
* ruby-2.0.0-p0
|
249
249
|
|
250
|
+
For Ruby 1.8, use an ftpd version before 0.8. In your Gemfile:
|
251
|
+
|
252
|
+
gem 'ftpd', '<0.8'
|
253
|
+
|
250
254
|
## Development
|
251
255
|
|
252
256
|
### Tests
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.8.0
|
data/ftpd.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "ftpd"
|
8
|
-
s.version = "0.7.
|
8
|
+
s.version = "0.7.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Wayne Conrad"]
|
12
|
-
s.date = "2013-
|
12
|
+
s.date = "2013-09-15"
|
13
13
|
s.description = "ftpd is a pure Ruby FTP server library. It supports implicit and explicit TLS, passive and active mode, and is unconditionally compliant per [RFC-1123][1]. It an be used as part of a test fixture or embedded in a program."
|
14
14
|
s.email = "wconrad@yagni.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -185,32 +185,32 @@ Gem::Specification.new do |s|
|
|
185
185
|
s.add_runtime_dependency(%q<memoizer>, ["~> 1.0.1"])
|
186
186
|
s.add_development_dependency(%q<cucumber>, [">= 0"])
|
187
187
|
s.add_development_dependency(%q<double-bag-ftps>, [">= 0"])
|
188
|
-
s.add_development_dependency(%q<jeweler>, ["
|
188
|
+
s.add_development_dependency(%q<jeweler>, ["= 1.8.4"])
|
189
189
|
s.add_development_dependency(%q<rake>, [">= 0"])
|
190
|
-
s.add_development_dependency(%q<redcarpet>, ["
|
190
|
+
s.add_development_dependency(%q<redcarpet>, ["< 3"])
|
191
191
|
s.add_development_dependency(%q<rspec>, [">= 0"])
|
192
|
-
s.add_development_dependency(%q<timecop>, ["
|
192
|
+
s.add_development_dependency(%q<timecop>, ["< 0.6.2.2"])
|
193
193
|
s.add_development_dependency(%q<yard>, [">= 0"])
|
194
194
|
else
|
195
195
|
s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
|
196
196
|
s.add_dependency(%q<cucumber>, [">= 0"])
|
197
197
|
s.add_dependency(%q<double-bag-ftps>, [">= 0"])
|
198
|
-
s.add_dependency(%q<jeweler>, ["
|
198
|
+
s.add_dependency(%q<jeweler>, ["= 1.8.4"])
|
199
199
|
s.add_dependency(%q<rake>, [">= 0"])
|
200
|
-
s.add_dependency(%q<redcarpet>, ["
|
200
|
+
s.add_dependency(%q<redcarpet>, ["< 3"])
|
201
201
|
s.add_dependency(%q<rspec>, [">= 0"])
|
202
|
-
s.add_dependency(%q<timecop>, ["
|
202
|
+
s.add_dependency(%q<timecop>, ["< 0.6.2.2"])
|
203
203
|
s.add_dependency(%q<yard>, [">= 0"])
|
204
204
|
end
|
205
205
|
else
|
206
206
|
s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
|
207
207
|
s.add_dependency(%q<cucumber>, [">= 0"])
|
208
208
|
s.add_dependency(%q<double-bag-ftps>, [">= 0"])
|
209
|
-
s.add_dependency(%q<jeweler>, ["
|
209
|
+
s.add_dependency(%q<jeweler>, ["= 1.8.4"])
|
210
210
|
s.add_dependency(%q<rake>, [">= 0"])
|
211
|
-
s.add_dependency(%q<redcarpet>, ["
|
211
|
+
s.add_dependency(%q<redcarpet>, ["< 3"])
|
212
212
|
s.add_dependency(%q<rspec>, [">= 0"])
|
213
|
-
s.add_dependency(%q<timecop>, ["
|
213
|
+
s.add_dependency(%q<timecop>, ["< 0.6.2.2"])
|
214
214
|
s.add_dependency(%q<yard>, [">= 0"])
|
215
215
|
end
|
216
216
|
end
|
@@ -4,11 +4,11 @@ module Ftpd
|
|
4
4
|
|
5
5
|
describe ConnectionThrottle do
|
6
6
|
|
7
|
-
let(:socket) {
|
7
|
+
let(:socket) {double TCPSocket}
|
8
8
|
let(:connections) {0}
|
9
9
|
let(:connections_for_socket) {0}
|
10
10
|
let(:connection_tracker) do
|
11
|
-
|
11
|
+
double ConnectionTracker, :connections => connections
|
12
12
|
end
|
13
13
|
subject(:connection_throttle) do
|
14
14
|
ConnectionThrottle.new(connection_tracker)
|
@@ -11,7 +11,7 @@ module Ftpd
|
|
11
11
|
# Create a mock socket with the given peer address
|
12
12
|
|
13
13
|
def socket_bound_to(source_ip)
|
14
|
-
socket =
|
14
|
+
socket = double TCPSocket
|
15
15
|
peeraddr = Socket.pack_sockaddr_in(0, source_ip)
|
16
16
|
socket.stub :getpeername => peeraddr
|
17
17
|
socket
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ftpd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-09-15 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: memoizer
|
@@ -64,17 +64,17 @@ dependencies:
|
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
65
65
|
none: false
|
66
66
|
requirements:
|
67
|
-
- -
|
67
|
+
- - '='
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version:
|
69
|
+
version: 1.8.4
|
70
70
|
type: :development
|
71
71
|
prerelease: false
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
75
|
-
- -
|
75
|
+
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version:
|
77
|
+
version: 1.8.4
|
78
78
|
- !ruby/object:Gem::Dependency
|
79
79
|
name: rake
|
80
80
|
requirement: !ruby/object:Gem::Requirement
|
@@ -96,17 +96,17 @@ dependencies:
|
|
96
96
|
requirement: !ruby/object:Gem::Requirement
|
97
97
|
none: false
|
98
98
|
requirements:
|
99
|
-
- -
|
99
|
+
- - <
|
100
100
|
- !ruby/object:Gem::Version
|
101
|
-
version: '
|
101
|
+
version: '3'
|
102
102
|
type: :development
|
103
103
|
prerelease: false
|
104
104
|
version_requirements: !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
|
-
- -
|
107
|
+
- - <
|
108
108
|
- !ruby/object:Gem::Version
|
109
|
-
version: '
|
109
|
+
version: '3'
|
110
110
|
- !ruby/object:Gem::Dependency
|
111
111
|
name: rspec
|
112
112
|
requirement: !ruby/object:Gem::Requirement
|
@@ -128,17 +128,17 @@ dependencies:
|
|
128
128
|
requirement: !ruby/object:Gem::Requirement
|
129
129
|
none: false
|
130
130
|
requirements:
|
131
|
-
- -
|
131
|
+
- - <
|
132
132
|
- !ruby/object:Gem::Version
|
133
|
-
version:
|
133
|
+
version: 0.6.2.2
|
134
134
|
type: :development
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
137
137
|
none: false
|
138
138
|
requirements:
|
139
|
-
- -
|
139
|
+
- - <
|
140
140
|
- !ruby/object:Gem::Version
|
141
|
-
version:
|
141
|
+
version: 0.6.2.2
|
142
142
|
- !ruby/object:Gem::Dependency
|
143
143
|
name: yard
|
144
144
|
requirement: !ruby/object:Gem::Requirement
|
@@ -334,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
334
334
|
version: '0'
|
335
335
|
segments:
|
336
336
|
- 0
|
337
|
-
hash:
|
337
|
+
hash: 590648335
|
338
338
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
339
339
|
none: false
|
340
340
|
requirements:
|