sauce 3.0.6 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZiODQxZGRmYzBlM2RhN2YwZDc5NGI3OTc0NjliYWM2NGUyMjE4Mw==
+    NGVlZTUyYjMyZDk4MzQ3N2RjMzVkYWM2MmJkYzE5OTRlZjI5YTkxYQ==
   data.tar.gz: !binary |-
-    OGZjOTMxOTJiN2U0MjM2YjIyNjUxNTI5MDEyNjJkOGUzZTY5YjcxNg==
+    YjkzOTE0Mjk5YjgzOGM4ODY3YTc2M2U5ZmY4Zjg4NGMwODkwMzg4OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGM4M2QwYWYzNTZiZGUyNzA1OTc3MmU2YWEyNjg2MDAwNWJmYzNmNTAwZGJm
-    MTRiZWNiMzgwYzQ2YzliYWE4NjNkZjM4ODAzMjNhYzBiZWU5MDUzNjcxNmQ5
-    MTM4ODE3MzBhYTU3YzdmMmJkNWQ2NmU2MzM3MmQ2MDVlMTU0ZWE=
+    YzBkNjgwODU5NDJiMTI1OWMwMjUyYjE1N2M1ZjVjODI5N2JjMDExY2FmMDQy
+    ZTljMjJiNWYwZDk5NTVhNjdlYzliN2IyYjU2OGRjODE1YWQwZDNmMTA0MDc2
+    NWQ4MzM2MjgzMDk5OGQ5YmY0M2Y2ZjI5ZmJmNzUxNThiMWQxNzI=
   data.tar.gz: !binary |-
-    YmZlNGNmNWViNTVhN2NlZTUwZDZkNTUxODM2MTUyMzI5MDhkZDI5NWE3OThk
-    MGU4MjMzNDc3YTZlMGRkYmE5MmMyZDFiNDQ0Nzg3MmZjOThjMDkzOTIzNDRm
-    ODRkNWFiNGM4OGEyNzA2NGMyZDUxOWVkOTI4NmZkM2JmMTU5MDM=
+    NzBjM2I0MDMxN2RkMzk1ZmZkNThkYTg3ODc1ZGE0YjU0ODBkYmNlOGRmOTA3
+    M2QwZWNjOWU2YjdiYzIwYTgwY2Q1NDgxOTlmNDk3OWY5NTFiOWY1MDcwZTU4
+    ODMzMzVkM2I1NDY1OTk4YmRlOWJhZTQxYjM4YTY3N2UzMjlkODg=

data/lib/sauce/capybara.rb

@@ -114,7 +114,6 @@ module Sauce
       def render(path)
         browser.save_screenshot path
       end
-
     end
   end
 end
@@ -130,3 +129,23 @@ module Capybara
     @javascript_driver || :sauce
   end
 end
+
+begin
+  require "rspec/core"
+  module Sauce
+    module RSpec
+      module SeleniumExampleGroup
+        ::RSpec.configuration.before(:suite, :sauce => true) do
+          ::Capybara.configure do |config|
+            host = Sauce::Config.new[:application_host] || "127.0.0.1"
+            port = Sauce::Config.new[:application_port]
+            config.app_host = "http://#{host}:#{port}"
+            config.run_server = false
+          end
+        end
+      end
+    end
+  end
+rescue LoadError => e
+  # User is not using RSpec
+end

data/lib/sauce/config.rb

@@ -39,6 +39,14 @@ module Sauce
         ]
     }
 
+    POTENTIAL_PORTS = [
+        3000, 3001, 3030, 3210, 3333, 4000, 4001, 4040, 4321, 4502, 4503, 5000,
+        5001, 5050, 5555, 5432, 6000, 6001, 6060, 6666, 6543, 7000, 7070, 7774,
+        7777, 8000, 8001, 8003, 8031, 8080, 8081, 8765, 8888, 9000, 9001, 9080,
+        9090, 9876, 9999, 49221, 55001, 80, 443, 888, 2000, 2001, 2020, 2109,
+        2222, 2310
+    ]
+
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME
         SAUCE_ACCESS_KEY SAUCE_OS SAUCE_BROWSER SAUCE_BROWSER_VERSION SAUCE_JOB_NAME
         SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL
@@ -60,12 +68,18 @@ module Sauce
         selenium-version command-timeout prerun prerun-args screen-resolution
         disable-popup-handler avoid-proxy public}
 
+    def self.get_application_port
+      port_index = ENV["TEST_ENV_NUMBER"].to_i
+      return POTENTIAL_PORTS[port_index]
+    end
+
     def initialize(opts={})
       @opts = {}
       @undefaulted_opts = {}
       if opts != false
         @opts.merge! DEFAULT_OPTIONS
         @opts.merge! DEFAULT_BROWSERS
+        @opts.merge!({:application_port => Sauce::Config.get_application_port})
 
         @undefaulted_opts.merge! load_options_from_yaml
         @undefaulted_opts.merge! load_options_from_environment

data/lib/sauce/rspec.rb

@@ -19,7 +19,7 @@ begin
           config = Sauce::Config.new
           if @@need_tunnel
             if config[:application_host]
-              Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
+              Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port])
             end
             if config[:start_local_application] &&
               Sauce::Utilities::RailsServer.is_rails_app?
@@ -105,16 +105,13 @@ begin
 
           config = Sauce::Config.new
           if config[:application_host]
-            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80, :quiet => true)
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port], :quiet => true)
           end
 
           if config[:start_local_application] &&
             Sauce::Utilities::RailsServer.is_rails_app?
-            # Start the app before the tests if this is a parallel run
-            if ENV["TEST_ENV_NUMBER"].nil?
               @@server = Sauce::Utilities::RailsServer.new
               @@server.start
-            end
           end
         end
 
@@ -128,16 +125,14 @@ begin
           end
 
           if need_tunnel || config[:start_tunnel]
-            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80, :quiet => true)
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port], :quiet => true)
           end
 
           if config[:start_local_application] &&
             files_to_run.any? {|file| file =~ /spec\/selenium\//} &&
             Sauce::Utilities::RailsServer.is_rails_app?
-            ## Only open the tunnel once.
-            ## TODO:  Why is this here?  It's above, also
-            @@server = Sauce::Utilities::RailsServer.new
-            @@server.start
+              @@server = Sauce::Utilities::RailsServer.new
+              @@server.start
           end
         end
         ::RSpec.configuration.after :suite do

data/lib/sauce/utilities.rb

@@ -4,6 +4,7 @@ require 'childprocess'
 require 'net/http'
 require 'childprocess/process'
 require 'sauce/parallel'
+require 'sauce/utilities/rails_server'
 
 module Sauce
   module Utilities
@@ -73,56 +74,5 @@ If you are using Capybara and are seeing this message, check the Capybara README
         end
       end
     end
-
-    class RailsServer
-      include Sauce::Utilities
-
-      def self.is_rails_app?
-        File.exists?('script/server') || File.exists?('script/rails')
-      end
-
-      def start
-        port = 3001
-
-        if ENV["TEST_ENV_NUMBER"]
-          @test_env = ENV["TEST_ENV_NUMBER"].to_i
-          port = port + @test_env
-        end
-
-        STDERR.puts "Starting Rails server on port #{port}..."
-
-        if File.exists?('script/server')
-          @process_args = ["ruby", "script/server", "-e", "test", "--port", "#{port}"]
-          #@server = ChildProcess.build("ruby", "script/server", "-e", "test", "--port", "#{port}")
-        elsif File.exists?('script/rails')
-          @process_args = ["bundle", "exec", "rails", "server", "-e", "test", "--port", "#{port}"]
-          #@server = ChildProcess.build("bundle", "exec", "rails", "server", "-e", "test", "--port", "#{port}")
-        end
-
-        if @test_env
-          @process_args.push *["--pid", "#{Dir.pwd}/tmp/pids/server-#{@test_env}"]
-        end
-
-        @server = ChildProcess.build *@process_args
-        @server.io.inherit!
-        @server.start
-
-        wait_for_server_on_port(port)
-
-        at_exit do
-          @server.stop(3, "INT")
-        end
-        STDERR.puts "Rails server running!"
-      end
-
-      def stop
-        begin
-          @server.stop(3, "INT")
-        rescue
-          STDERR.puts "Rails server could not be killed. Did it fail to start?"
-        end
-      end
-    end
-
   end
 end

data/lib/sauce/utilities/rails_server.rb

@@ -0,0 +1,81 @@
+module Sauce
+  module Utilities
+    class RailsServer
+      include Sauce::Utilities
+
+      def self.is_rails_app?
+        return !major_version.nil?
+      end
+
+      def self.major_version
+        paths = ["script/server", "script/rails", "bin/rails"]
+        startup_script = paths.detect {|path| File.exists? path}
+
+        case startup_script
+          when 'script/server'
+            return 2
+          when 'script/rails'
+            return 3
+          when 'bin/rails'
+            return 4
+          else
+            return nil
+        end
+      end
+
+      def self.process_arguments
+        case major_version
+          when 2
+            ["ruby", "script/server"]
+          else
+            ["bundle", "exec", "rails", "server"]
+        end
+      end
+
+      def self.server_pool
+        @@server_pool ||= {}
+      end
+
+      attr_reader :port
+
+      def start
+        @port = Sauce::Config.new[:application_port]
+
+        if ENV["TEST_ENV_NUMBER"]
+          @test_env = ENV["TEST_ENV_NUMBER"].to_i
+        end
+
+        STDERR.puts "Starting Rails server on port #{@port}..."
+
+        @process_args = RailsServer.process_arguments
+        @process_args.push *["-e", "test", "--port", "#{@port}"]
+
+        if @test_env
+          @process_args.push *["--pid", "#{Dir.pwd}/tmp/pids/server-#{@test_env}"]
+        end
+
+        @server = ChildProcess.build *@process_args
+        @server.io.inherit!
+        @server.start
+
+        wait_for_server_on_port(@port)
+
+        at_exit do
+          @server.stop(3, "INT")
+          RailsServer.server_pool.delete Thread.current.object_id
+        end
+        STDERR.puts "Rails server running!"
+
+        RailsServer.server_pool[Thread.current.object_id] = @server
+      end
+
+      def stop
+        begin
+          @server.stop(3, "INT")
+        rescue
+          STDERR.puts "Rails server could not be killed. Did it fail to start?"
+        end
+      end
+    end
+  end
+end

data/lib/sauce/version.rb

@@ -1,6 +1,6 @@
 module Sauce
-  MAJOR_VERSION = '3.0'
-  PATCH_VERSION = '6'
+  MAJOR_VERSION = '3.1'
+  PATCH_VERSION = '0'
 
   def version
     "#{MAJOR_VERSION}.#{PATCH_VERSION}"

data/spec/sauce/capybara_spec.rb

@@ -289,7 +289,6 @@ describe Sauce::Capybara do
         end
       end
     end
-
   end
 
   describe '#install_hooks' do

data/spec/sauce/utilities/rails_server_spec.rb

@@ -0,0 +1,95 @@
+require "spec_helper"
+
+describe "Sauce::Utilities::RailsServer" do
+  let (:server) {Sauce::Utilities::RailsServer.new}
+
+  context "With a Rails 4 app" do
+    before (:each) do
+      File.stub(:exists?).and_return false
+      File.stub(:exists?).with("bin/rails").and_return true
+    end
+
+    describe "#is_rails_app?" do
+      it "should be true" do
+        Sauce::Utilities::RailsServer.is_rails_app?.should be_true
+      end
+    end
+
+    describe "#major_version" do
+      it "should be 4" do
+        Sauce::Utilities::RailsServer.major_version.should eq 4
+      end
+    end
+
+    describe "#process_arguments" do
+      it "returns bundle exec rails server" do
+        expected_args = %w{bundle exec rails server}
+        Sauce::Utilities::RailsServer.process_arguments.should eq expected_args
+      end
+    end
+  end
+
+  context "With a Rails 3 app" do
+    before (:each) do
+      File.stub(:exists?).and_return false
+      File.stub(:exists?).with("script/rails").and_return true
+    end
+
+    describe "#is_rails_app?" do
+      it "should be true" do
+        Sauce::Utilities::RailsServer.is_rails_app?.should be_true
+      end
+    end
+
+    describe "#major_version" do
+      it "should be 3" do
+        Sauce::Utilities::RailsServer.major_version.should eq 3
+      end
+    end
+
+    describe "#process_arguments" do
+      it "returns bundle exec rails server" do
+        expected_args = %w{bundle exec rails server}
+        Sauce::Utilities::RailsServer.process_arguments.should eq expected_args
+      end
+    end
+  end
+
+  context "Without a Rails app" do
+    before (:each) do
+      File.stub(:exists?).and_return false
+    end
+
+    describe "#is_rails_app?" do
+      it "should be false" do
+        Sauce::Utilities::RailsServer.is_rails_app?.should be_false
+      end
+    end
+  end
+
+  context "With a Rails 4 app" do
+    before (:each) do
+      File.stub(:exists?).and_return false
+      File.stub(:exists?).with("bin/rails").and_return true
+    end
+
+    describe "#is_rails_app?" do
+      it "should be true" do
+        Sauce::Utilities::RailsServer.is_rails_app?.should be_true
+      end
+    end
+
+    describe "#major_version" do
+      it "should be 4" do
+        Sauce::Utilities::RailsServer.major_version.should eq 4
+      end
+    end
+
+    describe "#process_arguments" do
+      it "returns bundle exec rails server" do
+        expected_args = %w{bundle exec rails server}
+        Sauce::Utilities::RailsServer.process_arguments.should eq expected_args
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -237,6 +237,7 @@ files:
 - lib/sauce/rspec.rb
 - lib/sauce/selenium.rb
 - lib/sauce/test_unit.rb
+- lib/sauce/utilities/rails_server.rb
 - lib/sauce/utilities/rake.rb
 - lib/sauce/utilities.rb
 - lib/sauce/version.rb
@@ -265,6 +266,7 @@ files:
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
+- spec/sauce/utilities/rails_server_spec.rb
 - spec/sauce/utilities/rake_spec.rb
 - spec/sauce/utilities/utilities_spec.rb
 - spec/sauce_helper.rb
@@ -317,6 +319,7 @@ test_files:
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
+- spec/sauce/utilities/rails_server_spec.rb
 - spec/sauce/utilities/rake_spec.rb
 - spec/sauce/utilities/utilities_spec.rb
 - spec/sauce_helper.rb