sauce 0.14.2 → 0.15.0.alpha.1

data/Rakefile

@@ -1,32 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "sauce"
-    gem.summary = "Ruby access to Sauce Labs' features"
-    gem.description = "A Ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc."
-    gem.email = "help@saucelabs.com"
-    gem.homepage = "http://github.com/saucelabs/sauce"
-    gem.authors = ["Sean Grove", "Eric Allen", "Steven Hazel"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "jeweler", ">= 1.4.0"
-    gem.add_runtime_dependency "rest-client", ">= 0"
-    gem.add_runtime_dependency "net-ssh", ">= 0"
-    gem.add_runtime_dependency "net-ssh-gateway", ">= 0"
-    gem.add_runtime_dependency "selenium-webdriver", ">= 0.1.2"
-    gem.add_runtime_dependency "childprocess", ">= 0.1.6"
-    gem.add_runtime_dependency "json", ">= 1.2.0"
-    gem.add_runtime_dependency "cmdparse", ">= 2.0.2"
-    gem.add_runtime_dependency "highline", ">= 1.5.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -42,7 +16,7 @@ namespace :test do
   end
   Rake::TestTask.new(:integrations) do |test|
     test.libs << 'lib' << 'test'
-    test.pattern = 'test/integrations/test_*.rb'
+    test.pattern = 'test/test_integrations.rb'
     test.verbose = true
   end
 end
@@ -66,8 +40,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/lib/generators/sauce/install/install_generator.rb

@@ -0,0 +1,54 @@
+module Sauce
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      desc "Prep application for Sauce OnDemand Selenium tests"
+
+      argument :username, :type => :string, :required => false
+      argument :api_key, :type => :string, :required => false
+
+      def copy_rake_tasks
+        copy_file "sauce.rake", "lib/tasks/sauce.rake"
+      end
+
+      def configure_credentials
+        if username
+          system("sauce config #{username} #{api_key}")
+        end
+      end
+
+      def setup_spec
+        if File.directory? 'spec'
+          empty_directory "spec/selenium"
+          append_file "spec/spec_helper.rb", generate_config
+        end
+      end
+
+      def setup_test
+        if File.directory? 'test'
+          empty_directory "test/selenium"
+          append_file "test/test_helper.rb", generate_config
+        end
+      end
+
+      private
+
+      def generate_config
+        @random_id ||= rand(100000)
+        return <<-CONFIG
+    require 'sauce'
+
+    Sauce.config do |conf|
+        conf.browser_url = "http://#{@random_id}.test/"
+        conf.browsers = [
+            ["Windows 2003", "firefox", "3."]
+        ]
+        conf.application_host = "127.0.0.1"
+        conf.application_port = "3001"
+    end
+          CONFIG
+      end
+    end
+  end
+end

data/lib/sauce/config.rb

@@ -36,6 +36,7 @@ module Sauce
         @opts.merge! DEFAULT_OPTIONS
         @opts.merge! load_options_from_yaml
         @opts.merge! load_options_from_environment
+        @opts.merge! load_options_from_heroku
         @opts.merge! Sauce.get_config.opts rescue {}
         @opts.merge! opts
       end
@@ -80,30 +81,31 @@ module Sauce
     private
 
     def load_options_from_environment
-      opts = {}
-      opts[:host] = ENV['SAUCE_HOST']
-      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[:os] = ENV['SAUCE_OS']
-      opts[:browser] = ENV['SAUCE_BROWSER']
-      opts[:browser_version] = ENV['SAUCE_BROWSER_VERSION']
-      opts[:job_name] = ENV['SAUCE_JOB_NAME']
-
-      opts[:firefox_profile_url] = ENV['SAUCE_FIREFOX_PROFILE_URL']
-      opts[:user_extensions_url] = ENV['SAUCE_USER_EXTENSIONS_URL']
+      return extract_options_from_hash(ENV)
+    end
 
-      return opts.delete_if {|key, value| value.nil?}
+    def load_options_from_heroku
+      @@herkou_environment ||= begin
+        buffer = IO.popen("heroku config --shell") { |out| out.read }
+        if $?.exitstatus == 0
+          env = {}
+          buffer.split("\n").each do |line|
+            key, value = line.split("=")
+            env[key] = value
+          end
+          extract_options_from_hash(env)
+        else
+          {}
+        end
+      end
+      return @@herkou_environment
     end
 
     def load_options_from_yaml
         paths = [
             "ondemand.yml",
             File.join("config", "ondemand.yml"),
-            File.join(File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__)))), "ondemand.yml"),
+            File.expand_path("../../../ondemand.yml", __FILE__),
             File.join(File.expand_path("~"), ".sauce", "ondemand.yml")
         ]
 
@@ -115,5 +117,34 @@ module Sauce
         end
         return {}
     end
+
+    def extract_options_from_hash(env)
+      opts = {}
+      opts[:host] = env['SAUCE_HOST']
+      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[:os] = env['SAUCE_OS']
+      opts[:browser] = env['SAUCE_BROWSER']
+      opts[:browser_version] = env['SAUCE_BROWSER_VERSION']
+      opts[:job_name] = env['SAUCE_JOB_NAME']
+
+      opts[:firefox_profile_url] = env['SAUCE_FIREFOX_PROFILE_URL']
+      opts[:user_extensions_url] = env['SAUCE_USER_EXTENSIONS_URL']
+
+      if env.include? 'URL'
+        opts['SAUCE_BROWSER_URL'] = "http://#{env['URL']}/"
+      end
+
+      if env.include? 'SAUCE_BROWSERS'
+        browsers = JSON.parse(env['SAUCE_BROWSERS'])
+        opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['version']] }
+      end
+
+      return opts.delete_if {|key, value| value.nil?}
+    end
   end
 end

data/lib/sauce/connect.rb

@@ -1,5 +1,7 @@
 module Sauce
   class Connect
+    TIMEOUT = 300
+
     attr_reader :status, :error
 
     def initialize(options={})
@@ -14,7 +16,7 @@ module Sauce
       options.delete(:tunnel_port)
       config = Sauce::Config.new(options)
       args = ['-u', config.username, '-k', config.access_key, '-s', host, '-p', port, '-d', config.domain, '-t', tunnel_port]
-      @pipe = IO.popen(([Sauce::Connect.find_sauce_connect] + args).join(' '))
+      @pipe = IO.popen((["exec", "\"#{Sauce::Connect.find_sauce_connect}\""] + args).join(' '))
       at_exit do
         Process.kill("INT", @pipe.pid)
         while @ready
@@ -39,9 +41,14 @@ module Sauce
     end
 
     def wait_until_ready
-      while(!@ready)
+      start = Time.now
+      while !@ready and (Time.now-start) < TIMEOUT
         sleep 0.4
       end
+
+      if !@ready
+        raise "Sauce Connect failed to connect after #{TIMEOUT} seconds"
+      end
     end
 
     def disconnect

data/lib/sauce/integrations.rb

@@ -14,16 +14,19 @@ begin
 
         before :suite do
           config = Sauce::Config.new
-          if @@need_tunnel && config.application_host && !config.local?
-            @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
-            @@tunnel.wait_until_ready
+          if @@need_tunnel
+            if config.application_host && !config.local?
+              @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+              @@tunnel.wait_until_ready
+            end
+            @@server = Sauce::Utilities::RailsServer.new
+            @@server.start
           end
         end
 
         after :suite do
-          if defined? @@tunnel
-            @@tunnel.disconnect
-          end
+          @@tunnel.disconnect if defined? @@tunnel
+          @@server.stop if defined? @@server
         end
 
         def execute(*args)
@@ -102,11 +105,15 @@ begin
             @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
             @@tunnel.wait_until_ready
           end
+
+          if ::RSpec.configuration.settings[:files_to_run].any? {|file| file =~ /spec\/selenium\//}
+            @@server = Sauce::Utilities::RailsServer.new
+            @@server.start
+          end
         end
         ::RSpec.configuration.after :suite do
-          if defined? @@tunnel
-            @@tunnel.disconnect
-          end
+          @@tunnel.disconnect if defined? @@tunnel
+          @@server.stop if defined? @@server
         end
       end
     end
@@ -177,11 +184,12 @@ begin
             @sauce_tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
             @sauce_tunnel.wait_until_ready
           end
+          @server = Sauce::Utilities::RailsServer.new
+          @server.start
         end
         result = run_without_tunnel.bind(self).call(*args)
-        if defined? @sauce_tunnel
-          @sauce_tunnel.disconnect
-        end
+        @sauce_tunnel.disconnect if defined? @sauce_tunnel
+        @server.stop if defined? @server
         return result
       end
     end
@@ -206,11 +214,13 @@ begin
             @sauce_tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
             @sauce_tunnel.wait_until_ready
           end
+
+          @server = Sauce::Utilities::RailsServer.new
+          @server.start
         end
         result = run_without_tunnel.bind(self).call(*args)
-        if defined? @sauce_tunnel
-          @sauce_tunnel.disconnect
-        end
+        @sauce_tunnel.disconnect if defined? @sauce_tunnel
+        @server.stop if defined? @server
         return result
       end
     end

data/lib/sauce/raketasks.rb

@@ -17,17 +17,13 @@ if defined?(Spec::Rake::SpecTask)
     namespace :selenium do
       desc "Run the Selenium acceptance tests in spec/selenium using Sauce OnDemand"
       task :sauce => spec_prereq do
-        with_rails_server do
-          Rake::Task["spec:selenium:runtests"].invoke
-        end
+        Rake::Task["spec:selenium:runtests"].invoke
       end
 
       desc "Run the Selenium acceptance tests in spec/selenium using a local Selenium server"
       task :local => spec_prereq do
-        with_rails_server do
-          with_selenium_rc do
-            Rake::Task["spec:selenium:runtests"].invoke
-          end
+        with_selenium_rc do
+          Rake::Task["spec:selenium:runtests"].invoke
         end
       end
 
@@ -55,17 +51,13 @@ if defined?(RSpec::Core::RakeTask)
     namespace :selenium do
       desc "Run the Selenium acceptance tests in spec/selenium using Sauce OnDemand"
       task :sauce => spec_prereq do
-        with_rails_server do
-          Rake::Task["spec:selenium:runtests"].invoke
-        end
+        Rake::Task["spec:selenium:runtests"].invoke
       end
 
       desc "Run the Selenium acceptance tests in spec/selenium using a local Selenium server"
       task :local => spec_prereq do
-        with_rails_server do
-          with_selenium_rc do
-            Rake::Task["spec:selenium:runtests"].invoke
-          end
+        with_selenium_rc do
+          Rake::Task["spec:selenium:runtests"].invoke
         end
       end
 
@@ -84,17 +76,13 @@ namespace :test do
   namespace :selenium do
     desc "Run the Selenium acceptance tests in test/selenium using Sauce OnDemand"
     task :sauce do
-      with_rails_server do
-        Rake::Task["test:selenium:runtests"].invoke
-      end
+      Rake::Task["test:selenium:runtests"].invoke
     end
 
     desc "Run the Selenium acceptance tests in spec/selenium using a local Selenium server"
     task :local do
-      with_rails_server do
-        with_selenium_rc do
-          Rake::Task["test:selenium:runtests"].invoke
-        end
+      with_selenium_rc do
+        Rake::Task["test:selenium:runtests"].invoke
       end
     end
 

data/lib/sauce/utilities.rb

@@ -47,24 +47,31 @@ module Sauce
       end
     end
 
-    def with_rails_server
-      STDERR.puts "Starting Rails server on port 3001..."
-      if File.exists?('script/server')
-        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")
+    class RailsServer
+      include Sauce::Utilities
+      def start
+        STDERR.puts "Starting Rails server on port 3001..."
+        if File.exists?('script/server')
+          @server = ChildProcess.build("ruby", "script/server", "-e", "test", "--port", "3001")
+        elsif File.exists?('script/rails')
+          @server = ChildProcess.build("bundle", "exec", "rails", "server", "-e", "test", "--port", "3001")
+        end
+        @server.io.inherit!
+        @server.start
+
+        wait_for_server_on_port(3001)
+
+        at_exit do
+          @server.stop
+        end
+        STDERR.puts "Rails server running!"
       end
 
-      wait_for_server_on_port(3001)
-      STDERR.puts "Rails server running!"
-      begin
-        yield
-      ensure
+      def stop
         begin
-          pid = IO.read(File.join('tmp', 'pids', 'server.pid')).to_i
-          Process.kill("INT", pid)
+          @server.stop
         rescue
-          STDERR.puts "Rails server could not be killed. Is the pid in #{File.join('tmp', 'pids', 'server.pid')}?"
+          STDERR.puts "Rails server could not be killed. Did it fail to start?"
         end
       end
     end

data/sauce.gemspec

@@ -1,15 +1,12 @@
-# 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.2"
+  s.version = "0.15.0.alpha.1"
 
   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.date = %q{2011-01-26}
   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}
@@ -23,7 +20,6 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.markdown",
     "Rakefile",
-    "VERSION",
     "bin/sauce",
     "examples/helper.rb",
     "examples/other_spec.rb",
@@ -32,8 +28,8 @@ Gem::Specification.new do |s|
     "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/generators/sauce/install/install_generator.rb",
+    "lib/generators/sauce/install/templates/sauce.rake",
     "lib/sauce.rb",
     "lib/sauce/client.rb",
     "lib/sauce/config.rb",
@@ -56,8 +52,6 @@ Gem::Specification.new do |s|
     "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",
@@ -73,10 +67,7 @@ Gem::Specification.new do |s|
     "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"
@@ -86,8 +77,6 @@ Gem::Specification.new do |s|
     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"])
@@ -97,8 +86,6 @@ Gem::Specification.new do |s|
       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"])
@@ -109,8 +96,6 @@ Gem::Specification.new do |s|
       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"])

data/test/helper.rb

@@ -1,12 +1,14 @@
 require 'rubygems'
 require 'test/unit'
-require 'shoulda'
 require 'net/telnet'
+require 'fileutils'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sauce'
 
+include Sauce::Utilities
+
 Sauce.config do |config|
   config.browsers = [
     ["Windows 2003", "firefox", "3.6."],
@@ -17,3 +19,17 @@ Sauce.config do |config|
   #config.application_host = "localhost"
   #config.application_port = "4444"
 end
+
+def ensure_rvm_installed
+  rvm_executable = File.expand_path("~/.rvm/bin/rvm")
+  if File.exist? rvm_executable
+    unless defined?(RVM)
+      rvm_lib_path = File.expand_path("~/.rvm/lib")
+      $LOAD_PATH.unshift(rvm_lib_path) unless $LOAD_PATH.include?(rvm_lib_path)
+      require 'rvm'
+    end
+  else
+    raise "You do not have RVM installed. It is required for the integration tests.\n" +
+      "Please install it from http://rvm.beginrescueend.com/"
+  end
+end

data/test/test_config.rb

@@ -1,75 +1,74 @@
-require 'helper'
+require File.expand_path("../helper", __FILE__)
 
 class TestConfig < Test::Unit::TestCase
-  context "A new Config" do
-    should "Generate a reasonable browser string from the environment" do
-      preserved_env = {}
-      Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
-        preserved_env[key] = ENV[key] if ENV[key]
-      end
-      begin
-
-        ENV['SAUCE_USERNAME'] = "test_user"
-        ENV['SAUCE_ACCESS_KEY'] = "test_access"
-        ENV['SAUCE_OS'] = "Linux"
-        ENV['SAUCE_BROWSER'] = "firefox"
-        ENV['SAUCE_BROWSER_VERSION'] = "3."
-
-        config = Sauce::Config.new
-        assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
-      ensure
-        Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
-          ENV[key] = preserved_env[key] if preserved_env[key]
-        end
-      end
+  def test_generates_reasonable_browser_string_from_envrionment
+    preserved_env = {}
+    Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
+      preserved_env[key] = ENV[key] if ENV[key]
     end
+    begin
 
-    should "Generate a browser string from parameters" do
-      config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
-                                 :os => "Linux", :browser => "firefox", :browser_version => "3.")
-      assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
-    end
+      ENV['SAUCE_USERNAME'] = "test_user"
+      ENV['SAUCE_ACCESS_KEY'] = "test_access"
+      ENV['SAUCE_OS'] = "Linux"
+      ENV['SAUCE_BROWSER'] = "firefox"
+      ENV['SAUCE_BROWSER_VERSION'] = "3."
 
-    should "Respond to convenience accessors" do
       config = Sauce::Config.new
-      assert_equal "saucelabs.com", config.host
+      assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+    ensure
+      Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
+        ENV[key] = preserved_env[key]
+      end
     end
+  end
 
-    should "gracefully degrade the browsers field" do
-      Sauce.config {|c|}
-      config = Sauce::Config.new
-      config.os = "A"
-      config.browser = "B"
-      config.browser_version = "C"
+  def test_generates_browser_string_from_parameters
+    config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
+                               :os => "Linux", :browser => "firefox", :browser_version => "3.")
+    assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+  end
 
-      assert_equal [["A", "B", "C"]], config.browsers
-    end
+  def test_convenience_accessors
+    config = Sauce::Config.new
+    assert_equal "saucelabs.com", config.host
+  end
 
-    should "Let you set and query boolean flags" do
-      config = Sauce::Config.new
-      config.foo = true
-      assert config.foo?
-    end
+  def test_gracefully_degrades_browsers_field
+    Sauce.config {|c|}
+    config = Sauce::Config.new
+    config.os = "A"
+    config.browser = "B"
+    config.browser_version = "C"
+
+    assert_equal [["A", "B", "C"]], config.browsers
   end
 
-  context "The Sauce.config method" do
-    should "Allow you to set a default OS" do
-      Sauce.config {|c| c.os = "TEST_OS" }
+  def test_boolean_flags
+    config = Sauce::Config.new
+    config.foo = true
+    assert config.foo?
+  end
 
+  def test_sauce_config_default_os
+    Sauce.config {|c| c.os = "TEST_OS" }
+    begin
       config = Sauce::Config.new
       assert_equal "TEST_OS", config.os
-    end
-
-    should "Be callable twice" do
-      Sauce.config {|c| c.os = "A"}
-      assert_equal "A", Sauce::Config.new.os
+    ensure
       Sauce.config {|c|}
-      assert_not_equal "A", Sauce::Config.new.os
     end
+  end
 
-    should "not retain config after being called again" do
-      Sauce.config {|c|}
-      assert_not_equal [["Windows 2003", "firefox", "3.6."]], Sauce::Config.new.browsers
-    end
+  def test_can_call_sauce_config_twice
+    Sauce.config {|c| c.os = "A"}
+    assert_equal "A", Sauce::Config.new.os
+    Sauce.config {|c|}
+    assert_not_equal "A", Sauce::Config.new.os
+  end
+
+  def test_clears_config
+    Sauce.config {|c|}
+    assert_not_equal [["Windows 2003", "firefox", "3.6."]], Sauce::Config.new.browsers
   end
 end

data/test/test_connect.rb

@@ -1,25 +1,22 @@
-require 'helper'
+require File.expand_path("../helper", __FILE__)
 
 class TestConnect < Test::Unit::TestCase
-  context "Sauce Connect" do
-    should "be running when ready" do
-      connect = Sauce::Connect.new(:host => "saucelabs.com", :port => 80)
-      assert_equal "uninitialized", connect.status
-      connect.wait_until_ready
-      assert_equal "running", connect.status 
-      connect.status.should == "running"
-      connect.disconnect
-    end
-
-    should "set error flag if things don't go well" do
-      connect = Sauce::Connect.new(:host => "saucelabs.com", :port => 80, :username => 'fail')
-      start = Time.now
-      while Time.now-start < 20 && !connect.error
-        sleep 1
-      end
+  def test_running_when_ready
+    connect = Sauce::Connect.new(:host => "saucelabs.com", :port => 80)
+    assert_equal "uninitialized", connect.status
+    connect.wait_until_ready
+    assert_equal "running", connect.status 
+    connect.disconnect
+  end
 
-      assert connect.error
-      connect.disconnect
+  def test_error_flag
+    connect = Sauce::Connect.new(:host => "saucelabs.com", :port => 80, :username => 'fail')
+    start = Time.now
+    while Time.now-start < 20 && !connect.error
+      sleep 1
     end
