sauce 0.6.3 → 0.7.0

data/Rakefile

@@ -7,15 +7,16 @@ begin
     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 = "sean@saucelabs.com"
-    gem.homepage = "http://github.com/sgrove/sauce"
-    gem.authors = ["Sean Grove"]
+    gem.email = "help@saucelabs.com"
+    gem.homepage = "http://github.com/saucelabs/sauce"
+    gem.authors = ["Sean Grove", "Eric Allen"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 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-client", ">= 1.2.18"
     gem.add_runtime_dependency "json", ">= 1.4.6"
+    gem.add_runtime_dependency "cmdparse", ">= 2.0.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/bin/sauce

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'cmdparse'
+require 'yaml'
+
+sauce_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(sauce_dir) unless $LOAD_PATH.include?(sauce_dir)
+require 'lib/sauce'
+
+cmd = CmdParse::CommandParser.new(true, true)
+cmd.program_name = "sauce "
+cmd.program_version = [0, 1, 0]
+
+cmd.add_command(CmdParse::HelpCommand.new)
+
+# configure
+configure = CmdParse::Command.new('configure', false)
+configure.short_desc = "Configure Sauce OnDemand credentials"
+configure.set_execution_block do |args|
+  if args.length < 2:
+    puts "Usage: sauce configure USERNAME ACCESS_KEY"
+    exit 1
+  end
+  username = args[0]
+  access_key = args[1]
+  out = File.new(File.join(File.dirname(File.expand_path(File.dirname(__FILE__))), "ondemand.yml"), 'w')
+  out.write(YAML.dump({"username" => username, "access_key" => access_key}))
+  out.close()
+end
+cmd.add_command(configure)
+
+#create
+create = CmdParse::Command.new('create', false)
+create.short_desc = "Create a new Sauce OnDemand account"
+create.set_execution_block do |args|
+  puts "Let's create a new account!"
+  print "Username: "
+  username = $stdin.gets.chomp
+  print "password: "
+  password = $stdin.gets.chomp
+  print "password confirmation: "
+  password_confirmation = $stdin.gets.chomp
+  print "email: "
+  email = $stdin.gets.chomp
+  print "Full name: "
+  name = $stdin.gets.chomp
+
+  # TODO: Add error handling, of course
+  result = RestClient.post "http://saucelabs.com/rest/v1/users",
+    {
+    :username => username,
+    :password => password,
+    :password_confirmation => password_confirmation,
+    :email => email,
+    :token => "c8eb3e2645005bcbbce7e2c208c6b7a71555d908",
+    :name => name
+  }.to_json,
+    :content_type => :json, :accept => :json
+
+  puts result.inspect
+end
+
+cmd.add_command(create)
+
+cmd.parse

data/lib/sauce/config.rb

@@ -2,6 +2,15 @@ require 'json'
 require 'yaml'
 
 module Sauce
+  def self.config
+    @cfg = Sauce::Config.new(false)
+    yield @cfg
+  end
+
+  def self.get_config
+    @cfg
+  end
+
   class Config
     attr_reader :opts
     DEFAULT_OPTIONS = {
@@ -15,13 +24,23 @@ module Sauce
     }
 
     def initialize(opts={})
-      @opts = DEFAULT_OPTIONS.merge(load_options_from_yaml)
-      @opts.merge! load_options_from_environment
-      @opts.merge! opts
+      @opts = {}
+      if opts != false
+        @opts.merge! DEFAULT_OPTIONS
+        @opts.merge! load_options_from_yaml
+        @opts.merge! load_options_from_environment
+        @opts.merge! Sauce.get_config.opts rescue {}
+        @opts.merge! opts
+      end
     end
 
     def method_missing(meth, *args)
-      return @opts[meth]
+      if meth.to_s =~ /(.*)=$/
+        @opts[$1.to_sym] = args[0]
+        return args[0]
+      else
+        return @opts[meth]
+      end
     end
 
     def to_browser_string
@@ -35,6 +54,11 @@ module Sauce
       return browser_options.to_json
     end
 
+    def browsers
+      return @opts[:browsers] if @opts.include? :browsers
+      return [[os, browser, browser_version]]
+    end
+
     private
 
     def load_options_from_environment
@@ -61,6 +85,7 @@ module Sauce
         paths = [
             "ondemand.yml",
             File.join("config", "ondemand.yml"),
+            File.join(File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__)))), "ondemand.yml"),
             File.join(ENV['HOME'], ".ondemand.yml")
         ]
 

data/lib/sauce/integrations.rb

@@ -5,10 +5,6 @@ begin
       class SeleniumExampleGroup < Spec::Example::ExampleGroup
         attr_reader :selenium
 
-        before(:all) do
-          @selenium = Sauce::Selenium.new
-        end
-
         before(:each) do
           @selenium.start
         end
@@ -17,6 +13,14 @@ begin
           @selenium.stop
         end
 
+        def execute(*args)
+          config = Sauce::Config.new
+          config.browsers.each do |os, browser, version|
+            @selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version})
+            super(*args)
+          end
+        end
+
         alias_method :page, :selenium
         alias_method :s, :selenium
 

data/lib/sauce.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'sauce/tunnel'
 require 'sauce/job'
 require 'sauce/client'

data/test/helper.rb

@@ -7,5 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sauce'
 
-class Test::Unit::TestCase
+Sauce.config do |config|
+  config.browsers = [['Windows 2003', 'firefox', '3.6.']]
+  config.root_url = "http://saucelabs.com"
 end

data/test/saucelabs_spec.rb

@@ -1,6 +1,14 @@
 require 'helper'
 
-describe "saucelabs.com", :type => :selenium do
+# This should go in a test helper
+Sauce.config do |config|
+  config.browsers = [
+    ["Windows 2003", "firefox", "3.6."],
+    ["Windows 2003", "safariproxy", "5."]
+  ]
+end
+
+describe "The Sauce website", :type => :selenium do
   it "works" do
     page.open "/"
     page.is_text_present("Sauce Labs").should be_true

data/test/test_config.rb

@@ -23,5 +23,36 @@ class TestConfig < Test::Unit::TestCase
       config = Sauce::Config.new
       assert_equal "saucelabs.com", config.host
     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"
+
+      assert_equal [["A", "B", "C"]], config.browsers
+    end
+  end
+
+  context "The Sauce.config method" do
+    should "Allow you to set a default OS" do
+      Sauce.config {|c| c.os = "TEST_OS" }
+
+      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
+      Sauce.config {|c|}
+      assert_not_equal "A", Sauce::Config.new.os
+    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
   end
 end

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Sean Grove
+- Eric Allen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -07:00
-default_executable: 
+date: 2010-10-25 00:00:00 -07:00
+default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -106,10 +107,26 @@ dependencies:
         version: 1.4.6
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 0
+        - 2
+        version: 2.0.2
+  type: :runtime
+  version_requirements: *id007
 description: A ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc.
-email: sean@saucelabs.com
-executables: []
-
+email: help@saucelabs.com
+executables: 
+- sauce
 extensions: []
 
 extra_rdoc_files: 
@@ -122,6 +139,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- bin/sauce
 - lib/sauce.rb
 - lib/sauce/client.rb
 - lib/sauce/config.rb
@@ -138,7 +156,7 @@ files:
 - test/test_selenium.rb
 - test/test_tunnels.rb
 has_rdoc: true
-homepage: http://github.com/sgrove/sauce
+homepage: http://github.com/saucelabs/sauce
 licenses: []
 
 post_install_message: