sauce 2.2.2 → 2.3.2

data/bin/sauce

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
 require 'cmdparse'
 require 'yaml'
@@ -26,7 +25,12 @@ end
 connect = ConnectCommand.new('connect', false)
 connect.short_desc = 'Connect a Sauce Connect tunnel'
 connect.set_execution_block do |args|
-  require 'sauce/connect'
+  begin
+    require 'sauce/connect'
+  rescue LoadError
+    puts "Please install the sauce-connect gem (`gem install sauce-connect`) in order to use Sauce Connect"
+    exit 1
+  end
   require 'sauce/config'
   config = Sauce::Config.new
   command = "#{Sauce::Connect.connect_command} #{config.username} #{config.access_key} #{ARGV[1 .. -1]}"

data/lib/sauce.rb

@@ -5,4 +5,3 @@ require 'sauce/client'
 require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/integrations'
-require 'sauce/connect'

data/lib/sauce/capybara.rb

@@ -1,7 +1,6 @@
 require 'capybara'
 
 require 'sauce/config'
-require 'sauce/connect'
 require 'sauce/selenium'
 
 
@@ -10,6 +9,13 @@ $sauce_tunnel = nil
 module Sauce
   module Capybara
     def connect_tunnel(options={})
+      begin
+        require 'sauce/connect'
+      rescue LoadError
+        puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
+        raise
+      end
+
       unless $sauce_tunnel.nil?
         return $sauce_tunnel
       end

data/lib/sauce/config.rb

@@ -34,7 +34,7 @@ module Sauce
     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
-        SAUCE_ONDEMAND_BROWSERS}
+        SAUCE_ONDEMAND_BROWSERS SAUCE_USERNAME SAUCE_API_KEY}
 
     PLATFORMS = {
       "Windows 2003" => "WINDOWS",
@@ -237,13 +237,13 @@ module Sauce
       opts[:port] = env['SAUCE_PORT']
       opts[:browser_url] = env['SAUCE_BROWSER_URL']
 
-      opts[:username] = env['SAUCE_USERNAME']
-      opts[:access_key] = env['SAUCE_ACCESS_KEY']
+      opts[:username] = env['SAUCE_USERNAME'] || env['SAUCE_USER_NAME']
+      opts[:access_key] = env['SAUCE_ACCESS_KEY'] || env['SAUCE_API_KEY']
 
       opts[:os] = env['SAUCE_OS']
       opts[:browser] = env['SAUCE_BROWSER']
       opts[:browser_version] = env['SAUCE_BROWSER_VERSION']
-      opts[:job_name] = env['SAUCE_JOB_NAME']
+      opts[:job_name] = env['SAUCE_JOB_NAME'] || env['JOB_NAME']
 
       opts[:firefox_profile_url] = env['SAUCE_FIREFOX_PROFILE_URL']
       opts[:user_extensions_url] = env['SAUCE_USER_EXTENSIONS_URL']

data/lib/sauce/version.rb

@@ -1,4 +1,4 @@
 
 module Sauce
-  MAJOR_VERSION = '2.2'
+  MAJOR_VERSION = '2.3'
 end

data/spec/integration/connect_integration_spec.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'sauce/connect'
+
 
 
 describe 'Sauce::Connect integration testing' do

data/spec/sauce/capybara_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'sauce/capybara'
+require 'sauce/connect'
 
 describe Sauce::Capybara do
   describe '#connect_tunnel' do
@@ -37,6 +38,7 @@ describe Sauce::Capybara do
   end
 
   describe Sauce::Capybara::Driver do
+
     let(:app) { double('Mock App for Driver') }
     let(:driver) { Sauce::Capybara::Driver.new(app) }
 
@@ -60,6 +62,8 @@ describe Sauce::Capybara do
     end
 
     describe '#browser' do
+      let(:driver) { Sauce::Capybara::Driver.new(app) }
+
       before :each do
         # Stub out the selenium driver startup
         Sauce::Selenium2.stub(:new).and_return(nil)
@@ -67,9 +71,7 @@ describe Sauce::Capybara do
       context 'when tunneling is disabled' do
         it 'should not call #connect_tunnel' do
           Sauce::Capybara.should_receive(:connect_tunnel).never
-          Sauce.config do |c|
-            c[:start_tunnel] = false
-          end
+          Sauce.stub(:get_config) {{:start_tunnel => false}}
 
           driver.browser
         end

data/spec/sauce/config_spec.rb

@@ -103,6 +103,25 @@ describe Sauce::Config do
                               'browser' => 'firefox'}
     end
 
+    it 'should create a browser string from the environment set by the jenkins plugin' do
+      ENV['SAUCE_USER_NAME'] = 'test_user'
+      ENV['SAUCE_API_KEY'] = 'test_access'
+      ENV['SAUCE_OS'] = 'Linux'
+      ENV['SAUCE_BROWSER'] = 'firefox'
+      ENV['SAUCE_BROWSER_VERSION'] = '3.'
+      ENV['JOB_NAME'] = 'Named Ruby Job'
+
+      config = Sauce::Config.new
+      browser_data = JSON.parse(config.to_browser_string)
+      browser_data.should == {'name' => 'Named Ruby Job',
+                              'access-key' => 'test_access',
+                              'os' => 'Linux',
+                              'username' => 'test_user',
+                              'browser-version' => '3.',
+                              'browser' => 'firefox'}
+
+    end
+
     it 'should create a browser string from parameters' do
       config = Sauce::Config.new(:username => 'test_user',
                                  :access_key => 'test_access',
@@ -155,6 +174,16 @@ describe Sauce::Config do
   end
 
   describe '#to_desired_capabilities' do
+    context 'with custom sauce options' do
+      context 'max-duration' do
+        subject do
+          Sauce::Config.new(:'max-duration' => 600).to_desired_capabilities
+        end
+
+        it { should have_key :'max-duration' }
+      end
+    end
+
     context 'platforms' do
       it 'should refer to Windows 2003 as WINDOWS' do
         config = Sauce::Config.new(:os => "Windows 2003")
@@ -214,13 +243,17 @@ end
 describe Sauce do
   describe '#get_config' do
     context 'when #config has never been called' do
-      # See: <https://github.com/saucelabs/sauce_ruby/issues/59>
+      # See: <https://github.com/sauce-labs/sauce_ruby/issues/59>
       before :each do
         # This is kind of hack-ish, but the best way I can think to properly
         # prevent this class variable from existing
         Sauce.instance_variable_set(:@cfg, nil)
       end
 
+      after :all do
+
+      end
+
       it 'should return a newly created Sauce::Config' do
         dummy_config = double('Sauce::Config')
         Sauce::Config.should_receive(:new).and_return(dummy_config)

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../gems/sauce-jasmine/lib')
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../gems/sauce-cucumber/lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+['sauce-jasmine', 'sauce-cucumber', 'sauce-connect'].each do |gem|
+  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../gems/#{gem}/lib"))
+end
 
 require 'sauce'
 

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
-- Eric Allen
-- Sean Grove
+- Dylan Lacey
 - Steven Hazel
 - R. Tyler Croy
 - Santiago Suarez Ordoñez
+- Eric Allen
+- Sean Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &16379820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,21 +26,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16379820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &16378080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16378080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &16376340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +58,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16376340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &16375080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +74,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16375080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &16373280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +90,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16373280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &16388200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +106,15 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *16388200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &16385280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,10 +122,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *16385280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16382900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,10 +138,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16382900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: cmdparse
-  requirement: &16381280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -113,10 +154,15 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *16381280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &16396360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,7 +170,12 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *16396360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: A Ruby helper for running tests in Sauce OnDemand, Sauce Labs' browsers
   in the cloud service
 email: help@saucelabs.com
@@ -133,38 +184,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- Gemfile
-- LICENSE
-- README.markdown
-- Rakefile
-- bin/sauce
-- gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
-- gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
-- gems/sauce-cucumber/.gitignore
-- gems/sauce-cucumber/README.md
-- gems/sauce-cucumber/Rakefile
-- gems/sauce-cucumber/lib/sauce/cucumber.rb
-- gems/sauce-cucumber/sauce-cucumber.gemspec
-- gems/sauce-jasmine/.gitignore
-- gems/sauce-jasmine/README.md
-- gems/sauce-jasmine/Rakefile
-- gems/sauce-jasmine/lib/sauce/jasmine.rb
-- gems/sauce-jasmine/lib/sauce/jasmine/rake.rb
-- gems/sauce-jasmine/lib/sauce/jasmine/runner.rb
-- gems/sauce-jasmine/sauce-jasmine.gemspec
-- generators/sauce/sauce_generator.rb
-- generators/sauce/templates/sauce.rake
 - lib/generators/sauce/install/install_generator.rb
-- lib/generators/sauce/install/templates/sauce.rake
-- lib/sauce.rb
 - lib/sauce/capybara.rb
 - lib/sauce/client.rb
 - lib/sauce/config.rb
-- lib/sauce/connect.rb
 - lib/sauce/heroku.rb
 - lib/sauce/integrations.rb
 - lib/sauce/job.rb
@@ -172,7 +195,7 @@ files:
 - lib/sauce/selenium.rb
 - lib/sauce/utilities.rb
 - lib/sauce/version.rb
-- sauce.gemspec
+- lib/sauce.rb
 - spec/cucumber_helper.rb
 - spec/integration/connect_integration_spec.rb
 - spec/sauce/capybara_spec.rb
@@ -181,8 +204,8 @@ files:
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/selenium_spec.rb
 - spec/spec_helper.rb
-- support/Sauce-Connect.jar
-homepage: http://github.com/saucelabs/sauce_ruby
+- bin/sauce
+homepage: http://github.com/sauce-labs/sauce_ruby
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -194,22 +217,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 669678211782537327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 669678211782537327
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby helper for running tests in Sauce OnDemand
-test_files: []
+test_files:
+- spec/cucumber_helper.rb
+- spec/integration/connect_integration_spec.rb
+- spec/sauce/capybara_spec.rb
+- spec/sauce/config_spec.rb
+- spec/sauce/cucumber_spec.rb
+- spec/sauce/jasmine_spec.rb
+- spec/sauce/selenium_spec.rb
+- spec/spec_helper.rb