+
+    assert connect.error
+    connect.disconnect
   end
 end

data/test/test_selenium.rb

@@ -1,15 +1,11 @@
-require 'helper'
+require File.expand_path("../helper", __FILE__)
 
 class TestSelenium < Test::Unit::TestCase
-  context "The Sauce Selenium driver" do
-    should "Connect successfully using credentials from the environment" do
-      assert ENV['SAUCE_USERNAME'], "You haven't configured a Sauce OnDemand username. Please set $SAUCE_USERNAME"
-      assert ENV['SAUCE_ACCESS_KEY'], "You haven't configured a Sauce OnDemand access key. Please set $SAUCE_ACCESS_KEY"
-      selenium = Sauce::Selenium.new(:job_name => "Sauce gem test suite: test_selenium.rb",
-                                     :browser_url => "http://www.google.com/")
-      selenium.start
-      selenium.open "/"
-      selenium.stop
-    end
+  def test_successful_connection_from_environment
+    selenium = Sauce::Selenium.new(:job_name => "Sauce gem test suite: test_selenium.rb",
+                                   :browser_url => "http://www.google.com/")
+    selenium.start
+    selenium.open "/"
+    selenium.stop
   end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
+  hash: -3702664274
+  prerelease: 7
   segments: 
   - 0
-  - 14
-  - 2
-  version: 0.14.2
+  - 15
+  - 0
+  - alpha
+  - 1
+  version: 0.15.0.alpha.1
 platform: ruby
 authors: 
 - Sean Grove
@@ -17,43 +19,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -08:00
+date: 2011-01-26 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +35,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +49,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,11 +63,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +79,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: childprocess
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,11 +95,11 @@ dependencies:
         - 6
         version: 0.1.6
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,11 +111,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cmdparse
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,11 +127,11 @@ dependencies:
         - 2
         version: 2.0.2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,7 +143,7 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id008
 description: A Ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc.
 email: help@saucelabs.com
 executables: 
@@ -186,7 +158,6 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - bin/sauce
 - examples/helper.rb
 - examples/other_spec.rb
@@ -195,8 +166,8 @@ files:
 - 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/generators/sauce/install/install_generator.rb
+- lib/generators/sauce/install/templates/sauce.rake
 - lib/sauce.rb
 - lib/sauce/client.rb
 - lib/sauce/config.rb
@@ -219,13 +190,10 @@ files:
 - 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
-- test/integrations/test_rails2.rb
 has_rdoc: true
 homepage: http://github.com/saucelabs/sauce
 licenses: []
@@ -266,10 +234,7 @@ test_files:
 - 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

data/VERSION

@@ -1 +0,0 @@
-0.14.2

data/lib/generators/sauce_generator.rb

@@ -1,46 +0,0 @@
-class SauceGenerator < Rails::Generators::Base
-  source_root File.expand_path("../templates", __FILE__)
-
-  argument :username, :type => nil
-  argument :api_key, :type => nil
-
-  def copy_rake_tasks
-    copy_file "sauce.rake", "lib/tasks/sauce.rake"
-  end
-
-  def configure_credentials
-    system("sauce config #{username} #{api_key}")
-  end
-
-  def setup_spec
-    if File.directory? 'spec'
-      empty_directory "spec/selenium"
-      append_file "spec/spec_helper.rb", generate_config
-    end
-  end
-
-  def setup_test
-    if File.directory? 'test'
-      empty_directory "test/selenium"
-      append_file "test/test_helper.rb", generate_config
-    end
-  end
-
-  private
-
-  def generate_config
-    @random_id ||= rand(100000)
-    return <<-CONFIG
-require 'sauce'
-
-Sauce.config do |conf|
-    conf.browser_url = "http://#{@random_id}.test/"
-    conf.browsers = [
-        ["Windows 2003", "firefox", "3."]
-    ]
-    conf.application_host = "127.0.0.1"
-    conf.application_port = "3001"
-end
-      CONFIG
-  end
-end

data/test/api/test_jobs.rb

@@ -1,145 +0,0 @@
-require 'helper'
-require 'json'
-require 'yaml'
-
-class TestSauce < Test::Unit::TestCase
-  context "A V1 jobs instance" do
-    setup do
-      # Create this file and put in your details to run the tests
-      account = YAML.load_file "account.yml"
-      @username = account["username"]
-      @access_key = account["access_key"]
-      @ip = account["ip"]
-      @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key,
-                                  :protocol => account["protocol"],
-                                  :host => account["host"],
-                                  :port => account["port"],
-                                  :api_path => account["api_path"],
-                                  :api_version => account["api_version"])
-
-      #@example_data = YAML.load_file('example_data.yml')
-    end
-
-=begin
-    should "initialize with passed variables" do
-      client = Sauce::Client.new(:username => "test_user",
-                                 :access_key => "abc123")
-      
-      job = client.jobs.new(JSON.parse(@example_data["example_job"]))
-
-      assert_equal "501aca56282545a9a21ad2fc592b03fa", job.id
-      assert_equal "joe", job.owner
-      assert_equal "complete", job.status
-      assert_equal "job-example-fixture", job.name 
-
-      assert_equal "firefox", job.browser
-      assert_equal "3.5.", job.browser_version
-      assert_equal "Windows 2003", job.os
-
-      assert_equal 1253856281, job.creation_time
-      assert_equal 1253856366, job.start_time
-      assert_equal 1253856465, job.end_time 
-
-      assert_equal "http://saucelabs.com/video/8b6bf8d360cc338cc7cf7f6e093264d0/video.flv", job.video_url
-      assert_equal "http://saucelabs.com/video/8b6bf8d360cc338cc7cf7f6e093264d0/selenium-server.log", job.log_url
-
-      assert_equal false, job.public
-      assert_equal ["test", "example", "python_is_fun"], job.tags
-    end
-=end
-
-    # Note: Relies on server-side data fixture
-    should "retrieve and parse a job via the api" do
-      job = @client.jobs.find("gem-test-job")
-
-      assert_equal "gem-test-job", job.id
-      assert_equal "sah", job.owner
-      assert_equal "complete", job.status
-      assert_equal "job-example-fixture", job.name
-
-      assert_equal "firefox", job.browser
-      assert_equal "3.5.", job.browser_version
-      assert_equal "Windows 2003", job.os
-
-      assert_equal 1266030817, job.creation_time
-      assert_equal 1266030833, job.start_time
-      assert_equal 1266030871, job.end_time 
-
-      assert_equal "http://saucelabs.com/jobs/gem-test-job/video.flv", job.video_url
-      assert_equal "http://saucelabs.com/jobs/gem-test-job/selenium-server.log", job.log_url
-
-      assert_equal false, job.public
-      assert_equal ['test', 'equal', 'multilingualism_is_fun'], job.tags
-    end
-
-    should "update writable properties" do
-      job = @client.jobs.find("gem-test-job")
-
-      # Make sure it's in the expected condition before changing
-      assert_equal false, job.public
-      assert_equal ["test", "example", "multilingualism_is_fun"], job.tags
-      assert_equal "job-example-fixture", job.name
-
-      job.public = true
-      job.tags = ["changed", "updated", "ruby_is_also_fun"]
-      job.name = "changed-job-name", job.name
-      job.save
-
-      # Fresh copy of the same job
-      job2 = @client.jobs.find("gem-test-job")
-
-      assert_equal true, job2.public
-      assert_equal ["changed", "updated", "ruby_is_also_fun"], job2.tags
-      assert_equal "changed-job-name", job2.name
-
-      # Return the job to its original state and check it out
-      job.public = false
-      job.tags = ["test", "example", "multilingualism_is_fun"]
-      job.name = "job-example-fixture", job.name
-      job.save
-
-      # Check to see if the change took
-      job2.refresh!
-      assert_equal job.public, job2.public
-      assert_equal job.tags, job2.tags
-      assert_equal job.name, job2.name
-    end
-
-    should "not update read-only properties" do
-      job = @client.jobs.find("gem-test-job")
-
-      # Make sure it's in the expected condition before changing
-      assert_equal "complete", job.status
-      assert_equal "sah", job.owner
-      assert_equal "Windows 2003", job.os
-
-      job.status = "groggy"
-      job.owner = "sjobs"
-      job.os = "darwin" # In a perfect world...
-      assert_equal "groggy", job.status
-      assert_equal "sjobs", job.owner
-      assert_equal "darwin", job.os
-      job.save
-
-      # Changes should go away when refreshed
-      job.refresh!
-      assert_equal "complete", job.status
-      assert_equal "sah", job.owner
-      assert_equal "Windows 2003", job.os
-    end
-
-    should "list the 100 most recent jobs" do
-      jobs = @client.jobs.all
-
-      assert_equal 2, jobs.count
-    end
-
-    should "show the full job information on index if requested" do
-      flunk "TODO: implement this"
-    end
-
-    def teardown
-    end
-  end
-end

