sauce_whisk 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTgwOTc5ZTkyZmNiZjU3ZmMwZmI3MDBiZTc2M2ZlZTU1ZGU2NzQ5Yw==
+    MmJlNDVjYjkzMTZmMDQ4OGQ0MzhhMGZkOTM1M2ZiYzBlMjIzZGY4Yg==
   data.tar.gz: !binary |-
-    NzBiNDA1MmFkNTEzNjJhYzE1NTc1ZDhiMDBjZGI3YzM4NDNhYTdkMg==
+    OWUyY2Y2NGQyMmZjZTllOGM0MTI2ZDdjOGIxZjBlMjFlMTczZGNiMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGQ4ODNiZDQ5YTA5ZDI4ZGFlZTk1Y2MxYTRhOWJlNTA3YzM2NDhhNTJjMzg5
-    ODhiYzA1NGI5NTVlZGM5Y2I3ZjY5NTJiOTM2NTExYmI5NDVlOTdhNmVmNGY0
-    ODJjMjZmYjgwZWFkMzQyMTk1YTBlOTZlMjBmOWUzNDc2YTUxYTI=
+    MThlODBkNGFmMDZiNzM2NmRiYmFhMzAxMTE2NGFlMjZjNWRmYzc0MzMyOWQ3
+    NmRiZjcwZTI5YTVmMjQwYmE5MmZjMDE5NTkwZGIyZTk0NzIyMmY4ZDYzMmIy
+    MzI4MDFiNmNkOGEzMGUzZmI1ZGI3MDU1OTBhMmZkZjg4YjExOWQ=
   data.tar.gz: !binary |-
-    YWJlYWVhZjc3NzBkMjBiMzk4ZDdjYjAzZWY0MjNhYmM2Yjc2MzEwZDMxMTc5
-    NjQzMWEyYWJjZmFmYzBjY2YyNTZmODVhNjgzMjgyY2Y5ZTI1MmNkZGEyM2U1
-    YzI1YzhiMGQ1OTVjNTc5OWM2YzYyNTQwNDk1OTQwZGE3MmMxMjc=
+    ODEyMTE1YjFjZWRhOGM2MzI2ODdmZTYyMDgzZTViYjEwODI1NDJiZWEwMzBj
+    MmEyYWQ4NTRmYmVkNWQxYjIwYjkyOGQ4NTRlNWIzN2FkNzgzZTRlZjI5ODUw
+    ZDFmYTY3YTcxZGMwZmU4Y2RlM2RmOTVjMjVlZDMwMWM0NzVkYmY=

data/README.md

@@ -44,10 +44,10 @@ There are two ways to create a Job object.
 
 ```ruby
 # Create an 'empty' job (i.e. don't retrieve job details from the API)
-empty_job = Job.new job_id
+empty_job = SauceWhisk::Job.new job_id
 
 # Create a job with details fetched from the API
-fully_detailed_job = Jobs.fetch job_id
+fully_detailed_job = SauceWhisk::Jobs.fetch job_id
 ```
 
 Use the first form when you just want a simple way to push details to the API.  Use the last form when you want to fetch details from the API.
@@ -57,7 +57,7 @@ NB: It's not possible to create a new job on Sauce Labs' infrastructure with the
 ### Updating Job Metadata
 
 ```ruby
-job = Job.new job_id
+job = SauceWhisk::Jobs.fetch job_id
 job.build = "12.3.04-beta"
 job.visibility = "public"
 job.tags = "new_user"
@@ -77,14 +77,14 @@ There are three types of asset for Sauce Labs jobs: screenshots, video and logs.
 #### Screenshots
 
 ```ruby
-  job = Job.fetch job_id
+  job = SauceWhisk::Jobs.fetch job_id
   screenshots = job.screenshots # An array of Screenshot assets
 ```
 
 #### Video
 
 ```ruby
-  job = Job.fetch job_id
+  job = SauceWhisk::Jobs.fetch job_id
   video = job.video # A single Asset, holding the video
 ```
 
@@ -210,7 +210,7 @@ SauceWhisk.logger defaults to STDOUT.
 
 ## Contributing
 
-1. Fork the [sauce-labs version](https://github.com/sauce-labs/sauce_whisk) of this repository
+1. Fork the [sauce-labs version](https://github.com/saucelabs/sauce_whisk) of this repository
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/sauce_whisk/accounts.rb

@@ -1,4 +1,8 @@
 module SauceWhisk
+  class AccountError < StandardError; end
+  class SubAccountCreationError < AccountError; end
+  class InvalidAccountError < StandardError; end
+
   class Accounts
     extend SauceWhisk::RestRequestBuilder
 
@@ -8,6 +12,8 @@ module SauceWhisk
 
       account_parameters = user_parameters.merge concurrencies
       return Account.new(account_parameters)
+    rescue RestClient::ResourceNotFound
+      raise InvalidAccountError, "Account #{user_id} does not exist"
     end
 
     def self.concurrency_for(job_id = ENV["SAUCE_USERNAME"], type = :both)
@@ -24,7 +30,27 @@ module SauceWhisk
       end
     end
 
+    #TODO what happens if not a valid parent?
+    def self.create_subaccount(parent, name, username, email, password)
+      payload = {
+        :username => username,
+        :password => password,
+        :name => name,
+        :email => email
+      }
+      begin
+        response = post :resource => "users/#{parent.username}", :payload => payload
+      rescue RestClient::BadRequest => e
+        decoded_body = JSON.parse e.http_body, :symbolize_names => true
+        raise SubAccountCreationError, decoded_body[:errors]
+      rescue RestClient::ResourceNotFound => e
+        raise InvalidAccountError, "Parent account #{parent.username} does not exist"
+      end
+
+      new_subaccount = SubAccount.new parent, JSON.parse(response)
+    end
   end
+
   class Account
     attr_reader :access_key, :username, :minutes, :total_concurrency, :mac_concurrency
     def initialize(options)
@@ -34,5 +60,18 @@ module SauceWhisk
       @total_concurrency = options[:total_concurrency]
       @mac_concurrency = options[:mac_concurrency]
     end
+
+    def add_subaccount(name, username, email, password)
+      SauceWhisk::Accounts.create_subaccount(self, name, username, email, password)
+    end
+  end
+
+  class SubAccount < Account
+    attr_reader :parent
+
+    def initialize(parent, options)
+      @parent = parent
+      super(options)
+    end
   end
 end

data/lib/sauce_whisk/rest_request_builder.rb

@@ -28,18 +28,24 @@ module SauceWhisk
       RestClient::Request.execute({:method => :delete, :url => resource_to_delete}.merge auth_details)
     end
 
-    def post(resource_parameters)
+    def post(opts)
+      payload = (opts[:payload].to_json)
+      resource_id = opts[:resource] || nil
+
       url = fully_qualified_resource
-      length = resource_parameters.length
+      url << "/#{resource_id}" if resource_id
+
+      length = payload.length
       headers = {"Content-Length" => length}
       req_params = {
           :method => :post,
           :url => url,
-          :payload => resource_parameters,
           :content_type => "application/json",
           :headers => headers
       }
 
+      req_params.merge!({:payload => payload}) unless payload.nil?
+
       RestClient::Request.execute(req_params.merge auth_details)
 
     end

data/lib/sauce_whisk/tunnels.rb

@@ -23,9 +23,17 @@ module SauceWhisk
       return tunnels
     end
 
-    def self.open(opts)
-      #opts[:tunnel_identifier] = opts.delete :tunnel_id
-      new_tunnel_parameters = JSON.parse post opts.to_json
+    def self.open(opts, wait_until_ready = true)
+      new_tunnel_parameters = JSON.parse((post :payload => opts), :symbolize_names => true)
+      STDERR.puts "PERMS #{new_tunnel_parameters}"
+      new_tunnel = fetch new_tunnel_parameters[:id]
+
+      while(["starting", "booting"].include? new_tunnel.status)
+
+        new_tunnel = fetch new_tunnel_parameters[:id]
+      end
+
+      return new_tunnel
     end
 
     def self.stop tunnel_id
@@ -33,13 +41,16 @@ module SauceWhisk
     end
 
     def self.fetch tunnel_id
-      tunnel_parameters = JSON.parse get tunnel_id
+      unless tunnel_id
+        raise ArgumentError, "Can't fetch a tunnel without an id (you provided blank or nil)"
+      end
+      tunnel_parameters = JSON.parse(get(tunnel_id), :symbolize_names => true)
       Tunnel.new tunnel_parameters
     end
   end
 
   class Tunnel
-    attr_reader :id, :owner, :status, :host, :creation_time
+    attr_reader :id, :owner, :status, :host, :creation_time, :ssh_port
 
     def initialize(params)
       params.each do |param, val|

data/lib/sauce_whisk/version.rb

@@ -1,3 +1,3 @@
 module SauceWhisk
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/fixtures/vcr_cassettes/accounts.yml

@@ -89,4 +89,291 @@ http_interactions:
       string: '{"mac_concurrency": 5, "concurrency": 20}'
     http_version: 
   recorded_at: Mon, 17 Jun 2013 12:30:47 GMT
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/<SAUCE_USERNAME>
+    body:
+      encoding: UTF-8
+      string: '{"username":"newsub77","password":"davesdisease","name":"Manny","email":"Manny@blackbooks.co.uk"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '97'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Wed, 28 Aug 2013 20:55:46 GMT
+      Content-Type:
+      - application/json
+      Location:
+      - https://saucelabs.com/rest/v1/users/newsub77
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=eab7d96896e5296aee29b037fb5469d9; expires="Wed, 28-Aug-2013 21:14:44
+        GMT"; Max-Age=600; Path=/
+      - metrics=885a220fc548623dd57098d7d59489760cec3b2beaf8245688754773b074267ebb2e8c8e;
+        Path=/
+      Content-Length:
+      - '148'
+    body:
+      encoding: US-ASCII
+      string: '{"access_key": "699d9039-baab-49a8-8830-63d43d9d45ac", "name": null,
+        "subscribed": false, "can_run_manual": true, "minutes": 1122, "id": "newsub77"}'
+    http_version: 
+  recorded_at: Wed, 28 Aug 2013 21:04:45 GMT
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/<SAUCE_USERNAME>
+    body:
+      encoding: UTF-8
+      string: '{"username":"duplicate","password":"davesdisease","name":"Manny","email":"Manny@blackbooks.co.uk"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '98'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad request
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 29 Aug 2013 01:14:07 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=750f4cdca985d7f7f9fcbbd0bfc58fc3; expires="Thu, 29-Aug-2013 01:33:06
+        GMT"; Max-Age=600; Path=/
+      - metrics=4e602fa8932a373223341b7af992f9b7fa7563dff2c7d1d2eef24680a9be7e752de3233b;
+        Path=/
+      - metrics=a6431e82448e473a873bf07761f858e431227be3f26941e865a24ac88318aed9f4b32dc4;
+        Path=/
+      Content-Length:
+      - '52'
+    body:
+      encoding: US-ASCII
+      string: '{"errors": "User already exists with that username"}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 01:23:06 GMT
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/<SAUCE_USERNAME>
+    body:
+      encoding: UTF-8
+      string: '{"username":"toomany","password":"davesdisease","name":"Manny","email":"Manny@blackbooks.co.uk"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '96'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad request
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 29 Aug 2013 01:14:07 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=750f4cdca985d7f7f9fcbbd0bfc58fc3; expires="Thu, 29-Aug-2013 01:33:06
+        GMT"; Max-Age=600; Path=/
+      - metrics=4e602fa8932a373223341b7af992f9b7fa7563dff2c7d1d2eef24680a9be7e752de3233b;
+        Path=/
+      - metrics=a6431e82448e473a873bf07761f858e431227be3f26941e865a24ac88318aed9f4b32dc4;
+        Path=/
+      Content-Length:
+      - '44'
+    body:
+      encoding: US-ASCII
+      string: '{"errors": "Subaccount capacity exhausted."}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 01:24:25 GMT
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/<SAUCE_USERNAME>
+    body:
+      encoding: UTF-8
+      string: '{"username":"deeptree","password":"davesdisease","name":"Manny","email":"Manny@blackbooks.co.uk"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '96'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad request
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 29 Aug 2013 01:14:07 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=750f4cdca985d7f7f9fcbbd0bfc58fc3; expires="Thu, 29-Aug-2013 01:33:06
+        GMT"; Max-Age=600; Path=/
+      - metrics=4e602fa8932a373223341b7af992f9b7fa7563dff2c7d1d2eef24680a9be7e752de3233b;
+        Path=/
+      - metrics=a6431e82448e473a873bf07761f858e431227be3f26941e865a24ac88318aed9f4b32dc4;
+        Path=/
+      Content-Length:
+      - '53'
+    body:
+      encoding: US-ASCII
+      string: '{"errors": "Subaccount tree depth is limited to 10."}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 01:24:25 GMT
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/nopenotaperson
+    body:
+      encoding: UTF-8
+      string: '{"username":"deeptree","password":"davesdisease","name":"Manny","email":"Manny@blackbooks.co.uk"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '97'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Fri, 30 Aug 2013 01:42:07 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=61a20e3c835c0c8d755d559f06fef7af; expires="Fri, 30-Aug-2013 02:01:08
+        GMT"; Max-Age=600; Path=/
+      - metrics=64e2fb23b34c01d956f2c94b397ad0e8f8da99061432ad554e2147b8abc39f4c0b59ab84;
+        Path=/
+      - metrics=eff66bcc694eb3de5e91eccbd2915a58ad3553ba428c68734d9a4390aa98899f3f6127e4;
+        Path=/
+      Content-Length:
+      - '45'
+    body:
+      encoding: US-ASCII
+      string: '{"error": "That resource could not be found"}'
+    http_version: 
+  recorded_at: Fri, 30 Aug 2013 01:51:08 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/IDontExist
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Fri, 30 Aug 2013 18:50:29 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=ab87b5190e3649606fa26185f3bbdcc3; expires="Fri, 30-Aug-2013 19:09:31
+        GMT"; Max-Age=600; Path=/
+      - metrics=83aa4f4693e8f686608e6ff1da43f9dee7720fc9176863ee18574df8b331f23801337a5b;
+        Path=/
+      - metrics=da0d871a67933f3e2a96ec2e9c41b4e1e2c817cc7ae6265e9b054fcbba5bf3c8f83720ad;
+        Path=/
+      Content-Length:
+      - '45'
+    body:
+      encoding: US-ASCII
+      string: '{"error": "That resource could not be found"}'
+    http_version: 
+  recorded_at: Fri, 30 Aug 2013 18:59:31 GMT
 recorded_with: VCR 2.5.0

data/spec/fixtures/vcr_cassettes/tunnels.yml

@@ -233,11 +233,99 @@ http_interactions:
       - '352'
     body:
       encoding: US-ASCII
-      string: '{"status": "new", "direct_domains": null, "shutdown_time": null, "ssh_port":
-        9123, "user_shutdown": null, "use_caching_proxy": false, "creation_time":
-        1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
-        "KarlMarx", "host": null, "owner": "<SAUCE_USERNAME>", "use_kgp": true, "id":
-        "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+      string: &1 !ruby/string
+        str: '{"status": "new", "direct_domains": null, "shutdown_time": null, "ssh_port":
+          9123, "user_shutdown": null, "use_caching_proxy": false, "creation_time":
+          1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+          "KarlMarx", "host": null, "owner": "<SAUCE_USERNAME>", "use_kgp": true,
+          "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+        net_http_res: !ruby/object:Net::HTTPOK
+          http_version: '1.0'
+          code: '200'
+          message: OK
+          header:
+            server:
+            - nginx/0.7.62
+            date:
+            - Tue, 30 Jul 2013 08:38:22 GMT
+            content-type:
+            - application/json
+            connection:
+            - keep-alive
+            pragma:
+            - no-cache
+            cache-control:
+            - no-cache
+            x-frame-options:
+            - DENY
+            set-cookie:
+            - csrf_token=3c66b97477a4dedd1255faf05ce90d66; expires="Tue, 30-Jul-2013
+              08:56:35 GMT"; Max-Age=600; Path=/
+            - metrics=034bd00d05345d3992282b0f28e816878971ff1a86e9ab91ce174a2e89dcab18527fa539;
+              Path=/
+            content-length:
+            - '352'
+          body: *1
+          read: true
+          __read_body_previously_called: true
+        args:
+          :method: :post
+          :url: https://saucelabs.com/rest/v1/dylanatsauce/tunnels
+          :content_type: application/json
+          :headers:
+            Content-Length: 85
+          :payload: '{"tunnel_identifier":"bees","ssh_port":9123,"use_caching_proxy":false,"use_kgp":true}'
+          :user: dylanatsauce
+          :password: 8f5210dd-f0cf-477f-b720-9f721a9679a4
+        code: 200
     http_version: 
   recorded_at: Tue, 30 Jul 2013 08:46:35 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels/4824d6b282e04d1184daff5401a52e1e
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 01 Aug 2013 03:20:06 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=752c68b4d3f9188498845b26a9938b1d; expires="Thu, 01-Aug-2013 03:38:25
+        GMT"; Max-Age=600; Path=/
+      - metrics=6b0e2bf3f0246ea3a0837eab992cb753bf68300f3484e2ba8e39494d95d2c9408df53458;
+        Path=/
+      Content-Length:
+      - '385'
+    body:
+      encoding: US-ASCII
+      string: '{"status": "terminated", "direct_domains": null, "shutdown_time": null,
+        "ssh_port": 9123, "user_shutdown": true, "use_caching_proxy": false, "creation_time":
+        1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+        "bees", "host": "maki11122.miso.saucelabs.com", "owner": "<SAUCE_USERNAME>",
+        "use_kgp": true, "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+    http_version: 
+  recorded_at: Thu, 01 Aug 2013 03:28:18 GMT
 recorded_with: VCR 2.5.0

data/spec/fixtures/vcr_cassettes/tunnels_with_wait.yml

@@ -0,0 +1,393 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels
+    body:
+      encoding: UTF-8
+      string: '{"tunnel_identifier":"KarlMarx"}'
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '85'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Tue, 30 Jul 2013 08:38:22 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=3c66b97477a4dedd1255faf05ce90d66; expires="Tue, 30-Jul-2013 08:56:35
+        GMT"; Max-Age=600; Path=/
+      - metrics=034bd00d05345d3992282b0f28e816878971ff1a86e9ab91ce174a2e89dcab18527fa539;
+        Path=/
+      Content-Length:
+      - '352'
+    body:
+      encoding: US-ASCII
+      string: &1 !ruby/string
+        str: '{"status": "new", "direct_domains": null, "shutdown_time": null, "ssh_port":
+          9123, "user_shutdown": null, "use_caching_proxy": false, "creation_time":
+          1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+          "KarlMarx", "host": null, "owner": "<SAUCE_USERNAME>", "use_kgp": true,
+          "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+        net_http_res: !ruby/object:Net::HTTPOK
+          http_version: '1.0'
+          code: '200'
+          message: OK
+          header:
+            server:
+            - nginx/0.7.62
+            date:
+            - Tue, 30 Jul 2013 08:38:22 GMT
+            content-type:
+            - application/json
+            connection:
+            - keep-alive
+            pragma:
+            - no-cache
+            cache-control:
+            - no-cache
+            x-frame-options:
+            - DENY
+            set-cookie:
+            - csrf_token=3c66b97477a4dedd1255faf05ce90d66; expires="Tue, 30-Jul-2013
+              08:56:35 GMT"; Max-Age=600; Path=/
+            - metrics=034bd00d05345d3992282b0f28e816878971ff1a86e9ab91ce174a2e89dcab18527fa539;
+              Path=/
+            content-length:
+            - '352'
+          body: *1
+          read: true
+          __read_body_previously_called: true
+        args:
+          :method: :post
+          :url: https://saucelabs.com/rest/v1/dylanatsauce/tunnels
+          :content_type: application/json
+          :headers:
+            Content-Length: 85
+          :payload: '{"tunnel_identifier":"bees","ssh_port":9123,"use_caching_proxy":false,"use_kgp":true}'
+          :user: dylanatsauce
+          :password: 8f5210dd-f0cf-477f-b720-9f721a9679a4
+        code: 200
+    http_version: 
+  recorded_at: Tue, 30 Jul 2013 08:46:35 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels/4824d6b282e04d1184daff5401a52e1e
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 01 Aug 2013 03:20:06 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=752c68b4d3f9188498845b26a9938b1d; expires="Thu, 01-Aug-2013 03:38:25
+        GMT"; Max-Age=600; Path=/
+      - metrics=6b0e2bf3f0246ea3a0837eab992cb753bf68300f3484e2ba8e39494d95d2c9408df53458;
+        Path=/
+      Content-Length:
+      - '385'
+    body:
+      encoding: US-ASCII
+      string: &2 !ruby/string
+        str: '{"status": "starting", "direct_domains": null, "shutdown_time": null,
+          "ssh_port": 9123, "user_shutdown": true, "use_caching_proxy": false, "creation_time":
+          1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+          "bees", "host": "maki11122.miso.saucelabs.com", "owner": "<SAUCE_USERNAME>",
+          "use_kgp": true, "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+        net_http_res: !ruby/object:Net::HTTPOK
+          http_version: '1.0'
+          code: '200'
+          message: OK
+          header:
+            server:
+            - nginx/0.7.62
+            date:
+            - Thu, 01 Aug 2013 03:20:06 GMT
+            content-type:
+            - application/json
+            connection:
+            - keep-alive
+            pragma:
+            - no-cache
+            cache-control:
+            - no-cache
+            x-frame-options:
+            - DENY
+            set-cookie:
+            - csrf_token=752c68b4d3f9188498845b26a9938b1d; expires="Thu, 01-Aug-2013
+              03:38:25 GMT"; Max-Age=600; Path=/
+            - metrics=6b0e2bf3f0246ea3a0837eab992cb753bf68300f3484e2ba8e39494d95d2c9408df53458;
+              Path=/
+            content-length:
+            - '385'
+          body: *2
+          read: true
+          __read_body_previously_called: true
+        args:
+          :method: :get
+          :url: https://saucelabs.com/rest/v1/dylanatsauce/tunnels/4824d6b282e04d1184daff5401a52e1e
+          :user: dylanatsauce
+          :password: 8f5210dd-f0cf-477f-b720-9f721a9679a4
+        code: 200
+    http_version:
+  recorded_at: Thu, 01 Aug 2013 03:28:18 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels/4824d6b282e04d1184daff5401a52e1e
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 01 Aug 2013 06:23:17 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=6049fff0dc34a51764c1ef3da112e657; expires="Thu, 01-Aug-2013 06:41:36
+        GMT"; Max-Age=600; Path=/
+      - metrics=cf830e9e8889594d0c2b8aaa17e07faea4ddf1865ac81c3321174484bb0d5100342edcc8;
+        Path=/
+      Content-Length:
+      - '385'
+    body:
+      encoding: US-ASCII
+      string: &3 !ruby/string
+        str: '{"status": "starting", "direct_domains": null, "shutdown_time": null,
+          "ssh_port": 9123, "user_shutdown": true, "use_caching_proxy": false, "creation_time":
+          1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+          "bees", "host": "maki11122.miso.saucelabs.com", "owner": "<SAUCE_USERNAME>",
+          "use_kgp": true, "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+        net_http_res: !ruby/object:Net::HTTPOK
+          http_version: '1.0'
+          code: '200'
+          message: OK
+          header:
+            server:
+            - nginx/0.7.62
+            date:
+            - Thu, 01 Aug 2013 06:23:17 GMT
+            content-type:
+            - application/json
+            connection:
+            - keep-alive
+            pragma:
+            - no-cache
+            cache-control:
+            - no-cache
+            x-frame-options:
+            - DENY
+            set-cookie:
+            - csrf_token=6049fff0dc34a51764c1ef3da112e657; expires="Thu, 01-Aug-2013
+              06:41:36 GMT"; Max-Age=600; Path=/
+            - metrics=cf830e9e8889594d0c2b8aaa17e07faea4ddf1865ac81c3321174484bb0d5100342edcc8;
+              Path=/
+            content-length:
+            - '385'
+          body: *3
+          read: true
+          __read_body_previously_called: true
+        args:
+          :method: :get
+          :url: https://saucelabs.com/rest/v1/dylanatsauce/tunnels/4824d6b282e04d1184daff5401a52e1e
+          :user: dylanatsauce
+          :password: 8f5210dd-f0cf-477f-b720-9f721a9679a4
+        code: 200
+    http_version: 
+  recorded_at: Thu, 01 Aug 2013 06:31:36 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels/4824d6b282e04d1184daff5401a52e1e
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 01 Aug 2013 06:24:17 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=6049fff0dc34a51764c1ef3da112e657; expires="Thu, 01-Aug-2013 06:42:36
+        GMT"; Max-Age=600; Path=/
+      - metrics=cf830e9e8889594d0c2b8aaa17e07faea4ddf1865ac81c3321174484bb0d5100342edcc8;
+        Path=/
+      Content-Length:
+      - '385'
+    body:
+      encoding: US-ASCII
+      string: &4 !ruby/string
+        str: '{"status": "starting", "direct_domains": null, "shutdown_time": null,
+          "ssh_port": 9123, "user_shutdown": true, "use_caching_proxy": false, "creation_time":
+          1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+          "bees", "host": "maki11122.miso.saucelabs.com", "owner": "<SAUCE_USERNAME>",
+          "use_kgp": true, "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+        net_http_res: !ruby/object:Net::HTTPOK
+          http_version: '1.0'
+          code: '200'
+          message: OK
+          header:
+            server:
+            - nginx/0.7.62
+            date:
+            - Thu, 01 Aug 2013 06:24:17 GMT
+            content-type:
+            - application/json
+            connection:
+            - keep-alive
+            pragma:
+            - no-cache
+            cache-control:
+            - no-cache
+            x-frame-options:
+            - DENY
+            set-cookie:
+            - csrf_token=6049fff0dc34a51764c1ef3da112e657; expires="Thu, 01-Aug-2013
+              06:42:36 GMT"; Max-Age=600; Path=/
+            - metrics=cf830e9e8889594d0c2b8aaa17e07faea4ddf1865ac81c3321174484bb0d5100342edcc8;
+              Path=/
+            content-length:
+            - '385'
+          body: *4
+          read: true
+          __read_body_previously_called: true
+        args:
+          :method: :get
+          :url: https://saucelabs.com/rest/v1/dylanatsauce/tunnels/4824d6b282e04d1184daff5401a52e1e
+          :user: dylanatsauce
+          :password: 8f5210dd-f0cf-477f-b720-9f721a9679a4
+        code: 200
+    http_version: 
+  recorded_at: Thu, 01 Aug 2013 06:32:36 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/tunnels/4824d6b282e04d1184daff5401a52e1e
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/0.7.62
+      Date:
+      - Thu, 01 Aug 2013 06:29:10 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=dcc651346d3a6b3e229c42284cee3c47; expires="Thu, 01-Aug-2013 06:47:29
+        GMT"; Max-Age=600; Path=/
+      - metrics=e3721320f41cb6f479b7c8bbe10c5939da9b818100af52ea0c0d4e4fae0d523dc0de5ed4;
+        Path=/
+      Content-Length:
+      - '385'
+    body:
+      encoding: US-ASCII
+      string: '{"status": "terminated", "direct_domains": null, "shutdown_time": null,
+        "ssh_port": 9123, "user_shutdown": true, "use_caching_proxy": false, "creation_time":
+        1375173995, "domain_names": null, "shared_tunnel": null, "tunnel_identifier":
+        "bees", "host": "maki11122.miso.saucelabs.com", "owner": "<SAUCE_USERNAME>",
+        "use_kgp": true, "id": "4824d6b282e04d1184daff5401a52e1e", "metadata": null}'
+    http_version: 
+  recorded_at: Thu, 01 Aug 2013 06:37:30 GMT
+recorded_with: VCR 2.5.0

data/spec/lib/sauce_whisk/account_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe SauceWhisk::Account do
-  describe "#new" do
+  describe "##new" do
     it "sets any options passed in as a hash" do
       options = {
           :access_key => 12345,
@@ -26,4 +26,12 @@ describe SauceWhisk::Account do
       test_account.total_concurrency.should eq 100
     end
   end
+
+  describe "#add_subaccount", :vcr => {:cassette_name => "accounts"} do
+    let(:parent) {SauceWhisk::Account.new(:access_key => 12345, :minutes => 23, :id => ENV["SAUCE_USERNAME"])}
+
+    it "creates a subaccount" do
+      subaccount = parent.add_subaccount("Manny", "newsub77", "Manny@blackbooks.co.uk", "davesdisease")
+    end
+  end
 end

data/spec/lib/sauce_whisk/accounts_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts"} do
+describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts", :match_requests_on => [:uri, :body]} do
   let(:auth) {"#{ENV["SAUCE_USERNAME"]}:#{ENV["SAUCE_ACCESS_KEY"]}"}
 
   describe "#fetch" do
@@ -30,6 +30,14 @@ describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts"} do
       assert_not_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
       account.total_concurrency.should be_nil
     end
+
+    context "with an invalid account" do
+      it "Raises an InvalidAccountError" do
+        expect{
+          SauceWhisk::Accounts.fetch "IDontExist"
+        }.to raise_error SauceWhisk::InvalidAccountError
+      end
+    end
   end
 
   describe "#concurrency_for" do
@@ -51,4 +59,78 @@ describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts"} do
       SauceWhisk::Accounts.concurrency_for(ENV["SAUCE_USERNAME"], :total).should eq 20
     end
   end
+
+  describe "#create_subaccount" do
+    let(:params) {{
+      :username => "newsub77",
+      :password => "davesdisease",
+      :name => "Manny",
+      :email => "Manny@blackbooks.co.uk"
+    }}
+
+    let(:parent) {SauceWhisk::Account.new(:access_key => 12345, :minutes => 23, :id => ENV["SAUCE_USERNAME"])}
+
+    it "calls the correct url" do
+      SauceWhisk::Accounts.create_subaccount(parent,
+          "Manny", "newsub77", "Manny@blackbooks.co.uk", "davesdisease")
+
+      assert_requested(:post,
+        "https://#{auth}@saucelabs.com/rest/v1/users/#{ENV["SAUCE_USERNAME"]}",
+        :body => params.to_json
+      )
+    end
+
+    it "returns a Subaccount object" do
+      sub = SauceWhisk::Accounts.create_subaccount(parent, "Manny", "newsub77",
+          "Manny@blackbooks.co.uk", "davesdisease")
+
+      sub.should be_a_kind_of SauceWhisk::Account
+    end
+
+    it "returns a Subaccount, parented to the Parent account" do
+      parent = SauceWhisk::Accounts.fetch ENV["SAUCE_USERNAME"]
+
+      sub = SauceWhisk::Accounts.create_subaccount(parent, "Manny", "newsub77",
+                                                   "Manny@blackbooks.co.uk", "davesdisease")
+
+      sub.parent.should be parent
+    end
+
+    context "trying to create too many subaccounts" do
+      it "should throw SubaccountCreationError" do
+       expect{
+          SauceWhisk::Accounts.create_subaccount(parent, "Manny", "toomany",
+              "Manny@blackbooks.co.uk", "davesdisease")
+        }.to raise_error SauceWhisk::SubAccountCreationError
+      end
+    end
+
+    context "trying to create a subaccount which already exists" do
+      it "should throw SubaccountCreationError" do
+        expect{
+          SauceWhisk::Accounts.create_subaccount(parent, "Manny", "duplicate",
+               "Manny@blackbooks.co.uk", "davesdisease")
+        }.to raise_error SauceWhisk::SubAccountCreationError
+      end
+    end
+
+    context "trying to create a subaccount which causes the tree to be too deep" do
+      it "should throw SubaccountCreationError" do
+        expect{
+          SauceWhisk::Accounts.create_subaccount(parent, "Manny", "deeptree",
+               "Manny@blackbooks.co.uk", "davesdisease")
+        }.to raise_error SauceWhisk::SubAccountCreationError
+      end
+    end
+
+    context "with a non-existant parent" do
+      let(:parent) {SauceWhisk::Account.new(:access_key => 12345, :minutes => 23, :id =>"nopenotaperson")}
+      it "should throw SubaccountCreationError" do
+        expect{
+          SauceWhisk::Accounts.create_subaccount(parent, "Manny", "deeptree",
+                                                 "Manny@blackbooks.co.uk", "davesdisease")
+        }.to raise_error SauceWhisk::InvalidAccountError
+      end
+    end
+  end
 end

data/spec/lib/sauce_whisk/rest_request_builder_spec.rb

@@ -71,38 +71,45 @@ describe SauceWhisk::RestRequestBuilder do
 
 begin
   describe "#post", :vcr => {:cassette_name => 'tunnels'} do
-    let(:expected_payload) {{:tunnel_identifier => "KarlMarx"}.to_json}
+    let(:expected_payload) {{:tunnel_identifier => "KarlMarx"}}
     it "calls the base URL" do
       expected_url = "#{SauceWhisk.base_url}/#{dummy_client.resource}"
       RestClient::Request.should_receive(:execute).with(hash_including({:url => expected_url}))
 
-      dummy_client.post expected_payload
+      dummy_client.post(:payload => expected_payload)
     end
 
     it "uses the correct method" do
       RestClient::Request.should_receive(:execute).with(hash_including({:method => :post}))
-      dummy_client.post expected_payload
+      dummy_client.post(:payload => expected_payload)
     end
 
-    it "includes the correct payload" do
-      RestClient::Request.should_receive(:execute).with(hash_including({:payload => expected_payload}))
-      dummy_client.post expected_payload
+    it "includes the correct payload, in JSON" do
+      RestClient::Request.should_receive(:execute).with(hash_including({:payload => expected_payload.to_json}))
+      dummy_client.post(:payload => expected_payload)
     end
 
     it "includes the correct content_type" do
       RestClient::Request.should_receive(:execute).with(hash_including({:content_type => "application/json"}))
-      dummy_client.post expected_payload
+      dummy_client.post(:payload => expected_payload)
     end
 
     it "includes the correct length" do
-      expected_length = expected_payload.length
+      expected_length = expected_payload.to_json.length
       RestClient::Request.should_receive(:execute).with(hash_including({:headers => {"Content-Length" => expected_length}}))
-      dummy_client.post expected_payload
+      dummy_client.post(:payload => expected_payload)
     end
 
     it "includes the authentication parameters" do
       RestClient::Request.should_receive(:execute).with(hash_including(mock_auth))
-      dummy_client.post expected_payload
+      dummy_client.post(:payload => expected_payload)
+    end
+
+    it "allows for base resource additions" do
+      expected_url = "#{SauceWhisk.base_url}/#{dummy_client.resource}/dummy_res"
+      RestClient::Request.should_receive(:execute).with(hash_including({:payload => expected_payload.to_json, :url => expected_url}))
+
+      dummy_client.post(:payload => expected_payload, :resource =>"dummy_res")
     end
   end
 end

data/spec/lib/sauce_whisk/subaccounts_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "a subaccount" do
+  let(:parent) {SauceWhisk::Account.new(:id => ENV["SAUCE_USERNAME"], :access_key => "12345", :minutes=>12)}
+  let(:params) {{:access_key => 12345, :minutes => 23, :id => "someone"}}
+
+  it "is an Account object" do
+    sub = SauceWhisk::SubAccount.new(parent, params)
+    sub.should be_a_kind_of SauceWhisk::Account
+  end
+
+  it "takes a parent as a parameter" do
+    sub = SauceWhisk::SubAccount.new(parent, params)
+    sub.parent.should be parent
+  end
+end

data/spec/lib/sauce_whisk/tunnels_spec.rb

@@ -41,6 +41,11 @@ describe SauceWhisk::Tunnels, :vcr => {:cassette_name => "tunnels"} do
     it "returns instances of Tunnel" do
       tunnel = SauceWhisk::Tunnels.fetch job_id
       tunnel.should be_an_instance_of SauceWhisk::Tunnel
+      STDERR.puts "Tunnel port #{tunnel.ssh_port} #{tunnel.ssh_port.class}"
+    end
+
+    it "raises an exception with called without an id" do
+      expect {SauceWhisk::Tunnels.fetch(nil)}.to raise_exception ArgumentError
     end
   end
 
@@ -53,11 +58,33 @@ describe SauceWhisk::Tunnels, :vcr => {:cassette_name => "tunnels"} do
   end
 
   describe "##open" do
+    let(:params) {{:tunnel_identifier => "bees", :ssh_port => 9123, :use_caching_proxy => false, :use_kgp => true}}
     it "calls the correct API method" do
-      params = {:tunnel_identifier => "bees", :ssh_port => 9123, :use_caching_proxy => false, :use_kgp => true}
-
       SauceWhisk::Tunnels.open params
       assert_requested(:post, "https://#{auth}@saucelabs.com/rest/v1/dylanatsauce/tunnels",:body => params.to_json)
     end
+
+    it "returns an instance of tunnel" do
+      tunnel = SauceWhisk::Tunnels.open params
+      tunnel.should be_an_instance_of SauceWhisk::Tunnel
+
+      # These aren't magic, they're taken from the tunnels fixture.  <3 VCR.
+      tunnel.id.should eq "4824d6b282e04d1184daff5401a52e1e"
+      tunnel.ssh_port.should eq 9123
+    end
+
+    context "When asked to wait until running", :vcr => {:cassette_name => 'tunnels_with_wait'} do
+      it "calls fetch on the opened tunnel until the status is running" do
+        requested_tunnel = SauceWhisk::Tunnels.open params
+        t_id = requested_tunnel.id
+
+        # There are 3 failing and 1 passing examples in the fixture
+        assert_requested :get, "https://#{auth}@saucelabs.com/rest/v1/dylanatsauce/tunnels/#{t_id}", :times => 4
+      end
+
+      it "throws an exception if the timeout is exceeded" do
+        requested_tunnel = SauceWhisk::Tunnels.open params
+      end
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sauce_whisk
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Dylan Lacey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -113,6 +113,7 @@ files:
 - spec/fixtures/vcr_cassettes/no_tunnels.yml
 - spec/fixtures/vcr_cassettes/rest_request.yml
 - spec/fixtures/vcr_cassettes/tunnels.yml
+- spec/fixtures/vcr_cassettes/tunnels_with_wait.yml
 - spec/lib/sauce_whisk/account_spec.rb
 - spec/lib/sauce_whisk/accounts_spec.rb
 - spec/lib/sauce_whisk/asset_spec.rb
@@ -122,6 +123,7 @@ files:
 - spec/lib/sauce_whisk/jobs_spec.rb
 - spec/lib/sauce_whisk/rest_request_builder_spec.rb
 - spec/lib/sauce_whisk/sauce_whisk_spec.rb
+- spec/lib/sauce_whisk/subaccounts_spec.rb
 - spec/lib/sauce_whisk/tunnel_spec.rb
 - spec/lib/sauce_whisk/tunnels_spec.rb
 - spec/spec_helper.rb
@@ -205,6 +207,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/no_tunnels.yml
 - spec/fixtures/vcr_cassettes/rest_request.yml
 - spec/fixtures/vcr_cassettes/tunnels.yml
+- spec/fixtures/vcr_cassettes/tunnels_with_wait.yml
 - spec/lib/sauce_whisk/account_spec.rb
 - spec/lib/sauce_whisk/accounts_spec.rb
 - spec/lib/sauce_whisk/asset_spec.rb
@@ -214,6 +217,7 @@ test_files:
 - spec/lib/sauce_whisk/jobs_spec.rb
 - spec/lib/sauce_whisk/rest_request_builder_spec.rb
 - spec/lib/sauce_whisk/sauce_whisk_spec.rb
+- spec/lib/sauce_whisk/subaccounts_spec.rb
 - spec/lib/sauce_whisk/tunnel_spec.rb
 - spec/lib/sauce_whisk/tunnels_spec.rb
 - spec/spec_helper.rb