strelka 0.13.0 → 0.14.0
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.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/ChangeLog +54 -20
- data/History.rdoc +11 -0
- data/Rakefile +2 -2
- data/lib/strelka.rb +2 -2
- data/lib/strelka/app.rb +6 -20
- data/lib/strelka/cli.rb +1 -1
- data/lib/strelka/command/config.rb +15 -11
- data/lib/strelka/discovery.rb +11 -27
- data/lib/strelka/multipartparser.rb +16 -34
- data/spec/strelka/app/templating_spec.rb +4 -9
- metadata +40 -35
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a3240568b10c3d9c47ad9523c8d41d6b9c87c9c0
|
|
4
|
+
data.tar.gz: d6e59f27d6a5bf2bd5387a79fec0df667aee742a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fa0e979b77b9d5a531cee6f0ff28dac2b9ae5e67fc6b4dc27eacc7e797634a8ea14f5874dcf1e26b1143e8c96852ef796fb20a4f0cc20cdd67cf170b02e90998
|
|
7
|
+
data.tar.gz: 6ad652606601a7ab37210e9843c4bc8e5639d35e9fc525da140e48f0a59a9a216350f6b254a0383a0b2a181acac7c30cbb2ddc774be696639dda39247bc2258e
|
checksums.yaml.gz.sig
CHANGED
|
Binary file
|
data.tar.gz.sig
CHANGED
|
Binary file
|
data/ChangeLog
CHANGED
|
@@ -1,12 +1,44 @@
|
|
|
1
|
+
2017-01-19 Michael Granger <ged@FaerieMUD.org>
|
|
2
|
+
|
|
3
|
+
* lib/strelka/app.rb, lib/strelka/discovery.rb,
|
|
4
|
+
lib/strelka/multipartparser.rb:
|
|
5
|
+
Change Strelka configuration to use 3.x syntax/naming
|
|
6
|
+
[72c4fff2f719] [tip]
|
|
7
|
+
|
|
8
|
+
* lib/strelka.rb, lib/strelka/cli.rb, lib/strelka/command/config.rb,
|
|
9
|
+
lib/strelka/discovery.rb, spec/strelka/app/templating_spec.rb:
|
|
10
|
+
Fix discovery for newer versions of Rubygems.
|
|
11
|
+
[735478b87714]
|
|
12
|
+
|
|
13
|
+
2017-01-17 Michael Granger <ged@FaerieMUD.org>
|
|
14
|
+
|
|
15
|
+
* Rakefile, strelka.gemspec:
|
|
16
|
+
Merge dependency fix
|
|
17
|
+
[41dc4bad2048] [github/master]
|
|
18
|
+
|
|
19
|
+
2017-01-16 Mahlon E. Smith <mahlon@laika.com>
|
|
20
|
+
|
|
21
|
+
* .hgtags:
|
|
22
|
+
Added tag v0.13.0 for changeset 5b9e7c9e3cc7
|
|
23
|
+
[1b3e0578defc]
|
|
24
|
+
|
|
25
|
+
* .hgsigs:
|
|
26
|
+
Added signature for changeset 8f1805dd4657
|
|
27
|
+
[5b9e7c9e3cc7] [v0.13.0]
|
|
28
|
+
|
|
1
29
|
2017-01-16 Mahlon E. Smith <mahlon@martini.nu>
|
|
2
30
|
|
|
3
31
|
* .gems, .ruby-gemset, .ruby-version, .rvmrc, History.rdoc, Rakefile,
|
|
4
32
|
lib/strelka.rb:
|
|
5
33
|
Migrate away from .rvmrc, bump Configurability dependency.
|
|
6
|
-
[8f1805dd4657]
|
|
34
|
+
[8f1805dd4657]
|
|
7
35
|
|
|
8
36
|
2016-11-05 Michael Granger <ged@FaerieMUD.org>
|
|
9
37
|
|
|
38
|
+
* Rakefile, strelka.gemspec:
|
|
39
|
+
Add missing 'gli' dependency.
|
|
40
|
+
[b5996b9f1e8b]
|
|
41
|
+
|
|
10
42
|
* cert/ged.pem:
|
|
11
43
|
Replace my cert with the newest one
|
|
12
44
|
[b0022c0669af]
|
|
@@ -121,6 +153,12 @@
|
|
|
121
153
|
Merge with 093cea5ea618
|
|
122
154
|
[55d4b5210da6]
|
|
123
155
|
|
|
156
|
+
2015-04-01 Mahlon E. Smith <mahlon@martini.nu>
|
|
157
|
+
|
|
158
|
+
* cert/mahlon.pem:
|
|
159
|
+
Revert my key to a non-signed, the gem signing stuff is a mess.
|
|
160
|
+
[093cea5ea618]
|
|
161
|
+
|
|
124
162
|
2015-04-01 Michael Granger <ged@FaerieMUD.org>
|
|
125
163
|
|
|
126
164
|
* cert/ged.pem:
|
|
@@ -129,10 +167,6 @@
|
|
|
129
167
|
|
|
130
168
|
2015-04-01 Mahlon E. Smith <mahlon@martini.nu>
|
|
131
169
|
|
|
132
|
-
* cert/mahlon.pem:
|
|
133
|
-
Revert my key to a non-signed, the gem signing stuff is a mess.
|
|
134
|
-
[093cea5ea618]
|
|
135
|
-
|
|
136
170
|
* .hgtags:
|
|
137
171
|
Added tag v0.9.1 for changeset d86d6579a43e
|
|
138
172
|
[cc451faffccf]
|
|
@@ -302,6 +336,13 @@
|
|
|
302
336
|
Update dependencies.
|
|
303
337
|
[4ddae11c28b8]
|
|
304
338
|
|
|
339
|
+
2014-01-22 Mahlon E. Smith <mahlon@laika.com>
|
|
340
|
+
|
|
341
|
+
* lib/strelka/httprequest.rb:
|
|
342
|
+
Don't modify the original request URI object when calling
|
|
343
|
+
HttpRequest#base_uri.
|
|
344
|
+
[6e2d1e0e89d1]
|
|
345
|
+
|
|
305
346
|
2014-01-29 Michael Granger <ged@FaerieMUD.org>
|
|
306
347
|
|
|
307
348
|
* lib/strelka/app.rb:
|
|
@@ -339,19 +380,19 @@
|
|
|
339
380
|
Merge improvements to the AbstractClass mixin from elsewhere.
|
|
340
381
|
[96725c68d4ae]
|
|
341
382
|
|
|
342
|
-
2014-01-22 Mahlon E. Smith <mahlon@laika.com>
|
|
343
|
-
|
|
344
|
-
* lib/strelka/httprequest.rb:
|
|
345
|
-
Don't modify the original request URI object when calling
|
|
346
|
-
HttpRequest#base_uri.
|
|
347
|
-
[6e2d1e0e89d1]
|
|
348
|
-
|
|
349
383
|
2014-01-02 Michael Granger <ged@FaerieMUD.org>
|
|
350
384
|
|
|
351
385
|
* lib/strelka.rb:
|
|
352
386
|
Merged with bdb098771858
|
|
353
387
|
[140055f6ee81]
|
|
354
388
|
|
|
389
|
+
2013-12-02 Mahlon E. Smith <mahlon@martini.nu>
|
|
390
|
+
|
|
391
|
+
* .rvm.gems, lib/strelka.rb, lib/strelka/app/auth.rb,
|
|
392
|
+
spec/strelka/session/default_spec.rb:
|
|
393
|
+
Restore access to request parameters from the authentication plugin.
|
|
394
|
+
[bdb098771858]
|
|
395
|
+
|
|
355
396
|
2014-01-01 Michael Granger <ged@FaerieMUD.org>
|
|
356
397
|
|
|
357
398
|
* History.rdoc, lib/strelka.rb:
|
|
@@ -393,13 +434,6 @@
|
|
|
393
434
|
Remove config keys that moved to Discovery
|
|
394
435
|
[c4b52cde2f47]
|
|
395
436
|
|
|
396
|
-
2013-12-02 Mahlon E. Smith <mahlon@martini.nu>
|
|
397
|
-
|
|
398
|
-
* .rvm.gems, lib/strelka.rb, lib/strelka/app/auth.rb,
|
|
399
|
-
spec/strelka/session/default_spec.rb:
|
|
400
|
-
Restore access to request parameters from the authentication plugin.
|
|
401
|
-
[bdb098771858]
|
|
402
|
-
|
|
403
437
|
2013-11-08 Michael Granger <ged@FaerieMUD.org>
|
|
404
438
|
|
|
405
439
|
* .hgtags:
|
|
@@ -851,7 +885,7 @@
|
|
|
851
885
|
spec/strelka/app/parameters_spec.rb,
|
|
852
886
|
spec/strelka/paramvalidator_spec.rb:
|
|
853
887
|
Add a paramvalidator constraint for JSON fields
|
|
854
|
-
[ac11b12f9366]
|
|
888
|
+
[ac11b12f9366] [github/no-notes-auto-vivify]
|
|
855
889
|
|
|
856
890
|
2013-01-25 Michael Granger <ged@FaerieMUD.org>
|
|
857
891
|
|
data/History.rdoc
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
== v0.14.0 [2017-01-19] Michael Granger <ged@FaerieMUD.org>
|
|
2
|
+
|
|
3
|
+
Enhancements:
|
|
4
|
+
|
|
5
|
+
- Use the newest versions of Configurability/Inversion
|
|
6
|
+
|
|
7
|
+
Bugfixes:
|
|
8
|
+
|
|
9
|
+
- Fix discovery for newer versions of Rubygems.
|
|
10
|
+
|
|
11
|
+
|
|
1
12
|
== v0.13.0 [2017-01-16] Mahlon E. Smith <mahlon@martini.nu>
|
|
2
13
|
|
|
3
14
|
Housekeeping:
|
data/Rakefile
CHANGED
|
@@ -28,14 +28,14 @@ hoespec = Hoe.spec 'strelka' do
|
|
|
28
28
|
self.dependency 'configurability', '~> 3.1'
|
|
29
29
|
self.dependency 'foreman', '~> 0.62'
|
|
30
30
|
self.dependency 'highline', '~> 1.6'
|
|
31
|
-
self.dependency 'inversion', '~> 0
|
|
31
|
+
self.dependency 'inversion', '~> 1.0'
|
|
32
32
|
self.dependency 'loggability', '~> 0.9'
|
|
33
33
|
self.dependency 'mongrel2', '~> 0.44'
|
|
34
34
|
self.dependency 'pluggability', '~> 0.4'
|
|
35
35
|
self.dependency 'sysexits', '~> 1.1'
|
|
36
|
-
self.dependency 'trollop', '~> 2.0'
|
|
37
36
|
self.dependency 'uuidtools', '~> 2.1'
|
|
38
37
|
self.dependency 'safe_yaml', '~> 1.0'
|
|
38
|
+
self.dependency 'gli', '~> 2.14'
|
|
39
39
|
|
|
40
40
|
self.dependency 'hoe-deveiate', '~> 0.6', :developer
|
|
41
41
|
self.dependency 'rspec', '~> 3.0', :developer
|
data/lib/strelka.rb
CHANGED
|
@@ -25,10 +25,10 @@ module Strelka
|
|
|
25
25
|
log_as :strelka
|
|
26
26
|
|
|
27
27
|
# Library version constant
|
|
28
|
-
VERSION = '0.
|
|
28
|
+
VERSION = '0.14.0'
|
|
29
29
|
|
|
30
30
|
# Version-control revision constant
|
|
31
|
-
REVISION = %q$Revision:
|
|
31
|
+
REVISION = %q$Revision: e44936a1b4ac $
|
|
32
32
|
|
|
33
33
|
require 'strelka/mixins'
|
|
34
34
|
require 'strelka/constants'
|
data/lib/strelka/app.rb
CHANGED
|
@@ -28,13 +28,13 @@ class Strelka::App < Mongrel2::Handler
|
|
|
28
28
|
log_to :strelka
|
|
29
29
|
|
|
30
30
|
# Configurability API -- use the 'app' section of the config file.
|
|
31
|
-
|
|
31
|
+
configurability( 'strelka.app' ) do
|
|
32
32
|
|
|
33
|
+
##
|
|
34
|
+
# 'Developer mode' flag.
|
|
35
|
+
setting :devmode, default: true
|
|
33
36
|
|
|
34
|
-
|
|
35
|
-
CONFIG_DEFAULTS = {
|
|
36
|
-
devmode: false,
|
|
37
|
-
}.freeze
|
|
37
|
+
end
|
|
38
38
|
|
|
39
39
|
|
|
40
40
|
# Class instance variables
|
|
@@ -49,30 +49,16 @@ class Strelka::App < Mongrel2::Handler
|
|
|
49
49
|
# loaded from, or +nil+ if they weren't loaded via ::load.
|
|
50
50
|
singleton_attr_reader :subclasses
|
|
51
51
|
|
|
52
|
-
##
|
|
53
|
-
# 'Developer mode' flag.
|
|
54
|
-
singleton_attr_writer :devmode
|
|
55
|
-
|
|
56
52
|
|
|
57
53
|
### Returns +true+ if the application has been configured to run in 'developer mode'.
|
|
58
54
|
### Developer mode is mostly informational by default (it just makes logging more
|
|
59
55
|
### verbose), but plugins and such might alter their behavior based on this setting.
|
|
60
56
|
def self::devmode?
|
|
61
|
-
return @devmode
|
|
57
|
+
return @devmode || $DEBUG
|
|
62
58
|
end
|
|
63
59
|
singleton_method_alias :in_devmode?, :devmode?
|
|
64
60
|
|
|
65
61
|
|
|
66
|
-
### Configure the App. Override this if you wish to add additional configuration
|
|
67
|
-
### to the 'app' section of the config that will be passed to you when the config
|
|
68
|
-
### is loaded.
|
|
69
|
-
def self::configure( config=nil )
|
|
70
|
-
config = Strelka::App.defaults.merge( config || {} )
|
|
71
|
-
self.devmode = config[:devmode] || $DEBUG
|
|
72
|
-
self.log.info "Enabled developer mode." if self.devmode?
|
|
73
|
-
end
|
|
74
|
-
|
|
75
|
-
|
|
76
62
|
### Overridden from Mongrel2::Handler -- use the value returned from .default_appid if
|
|
77
63
|
### one is not specified.
|
|
78
64
|
def self::run( appid=nil )
|
data/lib/strelka/cli.rb
CHANGED
|
@@ -68,7 +68,7 @@ module Strelka::CLI
|
|
|
68
68
|
flag [:c, :config], type: Pathname
|
|
69
69
|
|
|
70
70
|
desc "Override the Strelka data directory"
|
|
71
|
-
flag [:D, :datadir],
|
|
71
|
+
flag [:D, :datadir], type: Pathname
|
|
72
72
|
|
|
73
73
|
desc 'Enable debugging output'
|
|
74
74
|
switch [:d, :debug]
|
|
@@ -8,26 +8,30 @@ require 'strelka/cli' unless defined?( Strelka::CLI )
|
|
|
8
8
|
module Strelka::CLI::Config
|
|
9
9
|
extend Strelka::CLI::Subcommand
|
|
10
10
|
|
|
11
|
-
desc '
|
|
11
|
+
desc 'Generate a config file (to STDOUT) for the specified GEM (or local apps)'
|
|
12
12
|
arg :GEM, :optional
|
|
13
13
|
command :config do |cmd|
|
|
14
14
|
|
|
15
15
|
cmd.action do |globals, options, args|
|
|
16
|
-
|
|
17
|
-
discovery_name = gemname || ''
|
|
16
|
+
require 'strelka/discovery'
|
|
18
17
|
|
|
19
|
-
|
|
20
|
-
discovered_apps = Strelka::Discovery.
|
|
18
|
+
apps = Array( args )
|
|
19
|
+
discovered_apps = Strelka::Discovery.discovered_apps
|
|
20
|
+
raise ArgumentError, "No apps discovered" if discovered_apps.empty?
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
apps.each do |app_name|
|
|
23
|
+
app_path = discovered_apps[ app_name ] or
|
|
24
|
+
raise "No such app: %s" % [ app_name ]
|
|
23
25
|
|
|
24
|
-
|
|
25
|
-
prompt.say " loading %s (%s)" % [
|
|
26
|
-
Strelka::Discovery.load(
|
|
26
|
+
app_path = Pathname( app_path )
|
|
27
|
+
prompt.say " loading %s (%s)" % [ app_path, app_path.basename('.rb') ]
|
|
28
|
+
Strelka::Discovery.load( app_path )
|
|
27
29
|
end
|
|
28
30
|
|
|
29
|
-
prompt.say "
|
|
30
|
-
|
|
31
|
+
prompt.say " generating config:"
|
|
32
|
+
yaml = Configurability.default_config.dump
|
|
33
|
+
yaml.gsub!( /(?<!^---)\n(\w)/m, "\n\n\\1" )
|
|
34
|
+
$stdout.puts( yaml )
|
|
31
35
|
end
|
|
32
36
|
end
|
|
33
37
|
|
data/lib/strelka/discovery.rb
CHANGED
|
@@ -94,14 +94,18 @@ module Strelka::Discovery
|
|
|
94
94
|
log_to :strelka
|
|
95
95
|
|
|
96
96
|
# Configurability API -- use the 'discovery' section of the config
|
|
97
|
-
|
|
97
|
+
configurability( 'strelka.discovery' ) do
|
|
98
98
|
|
|
99
|
+
##
|
|
100
|
+
# The glob(3) pattern for matching the discovery hook file.
|
|
101
|
+
setting :app_discovery_file, default: 'strelka/apps.rb'
|
|
99
102
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
local_data_dirs:
|
|
104
|
-
|
|
103
|
+
##
|
|
104
|
+
# The glob(3) pattern for matching local data directories during discovery. Local
|
|
105
|
+
# data directories are evaluated relative to the CWD.
|
|
106
|
+
setting :local_data_dirs, default: 'data/*'
|
|
107
|
+
|
|
108
|
+
end
|
|
105
109
|
|
|
106
110
|
|
|
107
111
|
##
|
|
@@ -109,15 +113,6 @@ module Strelka::Discovery
|
|
|
109
113
|
# loaded from, or +nil+ if they weren't loaded via ::load.
|
|
110
114
|
singleton_attr_reader :discovered_classes
|
|
111
115
|
|
|
112
|
-
##
|
|
113
|
-
# The glob(3) pattern for matching the discovery hook file.
|
|
114
|
-
singleton_attr_accessor :app_discovery_file
|
|
115
|
-
|
|
116
|
-
##
|
|
117
|
-
# The glob(3) pattern for matching local data directories during discovery. Local
|
|
118
|
-
# data directories are evaluated relative to the CWD.
|
|
119
|
-
singleton_attr_accessor :local_data_dirs
|
|
120
|
-
|
|
121
116
|
##
|
|
122
117
|
# The name of the file that's currently being loaded (if any)
|
|
123
118
|
singleton_attr_reader :loading_file
|
|
@@ -174,17 +169,6 @@ module Strelka::Discovery
|
|
|
174
169
|
end
|
|
175
170
|
|
|
176
171
|
|
|
177
|
-
### Configure the App. Override this if you wish to add additional configuration
|
|
178
|
-
### to the 'app' section of the config that will be passed to you when the config
|
|
179
|
-
### is loaded.
|
|
180
|
-
def self::configure( config=nil )
|
|
181
|
-
config = self.defaults.merge( config || {} )
|
|
182
|
-
|
|
183
|
-
self.app_discovery_file = config[:app_discovery_file]
|
|
184
|
-
self.local_data_dirs = config[:local_data_dirs]
|
|
185
|
-
end
|
|
186
|
-
|
|
187
|
-
|
|
188
172
|
### Return a Hash of glob patterns for matching data directories for the latest
|
|
189
173
|
### versions of all installed gems which have a dependency on Strelka, keyed
|
|
190
174
|
### by gem name.
|
|
@@ -194,7 +178,7 @@ module Strelka::Discovery
|
|
|
194
178
|
}
|
|
195
179
|
|
|
196
180
|
# Find all the gems that depend on Strelka
|
|
197
|
-
gems = Gem::Specification.find_all do |gemspec|
|
|
181
|
+
gems = Gem::Specification.latest_specs.find_all do |gemspec|
|
|
198
182
|
gemspec.dependencies.find {|dep| dep.name == 'strelka'}
|
|
199
183
|
end
|
|
200
184
|
|
|
@@ -34,7 +34,20 @@ class Strelka::MultipartParser
|
|
|
34
34
|
log_to :strelka
|
|
35
35
|
|
|
36
36
|
# Configurability API -- use the 'multipartparser' section of the config
|
|
37
|
-
|
|
37
|
+
configurability( 'strelka.multipartparser' ) do
|
|
38
|
+
##
|
|
39
|
+
# The configured buffer size to use when parsing
|
|
40
|
+
setting :bufsize, default: 524288 do |val|
|
|
41
|
+
Integer( val ) if val
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
##
|
|
45
|
+
# The configured spool directory for storing attachments
|
|
46
|
+
setting :spooldir, default: Dir.tmpdir + '/strelka-mimeparts' do |val|
|
|
47
|
+
Pathname( val ) if val
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
end
|
|
38
51
|
|
|
39
52
|
|
|
40
53
|
# Line-ending regexp. Supports UNIX line-endings for testing.
|
|
@@ -46,11 +59,6 @@ class Strelka::MultipartParser
|
|
|
46
59
|
# Line-ending for RFC5322 header fields; EOL *not* followed by a WSP char
|
|
47
60
|
HEADER_FIELD_EOL = /#{CRLF_REGEXP}(?!\x32|\x09)/
|
|
48
61
|
|
|
49
|
-
# Configurability API -- configuration defaults
|
|
50
|
-
CONFIG_DEFAULTS = {
|
|
51
|
-
bufsize: 524288,
|
|
52
|
-
spooldir: Pathname( Dir.tmpdir ) + 'strelka-mimeparts',
|
|
53
|
-
}
|
|
54
62
|
|
|
55
63
|
# A mixin that extends the IO objects for uploaded files.
|
|
56
64
|
module FileInputField
|
|
@@ -59,32 +67,6 @@ class Strelka::MultipartParser
|
|
|
59
67
|
|
|
60
68
|
end # module FileInputField
|
|
61
69
|
|
|
62
|
-
##
|
|
63
|
-
# The configured buffer size to use when parsing
|
|
64
|
-
singleton_attr_accessor :bufsize
|
|
65
|
-
|
|
66
|
-
##
|
|
67
|
-
# The configured spool directory for storing attachments
|
|
68
|
-
singleton_attr_accessor :spooldir
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
### Configurability API -- configure the parser with the 'mimeparser' section
|
|
72
|
-
### of the config:
|
|
73
|
-
###
|
|
74
|
-
### bufsize:: the size of the buffer (in bytes) to use when reading the
|
|
75
|
-
### document. Larger sizes use more heap, but are faster.
|
|
76
|
-
### spooldir:: the directory to spool file upload parts to.
|
|
77
|
-
def self::configure( options=nil )
|
|
78
|
-
if options
|
|
79
|
-
self.log.debug "Configuring the %p: %p" % [ self, options ]
|
|
80
|
-
self.bufsize = Integer( options[:bufsize] ) || CONFIG_DEFAULTS[:bufsize]
|
|
81
|
-
self.spooldir = Pathname( options[:spooldir] ) || CONFIG_DEFAULTS[:spooldir]
|
|
82
|
-
else
|
|
83
|
-
self.log.debug "Configuring %p with defaults: %p" % [ self, CONFIG_DEFAULTS ]
|
|
84
|
-
self.bufsize = CONFIG_DEFAULTS[:bufsize]
|
|
85
|
-
self.spooldir = CONFIG_DEFAULTS[:spooldir]
|
|
86
|
-
end
|
|
87
|
-
end
|
|
88
70
|
|
|
89
71
|
|
|
90
72
|
### Create a new Strelka::MultipartMimeParser
|
|
@@ -92,8 +74,8 @@ class Strelka::MultipartParser
|
|
|
92
74
|
io = StringIO.new( io ) unless io.respond_to?( :read )
|
|
93
75
|
boundary = '--' + boundary # unless boundary.start_with?( '--' )
|
|
94
76
|
|
|
95
|
-
@bufsize = self.class.bufsize ||
|
|
96
|
-
@spooldir = self.class.spooldir ||
|
|
77
|
+
@bufsize = self.class.bufsize || self.class.defaults.spooldir
|
|
78
|
+
@spooldir = self.class.spooldir || Pathname( self.class.defaults.spooldir )
|
|
97
79
|
@io = io
|
|
98
80
|
@boundary = boundary
|
|
99
81
|
@fields = {}
|
|
@@ -42,17 +42,14 @@ describe Strelka::App::Templating do
|
|
|
42
42
|
it "can discover template directories for loaded gems that depend on Strelka" do
|
|
43
43
|
specs = {}
|
|
44
44
|
specs[:gymnastics] = make_gemspec( 'gymnastics', '1.0.0' )
|
|
45
|
-
specs[:
|
|
46
|
-
specs[:cycling_new] = make_gemspec( 'cycling', '1.0.8' )
|
|
45
|
+
specs[:cycling] = make_gemspec( 'cycling', '1.0.8' )
|
|
47
46
|
specs[:karate] = make_gemspec( 'karate', '1.0.0', false )
|
|
48
47
|
specs[:javelin] = make_gemspec( 'javelin', '1.0.0' )
|
|
49
48
|
|
|
50
|
-
expect( Gem::Specification ).to receive( :
|
|
51
|
-
specs.values.each {|spec| block.call(spec) }
|
|
52
|
-
end
|
|
49
|
+
expect( Gem::Specification ).to receive( :latest_specs ).and_return( specs.values )
|
|
53
50
|
|
|
54
51
|
gymnastics_path = specs[:gymnastics].full_gem_path
|
|
55
|
-
cycling_path = specs[:
|
|
52
|
+
cycling_path = specs[:cycling].full_gem_path
|
|
56
53
|
javelin_path = specs[:javelin].full_gem_path
|
|
57
54
|
|
|
58
55
|
expect( Dir ).to receive( :glob ).with( 'data/*/templates' ).
|
|
@@ -81,9 +78,7 @@ describe Strelka::App::Templating do
|
|
|
81
78
|
specs[:gymnastics] = make_gemspec( 'gymnastics', '1.0.0' )
|
|
82
79
|
specs[:javelin] = make_gemspec( 'javelin', '1.0.0' )
|
|
83
80
|
|
|
84
|
-
expect( Gem::Specification ).to receive( :
|
|
85
|
-
specs.values.each {|spec| block.call(spec) }
|
|
86
|
-
end
|
|
81
|
+
expect( Gem::Specification ).to receive( :latest_specs ).and_return( specs.values )
|
|
87
82
|
|
|
88
83
|
gymnastics_path = specs[:gymnastics].full_gem_path
|
|
89
84
|
javelin_path = specs[:javelin].full_gem_path
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: strelka
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.14.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mahlon E. Smith
|
|
@@ -11,27 +11,32 @@ bindir: bin
|
|
|
11
11
|
cert_chain:
|
|
12
12
|
- |
|
|
13
13
|
-----BEGIN CERTIFICATE-----
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
14
|
+
MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
|
|
15
|
+
GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
|
|
16
|
+
HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
|
|
17
|
+
GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
|
|
18
|
+
ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
|
|
19
|
+
83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
|
|
20
|
+
ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
|
|
21
|
+
TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
|
|
22
|
+
4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
|
|
23
|
+
cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
|
|
24
|
+
+QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
|
|
25
|
+
soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
|
|
26
|
+
/D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
|
|
27
|
+
BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
|
|
28
|
+
MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
|
|
29
|
+
YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
|
|
30
|
+
FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
|
|
31
|
+
db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
|
|
32
|
+
inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
|
|
33
|
+
DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
|
|
34
|
+
PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
|
|
35
|
+
6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
|
|
36
|
+
w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
|
|
37
|
+
p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
|
|
33
38
|
-----END CERTIFICATE-----
|
|
34
|
-
date: 2017-01-
|
|
39
|
+
date: 2017-01-19 00:00:00.000000000 Z
|
|
35
40
|
dependencies:
|
|
36
41
|
- !ruby/object:Gem::Dependency
|
|
37
42
|
name: configurability
|
|
@@ -81,14 +86,14 @@ dependencies:
|
|
|
81
86
|
requirements:
|
|
82
87
|
- - "~>"
|
|
83
88
|
- !ruby/object:Gem::Version
|
|
84
|
-
version: '0
|
|
89
|
+
version: '1.0'
|
|
85
90
|
type: :runtime
|
|
86
91
|
prerelease: false
|
|
87
92
|
version_requirements: !ruby/object:Gem::Requirement
|
|
88
93
|
requirements:
|
|
89
94
|
- - "~>"
|
|
90
95
|
- !ruby/object:Gem::Version
|
|
91
|
-
version: '0
|
|
96
|
+
version: '1.0'
|
|
92
97
|
- !ruby/object:Gem::Dependency
|
|
93
98
|
name: loggability
|
|
94
99
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -146,47 +151,47 @@ dependencies:
|
|
|
146
151
|
- !ruby/object:Gem::Version
|
|
147
152
|
version: '1.1'
|
|
148
153
|
- !ruby/object:Gem::Dependency
|
|
149
|
-
name:
|
|
154
|
+
name: uuidtools
|
|
150
155
|
requirement: !ruby/object:Gem::Requirement
|
|
151
156
|
requirements:
|
|
152
157
|
- - "~>"
|
|
153
158
|
- !ruby/object:Gem::Version
|
|
154
|
-
version: '2.
|
|
159
|
+
version: '2.1'
|
|
155
160
|
type: :runtime
|
|
156
161
|
prerelease: false
|
|
157
162
|
version_requirements: !ruby/object:Gem::Requirement
|
|
158
163
|
requirements:
|
|
159
164
|
- - "~>"
|
|
160
165
|
- !ruby/object:Gem::Version
|
|
161
|
-
version: '2.
|
|
166
|
+
version: '2.1'
|
|
162
167
|
- !ruby/object:Gem::Dependency
|
|
163
|
-
name:
|
|
168
|
+
name: safe_yaml
|
|
164
169
|
requirement: !ruby/object:Gem::Requirement
|
|
165
170
|
requirements:
|
|
166
171
|
- - "~>"
|
|
167
172
|
- !ruby/object:Gem::Version
|
|
168
|
-
version: '
|
|
173
|
+
version: '1.0'
|
|
169
174
|
type: :runtime
|
|
170
175
|
prerelease: false
|
|
171
176
|
version_requirements: !ruby/object:Gem::Requirement
|
|
172
177
|
requirements:
|
|
173
178
|
- - "~>"
|
|
174
179
|
- !ruby/object:Gem::Version
|
|
175
|
-
version: '
|
|
180
|
+
version: '1.0'
|
|
176
181
|
- !ruby/object:Gem::Dependency
|
|
177
|
-
name:
|
|
182
|
+
name: gli
|
|
178
183
|
requirement: !ruby/object:Gem::Requirement
|
|
179
184
|
requirements:
|
|
180
185
|
- - "~>"
|
|
181
186
|
- !ruby/object:Gem::Version
|
|
182
|
-
version: '
|
|
187
|
+
version: '2.14'
|
|
183
188
|
type: :runtime
|
|
184
189
|
prerelease: false
|
|
185
190
|
version_requirements: !ruby/object:Gem::Requirement
|
|
186
191
|
requirements:
|
|
187
192
|
- - "~>"
|
|
188
193
|
- !ruby/object:Gem::Version
|
|
189
|
-
version: '
|
|
194
|
+
version: '2.14'
|
|
190
195
|
- !ruby/object:Gem::Dependency
|
|
191
196
|
name: hoe-mercurial
|
|
192
197
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -291,14 +296,14 @@ dependencies:
|
|
|
291
296
|
requirements:
|
|
292
297
|
- - "~>"
|
|
293
298
|
- !ruby/object:Gem::Version
|
|
294
|
-
version: '3.
|
|
299
|
+
version: '3.15'
|
|
295
300
|
type: :development
|
|
296
301
|
prerelease: false
|
|
297
302
|
version_requirements: !ruby/object:Gem::Requirement
|
|
298
303
|
requirements:
|
|
299
304
|
- - "~>"
|
|
300
305
|
- !ruby/object:Gem::Version
|
|
301
|
-
version: '3.
|
|
306
|
+
version: '3.15'
|
|
302
307
|
description: |-
|
|
303
308
|
Strelka is a framework for creating and deploying
|
|
304
309
|
Mongrel2[http://mongrel2.org/] web applications in Ruby.
|
|
@@ -484,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
484
489
|
version: '0'
|
|
485
490
|
requirements: []
|
|
486
491
|
rubyforge_project:
|
|
487
|
-
rubygems_version: 2.
|
|
492
|
+
rubygems_version: 2.6.8
|
|
488
493
|
signing_key:
|
|
489
494
|
specification_version: 4
|
|
490
495
|
summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]
|
metadata.gz.sig
CHANGED
|
Binary file
|