shotgun 0.1 → 0.2

data/Rakefile

@@ -5,7 +5,7 @@ task :default => [:test]
 task :spec => :test
 
 Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/spec_*.rb']
   t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
@@ -48,7 +48,7 @@ file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
 end
 
 desc 'Publish gem and tarball to rubyforge'
-task 'publish:gem' => [package('.gem'), package('.tar.gz')] do |t|
+task 'release' => [package('.gem'), package('.tar.gz')] do |t|
   sh <<-end
     rubyforge add_release wink #{$spec.name} #{$spec.version} #{package('.gem')} &&
     rubyforge add_file    wink #{$spec.name} #{$spec.version} #{package('.tar.gz')}

data/bin/shotgun

@@ -5,12 +5,10 @@ $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
 require 'optparse'
 
-automatic = false
 server = nil
 env = ENV['RACK_ENV'] || 'development'
-daemonize = false
-pid = nil
-options = {:Port => 9393, :Host => "0.0.0.0", :AccessLog => []}
+browse = false
+options = {:Port => 9393, :Host => 'localhost', :AccessLog => []}
 
 opts = OptionParser.new("", 24, '  ') { |opts|
   opts.banner = "Usage: shotgun [ruby options] [rack options] [rackup config]"
@@ -60,14 +58,18 @@ opts = OptionParser.new("", 24, '  ') { |opts|
   }
 
   opts.separator ""
-  opts.separator "Common options:"
+  opts.separator "Shotgun options:"
 
-  opts.on_tail("-h", "--help", "Show this message") do
+  opts.on("-O", "--browse", "open browser immediately after starting") { |browse|
+    browse = true
+  }
+
+  opts.on_tail("-h", "--help", "show this message") do
     puts opts
     exit
   end
 
-  opts.on_tail("--version", "Show version") do
+  opts.on_tail("--version", "show version") do
     require 'rack'
     puts "Rack #{Rack.version}"
     exit
@@ -84,6 +86,12 @@ if config =~ /\.ru$/ && File.read(config)[/^#\\(.*)/]
 end
 
 require 'rack'
+require 'rack/utils'
+require 'rack/request'
+require 'rack/response'
+require 'rack/lint'
+require 'rack/commonlogger'
+require 'rack/showexceptions'
 
 unless server = Rack::Handler.get(server)
   begin
@@ -95,12 +103,19 @@ end
 
 app_wrapper =
   lambda do |inner_app|
-    if env == 'development'
+    case env
+    when 'development'
       Rack::Builder.new {
+        use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
         use Rack::ShowExceptions
         use Rack::Lint
         run inner_app
       }.to_app
+    when 'deployment', 'production'
+      Rack::Builder.new {
+        use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
+        run inner_app
+      }.to_app
     else
       inner_app
     end
@@ -113,4 +128,9 @@ app = Shotgun.new(config, app_wrapper)
 
 server.run app, options do |inst|
   puts "== Shotgun starting #{server.to_s} on #{options[:Host]}:#{options[:Port]}"
+
+  if browse
+    require 'launchy'
+    Launchy.open("http://#{options[:Host]}:#{options[:Port]}/")
+  end
 end

data/lib/shotgun.rb

@@ -64,6 +64,8 @@ class Shotgun
       require rackup_file
       if defined? Sinatra::Application
         Sinatra::Application.set :reload, false
+        Sinatra::Application.set :logging, false
+        Sinatra::Application.set :raise_errors, true
         Sinatra::Application
       else
         Object.const_get(File.basename(rackup_file, '.rb').capitalize)

data/shotgun.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'shotgun'
-  s.version = '0.1'
-  s.date = '2009-02-20'
+  s.version = '0.2'
+  s.date = '2009-03-22'
 
   s.description = "Because reloading sucks."
   s.summary     = s.description
@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README]
-  s.add_dependency 'rack', '>= 0.9.1', '< 1.0'
+  s.add_dependency 'rack',    '>= 0.9.1', '< 1.0'
+  s.add_dependency 'launchy', '>= 0.3.3', '< 1.0'
 
   s.homepage = "http://github.com/rtomayko/shotgun/"
   s.require_paths = %w[lib]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shotgun
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.3
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
 description: Because reloading sucks.
 email: r@tomayko.com
 executables: