fishwife 1.10.0-java → 1.10.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e03291bc98a777e051010275b8cd1f16bf5887d45d84a315cae65c1983e5f822
-  data.tar.gz: e12785a24dd82799a8df83d0c9d64bbe93d2f809e13144d26ad0705cfcc4996a
+SHA1:
+  metadata.gz: 42744f425cebb7a7228bda7b78f0964e0d76a5b8
+  data.tar.gz: ff9bee6e2e0aaafc3248b3e6e3e4b8f8f6ede3cb
 SHA512:
-  metadata.gz: d881973e3c17742a28c7cf00315f2bf593be244b3d4d9eb6210674b1f0c8f5b8ca26b0a59a83d8336094fd1823b19177f689fd1ae9310680d54328f97ba6349c
-  data.tar.gz: 4b66135628a938cad6ddb9e3adc02a31588fe8c8424f58a94d1ae7511707cc3fc2828a04deea269707978d479e4dd0329f2997e4ff05cf927a5b337f7a61e4c5
+  metadata.gz: 5b2a8bc049e2bd611cfc609b97d57ef56a1d4d23fbca62de69dbf0cbc7704576f19967c7f53e8c529f39973c5fa5c0b9d0bd6ea2db683ae6a757753ddd8e906d
+  data.tar.gz: ee9cb0473ab4b7191257a11ceb9851ec1141e69b7e8273b40c5e4c013694b8ed17cd9707624882409675cb5679b871b51a79ae9898940ccd49cb16958cab7467

data/History.rdoc

@@ -1,6 +1,8 @@
+=== 1.10.1 (2018-7-20)
+* Fix setting of options[:server] in bin/fishwife for rack 2.0+ (#20)
+
 === 1.10.0 (2017-6-16)
 * Broaden to rjack-jetty [9.2.11, 9.5) (tested with 9.4.6)
-
 * Replace the vestigial/broken `async.callback` implementation
   with \Rack 1.5+ compliant, response (after-headers) only
   {Hijacking}[http://www.rubydoc.info/github/rack/rack/file/SPEC#Hijacking]

data/Manifest.txt

@@ -21,4 +21,4 @@ spec/data/hello.txt
 spec/data/localhost.keystore
 spec/data/reddit-icon.png
 spec/fishwife/hijacked_io_spec.rb
-lib/fishwife/fishwife-1.10.0.jar
+lib/fishwife/fishwife-1.10.1.jar

data/README.rdoc

@@ -84,14 +84,15 @@ from JRuby so its not practical to support a fishwife --daemon
 flag. \Fishwife simply logs to STDERR by default.  Instead consider
 using:
 
-* Linux systemd, which supports foreground processes (Type=simple)
+* Linux {systemd}[https://www.freedesktop.org/wiki/Software/systemd/],
+  which supports foreground processes (Type=simple), and via socket
+  activation, zero-downtime restarts. See the {Guppy Sample
+  Application}[https://github.com/dekellum/guppy#readme] and its
+  configuration for systemd.
 
 * {Bluepill}[https://github.com/arya/bluepill#readme] or God (MRI
   Ruby) process monitors support foreground processes.
 
-* The {Iyyov}[https://github.com/dekellum/iyyov#readme] (JRuby)
-  process monitor supports self-daemonizing via the hashdot launcher.
-
 == Building from Source and Contributing
 
 You'll need a working Java 8+ JDK (with javac) and recent JRuby 1.7.x
@@ -107,7 +108,7 @@ confusion.
 
 == License
 
-Copyright (c) 2011-2017 David Kellum
+Copyright (c) 2011-2018 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/bin/fishwife

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -31,5 +31,7 @@ end
 require 'fishwife'
 
 server = Rack::Server.new
-server.options[:server] = 'Fishwife'
+opts = server.options
+opts[:server] = 'Fishwife'
+server.options = opts
 server.start

data/lib/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,6 +15,6 @@
 #++
 
 module Fishwife
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
   LIB_DIR = File.dirname( __FILE__ )
 end

data/lib/fishwife/hijacked_io.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2017 Theo Hultberg, David Kellum
+# Copyright (c) 2017-2018 Theo Hultberg, David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/fishwife/http_server.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/fishwife/rack_servlet.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/rack/handler/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>fishwife</groupId>
   <artifactId>fishwife</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0</version>
+  <version>1.10.1</version>
   <name>Fishwife Java Extension</name>
 
   <properties>

data/spec/fishwife/hijacked_io_spec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2017 Theo Hultberg, David Kellum
+# Copyright (c) 2017-2018 Theo Hultberg, David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/spec/fishwife_spec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -108,9 +108,9 @@ describe Fishwife do
         response = get("/echo")
         response.code.should == "200"
         content = JSON.parse(response.body)
-        content["rack.multithread"].should be_true
-        content["rack.multiprocess"].should be_false
-        content["rack.run_once"].should be_false
+        content["rack.multithread"].should be true
+        content["rack.multiprocess"].should be false
+        content["rack.run_once"].should be false
       end
 
       it "passes form variables via GET" do
@@ -187,7 +187,7 @@ describe Fishwife do
         response = get("/echo", 'answer' => '42')
         response.code.should == "200"
         content = JSON.parse(response.body)
-        content['rack.java.servlet'].should be_true
+        content['rack.java.servlet'].should be true
       end
 
       it "is clearly Jetty" do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -49,3 +49,8 @@ class Rack::Lint
   end
 
 end
+
+RSpec.configure do |cfg|
+  cfg.expect_with(:rspec) { |c| c.syntax = :should }
+  cfg.mock_with(:rspec) { |m| m.syntax = :should }
+end

data/spec/test_app.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2017 David Kellum
+# Copyright (c) 2011-2018 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fishwife
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '2.1'
   name: json
   prerelease: false
   type: :development
@@ -77,7 +77,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -97,7 +97,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.6.0
   name: rspec
   prerelease: false
   type: :development
@@ -105,7 +105,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -143,7 +143,7 @@ files:
 - example/ssl.ru
 - lib/fishwife.rb
 - lib/fishwife/base.rb
-- lib/fishwife/fishwife-1.10.0.jar
+- lib/fishwife/fishwife-1.10.1.jar
 - lib/fishwife/hijacked_io.rb
 - lib/fishwife/http_server.rb
 - lib/fishwife/rack_servlet.rb
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: A Jetty based Rack HTTP 1.1 server.