gergich 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae5718f79f93916a7fdfbbe3bf316ef3b136001
-  data.tar.gz: 632d2883f68a0f4d59a2873d5191b5ecffdc9d66
+  metadata.gz: ef236cdff9358a9799255dcd4ce0683f89eca6d2
+  data.tar.gz: 53cf76a1f2b0b490f03883f24b75b0d399b5e0fc
 SHA512:
-  metadata.gz: 60daade2ff2d41045d134a34912d0251f08db4559bbadcb3d6fffcd596e1d5701dd0f26c3d4236fed832f73bc271791cc1e65d0e035bf88ac65d4ba3e131405c
-  data.tar.gz: e92bd1b2b1bac1e9cb5037b2543f196966583908c8e20768334926ea0b03f328d981f2ae588eea3fcc5c52c57a41f8cc755104f456f0f0c2f33ab9f957bd4540
+  metadata.gz: fee27eccf19e051b3972975e4531de705ec5a20e517410994d3cc36d088d1e1fb3b9f06fa1a581930b1345b08be3793c01b432bfbf89fd33f608ca519170dd10
+  data.tar.gz: 90dc1b48b44b42504feb9d26b2aa0ebc39ff7acc7d2af648b818b0b1edcf71d8372ff1d0b2dca78c4ad27d6e7f08f15105f14a046ff08b0270e1338c4ed3bfb2

data/lib/gergich.rb

@@ -239,14 +239,28 @@ module Gergich
           raise(GergichError, "need to set GERRIT_BASE_URL or GERRIT_HOST")
       end
 
+      def auth_config
+        if ENV["GERGICH_DIGEST_AUTH"]
+          {
+            digest_auth: {
+              username: GERGICH_USER,
+              password: ENV.fetch("GERGICH_KEY")
+            }
+          }
+        else
+          {
+            basic_auth: {
+              username: GERGICH_USER,
+              password: ENV.fetch("GERGICH_KEY")
+            }
+          }
+        end
+      end
+
       def prepare_options(options)
         options = {
-          base_uri: base_uri + "/a",
-          digest_auth: {
-            username: GERGICH_USER,
-            password: ENV.fetch("GERGICH_KEY")
-          }
-        }.merge(options)
+          base_uri: base_uri + "/a"
+        }.merge(auth_config).merge(options)
         if options[:body]
           options[:headers] ||= {}
           options[:headers]["Content-Type"] ||= "application/json"

data/spec/gergich_spec.rb

@@ -1,13 +1,52 @@
 RSpec.describe Gergich::API do
-  let(:result) { double(:result, body: "Not Found: 1234") }
+  context "bad change-id" do
+    let(:result) { double(:result, body: "Not Found: 1234") }
 
-  before :each do
-    allow(HTTParty).to receive(:send).and_return(result)
-    allow(described_class).to receive(:prepare_options).and_return({})
+    before :each do
+      allow(HTTParty).to receive(:send).and_return(result)
+      allow(described_class).to receive(:prepare_options).and_return({})
+    end
+
+    it "provides helpful error when Change-Id not found" do
+      expect { described_class.get("/a/changes/1234") }
+        .to raise_error(/Cannot find Change-Id: 1234/)
+    end
   end
 
-  it "provides helpful error when Change-Id not found" do
-    expect { described_class.get("/a/changes/1234") }.to raise_error(/Cannot find Change-Id: 1234/)
+  context "GERGICH_DIGEST_AUTH exists" do
+    it "uses digest auth" do
+      original_basic_auth = ENV["GERGICH_DIGEST_AUTH"]
+      ENV["GERGICH_DIGEST_AUTH"] = "1"
+      original_gergich_key = ENV["GERGICH_KEY"]
+      ENV["GERGICH_KEY"] = "foo"
+      allow(described_class).to receive(:base_uri).and_return("https://gerrit.foobar.com")
+
+      expect(described_class.send(:prepare_options, {}))
+        .to match(
+          hash_including(
+            digest_auth: { username: "gergich", password: ENV["GERGICH_KEY"] }
+          )
+        )
+
+      ENV["GERGICH_DIGEST_AUTH"] = original_basic_auth
+      ENV["GERGICH_KEY"] = original_gergich_key
+    end
+  end
+
+  context "GERGICH_DIGEST_AUTH does not exist" do
+    it "uses basic auth" do
+      original_basic_auth = ENV["GERGICH_DIGEST_AUTH"]
+      ENV["GERGICH_DIGEST_AUTH"] = nil
+      original_gergich_key = ENV["GERGICH_KEY"]
+      ENV["GERGICH_KEY"] = "foo"
+      allow(described_class).to receive(:base_uri).and_return("https://gerrit.foobar.com")
+
+      expect(described_class.send(:prepare_options, {}))
+        .to match(hash_including(basic_auth: { username: "gergich", password: ENV["GERGICH_KEY"] }))
+
+      ENV["GERGICH_DIGEST_AUTH"] = original_basic_auth
+      ENV["GERGICH_KEY"] = original_gergich_key
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line tool for adding Gerrit comments