sauce_whisk 0.0.5 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUxZmUwNTM1MjkxMmM2OWYxZjViZDhlYjVhMjAwNTQzZWYzNWQzOQ==
+    Mjk5OWJjYTU5ZDI4Nzc2NWI1MzliODZkNzQyNWI0YmNiNDUzM2U1YQ==
   data.tar.gz: !binary |-
-    YzFjZTE5OTZjZTE4YWNkNzc0NjBiMWZiNTA0MjM5Yjc4YzM5YTUwMQ==
+    ZWY3ZWY5ZDk4ZTlmYTM1NmUxYjFmMmYwMGI3YTdmZDU5YzJjZWI5Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDczNThiNDI5NmJlM2IzNzg4MzIxMDMyYWRlM2FlMmMyZjVlMTQ4MjRjMDRl
-    NDU1YWEyMjk3ZDhmNDJiNDZhM2ZkY2E0NDBlZjBjNTcwOTVjYTkxNGNiNjA4
-    ZGVmMGRlNTAzZGUxNzQ2YjJkMzdlNTE3MDgyZjI0Zjc4YjJmZmE=
+    M2NkNmY3ZGY4OTM0YTI5YTBkZTVmZWY5ZGFiZGE3NGI5ZGIyZDRmNzBlYjVk
+    ODIxMTJjYzQzZTNkMjcyNGFjYTJkNWMzYzY4NjRmZjI4NWM4OGUwZTNlMzZl
+    MmU5MDM4NDkwYTU3ZjFlNTczY2ZjMTdjODZmZDZkYzJmMTkzNGI=
   data.tar.gz: !binary |-
-    ODQ4OGJiNzdiZGQ5MmY2ZjI5MTI2YTEwYzhmNTdhOTg1YTZkMWEwM2JiMmUz
-    OTdmOGUxMTE4ZWJkZGYzZDk3OTg2ZjFlYzNmYTFmNjU5ZDMzNGQ1ZGU0NGU1
-    NzkyNjNlZDg2NDQ3OTY3YWNjNDc3ZDVkZGE1NDhhYzRhMGQ0NzE=
+    MDA0YzI3MWYzMzExYjk5NGUxYTQwM2UwMTc4MmJhOWU3ZTJmYTYyMmRmNWE1
+    N2UyNGJmOTljYTZiZWI3N2M1MDc5ODgxYmUyMmRhNmM3YTUxMWYzNDVjYzg3
+    YzQxZDE5YzI4ODFmNGMyYjY5OTU0MzliMzc3YzJmNWIxOTZlZDA=

data/.ruby-gemset

@@ -0,0 +1 @@
+sauce_whisk

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p362

data/Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
+gem "pry"
+
 group :test do
-#  gem 'psych', "2.0.0", :path => "./vendor/psych"
+  gem 'psych', "2.0.0", :path => "./vendor/psych"
 end
 
 gemspec

data/README.md

@@ -88,6 +88,36 @@ There are three types of asset for Sauce Labs jobs: screenshots, video and logs.
   video = job.video # A single Asset, holding the video
 ```
 
+### Tunnels
+
+Tunnels give information about currently running [Sauce Connect](https://saucelabs.com/docs/connect) tunnels for a given user.
+
+#### Fetching All Active Tunnels
+
+```ruby
+all_tunnels = SauceWhisk::Tunnels.all   # An array of SauceWhisk::Tunnel objects
+all_tunnels_as_json = SauceWhisk::Tunnels.all(:fetch_each => false)  # An array of Tunnel IDs
+```
+
+#### Details for a specific tunnel
+```ruby
+tunnel = SauceWhisk::Tunnels.fetch(tunnel_id)   # An instance of Tunnel
+tunnel.id        # The Tunnel, um, id.
+tunnel.owner     # The Sauce Account responsible for the tunnel -- The Credentials used to open it
+tunnel.status    # Whether or not the tunnel is open
+tunnel.host      # The Sauce Labs machine hosting the other end of the Tunnel
+tunnel.creation_time  # When the tunnel was opened, in Epoch time
+```
+
+#### Stopping a Tunnel
+
+```ruby
+tunnel = SauceWhisk::Tunnels.fetch tunnel_id
+tunnel.stop  # Stops the Tunnel
+
+SauceWhisk::Tunnels.stop tunnel_id   # Stops the tunnel with the given id
+```
+
 ### Logger
 
 You can set a custom logger object, passing anything that responds to puts:

data/changelog.markdown

@@ -1,4 +1,6 @@
 # Major Version 0
+### 0.0.6
+* Correct RestClient -- Actually require it
 ### 0.0.5
 * Added Sauce class
 

data/lib/sauce_whisk.rb

@@ -1,9 +1,11 @@
+require "sauce_whisk/rest_request_builder"
 require "sauce_whisk/version"
 require "sauce_whisk/jobs"
 require "sauce_whisk/assets"
 require "sauce_whisk/tunnels"
 require "sauce_whisk/info"
-require "sauce_whisk/rest_request_builder"
+require "sauce_whisk/accounts"
+
 
 
 module SauceWhisk

data/lib/sauce_whisk/accounts.rb

@@ -0,0 +1,38 @@
+module SauceWhisk
+  class Accounts
+    extend SauceWhisk::RestRequestBuilder
+
+    def self.fetch(user_id = ENV["SAUCE_USERNAME"], get_concurrency = true)
+      user_parameters = JSON.parse get "users/#{user_id}"
+      concurrencies = get_concurrency ? concurrency_for(user_id) : {}
+
+      account_parameters = user_parameters.merge concurrencies
+      return Account.new(account_parameters)
+    end
+
+    def self.concurrency_for(job_id = ENV["SAUCE_USERNAME"], type = :both)
+      concurrencies = JSON.parse (get "#{job_id}/limits"), :symbolize_names => true
+      case type
+        when :mac
+          return concurrencies[:mac_concurrency]
+        when :total
+          return concurrencies[:concurrency]
+        else
+          return {:mac_concurrency => concurrencies[:mac_concurrency],
+                  :total_concurrency => concurrencies[:concurrency]
+          }
+      end
+    end
+
+  end
+  class Account
+    attr_reader :access_key, :username, :minutes, :total_concurrency, :mac_concurrency
+    def initialize(options)
+      @access_key = options[:access_key]
+      @username = options[:id]
+      @minutes = options[:minutes]
+      @total_concurrency = options[:total_concurrency]
+      @mac_concurrency = options[:mac_concurrency]
+    end
+  end
+end

data/lib/sauce_whisk/info.rb

@@ -1,4 +1,5 @@
 require "json"
+require 'sauce_whisk/rest_request_builder'
 
 module SauceWhisk
   class Sauce

data/lib/sauce_whisk/jobs.rb

@@ -17,7 +17,7 @@ module SauceWhisk
 
     def self.change_status(job_id, status)
       put job_id, {"passed" => status}.to_json
-    rescue e
+    rescue StandardError => e
       SauceWhisk.logger "Unable to change_status for #{job_id} to #{status}\nReason: #{e.to_s}"
     end
 

data/lib/sauce_whisk/rest_request_builder.rb

@@ -1,3 +1,5 @@
+require "rest-client"
+
 module SauceWhisk
   module RestRequestBuilder
 

data/lib/sauce_whisk/tunnels.rb

@@ -8,8 +8,9 @@ module SauceWhisk
       "#{SauceWhisk.username}/tunnels"
     end
 
-    def self.all(fetch_each = false)
+    def self.all(opts = {:fetch_each => true})
       all_tunnels = JSON.parse get
+      fetch_each = opts[:fetch_each]
 
       unless fetch_each
         return all_tunnels

data/lib/sauce_whisk/version.rb

@@ -1,3 +1,3 @@
 module SauceWhisk
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/spec/fixtures/vcr_cassettes/accounts.yml

@@ -0,0 +1,92 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/users/<SAUCE_USERNAME>
+    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:
+      - Mon, 17 Jun 2013 12:23:32 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=80e9120e6d754f5d8df8772d5aadd0a8; expires="Mon, 17-Jun-2013 12:40:47
+        GMT"; Max-Age=600; Path=/
+      - metrics=a5621049f443f276d44c2d73fbbba83bef904ae8455aede851a14edfb2450fb7e3255e49;
+        Path=/
+      Content-Length:
+      - '143'
+    body:
+      encoding: US-ASCII
+      string: '{"access_key": "<SAUCE_ACCESS_KEY>", "minutes": "infinite", "id": "<SAUCE_USERNAME>",
+        "subscribed": true, "can_run_manual": true}'
+    http_version: 
+  recorded_at: Mon, 17 Jun 2013 12:30:46 GMT
+- request:
+    method: get
+    uri: https://<SAUCE_USERNAME>:<SAUCE_ACCESS_KEY>@saucelabs.com/rest/v1/<SAUCE_USERNAME>/limits
+    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:
+      - Mon, 17 Jun 2013 12:23:33 GMT
+      Content-Type:
+      - application/json
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      X-Frame-Options:
+      - DENY
+      Set-Cookie:
+      - csrf_token=d38cdde67f2a155f7083ebe872c582bd; expires="Mon, 17-Jun-2013 12:40:48
+        GMT"; Max-Age=600; Path=/
+      - metrics=897a82824950620d8e70dbda2cb339666f9a60cba2d2ef02beab418680a125d3df05bb41;
+        Path=/
+      Content-Length:
+      - '76'
+    body:
+      encoding: US-ASCII
+      string: '{"mac_concurrency": 5, "concurrency": 20}'
+    http_version: 
+  recorded_at: Mon, 17 Jun 2013 12:30:47 GMT
+recorded_with: VCR 2.5.0

data/spec/lib/sauce_whisk/account_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe SauceWhisk::Account do
+  describe "#new" do
+    it "sets any options passed in as a hash" do
+      options = {
+          :access_key => 12345,
+          :minutes => 23,
+          :id => "someone"
+      }
+
+      test_account = SauceWhisk::Account.new options
+      test_account.access_key.should eq 12345
+      test_account.minutes.should eq 23
+      test_account.username.should eq "someone"
+    end
+
+    it "sets concurrency figures" do
+      concurrencies = {
+          :mac_concurrency => 23,
+          :total_concurrency => 100
+      }
+
+      test_account = SauceWhisk::Account.new concurrencies
+      test_account.mac_concurrency.should eq 23
+      test_account.total_concurrency.should eq 100
+    end
+  end
+end

data/spec/lib/sauce_whisk/accounts_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe SauceWhisk::Accounts, :vcr => {:cassette_name => "accounts"} do
+  let(:auth) {"#{ENV["SAUCE_USERNAME"]}:#{ENV["SAUCE_ACCESS_KEY"]}"}
+
+  describe "#fetch" do
+    it "fetches the passed in account" do
+      SauceWhisk::Accounts.fetch ENV["SAUCE_USERNAME"]
+      assert_requested :get, "https://#{auth}@saucelabs.com/rest/v1/users/#{ENV["SAUCE_USERNAME"]}"
+    end
+
+    it "returns an Account object" do
+      SauceWhisk::Accounts.fetch(ENV["SAUCE_USERNAME"]).should be_an_instance_of SauceWhisk::Account
+    end
+
+    it "includes the concurrency by default" do
+      account = SauceWhisk::Accounts.fetch ENV["SAUCE_USERNAME"]
+      assert_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
+      account.total_concurrency.should eq 20
+      account.mac_concurrency.should eq 5
+    end
+
+    it "should not include concurrency when conservative is set to false" do
+      account = SauceWhisk::Accounts.fetch(ENV["SAUCE_USERNAME"], false)
+      assert_not_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
+      account.total_concurrency.should be_nil
+    end
+  end
+
+  describe "#concurrency_for" do
+    it "fetches the concurrency for the passed in account" do
+      SauceWhisk::Accounts.concurrency_for ENV["SAUCE_USERNAME"]
+      assert_requested :get, "https://#{auth}@saucelabs.com/rest/v1/#{ENV["SAUCE_USERNAME"]}/limits"
+    end
+
+    it "returns concurrencies with altered names" do
+      expected_hash = {:mac_concurrency => 5, :total_concurrency => 20}
+      SauceWhisk::Accounts.concurrency_for(ENV["SAUCE_USERNAME"]).should eq expected_hash
+    end
+
+    it "returns just mac as an integer when requested" do
+      SauceWhisk::Accounts.concurrency_for(ENV["SAUCE_USERNAME"], :mac).should eq 5
+    end
+
+    it "returns just the total as an integer when requested" do
+      SauceWhisk::Accounts.concurrency_for(ENV["SAUCE_USERNAME"], :total).should eq 20
+    end
+  end
+end

data/spec/lib/sauce_whisk/jobs_spec.rb

@@ -86,8 +86,8 @@ describe SauceWhisk::Jobs do
       SauceWhisk::Jobs.stop "9591ce8519f043f8b3bea0462923c883"
     end
 
-    it "does something else interesting when the job does not exist" do
-      SauceWhisk::Jobs.stop "job_id"
+    it "throws a ResourceNotFound error when the job isn't found" do
+       expect {SauceWhisk::Jobs.stop("job_id")}.to raise_exception RestClient::ResourceNotFound
     end
 
   end

data/spec/lib/sauce_whisk/tunnels_spec.rb

@@ -15,18 +15,18 @@ describe SauceWhisk::Tunnels, :vcr => {:cassette_name => "tunnels"} do
     end
 
     context "called without the 'fetch' parameter" do
-      it "returns an array of strings" do
+      it "returns an array of Tunnels" do
         tunnels = SauceWhisk::Tunnels.all
         tunnels.should be_an_instance_of Array
-        tunnels.each {|tunnel| tunnel.should be_an_instance_of String }
+        tunnels.each {|tunnel| tunnel.should be_an_instance_of SauceWhisk::Tunnel}
       end
     end
 
-    context "called with the fetch parameter" do
-      it "returns an array of Tunnels" do
-        tunnels = SauceWhisk::Tunnels.all(:fetch)
+    context "called with the fetch parameter set false" do
+      it "returns an array of strings" do
+        tunnels = SauceWhisk::Tunnels.all(:fetch_each => false)
         tunnels.should be_an_instance_of Array
-        tunnels.each {|tunnel| tunnel.should be_an_instance_of SauceWhisk::Tunnel}
+        tunnels.each {|tunnel| tunnel.should be_an_instance_of String }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sauce_whisk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Dylan Lacey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -88,12 +88,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - changelog.markdown
 - lib/sauce_whisk.rb
+- lib/sauce_whisk/accounts.rb
 - lib/sauce_whisk/assets.rb
 - lib/sauce_whisk/info.rb
 - lib/sauce_whisk/jobs.rb
@@ -101,6 +104,7 @@ files:
 - lib/sauce_whisk/tunnels.rb
 - lib/sauce_whisk/version.rb
 - sauce_whisk.gemspec
+- spec/fixtures/vcr_cassettes/accounts.yml
 - spec/fixtures/vcr_cassettes/assets.yml
 - spec/fixtures/vcr_cassettes/info.yml
 - spec/fixtures/vcr_cassettes/jobs.yml
@@ -108,6 +112,8 @@ files:
 - spec/fixtures/vcr_cassettes/no_tunnels.yml
 - spec/fixtures/vcr_cassettes/rest_request.yml
 - spec/fixtures/vcr_cassettes/tunnels.yml
+- spec/lib/sauce_whisk/account_spec.rb
+- spec/lib/sauce_whisk/accounts_spec.rb
 - spec/lib/sauce_whisk/asset_spec.rb
 - spec/lib/sauce_whisk/assets_spec.rb
 - spec/lib/sauce_whisk/info_spec.rb
@@ -190,6 +196,7 @@ specification_version: 4
 summary: Sauce_Whisk lets you mix extra data into your Sauce test results! Fetch and
   update Job details, screenshots, videos and logs.
 test_files:
+- spec/fixtures/vcr_cassettes/accounts.yml
 - spec/fixtures/vcr_cassettes/assets.yml
 - spec/fixtures/vcr_cassettes/info.yml
 - spec/fixtures/vcr_cassettes/jobs.yml
@@ -197,6 +204,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/no_tunnels.yml
 - spec/fixtures/vcr_cassettes/rest_request.yml
 - spec/fixtures/vcr_cassettes/tunnels.yml
+- spec/lib/sauce_whisk/account_spec.rb
+- spec/lib/sauce_whisk/accounts_spec.rb
 - spec/lib/sauce_whisk/asset_spec.rb
 - spec/lib/sauce_whisk/assets_spec.rb
 - spec/lib/sauce_whisk/info_spec.rb