lita-jenkins 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e4bae16d034bae22bcb09463001f0713740b7f4
-  data.tar.gz: 827d8a0c091f77c8f44c7b4cfb1c0991d35cc9e1
+  metadata.gz: de14bb62c3dfbc3a6b48a6adb72230dd0f63290f
+  data.tar.gz: 292efa6a989179b0e60e90f4232d70d33cf53965
 SHA512:
-  metadata.gz: 9ea7092693b33fb132b24db70261bad4e4a581b6e65583cfdffeb7f72cd07aef307a6d017dc4db0abb9002b37244b5275024f3edb2cab75f4aa13dc5073b668a
-  data.tar.gz: 548703e81c0ca9ea1ca82a175f811cb0b2336b99a74260fbf39239b2c6617e0f8ea1d2df7f86b0bc4947813153c8c152186af2bc7b340d05673506ef1cdf4efb
+  metadata.gz: 74010566d3e08326c7618df2bbb3faa371e0bf538c6588bbedf24b20a20511731c3e8fc9bfc9729425f1790707516ea29ac2770fbaaf29e0a560ea11847f27b6
+  data.tar.gz: d3a794d404c972effb2735b7f1067adcb02cc8a5a64b64e6fdd743e6d56c9e7ab71fbd7e57e9a14b6abc9c3a8a790652eb24b3a9790910b262e812d9120b5daa

data/lib/lita/handlers/jenkins.rb

@@ -7,6 +7,7 @@ module Lita
 
       config :auth
       config :url
+      config :http_options, required: false, type: Hash, default: {}
 
       route /j(?:enkins)? list( (.+))?/i, :jenkins_list, command: true, help: {
         'jenkins list <filter>' => 'lists Jenkins jobs'
@@ -31,7 +32,7 @@ module Lita
         named_job_url = job_url(job['name'])
         path = job_build_url(named_job_url, params)
 
-        http_resp = http.post(path) do |req|
+        http_resp = http(config.http_options).post(path) do |req|
           req.headers = headers
           req.params  = params if params.is_a? Hash
         end
@@ -65,12 +66,12 @@ module Lita
 
       def headers
         {}.tap do |headers|
-          headers["Authorization"] = "Basic #{Base64.encode64(config.auth).chomp}" if config.auth
+          headers["Authorization"] = "Basic #{Base64.strict_encode64(config.auth).chomp}" if config.auth
         end
       end
 
       def jobs
-        api_response = http.get(api_url) do |req|
+        api_response = http(config.http_options).get(api_url) do |req|
           req.headers = headers
         end
         JSON.parse(api_response.body)["jobs"]

data/lita-jenkins.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-jenkins"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Daniel Yoon", "Mike Fiedler"]
   spec.email         = ["daniel.kiros@gmail.com", "miketheman@gmail.com"]
   spec.description   = %q{Interact with Jenkins CI server.}

data/spec/lita/handlers/jenkins_spec.rb

@@ -43,6 +43,49 @@ describe Lita::Handlers::Jenkins, lita_handler: true do
       return_value = described_class.new(robot).headers
       expect(return_value.inspect).to eq("{\"Authorization\"=>\"Basic Zm9vOmJhcg==\"}")
     end
+
+    it 'encodes auth headers without line breaks' do
+      registry.config.handlers.jenkins.auth = "foo:thisisalongtokenthatmighthavelinebreakswithoutstrict"
+      return_value = described_class.new(robot).headers
+      expect(return_value.inspect).to eq("{\"Authorization\"=>\"Basic Zm9vOnRoaXNpc2Fsb25ndG9rZW50aGF0bWlnaHRoYXZlbGluZWJyZWFrc3dpdGhvdXRzdHJpY3Q=\"}")
+    end
+  end
+
+  describe '#http_options' do
+    it 'handles no options specified by default' do
+      http = described_class.new(robot).http
+      expect(http.options.empty?).to be true
+    end
+
+    it 'sets default http options on jobs request' do
+      handler = described_class.new(robot)
+      expect(handler).to receive(:http).with({}).and_call_original
+      allow(response).to receive(:body).and_return(api_response)
+      handler.jobs
+    end
+
+    it 'sets default http options for build' do
+      expect_any_instance_of(Lita::Handlers::Jenkins).to receive(:http).twice.with({}).and_call_original
+      allow(response).to receive(:body).and_return(api_response)
+      allow(response).to receive(:status).and_return(201)
+      send_command('jenkins b deploy')
+    end
+
+    it 'sets configured http options on jobs request' do
+      registry.config.handlers.jenkins.http_options = { url: 'http://test.com' }
+      handler = described_class.new(robot)
+      expect(handler).to receive(:http).with({ url: 'http://test.com' }).and_call_original
+      allow(response).to receive(:body).and_return(api_response)
+      handler.jobs
+    end
+
+    it 'sets configured http options for build' do
+      registry.config.handlers.jenkins.http_options = { url: 'http://test.com' }
+      expect_any_instance_of(Lita::Handlers::Jenkins).to receive(:http).twice.with({ url: 'http://test.com' }).and_call_original
+      allow(response).to receive(:body).and_return(api_response)
+      allow(response).to receive(:status).and_return(201)
+      send_command('jenkins b deploy')
+    end
   end
 
   describe '#jenkins list' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Yoon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Interact with Jenkins CI server.