sauce_whisk 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 580cc7466c29d1ed8d8504c6afb3cb80354884c8
-  data.tar.gz: 043b5e0f5b53be3599349913b0d8926e0abc95aa
+  metadata.gz: 5bcdd67ee4587647ee4a6d20b5bac89a50d09a25
+  data.tar.gz: 73fb38fbc95b357c5edcf37c759ae505cbc1ba71
 SHA512:
-  metadata.gz: 54942e8ed65c2c4a7e1f82848ba1cb06c080c20e2427b9b78019acc833cfabb700a2a81df1ce3d54b6956aef46c4c52d9cb97e045b800e3b9467d195f4a838ef
-  data.tar.gz: 4c2dc81b0a7a7281bb926006f43e9ecb7d4fb0ab7d652d78da16e7f4b2fd48e41b1b9c2d838015e89270bb63080af0ecb5a1cdc9f13f103bd2c1bddc64431f51
+  metadata.gz: 42717f223ac6ead17b8e3d9542436e436204a2bbe6df622ca05f340fd63450b9b90e01c5e331495840e09df49038d72cfe075942ba0e946bf53fe4a8b600d097
+  data.tar.gz: 997b70fc0e41c91a9b4a415de955be01450d242bdf8101b054e9278bec541c5f20a531acadda37fd04d1b7e0607a95cece67f56c35a9f6d123297c359f4ddd21

data/.travis.yml

@@ -2,4 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.1
+before_install:
+  - gem install bundler

data/Rakefile

@@ -2,10 +2,14 @@ require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-RSpec::Core::RakeTask.new(:spec)
+begin
+  RSpec::Core::RakeTask.new(:spec)
 
-# If these are nil then the tests will fail
-ENV['SAUCE_USERNAME']   ||= 'test_user'
-ENV['SAUCE_ACCESS_KEY'] ||= 'test_key'
+  # If these are nil then the tests will fail
+  ENV['SAUCE_USERNAME']   ||= 'test_user'
+  ENV['SAUCE_ACCESS_KEY'] ||= 'test_key'
 
-task :default => :spec
+  task :default => :spec
+rescue LoadError
+  # No Rspec here
+end

data/changelog.markdown

@@ -1,4 +1,8 @@
 # Major Version 0
+###
+* ArgumentError will now be thrown if the gem can't find a Username or Access Key
+* Jobs.fetch no longer swallows RestClient errors _unless_ specifically caused by a job not being finished.
+
 ### 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

data/code_of_conduct.markdown

@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/lib/sauce_whisk.rb

@@ -26,11 +26,15 @@ module SauceWhisk
   end
 
   def self.username
-    return self.load_first_found(:username)
+    configured_username = self.load_first_found(:username)
+    return configured_username unless configured_username.nil? || configured_username.empty?
+    raise ::ArgumentError.new "Couldn't find Username in Sauce::Config, yaml file or Environment Variables"
   end
 
   def self.password
-    return self.load_first_found(:access_key)
+    configured_key = self.load_first_found(:access_key)
+    return configured_key unless configured_key.nil? || configured_key.empty?
+    raise ::ArgumentError.new "Couldn't find Access Key in Sauce::Config, yaml file or Environment Variables"
   end
 
   def self.asset_fetch_retries=(retries)

data/lib/sauce_whisk/jobs.rb

@@ -31,7 +31,11 @@ module SauceWhisk
 
     def self.save(job)
       fields_to_save = job.updated_fields.each_with_object(Hash.new) do |field, hsh|
-        hsh[field] = job.send(field.to_s)
+        if field == :custom_data
+          hsh[:'custom-data'] = job.send(field.to_s)
+        else
+          hsh[field] = job.send(field.to_s)
+        end
       end
       put job.id, fields_to_save.to_json
     end
@@ -70,8 +74,13 @@ module SauceWhisk
       screenshots = assets["screenshots"]
 
       {"screenshot_urls" => screenshots}
-    rescue RestClient::BadRequest
-      raise SauceWhisk::JobNotComplete
+    rescue RestClient::BadRequest => e
+      SauceWhisk.logger.debug("Exception fetching assets: #{e}")
+      if (/Job hasn't finished running/.match e.response)
+        raise SauceWhisk::JobNotComplete
+      else
+        raise e
+      end
     end
   end
 

data/lib/sauce_whisk/version.rb

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

data/spec/lib/sauce_whisk/jobs_spec.rb

@@ -62,6 +62,15 @@ describe SauceWhisk::Jobs do
       expected_body = {:name => "Updated Name"}.to_json
       assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => expected_body
     end
+
+    it "sends custom-data with hyphen", :focus => true do
+      job_id = "bd9c43dd6b5549f1b942d1d581d98cac"
+      job = SauceWhisk::Job.new({:id => job_id})
+      job.custom_data = {:key => "value"}
+      SauceWhisk::Jobs.save (job)
+      expected_body = {:'custom-data' => {:key => "value"}}.to_json
+      assert_requested :put, "https://#{auth}@saucelabs.com/rest/v1/#{user}/jobs/#{job.id}", :body => expected_body
+    end
   end
 
   describe "##fetch", :vcr => {:cassette_name => "jobs"} do

data/spec/lib/sauce_whisk/sauce_whisk_spec.rb

@@ -10,11 +10,41 @@ describe SauceWhisk do
   describe "##username" do
     subject {SauceWhisk.username}
     it {should eq ENV["SAUCE_USERNAME"]}
+
+    describe "when empty" do
+      subject {lambda {SauceWhisk.username}}
+
+      around do |spec|
+        @un = ENV["SAUCE_USERNAME"]
+        ENV.delete "SAUCE_USERNAME"
+        
+        spec.run
+
+        ENV["SAUCE_USERNAME"] = @un
+      end
+
+      it {is_expected.to raise_exception}
+    end  
   end
 
   describe "##password" do
     subject {SauceWhisk.password}
     it {should eq ENV["SAUCE_ACCESS_KEY"]}
+
+    describe "when empty" do
+      subject {lambda {SauceWhisk.password}}
+
+      around do |spec|
+        @pw = ENV["SAUCE_ACCESS_KEY"]
+        ENV.delete "SAUCE_ACCESS_KEY"
+        
+        spec.run
+
+        ENV["SAUCE_ACCESS_KEY"] = @pw
+      end
+
+      it {is_expected.to raise_exception}
+    end  
   end
 
   describe "##pass_job" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sauce_whisk
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Dylan Lacey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -111,6 +111,7 @@ files:
 - README.md
 - Rakefile
 - changelog.markdown
+- code_of_conduct.markdown
 - lib/sauce-whisk.rb
 - lib/sauce_whisk.rb
 - lib/sauce_whisk/accounts.rb