shotgun 0.4 → 0.5

data/Rakefile

@@ -9,14 +9,8 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-$spec =
-  begin
-    require 'rubygems/specification'
-    data = File.read('shotgun.gemspec')
-    spec = nil
-    Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-    spec
-  end
+require 'rubygems'
+$spec = eval(File.read('shotgun.gemspec'))
 
 def package(ext='')
   "pkg/#{$spec.name}-#{$spec.version}" + ext
@@ -46,11 +40,3 @@ file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
       HEAD | gzip > #{f.name}
   SH
 end
-
-desc 'Publish gem and tarball to rubyforge'
-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')}
-  end
-end

data/bin/shotgun

@@ -1,14 +1,17 @@
 #!/usr/bin/env ruby
 
-libdir = "#{File.dirname(File.dirname(__FILE__))}/lib"
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
-
 require 'optparse'
 
-server = nil
+begin
+  require 'thin'
+  server = 'thin'
+rescue LoadError
+  server = nil
+end
+
 env = ENV['RACK_ENV'] || 'development'
 browse = false
-options = {:Port => 9393, :Host => 'localhost', :AccessLog => []}
+options = {:Port => 9393, :Host => 'localhost', :AccessLog => [], :Path => '/'}
 
 opts = OptionParser.new("", 24, '  ') { |opts|
   opts.banner = "Usage: shotgun [ruby options] [rack options] [rackup config]"
@@ -60,6 +63,10 @@ opts = OptionParser.new("", 24, '  ') { |opts|
   opts.separator ""
   opts.separator "Shotgun options:"
 
+  opts.on("-u", "--url URL", "specify url path (default: /)") { |url|
+    options[:Path] = url
+  }
+
   opts.on("-O", "--browse", "open browser immediately after starting") { |browse|
     browse = true
   }
@@ -127,10 +134,10 @@ require 'shotgun'
 app = Shotgun.new(config, app_wrapper)
 
 server.run app, options do |inst|
-  puts "== Shotgun starting #{server.to_s} on #{options[:Host]}:#{options[:Port]}"
+  puts "== Shotgun starting #{server.to_s} on http://#{options[:Host]}:#{options[:Port]}"
 
   if browse
     require 'launchy'
-    Launchy.open("http://#{options[:Host]}:#{options[:Port]}/")
+    Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}")
   end
 end

data/lib/shotgun.rb

@@ -9,6 +9,7 @@ class Shotgun
   def initialize(rackup_file, wrapper=nil)
     @rackup_file = rackup_file
     @wrapper = wrapper || lambda { |inner_app| inner_app }
+    enable_copy_on_write
   end
 
   def call(env)
@@ -19,27 +20,21 @@ class Shotgun
     @env = env
     @reader, @writer = IO.pipe
 
-    # Disable GC before forking in an attempt to get some advantage
-    # out of COW.
-    GC.disable
-
-    if fork
+    if @child = fork
       proceed_as_parent
     else
       proceed_as_child
     end
-
-  ensure
-    GC.enable
   end
 
   # ==== Stuff that happens in the parent process
 
   def proceed_as_parent
+    rand # Reseeds 
     @writer.close
     result = Marshal.load(@reader)
     @reader.close
-    Process.wait
+    Process.wait(@child)
     if result.length == 3
       result
     else
@@ -96,4 +91,8 @@ class Shotgun
     body.each { |part| buf << part }
     buf
   end
+
+  def enable_copy_on_write
+    GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+  end
 end

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.4'
-  s.date = '2009-03-22'
+  s.version = '0.5'
+  s.date = '2010-01-16'
 
   s.description = "Because reloading sucks."
   s.summary     = s.description
@@ -29,6 +29,5 @@ Gem::Specification.new do |s|
 
   s.homepage = "http://github.com/rtomayko/shotgun/"
   s.require_paths = %w[lib]
-  s.rubyforge_project = 'wink'
   s.rubygems_version = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shotgun
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2010-01-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,8 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: wink
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Because reloading sucks.