jetty-rackup 7.1.0 → 7.2.0

data/README.markdown

@@ -76,6 +76,14 @@ particular example directory and run. E.g.
 jetty-rackup uses `config.ru` file from the current directory by
 default.
 
+What's new
+----------
+* 7.2.0
+  + Add support for `Host` option. In addition to specifying port
+    now a host ip can also be specified if e.g. you only wish to bind the
+    server only to the loopback interface 127.0.0.1 and not to all IPs.
+  + Add support for `pid` option - create pid file
+
 See also
 --------
 For Rails deployment you may prefer jetty-rails

data/examples/bind_to_specific_ip/app.rb

@@ -0,0 +1,9 @@
+require 'sinatra'
+
+get '/?' do
+  "hello from root url"
+end
+
+get '/:message/?' do |message|
+  "Hello #{message}"
+end

data/examples/bind_to_specific_ip/config.ru

@@ -0,0 +1,8 @@
+#\ -p 8765 -o 127.0.0.1 --pid /tmp/jetty-example.pid
+require 'rubygems'
+require 'app'
+
+set :run, false   # disable built-in sinatra web server
+set :environment, :development
+
+run Sinatra::Application

data/lib/jetty-rackup/bootstrap.rb

@@ -5,7 +5,6 @@
 automatic = false
 server_type = nil
 env = "development"
-pid = nil
 options = {:Port => 9292, :Host => "0.0.0.0", :AccessLog => []}
 
 opts = OptionParser.new("", 24, '  ') { |opts|
@@ -59,8 +58,10 @@ opts = OptionParser.new("", 24, '  ') { |opts|
     daemonize = d ? true : false
   }
 
-  opts.on("-P", "--pid FILE", "file to store PID (default: rack.pid)") { |f|
-    pid = File.expand_path(f)
+  opts.on("-P", "--pid FILE", "file to store PID") { |file|
+    file = File.expand_path(file)
+    puts "Creating PID file '#{file}'"
+    File.write(file, java.io.File.new('/proc/self').canonical_file.name)
   }
 
   opts.separator ""

data/lib/jetty-rackup/server.rb

@@ -2,6 +2,8 @@ class Rack::Handler::Jetty
   def self.run(rackup_content, options={})
     Dir["#{File.dirname(__FILE__)}/../../jars/*.jar"].each { |jar| require jar }
 
+    java_import 'java.net.InetAddress'
+    java_import 'java.net.InetSocketAddress'
     java_import 'javax.servlet.http.HttpServlet'
     java_import 'org.eclipse.jetty.server.Server'
     java_import 'org.eclipse.jetty.servlet.ServletContextHandler'
@@ -13,7 +15,9 @@ class Rack::Handler::Jetty
     java_import 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
     java_import 'org.eclipse.jetty.servlet.DefaultServlet'
 
-    jetty = org.eclipse.jetty.server.Server.new options[:Port]
+    bind_to_address = java.net.InetAddress.getByName(options[:Host])
+    socket_address = java.net.InetSocketAddress.new(bind_to_address, options[:Port])
+    jetty = org.eclipse.jetty.server.Server.new(socket_address)
 
     context = org.eclipse.jetty.servlet.ServletContextHandler.new(nil, "/", org.eclipse.jetty.servlet.ServletContextHandler::NO_SESSIONS)
     context.add_filter("org.jruby.rack.RackFilter", "/*", 0)

data/lib/jetty-rackup/version.rb

@@ -1,5 +1,5 @@
 module Jetty
   module Rackup
-    VERSION = "7.1.0"
+    VERSION = "7.2.0"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jetty-rackup
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Vladimir Dobriakov
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -65,6 +65,8 @@ files:
 - README.markdown
 - Rakefile
 - bin/jetty-rackup
+- examples/bind_to_specific_ip/app.rb
+- examples/bind_to_specific_ip/config.ru
 - examples/issue4_handle400/app.rb
 - examples/issue4_handle400/config.ru
 - examples/just_ruby/app.rb