subordinate 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2EzZTBlYzBhZDM0MmQwN2RjMjhhYTg0MGQ4YTliOGJkNmU4NDgwNg==
+    YmNjYmE1MjYzMTFhYWJmMmRiNGZlNTY3ZTA3YzNjNzJlYTlmZjBlMw==
   data.tar.gz: !binary |-
-    MjI0ODExMWQ1MjdlOGI1NjhlN2VkNzk4MDZhZWI0MDQ3Y2E4YzAxMg==
+    Y2EwZGZiM2QwMTVlZmIxN2MwMGQ2ZmQxZTEyZDYzNmU5MDg1ZTEyMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDVhYzdkZTg2ZTdkMjM1OGIyNDVlYTBjODJhYzY5ODRiZGZhNTRiOTlkNzg0
-    ODRhMmZmMmQxZTM3ZTUwMGIxYzhkY2Q3YmVmNmRlNzA4NTBlNzU2NmIzOGZl
-    MWQ1ZmEwYWM4OGFhN2Y5OTY3NGVhMmFkM2MyZGRkMTkzNWMyMmY=
+    MTExMzMxNjYwNzkxMzM1ZDQ0YzJhYmNjYWVmNTYzNzlhZDI0YjE4YTgwOWVh
+    OGM5NWUxZTZhYzFkNjRmNDAwOGIyNzhhZjhhYWU5MWQxYjcxOTAxMzRlZTFl
+    YmIyOTBhNjg1MmE3N2RjZDA1ZTk1M2U3MjRiY2Q2ODhjZjYwZWM=
   data.tar.gz: !binary |-
-    ZDBhZWFlMjJlZThhZDY2MzhjNTMzOTBhMmFmNmI0NjFmNjBkNDFiYjEyZWY1
-    NWIxZjNiZDA3NWU4NzRjNjQ1YmRjMDdhNmE0Y2YzYTRmMThmYmQ2ZTUyNzE5
-    OTM1MGUxZTNkM2Q0MDY5ZWIyNjgzOTE2YmY0ZjRhNTU3ZmQ5MGU=
+    ZTJiMzcwOWE2NDJhMjg4ZDRkNTU4ZGRmOGU4OGI1YzQ4NTE3N2NkODRhNDk4
+    MjU2MTUwMjViOWYwY2E2MTlhYzk3MDBmYTlhMThhOGY3Y2MwYmNmMWYyZGE4
+    M2Q3MGMzM2RkMTkwOWE1NzBmODljNTU4OGYyNzRlMjIxODljNmI=

data/.travis.yml

@@ -6,41 +6,4 @@ rvm:
 - rbx-19mode
 - 1.9.2
 - 1.9.3
-- 2.0.0
-env:
-  global:
-  - secure: ! 'JyUmtS/9TPcO177P0YpIgt9aHU6Be40uhG8zM4x0IFT7/z0824iJFCNr4k86
-
-      CJnvF4ykHqQJPNmVQibmJjXFclYQcJbs6fXRWz0Bbiu7awO+W3/ZGOqzaG4W
-
-      0VNJPprWIjVRD9MtlBfruCVlEDz06Ssr/PSCzEAO0ozePM7LCak='
-  - secure: ! 'MKerFaIev3SZZr1kcZfQTH8B6WOv+a0ir0t9A8GcJRcFVOclOEEy55lwXLbF
-
-      1Sa2ol6i+ADV92GnZ/MvavgbUUuc34ylV+kgBkJ8nbuOE1xtT6bSEqYeLbSE
-
-      82zWEo2FSvenOc7qaVuqf7lR7S7acVAWP0tuyG06pA6myEHfptM='
-  - secure: ! 'GKejLb0DLwZV9gvVpDJry5BD8LNURZfq3U97Zf4aGl1+bb8lFteNHTclDLzL
-
-      sd4ELwq+Ek5aO2ZdhnGiyhBkVX4dqxMRGH8OYoUEUMX887UaWrME4T0ch1W4
-
-      8y6V+NTOl+LlWjhzeOA+vxhB7YRd4lzjNFLsJmuQieymBbdZAwo='
-  - secure: ! 'D8jIL+eWzjUDzUiJci9OFMvxqGvWSmY2PhjawYUcuwDsmC1HbIxsIf2PKSBY
-
-      TyE18KwCp+KcRrn6zQjpdkUgMaMYK9rVyGD5NQhOhNjns31zJmON5LPhTehf
-
-      5Rrn6UevypPdqhOLJzDp4Jo15UY1Q95glU5Q49I6+k3VR2jlxAM='
-  - secure: ! 'YjYOzWTAJnZqjqjxAO2tTKKCDh3dd7B4kAhc2i3v2uprL2z2WzgrQUKZRsZh
-
-      eaOxManOwD26oTk2F44tnSs/prLUG/6gLg+hw4FU04v+p9H5xcm1/q56btar
-
-      cr9suABpV7MIvOlBd4Pb2LJdyFlzTvw94xmJYTYg1jGwcKrYBF0='
-  - secure: ! 'GsmIF1EIKv/k7r59I4N1Bdbi+dsXWH97SPWHl/Gaat+zN8yXEwVmQuO0P6Nb
-
-      hzFTkvHJSE/aOAnQPxKs9qKV76/ERYPt1YZ1kUmQflCtgwWfx9K1MnGR6Ssy
-
-      4rXDbL14ERUm8DokrM4q2rjceg/Z75HSmBHUYtOb62XEzu2kpwg='
-  - secure: ! 'QP9gVy6BBC/fV43hGDChNE2ln5Zi0MdNYMUnLq40bfBwreo1B+gLWH5I3ZAj
-
-      RcMf+gLst3LMFu1hWtuCnRYH9L/ph8nwawkqNQoF22TJUCRFCGPUqrTJpzNg
-
-      yz6vt+XrtRZk1whJwJcRWwLX9gybVv5sB6qGQu8swsgLrNDvsrE='
+- 2.0.0

data/README.md

@@ -147,27 +147,6 @@ A note from Jenkins: for array-type properties (such as jobs in this example), t
 
 Please see the [docs](https://ci.jenkins-ci.org/api/) for more info on tree parameters
 
-## Testing
-
-This gem uses VCR to record requests to the api so you must test using a valid Jenkins server and credentails to test
-
-Add a sample authentications file to your `spec/fixtures` directory:
-
-```ruby
-#spec/fixtures/authentications.yml
-USERNAME:  jasontruluck           # Your Username
-TOKEN:     12345678901234567890   # Your Jenkins Token (found at jenkins-server/user/your-user-name/configure)
-DOMAIN:    mydomain.com           # The domain of your Jenkins server
-PORT:      8080                   # The port of your Jenkins Server
-SUBDOMAIN: jenkins                # The subdomain of your Jenkins Server
-JOB:       My-Jenkins-Job         # The job that you want to run tests on
-VIEW:      My-awesome-view        # The view that you want to run tests on
-```
-
-A sample is included in the [source](https://github.com/jasontruluck/subordinate/blob/master/spec/fixtures/authentications.yml.sample).
-
-*Note: for tests concerning disabling, deleting, restarting, etc they are mocked explicitly with webmock and will not effect your server*
-
 ## Contributing
 
 1. Fork it

data/lib/subordinate/version.rb

@@ -1,3 +1,3 @@
 module Subordinate
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'coveralls'
 Coveralls.wear!
 
-# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 
 if ENV['RAILS_ENV'] == 'test'
@@ -20,26 +19,7 @@ if ENV['RAILS_ENV'] == 'test'
 end
 
 require 'subordinate'
-require 'vcr'
 require "webmock/rspec"
-require "mocha/api"
-
-authentications = File.expand_path("../fixtures/authentications.yml", __FILE__)
-if File.exists?(authentications)
-  ENV.update YAML::load(File.open(authentications))
-end
-
-VCR.configure do |c|
-  c.cassette_library_dir = 'spec/cassettes'
-  c.hook_into :faraday
-  c.ignore_localhost = true
-  # Uncomment if you need to log VCR
-  # c.debug_logger = File.open(Rails.root.join("log","vcr_debugger.log"), 'w')
-  c.configure_rspec_metadata!
-  c.allow_http_connections_when_no_cassette = true
-end
-
-WebMock.allow_net_connect!
 
 Dir[File.expand_path("spec/support/**/*.rb", __FILE__)].each {|f| require f}
 
@@ -47,3 +27,10 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.order                                           = "random"
 end
+
+def stub_jenkins(http_method = :any, endpoint = "/", status = 200, content_type = "application/json", response)
+  stub_request(http_method, "http://someusername:sometoken@jenkins.example.com:8080#{endpoint}").
+  to_return(:status => status, 
+    :body => File.read(File.expand_path("../support/mocks/#{response}", __FILE__)),
+    :headers =>{'Accept' => content_type, 'Content-type' => content_type})
+end

data/spec/subordinate/client/build_spec.rb

@@ -1,22 +1,23 @@
+# Build Spec
 require "spec_helper"
 
-
-
-# Client Spec
 describe Subordinate::Client do
-  before do
+  before(:each) do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#build", :vcr do
-    let(:current_response) { subordinate.build(ENV["JOB"], 1) }
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#build" do
+    before(:each) {stub_jenkins(:get, "/job/Some-Job/1/api/json", "build.json") }
+
+    let(:current_response) { subordinate.build("Some-Job", 1) }
 
     it "returns the job response" do
       current_response.should_not be_nil
@@ -95,45 +96,60 @@ describe Subordinate::Client do
 
   describe "#build_timestamp" do
     it "returns the timestamp of the specified build" do
-      stub_request(:get, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/1/buildTimestamp").
-      to_return(:status => 302, :body => "3/25/13 3:30 AM", :headers => {})
+      stub_jenkins(:get, "/job/Some-Job/1/buildTimestamp", 302, "text/plain", "build_timestamp.txt")
 
-
-      subordinate.build_timestamp(ENV["JOB"], 1).should == "3/25/13 3:30 AM"
+      subordinate.build_timestamp("Some-Job", 1).should == "9/9/13 9:32 PM"
     end
 
     it "returns the timestamp in the specified format" do
-      stub_request(:get, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/1/buildTimestamp?format=yyyy/MM/dd").
-      to_return(:status => 302, :body => "2013/03/25", :headers => {})
+      stub_jenkins(:get, "/job/Some-Job/1/buildTimestamp?format=yyyy/MM/dd", 302, "text/plain", "build_timestamp_formatted.txt")
 
-      subordinate.build_timestamp(ENV["JOB"], 1, "yyyy/MM/dd").should == "2013/03/25"
+      subordinate.build_timestamp("Some-Job", 1, "yyyy/MM/dd").should == "2013/03/25"
     end
   end
 
-  describe "#console_output_for_build", :vcr do
-    it "returns the console output for a complete build" do
-      response = subordinate.console_output_for_build(ENV["JOB"], 1)
-      response.should_not be_nil
-      response.should_not include("javax.servlet.ServletException:")
+  describe "#console_output_for_build" do
+    context "complete console output" do
+      before(:each) { stub_jenkins(:get, "/job/Some-Job/1/logText/progressiveText?start=0", 200, "text/plain", "console_output.txt") }
+      let(:response) { subordinate.console_output_for_build("Some-Job", 1) }
+      
+      it "returns the console output for a complete build" do
+        response.should_not be_nil
+      end
+
+      it "is not an error" do
+        response.should_not include("javax.servlet.ServletException:")
+      end
     end
 
-    it "returns pre-formatted output" do
-      response = subordinate.console_output_for_build(ENV["JOB"], 1, nil, true)
-      response.should_not be_nil
-      response.should_not include("javax.servlet.ServletException:")
+    context "preformatted console output" do
+      before(:each) { stub_jenkins(:get, "/job/Some-Job/1/logText/progressiveHtml?start=0", 200, "text/html", "console_output_pre.html") }
+      let(:response) { subordinate.console_output_for_build("Some-Job", 1, nil, true) }
+      
+      it "returns the console output for a complete build" do
+        response.should_not be_nil
+      end
+
+      it "is not an error" do
+        response.should_not include("javax.servlet.ServletException:")
+      end
     end
 
-    context "byte size arguement" do
+    context "offset console output" do
+      before(:each) { 
+        stub_jenkins(:get, "/job/Some-Job/1/logText/progressiveText?start=0", 200, "text/plain", "console_output.txt") 
+        stub_jenkins(:get, "/job/Some-Job/1/logText/progressiveText?start=2000", 200, "text/plain", "console_output_offset.txt") 
+      }
+      let(:output1) {subordinate.console_output_for_build("Some-Job", 1, 2000) }
+      let(:output2) {subordinate.console_output_for_build("Some-Job", 1, 0) }
+
       it "returns data at byte 2000" do
-        subordinate.console_output_for_build(ENV["JOB"], 1, 2000).should_not be_nil
+        output1.should_not be_nil
       end
 
       it "when passed an offset of 2000 it is offset by 2000 bytes" do
-        output1 = subordinate.console_output_for_build(ENV["JOB"], 1, 2000)
-        output2 = subordinate.console_output_for_build(ENV["JOB"], 1, 0)
-
         output1.bytesize.should < output2.bytesize
       end
     end
   end
-end
+end

data/spec/subordinate/client/executor_spec.rb

@@ -1,19 +1,24 @@
+# Build Executor Spec
 require "spec_helper"
 
-# Build Executor Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#build_executor", :vcr do
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#build_executor" do
+    before(:each) do
+      stub_jenkins(:get, "/computer/api/json", "computer.json")
+    end
+
     let(:current_response) { subordinate.build_executor }
 
     it "returns the build_executor response" do
@@ -104,4 +109,4 @@ describe Subordinate::Client do
       end
     end
   end
-end
+end

data/spec/subordinate/client/job_spec.rb

@@ -1,22 +1,23 @@
+# Job Spec
 require "spec_helper"
 
-
-
-# Client Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#job", :vcr do
-    let(:current_response) { subordinate.job(ENV["JOB"]) }
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#job" do
+    before(:each) { stub_jenkins(:get, "/job/Some-Job/api/json", "job.json") }
+
+    let(:current_response) { subordinate.job("Some-Job") }
 
     it "should return the job response" do
       current_response.should_not be_nil
@@ -135,46 +136,41 @@ describe Subordinate::Client do
 
   describe "#build_job" do
     it "builds the job specified" do
-      stub_request(:post, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/build").
-      to_return(:status => 302, :body => "", :headers => {})
+      stub_jenkins(:post, "/job/Some-Job/build", 302, "empty.json")
 
-      subordinate.build_job(ENV["JOB"]).should  == 302
+      subordinate.build_job("Some-Job").should  == 302
     end
   end
 
   describe "#build_job_with_params" do
     it "builds the job specified with the parameters specified" do
-      stub_request(:post, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/buildWithParameters").
-      to_return(:status => 302, :body => "", :headers => {})
+      stub_jenkins(:post, "/job/Some-Job/buildWithParameters", 302, "empty.json")
 
-      subordinate.build_job_with_params(ENV["JOB"]).should  == 302
+      subordinate.build_job_with_params("Some-Job").should  == 302
     end
   end
 
   describe "#disable_job" do
     it "disables the specified job" do
-      stub_request(:post, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/disable").
-      to_return(:status => 302, :body => "", :headers => {})
+      stub_jenkins(:post, "/job/Some-Job/disable", 302, "empty.json")
 
-      subordinate.disable_job(ENV["JOB"]).should == 302
+      subordinate.disable_job("Some-Job").should == 302
     end
   end
 
   describe "#enable_job" do
     it "enables the specified job" do
-      stub_request(:post, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/enable").
-      to_return(:status => 302, :body => "", :headers => {})
+      stub_jenkins(:post, "/job/Some-Job/enable", 302, "empty.json")
 
-      subordinate.enable_job(ENV["JOB"]).should == 302
+      subordinate.enable_job("Some-Job").should == 302
     end
   end
 
   describe "#delete_job" do
     it "deletes the specified job" do
-      stub_request(:post, "#{subordinate.api_endpoint}/job/#{ENV["JOB"]}/delete").
-      to_return(:status => 302, :body => "", :headers => {})
+      stub_jenkins(:post, "/job/Some-Job/delete", 302, "empty.json")
 
-      subordinate.delete_job(ENV["JOB"]).should == 302
+      subordinate.delete_job("Some-Job").should == 302
     end
   end
 end

data/spec/subordinate/client/load_spec.rb

@@ -5,15 +5,18 @@ describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#load_statistics", :vcr do
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#load_statistics" do
+    before(:each) { stub_jenkins(:get, "/overallLoad/api/json", "load_statistics.json") }
+
     let(:current_response) { subordinate.load_statistics }
 
     it "returns the load statistics response" do
@@ -38,4 +41,4 @@ describe Subordinate::Client do
       end
     end
   end
-end
+end

data/spec/subordinate/client/people_spec.rb

@@ -1,19 +1,22 @@
+# Queue Spec
 require "spec_helper"
 
-# Queue Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#people", :vcr do
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#people" do
+    before(:each) { stub_jenkins(:get, "/asynchPeople/api/json", "people.json") }
+
     let(:current_response) { subordinate.people }
 
     it "returns the users response" do
@@ -61,4 +64,4 @@ describe Subordinate::Client do
       end
     end
   end
-end
+end