fishwife 1.10.0-java → 1.10.1-java

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.
Files changed (19) hide show
  1. checksums.yaml +5 -5
  2. data/History.rdoc +3 -1
  3. data/Manifest.txt +1 -1
  4. data/README.rdoc +6 -5
  5. data/bin/fishwife +4 -2
  6. data/lib/fishwife.rb +1 -1
  7. data/lib/fishwife/base.rb +2 -2
  8. data/lib/fishwife/fishwife-1.10.1.jar +0 -0
  9. data/lib/fishwife/hijacked_io.rb +1 -1
  10. data/lib/fishwife/http_server.rb +1 -1
  11. data/lib/fishwife/rack_servlet.rb +1 -1
  12. data/lib/rack/handler/fishwife.rb +1 -1
  13. data/pom.xml +1 -1
  14. data/spec/fishwife/hijacked_io_spec.rb +1 -1
  15. data/spec/fishwife_spec.rb +5 -5
  16. data/spec/spec_helper.rb +6 -1
  17. data/spec/test_app.rb +1 -1
  18. metadata +8 -8
  19. data/lib/fishwife/fishwife-1.10.0.jar +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: e03291bc98a777e051010275b8cd1f16bf5887d45d84a315cae65c1983e5f822
4
- data.tar.gz: e12785a24dd82799a8df83d0c9d64bbe93d2f809e13144d26ad0705cfcc4996a
2
+ SHA1:
3
+ metadata.gz: 42744f425cebb7a7228bda7b78f0964e0d76a5b8
4
+ data.tar.gz: ff9bee6e2e0aaafc3248b3e6e3e4b8f8f6ede3cb
5
5
  SHA512:
6
- metadata.gz: d881973e3c17742a28c7cf00315f2bf593be244b3d4d9eb6210674b1f0c8f5b8ca26b0a59a83d8336094fd1823b19177f689fd1ae9310680d54328f97ba6349c
7
- data.tar.gz: 4b66135628a938cad6ddb9e3adc02a31588fe8c8424f58a94d1ae7511707cc3fc2828a04deea269707978d479e4dd0329f2997e4ff05cf927a5b337f7a61e4c5
6
+ metadata.gz: 5b2a8bc049e2bd611cfc609b97d57ef56a1d4d23fbca62de69dbf0cbc7704576f19967c7f53e8c529f39973c5fa5c0b9d0bd6ea2db683ae6a757753ddd8e906d
7
+ data.tar.gz: ee9cb0473ab4b7191257a11ceb9851ec1141e69b7e8273b40c5e4c013694b8ed17cd9707624882409675cb5679b871b51a79ae9898940ccd49cb16958cab7467
data/History.rdoc CHANGED
@@ -1,6 +1,8 @@
1
+ === 1.10.1 (2018-7-20)
2
+ * Fix setting of options[:server] in bin/fishwife for rack 2.0+ (#20)
3
+
1
4
  === 1.10.0 (2017-6-16)
2
5
  * Broaden to rjack-jetty [9.2.11, 9.5) (tested with 9.4.6)
3
-
4
6
  * Replace the vestigial/broken `async.callback` implementation
5
7
  with \Rack 1.5+ compliant, response (after-headers) only
6
8
  {Hijacking}[http://www.rubydoc.info/github/rack/rack/file/SPEC#Hijacking]
data/Manifest.txt CHANGED
@@ -21,4 +21,4 @@ spec/data/hello.txt
21
21
  spec/data/localhost.keystore
22
22
  spec/data/reddit-icon.png
23
23
  spec/fishwife/hijacked_io_spec.rb
24
- lib/fishwife/fishwife-1.10.0.jar
24
+ lib/fishwife/fishwife-1.10.1.jar
data/README.rdoc CHANGED
@@ -84,14 +84,15 @@ from JRuby so its not practical to support a fishwife --daemon
84
84
  flag. \Fishwife simply logs to STDERR by default. Instead consider
85
85
  using:
86
86
 
87
- * Linux systemd, which supports foreground processes (Type=simple)
87
+ * Linux {systemd}[https://www.freedesktop.org/wiki/Software/systemd/],
88
+ which supports foreground processes (Type=simple), and via socket
89
+ activation, zero-downtime restarts. See the {Guppy Sample
90
+ Application}[https://github.com/dekellum/guppy#readme] and its
91
+ configuration for systemd.
88
92
 
89
93
  * {Bluepill}[https://github.com/arya/bluepill#readme] or God (MRI
90
94
  Ruby) process monitors support foreground processes.
91
95
 
92
- * The {Iyyov}[https://github.com/dekellum/iyyov#readme] (JRuby)
93
- process monitor supports self-daemonizing via the hashdot launcher.
94
-
95
96
  == Building from Source and Contributing
96
97
 
97
98
  You'll need a working Java 8+ JDK (with javac) and recent JRuby 1.7.x
@@ -107,7 +108,7 @@ confusion.
107
108
 
108
109
  == License
109
110
 
110
- Copyright (c) 2011-2017 David Kellum
111
+ Copyright (c) 2011-2018 David Kellum
111
112
 
112
113
  Licensed under the Apache License, Version 2.0 (the "License"); you
113
114
  may not use this file except in compliance with the License. You
data/bin/fishwife CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env jruby
2
2
  # -*- ruby -*-
3
3
  #--
4
- # Copyright (c) 2011-2017 David Kellum
4
+ # Copyright (c) 2011-2018 David Kellum
5
5
  # Copyright (c) 2010-2011 Don Werve
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -31,5 +31,7 @@ end
31
31
  require 'fishwife'
32
32
 
33
33
  server = Rack::Server.new
34
- server.options[:server] = 'Fishwife'
34
+ opts = server.options
35
+ opts[:server] = 'Fishwife'
36
+ server.options = opts
35
37
  server.start
data/lib/fishwife.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  # Copyright (c) 2010-2011 Don Werve
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License"); you
data/lib/fishwife/base.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"); you
5
5
  # may not use this file except in compliance with the License. You may
@@ -15,6 +15,6 @@
15
15
  #++
16
16
 
17
17
  module Fishwife
18
- VERSION = '1.10.0'
18
+ VERSION = '1.10.1'
19
19
  LIB_DIR = File.dirname( __FILE__ )
20
20
  end
data/lib/fishwife/hijacked_io.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2017 Theo Hultberg, David Kellum
2
+ # Copyright (c) 2017-2018 Theo Hultberg, David Kellum
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"); you
5
5
  # may not use this file except in compliance with the License. You may
data/lib/fishwife/http_server.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"); you
5
5
  # may not use this file except in compliance with the License. You may
data/lib/fishwife/rack_servlet.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  # Copyright (c) 2010-2011 Don Werve
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License"); you
data/lib/rack/handler/fishwife.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"); you
5
5
  # may not use this file except in compliance with the License. You may
data/pom.xml CHANGED
@@ -4,7 +4,7 @@
4
4
  <groupId>fishwife</groupId>
5
5
  <artifactId>fishwife</artifactId>
6
6
  <packaging>jar</packaging>
7
- <version>1.10.0</version>
7
+ <version>1.10.1</version>
8
8
  <name>Fishwife Java Extension</name>
9
9
 
10
10
  <properties>
data/spec/fishwife/hijacked_io_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2017 Theo Hultberg, David Kellum
2
+ # Copyright (c) 2017-2018 Theo Hultberg, David Kellum
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"); you
5
5
  # may not use this file except in compliance with the License. You may
data/spec/fishwife_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  # Copyright (c) 2010-2011 Don Werve
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -108,9 +108,9 @@ describe Fishwife do
108
108
  response = get("/echo")
109
109
  response.code.should == "200"
110
110
  content = JSON.parse(response.body)
111
- content["rack.multithread"].should be_true
112
- content["rack.multiprocess"].should be_false
113
- content["rack.run_once"].should be_false
111
+ content["rack.multithread"].should be true
112
+ content["rack.multiprocess"].should be false
113
+ content["rack.run_once"].should be false
114
114
  end
115
115
 
116
116
  it "passes form variables via GET" do
@@ -187,7 +187,7 @@ describe Fishwife do
187
187
  response = get("/echo", 'answer' => '42')
188
188
  response.code.should == "200"
189
189
  content = JSON.parse(response.body)
190
- content['rack.java.servlet'].should be_true
190
+ content['rack.java.servlet'].should be true
191
191
  end
192
192
 
193
193
  it "is clearly Jetty" do
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  # Copyright (c) 2010-2011 Don Werve
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -49,3 +49,8 @@ class Rack::Lint
49
49
  end
50
50
 
51
51
  end
52
+
53
+ RSpec.configure do |cfg|
54
+ cfg.expect_with(:rspec) { |c| c.syntax = :should }
55
+ cfg.mock_with(:rspec) { |m| m.syntax = :should }
56
+ end
data/spec/test_app.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2011-2017 David Kellum
2
+ # Copyright (c) 2011-2018 David Kellum
3
3
  # Copyright (c) 2010-2011 Don Werve
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License"); you
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fishwife
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.0
4
+ version: 1.10.1
5
5
  platform: java
6
6
  authors:
7
7
  - David Kellum
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-06-16 00:00:00.000000000 Z
11
+ date: 2018-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
69
69
  requirements:
70
70
  - - "~>"
71
71
  - !ruby/object:Gem::Version
72
- version: 1.8.2
72
+ version: '2.1'
73
73
  name: json
74
74
  prerelease: false
75
75
  type: :development
@@ -77,7 +77,7 @@ dependencies:
77
77
  requirements:
78
78
  - - "~>"
79
79
  - !ruby/object:Gem::Version
80
- version: 1.8.2
80
+ version: '2.1'
81
81
  - !ruby/object:Gem::Dependency
82
82
  requirement: !ruby/object:Gem::Requirement
83
83
  requirements:
@@ -97,7 +97,7 @@ dependencies:
97
97
  requirements:
98
98
  - - "~>"
99
99
  - !ruby/object:Gem::Version
100
- version: 2.13.0
100
+ version: 3.6.0
101
101
  name: rspec
102
102
  prerelease: false
103
103
  type: :development
@@ -105,7 +105,7 @@ dependencies:
105
105
  requirements:
106
106
  - - "~>"
107
107
  - !ruby/object:Gem::Version
108
- version: 2.13.0
108
+ version: 3.6.0
109
109
  - !ruby/object:Gem::Dependency
110
110
  requirement: !ruby/object:Gem::Requirement
111
111
  requirements:
@@ -143,7 +143,7 @@ files:
143
143
  - example/ssl.ru
144
144
  - lib/fishwife.rb
145
145
  - lib/fishwife/base.rb
146
- - lib/fishwife/fishwife-1.10.0.jar
146
+ - lib/fishwife/fishwife-1.10.1.jar
147
147
  - lib/fishwife/hijacked_io.rb
148
148
  - lib/fishwife/http_server.rb
149
149
  - lib/fishwife/rack_servlet.rb
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
177
177
  version: '0'
178
178
  requirements: []
179
179
  rubyforge_project:
180
- rubygems_version: 2.6.11
180
+ rubygems_version: 2.6.14.1
181
181
  signing_key:
182
182
  specification_version: 4
183
183
  summary: A Jetty based Rack HTTP 1.1 server.