reel-rack 0.0.1.pre → 0.0.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295c91157e742548431a304bbbec23735c0311ac
-  data.tar.gz: fe66822f852b7581f06f0ca16fec4da0a59e3267
+  metadata.gz: 43b21d6af7dcc1fe337503181c1db02b1872811f
+  data.tar.gz: 6e8577ce53c98f06345be8ec201b99cbb1c33982
 SHA512:
-  metadata.gz: 3b3293afdaec98ab0d1adafa7fdd255359c6574d7daeb209e551b7b1ff747dfc5f143e10b77f1f92789b0092c60e01a9d0f32333e77d39ace26a66b14deb0ffc
-  data.tar.gz: bd8f4969fcfc9824da91928c52db2daa6f0689e3f4325b7635a60b8d91e32535bf48ed92f5ca2fd52376b2fb64d0d338cf7742acd070c359da7dc582b42883e0
+  metadata.gz: cd2c574401da814bf72f86971a958a04bc0cc196e8d02d183b14854e74c9a69d9426cc7b1cb7686079deeea2ad81dbeb72f056c3901ffee57e0a2f1c3415a414
+  data.tar.gz: 263c1f3be49b9cb573a012d65f34b5c8e25dfad80bab99b1dd8143b0eef4a3e4c51355a23a0857a6c6e759683b30fcf04ae8e99c3d552b1acad8973a9152b8bb

data/lib/rack/handler/reel.rb

@@ -12,16 +12,8 @@ module Rack
       def self.run(app, options = {})
         options = DEFAULT_OPTIONS.merge(options)
 
-        unless options[:quiet]
-          app = Rack::CommonLogger.new(app, STDOUT)
-        end
-
-        if options[:environment]
-          ENV['RACK_ENV'] = options[:environment].to_s
-        end
-
-        Celluloid.logger.info  "A Reel good HTTP server! (Codename \"#{::Reel::CODENAME}\")"
-        Celluloid.logger.info "Listening on #{options[:host]}:#{options[:port]}"
+        app = Rack::CommonLogger.new(app, STDOUT) unless options[:quiet]
+        ENV['RACK_ENV'] = options[:environment].to_s if options[:environment]
 
         supervisor = ::Reel::Rack::Server.supervise_as(:reel_rack_server, app, options)
 
@@ -30,8 +22,6 @@ module Rack
         rescue Interrupt
           Celluloid.logger.info "Interrupt received... shutting down"
           supervisor.terminate
-          Celluloid.join(supervisor)
-          Celluloid.logger.info "That's all, folks!"
         end
       end
     end

data/lib/reel/rack/cli.rb

@@ -1,16 +1,52 @@
 require 'reel/rack'
+require 'optparse'
 
 module Reel
   module Rack
     class CLI
       def initialize(argv)
         @argv   = argv
-        @rackup = "config.ru"
+        @options = {
+          addr:   "localhost",
+          port:   3000,
+          quiet:  false,
+          rackup: "config.ru"
+        }
+        parser
+      end
+
+      def parser
+        @parser ||= OptionParser.new do |o|
+          o.banner = "reel-rack <options> <rackup file>"
+
+          o.on "-a", "--addr ADDR", "Address to listen on (default #{@options[:addr]})" do |addr|
+            @options[:addr] = addr
+          end
+
+          o.on "-p", "--port PORT", "Port to bind to (default #{@options[:port]})" do |port|
+            @options[:port] = port
+          end
+
+          o.on "-q", "--quiet", "Suppress normal logging output" do
+            @options[:quiet] = true
+          end
+
+          o.on_tail "-h", "--help", "Show help" do
+            STDOUT.puts @parser
+            exit 1
+          end
+        end
       end
 
       def run
-        app, options = ::Rack::Builder.parse_file(@rackup)
+        @parser.parse! @argv
+        @options[:rackup] = @argv.shift if @argv.last
+
+        app, options = ::Rack::Builder.parse_file(@options[:rackup])
+        options.merge!(@options)
         ::Rack::Handler::Reel.run(app, options)
+
+        Celluloid.logger.info "That's all, folks!"
       end
     end
   end

data/lib/reel/rack/server.rb

@@ -7,11 +7,17 @@ require 'rack'
 module Reel
   module Rack
     class Server < Server
+      include Celluloid::Logger
+
       attr_reader :app
+
       def initialize(app, options)
         raise ArgumentError, "no host given" unless options[:host]
         raise ArgumentError, "no port given" unless options[:port]
 
+        info  "A Reel good HTTP server! (Codename \"#{::Reel::CODENAME}\")"
+        info "Listening on http://#{options[:host]}:#{options[:port]}"
+
         super(options[:host], options[:port], &method(:on_connection))
         @app = app
       end
@@ -35,12 +41,15 @@ module Reel
    
         status, headers, body = app.call ::Rack::MockRequest.env_for(request.url, options)
 
-        if body.respond_to? :each
+        if body.respond_to?(:to_str)
+          request.respond status_symbol(status), headers, body.to_str
+        elsif body.respond_to?(:each)
           request.respond status_symbol(status), headers.merge(:transfer_encoding => :chunked)
           body.each { |chunk| request << chunk }
           request.finish_response
         else
-          request.respond status_symbol(status), headers, body
+          Logger.error("don't know how to render: #{body.inspect}")
+          request.respond :internal_server_error, "An error occurred processing your request"
         end
 
         body.close if body.respond_to? :close

data/lib/reel/rack/version.rb

@@ -1,5 +1,5 @@
 module Reel
   module Rack
-    VERSION = "0.0.1.pre"
+    VERSION = "0.0.1.pre2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reel-rack
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel