sauce 3.1.1 → 3.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ0M2MyYTcxZmQ5MjZhZDcxMTM5ZWNhMDc0YWE5ZDJhYzE1ZDk5ZA==
+    Y2U0MmM0ZDc3ZDU3ZjIyYTlkYzQ4MzAyM2YxMzgzNmI2MWZjZGZmOA==
   data.tar.gz: !binary |-
-    OTAxN2EzZDk5NzMwMTczYWQ1ZWU1ZTE4ZWIxMThiYTFmZTBhY2FmZQ==
+    ZDAyMzRiOWZkZDVlYjQzOTE1NmM0YWZhODMxYzFiYTYyNDY3YWRiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2U5NmI1N2FmNWQ4NDQ3ZGE5M2EwMzA0YWQ0OWZkM2Y3MmQwNzRlOTczNjg0
-    NGNjMzZlNWNmYmI3YmYwNTQwNGJlMTM1MDFlZWEwZjMyMmNhNzM5ZGFkNzli
-    NzM2MDAzZTkyOGY3ZjFjY2UwZmQ4NjU2NDUzZGJlZDQzNmFkMWY=
+    YjA4MGU4ZWU5MGEwZmZkOWI2YmNmMjQ5YjZlYTVlZjhmZTMxMDY3M2NjZGI5
+    NDA2YjNlOTA5NWZmYTFmM2NhZjJlOTdkY2ViOTk4YTRmMmU3NDhjMDBkYWU5
+    MDU2M2Q3MzUwMjNjZGVjNzZiNzc2ZDRlZWViMjViMTI3MzhiMTQ=
   data.tar.gz: !binary |-
-    YzAxZTlhMTE1ZDQ4M2RjNmRlYzg1OGNiYjNhOGIzM2FjNmQ3YjdiMjdjNmNk
-    Njk3MmRiY2U0MThlNDljM2Q0NzI4YmZlNzUwNmQ5MWM5YzcwOWU2OWZmNTlj
-    NGY3MmI3N2U1NDllZDYzZmIzYzZhNWM0MDhhZjIxM2M2ZjI2ODA=
+    NDA2ZmFmMTE3ZmFjZTU0ZGFhNDdmMTYzYjRjMTdlNTMwNzFmZTJhMDY5ZjQ4
+    MTcxODlkNzM5YTdjNDRkYTM4YTczYWRlMjYwODY5MjJjODEzNWE1NzFkNTJh
+    NTg1ZDVhNDhkZmVkMzBjNzBiYmZhYzI0NzYxN2ExZTgxYmRkYTg=

data/lib/sauce/utilities.rb

@@ -1,10 +1,9 @@
 require 'timeout'
 require 'socket'
-require 'childprocess'
 require 'net/http'
-require 'childprocess/process'
 require 'sauce/parallel'
 require 'sauce/utilities/rails_server'
+require 'sauce/utilities/connect'
 
 module Sauce
   module Utilities
@@ -39,40 +38,5 @@ module Sauce
 If you are using Capybara and are seeing this message, check the Capybara README for information on how to include the Capybara DSL in your tests.
       MESSAGE
     end
-
-
-    class Connect
-      def self.start(options={})
-        begin
-          require "sauce/connect"
-        rescue LoadError => e
-          STDERR.puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
-          exit(1)
-        end
-
-        if ParallelTests.first_process?
-          unless @tunnel
-            @tunnel = Sauce::Connect.new options
-            @tunnel.connect
-            @tunnel.wait_until_ready
-          end
-          @tunnel
-        else
-          while not File.exist? "sauce_connect.ready"
-            sleep 0.5
-          end
-        end
-      end
-
-      def self.close
-        if @tunnel
-          if ParallelTests.first_process?
-            ParallelTests.wait_for_other_processes_to_finish
-            @tunnel.disconnect
-            @tunnel = nil
-          end
-        end
-      end
-    end
   end
 end

data/lib/sauce/utilities/connect.rb

@@ -0,0 +1,37 @@
+module Sauce
+  module Utilities
+    class Connect
+      def self.start(options={})
+        begin
+          require "sauce/connect"
+        rescue LoadError => e
+          STDERR.puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
+          exit(1)
+        end
+
+        if ParallelTests.first_process?
+          unless @tunnel
+            @tunnel = Sauce::Connect.new options
+            @tunnel.connect
+            @tunnel.wait_until_ready
+          end
+          @tunnel
+        else
+          while not File.exist? "sauce_connect.ready"
+            sleep 0.5
+          end
+        end
+      end
+
+      def self.close
+        if @tunnel
+          if ParallelTests.first_process?
+            ParallelTests.wait_for_other_processes_to_finish
+            @tunnel.disconnect
+            @tunnel = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sauce/utilities/rails_server.rb

@@ -1,3 +1,6 @@
+require 'childprocess'
+require 'childprocess/process'
+
 module Sauce
   module Utilities
     class RailsServer

data/lib/sauce/version.rb

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

data/lib/tasks/parallel_testing.rb

@@ -4,25 +4,42 @@ require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
 
 namespace :sauce do
-  task :spec, :files, :concurrencies do |t, args|
+  task :spec, :files, :concurrencies, :rspec_opts do |t, args|
     ::RSpec::Core::Runner.disable_autorun!
 
     args.with_defaults({
       :concurrencies => [Sauce::TestBroker.concurrencies, 20].min,
-      :files => "spec"
+      :files => "spec",
+      :rspec_opts => "-t sauce"
     })
-    ParallelTests::CLI.new.run(["--type", "saucerspec",
-                                "-n", "#{args[:concurrencies]}",
-                                "#{args[:files]}"])
+
+    parallel_arguments = [
+      "--type", "saucerspec",
+      "-n", "#{args[:concurrencies]}"
+    ]
+
+    unless args[:rspec_opts].nil?
+      parallel_arguments.push "-o"
+      parallel_arguments.push args[:rspec_opts]
+    end
+
+    parallel_arguments.push args[:files]
+    ParallelTests::CLI.new.run(parallel_arguments)
   end
 
-  task :features, :files, :concurrency  do |t, args|
+  task :features, :files, :concurrencies  do |t, args|
     args.with_defaults({
       :concurrency => [Sauce::TestBroker.concurrencies, 20].min,
       :files => "features"
     })
-    ParallelTests::CLI.new.run(["--type", "saucecucumber", args[:files],
-                                  "-n", args[:concurrency].to_s])
+
+    parallel_arguments = [
+      "--type", "saucecucumber",
+      "-n", args[:concurrencies].to_s,
+      args[:files]
+    ]
+
+    ParallelTests::CLI.new.run(parallel_arguments)
   end
 
   namespace :install do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-09 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/connect.rb
 - lib/sauce/utilities/rails_server.rb
 - lib/sauce/utilities/rake.rb
 - lib/sauce/utilities.rb