startbrick 0.0.5 → 0.0.6

data/README.md

@@ -1,6 +1,6 @@
 # Startbrick
 
-How much of your Rails dev time is utterly wasted waiting for this: 
+How much of your Rails dev time is wasted waiting for this: 
 
     $ rails s
     => Booting WEBrick
@@ -21,7 +21,7 @@ to turn into this:
 
 just so you can manually load the Rails app in your web browser?
 
-**Startbrick** is a thin wrapper gem around Rack::Handler::WEBrick that
+**Startbrick** is a thin wrapper around the `rails s` command that
 automatically opens your Rails app in your default web browser when it's ready
 to accept requests.
 
@@ -32,21 +32,20 @@ Install the gem with
 Startbrick works with Rails 3. It doesn't work with JRuby because it
 uses `Kernel#fork`.
 
-To use startbrick, puts this line in your Gemfile
-
-    gem 'startbrick'
-
-and start your Rails app with this command:
+Start your Rails app with this command:
 
     startbrick
 
-You can add any of the flagged arguments that you can pass to the `rails s`
+The browser should open to your app once the server is ready to accept
+requests.
+
+You can add any of the arguments that you can pass to the `rails s`
 command.
 
 ## Optional .startbrick script
 
-By default, Startbrick runs this shell command when WEBrick is ready for
-requests:
+By default, Startbrick runs this shell command when the Rails server is
+ready for requests:
 
     open "http://#{BindAddress}:#{Port}"
 

data/bin/startbrick

@@ -1,4 +1,29 @@
 #!/usr/bin/env ruby
-cmd = "rails s #{ARGV.join(' ').strip} Startbrick"
+
+require 'optparse'
+
+args = ARGV.dup
+
+options = {:Host => 'localhost', :Port => '3000'}
+
+opt_parser = OptionParser.new do |opts|
+  opts.on("-p", "--port=port", Integer,
+          "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
+  opts.on("-b", "--binding=ip", String,
+          "Binds Rails to the specified ip.", "Default: 0.0.0.0") { |v| options[:Host] = v }
+end
+
+opt_parser.parse! args
+puts options.inspect
+
+cmd = "rails s #{ARGV.join(' ').strip}"
+
+open_cmd = "open 'http://#{options[:Host]}:#{options[:Port]}'"
+puts open_cmd
+fork do
+  `while ! nc -z localhost #{options[:Port]}; do sleep 0.1; done; echo 'opening browser'; #{open_cmd}`
+end
+
 puts cmd
+
 exec cmd

data/lib/startbrick/version.rb

@@ -1,3 +1,3 @@
 module Startbrick
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/startbrick.rb

@@ -1,38 +1,3 @@
-require 'rack'
-require 'rack/handler/webrick'
- 
-module Rack
-  module Handler
-    SCRIPT_FILE = '.startbrick'
-    
-    class Startbrick < Rack::Handler::WEBrick
-      def self.run(app, options={})
+module Startbrick
 
-        options[:BindAddress] = options.delete(:Host) if options[:Host]
-
-        options[:StartCallback] = if ::File.size?(SCRIPT_FILE)
-          script = ::File.read(SCRIPT_FILE)
-          puts "Loading #{SCRIPT_FILE} script:\n\n#{script.gsub(/^/, '  ')}"
-          Proc.new {
-            puts "Executing #{SCRIPT_FILE}"
-            fork { `bash #{SCRIPT_FILE}` }
-          }
-        else
-          Proc.new {
-            url = "http://#{options[:BindAddress]}:#{options[:Port]}"
-            cmd = "open #{url}"
-            puts "Running '#{cmd}'"
-            fork { `#{cmd}` }
-          }
-          
-        end
-        @server = ::WEBrick::HTTPServer.new(options)
-        @server.mount "/", Rack::Handler::WEBrick, app
-        yield @server  if block_given?
-        @server.start
-      end
-
-    end
-  end
 end
-

data/startbrick.gemspec

@@ -3,7 +3,7 @@ require 'startbrick/version'
 
 Gem::Specification.new do |s|
   s.name = "startbrick"
-  s.description = "WEBrick wrapper"
+  s.description = "rails s wrapper"
   s.version = Startbrick::VERSION
   s.summary = s.description
   s.authors = ["Daniel Choi"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: startbrick
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-05 00:00:00.000000000Z
 dependencies: []
-description: WEBrick wrapper
+description: rails s wrapper
 email:
 - dhchoi@gmail.com
 executables:
@@ -48,5 +48,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: WEBrick wrapper
+summary: rails s wrapper
 test_files: []