data/test/api/test_tunnels.rb

@@ -1,108 +0,0 @@
-require 'helper'
-require 'yaml'
-
-class TestSauce < Test::Unit::TestCase
-  context "A V1 tunnel instance" do
-    setup do
-      # Create this file and put in your details to run the tests
-      account = YAML.load_file "account.yml"
-      @username = account["username"]
-      @access_key = account["access_key"]
-      @ip = account["ip"]
-      @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key,
-                                  :ip => @ip
-                                  )
-
-      #STDOUT.puts @client.api_url
-      @client.tunnels.destroy_all
-    end
-
-    should "initialize with passed variables" do
-      client = Sauce::Client.new(:username => "test_user",
-                                 :access_key => "abc123")
-      assert_equal "http://test_user:abc123@saucelabs.com:80/rest/v1/test_user/", client.api_url
-    end
-
-    should "create a tunnel with the current user" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.110"])
-      tunnel.refresh!
-      assert_not_nil tunnel
-      assert_equal @username, tunnel.owner
-    end
-
-    should "list current tunnels" do
-      @client.tunnels.create('DomainNames' => ["192.168.0.111"])
-      @client.tunnels.create('DomainNames' => ["192.168.0.112"])
-      @client.tunnels.create('DomainNames' => ["192.168.0.113"])
-
-      tunnels = @client.tunnels.all
-      assert_equal 3, tunnels.select{|t| t.status != "halting"}.count
-    end
-
-    should "destroy a tunnel" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.114"])
-      tunnel.destroy
-      assert_equal "halting", tunnel.status
-    end
-
-    should "destroy all tunnels" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.115"])
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.116"])
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.117"])
-
-      @client.tunnels.destroy_all
-
-      @client.tunnels.all.each do |tunnel|
-        # This could be failing because the tunnels are already dead. Our servers too fast?
-        tunnel.refresh!
-        assert_equal "halting", tunnel.status
-      end
-    end
-
-    should "say hello on port 1025 if healthy" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
-
-      max_retries = 30
-      retries = 0
-      until tunnel.status == "running" or retries >= max_retries
-        sleep 5
-        retries += 1
-        tunnel.refresh!
-      end
-
-      assert_equal true, tunnel.says_hello?
-
-      tunnel.destroy # cleanup
-    end
-
-    should "have a host if finished booting" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
-
-      max_retries = 30
-      retries = 0
-      until tunnel.status == "running" or retries >= max_retries
-        sleep 5
-        retries += 1
-        tunnel.refresh!
-      end
-
-      tunnel.refresh!
-
-      assert_not_nil tunnel.host
-
-      tunnel.destroy # cleanup
-    end
-
-    should "not attempt to telnet if status is not running" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
-
-      tunnel.status = "booting"
-      assert_equal false, tunnel.says_hello?
-    end
-
-    def teardown
-      @client.tunnels.destroy_all
-    end
-  end
-end

data/test/integrations/test_rails2.rb

@@ -1,20 +0,0 @@
-require 'helper'
-require 'tmpdir'
-require 'fileutils'
-
-class TestRails2Integration < Test::Unit::TestCase
-  def setup
-    @dir = File.join(Dir.tmpdir, "sauce_gem_test_#{rand(100000)}")
-    Dir.mkdir(@dir)
-    Dir.chdir(@dir)
-    puts @dir
-  end
-
-  def test_ruby18
-
-  end
-
-  def teardown
-    FileUtils.remove_dir(@dir)
-  end
-end