sauce 0.11.0 → 0.11.1

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

data/generators/sauce/sauce_generator.rb

@@ -5,7 +5,7 @@ class SauceGenerator < Rails::Generator::Base
   def initialize(runtime_args, runtime_options = {})
     config = Sauce::Config.new
     if config.username.nil? || config.access_key.nil?
-      if runtime_args.size < 2
+      if runtime_args.size != 2
         raise "Usage: #{$0} sauce <USERNAME> <ACCESS_KEY>"
       else
         system("sauce config #{runtime_args[0]} #{runtime_args[1]}")

data/lib/sauce/utilities.rb

@@ -28,15 +28,7 @@ module Sauce
 
     def with_rails_server
       STDERR.puts "Starting Rails server on port 3001..."
-      server = IO.popen("script/server RAILS_ENV=test --port 3001 2>&1")
-      pid = nil
-      Thread.new do
-        while (line = server.gets)
-          if line =~ /pid=(.*) /
-            pid = $1.to_i
-          end
-        end
-      end
+      server = IO.popen("ruby script/server RAILS_ENV=test --port 3001 --daemon")
 
       silence_stream(STDOUT) do
         TCPSocket.wait_for_service(:host => "127.0.0.1", :port => 3001)
@@ -45,7 +37,12 @@ module Sauce
       begin
         yield
       ensure
-        Process.kill("INT", pid)
+        begin
+          pid = IO.read(File.join('tmp', 'pids', 'server.pid')).to_i
+          Process.kill("INT", pid)
+        rescue
+          STDERR.puts "Rails server could not be killed. Is the pid in #{File.join('tmp', 'pids', 'server.pid')}?"
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Sean Grove
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -07:00
+date: 2010-11-19 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency