sauce_whisk 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c06558c998bebee55ffeb54f939eb943226df5c
-  data.tar.gz: 364146facb4967133f6c185c04047da134b4f4cb
+  metadata.gz: 580cc7466c29d1ed8d8504c6afb3cb80354884c8
+  data.tar.gz: 043b5e0f5b53be3599349913b0d8926e0abc95aa
 SHA512:
-  metadata.gz: ecfc79550e42cc21f1bdf1272fb81d1af1ccd011bc45ced2b795cba6fced8e911cb8359272430353be66c6c2ddb065e221c15415eb739a6e4ce53aaa0c0ffa70
-  data.tar.gz: 53322585638866c7da9aef5090fb4b361869f2afa439ecba1ab884e49ff919e788d39ca09d2107b352136ebe31ba04dd0355ffc69db48737c8b3c41a8fec8c28
+  metadata.gz: 54942e8ed65c2c4a7e1f82848ba1cb06c080c20e2427b9b78019acc833cfabb700a2a81df1ce3d54b6956aef46c4c52d9cb97e045b800e3b9467d195f4a838ef
+  data.tar.gz: 4c2dc81b0a7a7281bb926006f43e9ecb7d4fb0ab7d652d78da16e7f4b2fd48e41b1b9c2d838015e89270bb63080af0ecb5a1cdc9f13f103bd2c1bddc64431f51

data/README.md

@@ -36,11 +36,12 @@ You'll need a [Sauce Labs account](http://wwww.saucelabs.com/signup).  They're f
 
 
 ### Locations
-There are three ways to configure SauceWhisk.  The gem tries each of the following locations in turn.
+There are four ways to configure SauceWhisk.  The gem tries each of the following locations in turn.  Note, Environment Variables are the preferred means of setting configuration.
 
 #### Directly on the SauceWhisk object
-`asset_fetch_retries` and `rest_retries` can be set directly on the SauceWhisk object:
+`username`, `access_key`, `asset_fetch_retries` and `rest_retries` can be set directly on the SauceWhisk object:
 ```ruby
+SauceWhisk.username = 'some_rad_tester'
 SauceWhisk.asset_fetch_retries = 5
 ```
 

data/changelog.markdown

@@ -1,4 +1,8 @@
 # Major Version 0
+### 0.0.19
+* You can now configure SauceWhisk.username and SauceWhisk.access_key.  These values override all other configuration settings
+* Removed Content-Type header from PUT commands as per documentation
+
 ### 0.0.18
 * @tommeier is a champion and bumped rest_client to 1.8.0 to avoid a security flaw (Fixes #42).
 

data/lib/sauce_whisk.rb

@@ -17,6 +17,14 @@ module SauceWhisk
     "https://saucelabs.com/rest/v1"
   end
 
+  def self.username= username
+    @username = username
+  end
+
+  def self.access_key= access_key
+    @access_key = access_key
+  end
+
   def self.username
     return self.load_first_found(:username)
   end
@@ -98,8 +106,14 @@ module SauceWhisk
   end
 
   def self.load_first_found(key)
-    value = ::Sauce::Config.new[key] if defined? ::Sauce
+    value = self.instance_variable_get "@#{key}".to_sym
+
+    unless value
+      value = ::Sauce::Config.new[key] if defined? ::Sauce
+    end
+
     value = self.from_yml(key) unless value
+    
     unless value
       env_key = "SAUCE_#{key.to_s.upcase}" 
       value = ENV[env_key]

data/lib/sauce_whisk/rest_request_builder.rb

@@ -20,7 +20,7 @@ module SauceWhisk
           :method => :put,
           :url => url,
           :payload => body,
-          :content_type => "application/json",
+          :content_type => :json,
           :headers => headers
       }
       make_request(req_params.merge auth_details)

data/lib/sauce_whisk/version.rb

@@ -1,3 +1,3 @@
 module SauceWhisk
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/sauce_whisk.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
 
   gem.license = 'MIT'
 
-  gem.add_runtime_dependency 'rest-client', '~> 1.7'
+  gem.add_runtime_dependency 'rest-client', '~> 1.8.0'
   gem.add_runtime_dependency 'json', '~> 1.8.1'
   gem.add_development_dependency 'vcr', '~> 2.9.0'
-  gem.add_development_dependency 'webmock', '~> 1.18.0'
-  gem.add_development_dependency 'rspec', '~> 3.0.0'
-  gem.add_development_dependency 'rake', '~> 10.3.2'
+  gem.add_development_dependency 'webmock', '~> 1.21.0'
+  gem.add_development_dependency 'rspec', '~> 3.3.0'
+  gem.add_development_dependency 'rake', '~> 10.4.2'
 end

data/spec/lib/sauce_whisk/jobs_spec.rb

@@ -24,7 +24,7 @@ describe SauceWhisk::Jobs do
     it "passes a test status to the REST api" do
       job_id = "bd9c43dd6b5549f1b942d1d581d98cac"
       SauceWhisk::Jobs.change_status job_id, true
-      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job_id}", :body => pass_string, :content_type => "application/json"
+      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job_id}", :body => pass_string
     end
   end
 
@@ -51,7 +51,7 @@ describe SauceWhisk::Jobs do
       job_id = "bd9c43dd6b5549f1b942d1d581d98cac"
       job = SauceWhisk::Job.new({:id => job_id})
       SauceWhisk::Jobs.save (job)
-      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => anything, :content_type => "application/json"
+      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => anything
     end
 
     it "only sends updated information" do
@@ -60,7 +60,7 @@ describe SauceWhisk::Jobs do
       job.name = "Updated Name"
       SauceWhisk::Jobs.save (job)
       expected_body = {:name => "Updated Name"}.to_json
-      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => expected_body, :content_type => "application/json"
+      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => expected_body
     end
   end
 
@@ -116,7 +116,7 @@ describe SauceWhisk::Jobs do
   describe "##stop", :vcr => {:cassette_name => "jobs"} do
     it "calls the API correctly" do
       SauceWhisk::Jobs.stop "3edc8fe6d52645bf931b1003da65af1f"
-      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/3edc8fe6d52645bf931b1003da65af1f/stop", :content_type => "application/json"
+      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/3edc8fe6d52645bf931b1003da65af1f/stop"
     end
 
     it "does something interesting when the job is already stopped" do

data/spec/lib/sauce_whisk/rest_request_builder_spec.rb

@@ -144,11 +144,6 @@ end
       dummy_client.put "something", "another_thing"
     end
 
-    it "includes the right content_type" do
-      expect( RestClient::Request ).to receive(:execute).with(hash_including({:content_type => "application/json"}))
-      dummy_client.put "something", "another_thing"
-    end
-
     it "includes the right method" do
       expect( RestClient::Request ).to receive(:execute).with(hash_including({:method => :put}))
       dummy_client.put "something", "another_thing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sauce_whisk
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Dylan Lacey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
 description: A Wrapper for the Sauce Labs REST API.
 email:
 - github@dylanlacey.com