maremma 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85c7ec8aada2d2f923923b8b4e6dbab66db8bbe
-  data.tar.gz: 3cac6cf66e744d64eaf2fb175f3d1ac3a868d390
+  metadata.gz: ad3e476013e011400f9cb2bc0cce7506edb73f1d
+  data.tar.gz: 8b82d6d99583631206cf98dd35f8fd918ec8b7a5
 SHA512:
-  metadata.gz: f7c2c8fa0e410e7cec5dcb40dd48c7f9e847f08d424624b0756f9aea7fa56a770b28cfe39cf4105d40a0a00a3d0af2a41b6d5fe916484400a24eb7ce642a2b3a
-  data.tar.gz: 4dfbcdb599d97e2dd9e7b9c5635756d8b0269d6ae9e4bad6a70d3bcfd5fa5acf84170916b6de8ebb7f37eaa4eb9da32746ee4ad28e5b6301b1df13a511179a98
+  metadata.gz: 8724f8d5520fa807b948343970745fd3fb8bfa04c1d2ad208b7d775fb811939bc5922d4d080a0f8dbb9381895e5183c667984bec0f4135a0600fc51a88ddc129
+  data.tar.gz: 002312c3ca9cb4889734ae4fa02f8edaba4e7822e99790068237414a41af3a0c304e59cf14c9db09e8839a28acd58740402a602d10f8151ed53398f17331c39b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.4.1)
+    maremma (2.4.2)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -15,63 +15,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    builder (3.2.2)
-    codeclimate-test-reporter (1.0.0)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     excon (0.45.4)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.4)
       faraday
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    hashdiff (0.3.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
+    hashdiff (0.3.4)
+    i18n (0.8.4)
+    json (2.1.0)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.2)
     multi_json (1.11.3)
     multipart-post (2.0.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     oj (2.13.1)
-    public_suffix (2.0.3)
-    rack (2.0.1)
+    public_suffix (2.0.5)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     safe_yaml (1.0.4)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    simplecov-html (0.10.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     vcr (3.0.3)
     webmock (1.24.6)

data/lib/maremma.rb

@@ -107,6 +107,9 @@ module Maremma
       options[:headers]['Authorization'] = "Bearer #{options[:bearer]}"
     elsif options[:token].present?
       options[:headers]["Authorization"] = "Token token=#{options[:token]}"
+    elsif options[:github_token].present?
+      # GitHub uses different format for token authentication
+      options[:headers]["Authorization"] = "Token #{options[:github_token]}"
     elsif options[:username].present?
       basic = Base64.encode64("#{options[:username]}:#{options[:password].to_s}")
       options[:headers]["Authorization"] = "Basic #{basic}"

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

data/spec/maremma_spec.rb

@@ -365,6 +365,11 @@ describe Maremma do
       expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token token=12345")
     end
 
+    it 'github_token' do
+      options = { github_token: '12345' }
+      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token 12345")
+    end
+
     it 'basic' do
       options = { username: 'foo', password: '12345' }
       basic = Base64.encode64("foo:12345")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday