Merge pull request #105 from thatdutchguy/jenkins-environment-variables

Support Jenkins Plugin environment variables

Rakefile

@@ -66,7 +66,11 @@ rescue LoadError
   end
 end
 
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

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']

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',