shotgun 0.5 → 0.6

data/Rakefile

@@ -5,38 +5,39 @@ task :default => [:test]
 task :spec => :test
 
 Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/spec_*.rb']
+  t.test_files = FileList['test/*_test.rb']
   t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-require 'rubygems'
-$spec = eval(File.read('shotgun.gemspec'))
-
-def package(ext='')
-  "pkg/#{$spec.name}-#{$spec.version}" + ext
-end
-
-desc 'Build packages'
-task :package => %w[.gem .tar.gz].map { |e| package(e) }
-
-desc 'Build and install as local gem'
-task :install => package('.gem') do
-  sh "gem install #{package('.gem')}"
-end
-
-directory 'pkg/'
-CLOBBER.include('pkg')
-
-file package('.gem') => %W[pkg/ #{$spec.name}.gemspec] + $spec.files do |f|
-  sh "gem build #{$spec.name}.gemspec"
-  mv File.basename(f.name), f.name
-end
-
-file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
-  sh <<-SH
-    git archive \
-      --prefix=#{$spec.name}-#{$spec.version}/ \
-      --format=tar \
-      HEAD | gzip > #{f.name}
-  SH
+if defined? Gem
+  $spec = eval(File.read('shotgun.gemspec'))
+
+  def package(ext='')
+    "pkg/#{$spec.name}-#{$spec.version}#{ext}"
+  end
+
+  desc 'Build packages'
+  task :package => %w[.gem .tar.gz].map { |ext| package(ext) }
+
+  desc 'Build and install as local gem'
+  task :install => package('.gem') do
+    sh "gem install #{package('.gem')}"
+  end
+
+  directory 'pkg/'
+  CLOBBER.include('pkg')
+
+  file package('.gem') => %w[pkg/ shotgun.gemspec] + $spec.files do |f|
+    sh "gem build shotgun.gemspec"
+    mv File.basename(f.name), f.name
+  end
+
+  file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
+    sh <<-SH
+      git archive \
+        --prefix=shotgun-#{$spec.version}/ \
+        --format=tar \
+        HEAD | gzip > #{f.name}
+    SH
+  end
 end

data/bin/shotgun

@@ -130,14 +130,25 @@ app_wrapper =
 
 ENV['RACK_ENV'] = env
 
+# use the BROWSER environment variable or fall back to a more or less standard
+# set of commands
+ENV['BROWSER'] ||=
+  %w[open xdg-open x-www-browser firefox opera mozilla netscape].find do |comm|
+    next if comm == 'open' && `uname` !~ /Darwin/
+    ENV['PATH'].split(':').any? { |dir| File.executable?("#{dir}/#{comm}") }
+  end
+
 require 'shotgun'
 app = Shotgun.new(config, app_wrapper)
 
+base_url = "http://#{options[:Host]}:#{options[:Port]}"
+puts "== Shotgun starting #{server.to_s} at #{base_url}"
 server.run app, options do |inst|
-  puts "== Shotgun starting #{server.to_s} on http://#{options[:Host]}:#{options[:Port]}"
-
   if browse
-    require 'launchy'
-    Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}")
+    if ENV['BROWSER']
+      system "#{ENV['BROWSER']} '#{base_url}#{options[:Path]}'"
+    else
+      abort "BROWSER environment variable not set and no browser detected"
+    end
   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.5'
-  s.date = '2010-01-16'
+  s.version = '0.6'
+  s.date = '2010-01-28'
 
   s.description = "Because reloading sucks."
   s.summary     = s.description
@@ -19,13 +19,14 @@ Gem::Specification.new do |s|
     shotgun.gemspec
     lib/shotgun.rb
     bin/shotgun
+    test/shotgun_test.rb
+    test/test.ru
   ]
   s.executables = ['shotgun']
-  s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
+  s.test_files = ['test/shotgun_test.rb']
 
   s.extra_rdoc_files = %w[README]
   s.add_dependency 'rack',    '>= 0.9.1'
-  s.add_dependency 'launchy', '>= 0.3.3', '< 1.0'
 
   s.homepage = "http://github.com/rtomayko/shotgun/"
   s.require_paths = %w[lib]

data/test/shotgun_test.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'rack/mock'
+require 'shotgun'
+
+class ShotgunTest < Test::Unit::TestCase
+  def setup
+    @rackup_file = "#{File.dirname(__FILE__)}/test.ru"
+    @shotgun = Shotgun.new(@rackup_file)
+  end
+
+  def test_knows_the_rackup_file
+    assert_equal @rackup_file, @shotgun.rackup_file
+  end
+
+  def test_processes_requests
+    request = Rack::MockRequest.new(@shotgun)
+    res = request.get("/")
+    assert_equal 200, res.status
+    assert_equal "BANG!", res.body
+    assert_equal "text/plain", res.headers['Content-Type']
+  end
+end

data/test/test.ru

@@ -0,0 +1,7 @@
+require 'rack'
+
+app = lambda { |env|
+  [200, {'Content-Type'=>'text/plain'}, ['BANG!']] }
+
+use Rack::ContentLength
+run app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shotgun
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "0.6"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -08:00
+date: 2010-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,19 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     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: 
@@ -50,6 +37,8 @@ files:
 - shotgun.gemspec
 - lib/shotgun.rb
 - bin/shotgun
+- test/shotgun_test.rb
+- test/test.ru
 has_rdoc: true
 homepage: http://github.com/rtomayko/shotgun/
 licenses: []
@@ -78,5 +67,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Because reloading sucks.
-test_files: []
-
+test_files: 
+- test/shotgun_test.rb