sauce 0.13.2 → 0.14.0

data/VERSION

@@ -1 +1 @@
-0.13.2
+0.14.0

data/lib/sauce.rb

@@ -7,3 +7,28 @@ require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/integrations'
 require 'sauce/connect'
+
+module Sauce
+  @@cached_sessions = {}
+
+  def self.cached_session(opts)
+    @@cached_sessions[opts] or new_session(opts)
+  end
+
+  private
+
+  def self.new_session(opts)
+    session = nil
+    if Sauce::Config.new.local?
+      session = ::Selenium::Client::Driver.new(opts)
+    else
+      session = Sauce::Selenium.new(opts)
+    end
+    at_exit do
+      session.stop
+    end
+    session.start
+    @@cached_sessions[opts] = session
+    return session
+  end
+end

data/lib/sauce/config.rb

@@ -45,6 +45,8 @@ module Sauce
       if meth.to_s =~ /(.*)=$/
         @opts[$1.to_sym] = args[0]
         return args[0]
+      elsif meth.to_s =~ /(.*)\?$/
+        return @opts[$1.to_sym]
       else
         return @opts[meth]
       end

data/lib/sauce/integrations.rb

@@ -232,29 +232,40 @@ if defined?(ActiveSupport::TestCase)
         unless my_name =~ /^default_test/
           config = Sauce::Config.new
           config.browsers.each do |os, browser, version|
-            if config.local?
-              @browser = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
-                                                         :port => 4444,
-                                                         :browser => "*" + browser,
-                                                         :url => "http://127.0.0.1:#{config.local_application_port}/")
+            if config.single_session?
+              if config.local?
+                @browser = Sauce.cached_session(:host => "127.0.0.1", :port => 4444, :browser => "*" +
+                                                browser, :url => "http://127.0.0.1:#{config.local_application_port}/")
+              else
+                @browser = Sauce.cached_session({:os => os, :browser => browser, :browser_version => version,
+                  :job_name => "#{Rails.root.split[1].to_s} test suite"})
+              end
+              super(*args, &blk)
             else
-              @browser = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
-                :job_name => "#{my_name}"})
+              if config.local?
+                @browser = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
+                                                           :port => 4444,
+                                                           :browser => "*" + browser,
+                                                           :url => "http://127.0.0.1:#{config.local_application_port}/")
+              else
+                @browser = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
+                  :job_name => "#{my_name}"})
+              end
+              @browser.start
+              super(*args, &blk)
+              @browser.stop
             end
-            @browser.start
-            super(*args, &blk)
-            @browser.stop
           end
         end
       end
-
-      # Placeholder so test/unit ignores test cases without any tests.
-      def default_test
-      end
     end
 
     class RailsTestCase < ::ActiveSupport::TestCase
       include SeleniumForTestUnit
+
+      # Placeholder so test/unit ignores test cases without any tests.
+      def default_test
+      end
     end
   end
 end

data/lib/sauce/raketasks.rb

@@ -34,7 +34,8 @@ if defined?(Spec::Rake::SpecTask)
       desc "" # Hide it from rake -T
       Spec::Rake::SpecTask.new :runtests do |t|
         t.spec_opts = ['--options', "\"#{Rails.root.join('spec', 'spec.opts')}\""]
-        t.spec_files = FileList["spec/selenium/**/*_spec.rb"]
+        spec_glob = ENV["SAUCE_SPEC_GLOB"] || "spec/selenium/**/*_spec.rb"
+        t.spec_files = FileList[spec_glob]
       end
     end
 
@@ -70,7 +71,8 @@ if defined?(RSpec::Core::RakeTask)
 
       desc "" # Hide it from rake -T
       RSpec::Core::RakeTask.new :runtests do |t|
-        t.pattern = "spec/selenium/**/*_spec.rb"
+        spec_glob = ENV["SAUCE_SPEC_GLOB"] || "spec/selenium/**/*_spec.rb"
+        t.pattern = spec_glob
       end
     end
 
@@ -98,7 +100,8 @@ namespace :test do
 
     Rake::TestTask.new(:runtests) do |t|
       t.libs << "test"
-      t.pattern = 'test/selenium/**/*_test.rb'
+      test_glob = ENV["SAUCE_TEST_GLOB"] || "test/selenium/**/*_test.rb"
+      t.pattern = test_glob
       t.verbose = true
     end
     # Hide it from rake -T

data/lib/sauce/selenium.rb

@@ -4,9 +4,8 @@ module Sauce
   class Selenium < Selenium::Client::Driver
     def initialize(opts={})
       @config = Sauce::Config.new(opts)
-      opts.merge!({:host => @config.host, :port => @config.port,
-           :browser => @config.to_browser_string, :url => @config.browser_url})
-      super(opts)
+      super(opts.merge({:host => @config.host, :port => @config.port,
+           :browser => @config.to_browser_string, :url => @config.browser_url}))
     end
   end
 end

data/lib/sauce/utilities.rb

@@ -50,7 +50,7 @@ module Sauce
     def with_rails_server
       STDERR.puts "Starting Rails server on port 3001..."
       if File.exists?('script/server')
-        server = IO.popen("ruby script/server RAILS_ENV=test --port 3001 --daemon")
+        server = IO.popen("ruby script/server -e test --port 3001 --daemon")
       elsif File.exists?('script/rails')
         server = IO.popen("script/rails server -p 3001 -e test")
       end

data/sauce.gemspec

@@ -0,0 +1,124 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sauce}
+  s.version = "0.14.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sean Grove", "Eric Allen", "Steven Hazel"]
+  s.date = %q{2011-01-24}
+  s.default_executable = %q{sauce}
+  s.description = %q{A Ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc.}
+  s.email = %q{help@saucelabs.com}
+  s.executables = ["sauce"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bin/sauce",
+    "examples/helper.rb",
+    "examples/other_spec.rb",
+    "examples/saucelabs_spec.rb",
+    "examples/test_saucelabs.rb",
+    "examples/test_saucelabs2.rb",
+    "generators/sauce/sauce_generator.rb",
+    "generators/sauce/templates/sauce.rake",
+    "lib/generators/sauce_generator.rb",
+    "lib/generators/templates/sauce.rake",
+    "lib/sauce.rb",
+    "lib/sauce/client.rb",
+    "lib/sauce/config.rb",
+    "lib/sauce/connect.rb",
+    "lib/sauce/gateway_ext.rb",
+    "lib/sauce/heroku.rb",
+    "lib/sauce/integrations.rb",
+    "lib/sauce/job.rb",
+    "lib/sauce/raketasks.rb",
+    "lib/sauce/selenium.rb",
+    "lib/sauce/tunnel.rb",
+    "lib/sauce/utilities.rb",
+    "sauce.gemspec",
+    "support/sauce_connect",
+    "support/selenium-server.jar",
+    "support/simplejson/LICENSE.txt",
+    "support/simplejson/__init__.py",
+    "support/simplejson/decoder.py",
+    "support/simplejson/encoder.py",
+    "support/simplejson/ordered_dict.py",
+    "support/simplejson/scanner.py",
+    "support/simplejson/tool.py",
+    "test/api/test_jobs.rb",
+    "test/api/test_tunnels.rb",
+    "test/helper.rb",
+    "test/test_config.rb",
+    "test/test_connect.rb",
+    "test/test_selenium.rb"
+  ]
+  s.homepage = %q{http://github.com/saucelabs/sauce}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Ruby access to Sauce Labs' features}
+  s.test_files = [
+    "examples/helper.rb",
+    "examples/other_spec.rb",
+    "examples/saucelabs_spec.rb",
+    "examples/test_saucelabs.rb",
+    "examples/test_saucelabs2.rb",
+    "test/api/test_jobs.rb",
+    "test/api/test_tunnels.rb",
+    "test/helper.rb",
+    "test/integrations/test_rails2.rb",
+    "test/test_config.rb",
+    "test/test_connect.rb",
+    "test/test_selenium.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 0"])
+      s.add_runtime_dependency(%q<selenium-webdriver>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<childprocess>, [">= 0.1.6"])
+      s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.5.0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<net-ssh>, [">= 0"])
+      s.add_dependency(%q<net-ssh-gateway>, [">= 0"])
+      s.add_dependency(%q<selenium-webdriver>, [">= 0.1.2"])
+      s.add_dependency(%q<childprocess>, [">= 0.1.6"])
+      s.add_dependency(%q<json>, [">= 1.2.0"])
+      s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
+      s.add_dependency(%q<highline>, [">= 1.5.0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<net-ssh>, [">= 0"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 0"])
+    s.add_dependency(%q<selenium-webdriver>, [">= 0.1.2"])
+    s.add_dependency(%q<childprocess>, [">= 0.1.6"])
+    s.add_dependency(%q<json>, [">= 1.2.0"])
+    s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
+    s.add_dependency(%q<highline>, [">= 1.5.0"])
+  end
+end
+

data/test/integrations/test_rails2.rb

@@ -10,7 +10,8 @@ class TestRails2Integration < Test::Unit::TestCase
     puts @dir
   end
 
-  def test_foo
+  def test_ruby18
+
   end
 
   def teardown

data/test/test_config.rb

@@ -44,6 +44,12 @@ class TestConfig < Test::Unit::TestCase
 
       assert_equal [["A", "B", "C"]], config.browsers
     end
+
+    should "Let you set and query boolean flags" do
+      config = Sauce::Config.new
+      config.foo = true
+      assert config.foo?
+    end
   end
 
   context "The Sauce.config method" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
+  hash: 39
+  prerelease: 
   segments: 
   - 0
-  - 13
-  - 2
-  version: 0.13.2
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Sean Grove
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,6 +209,7 @@ files:
 - lib/sauce/selenium.rb
 - lib/sauce/tunnel.rb
 - lib/sauce/utilities.rb
+- sauce.gemspec
 - support/sauce_connect
 - support/selenium-server.jar
 - support/simplejson/LICENSE.txt
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ruby access to Sauce Labs' features