maremma 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139244896bb3592f1eade50f3cad609a7d8654b8
-  data.tar.gz: 1ea3c523fced8b0b4449675679274bfa1edb3df2
+  metadata.gz: e82d176ef0ad595adb54b010b369d97ce43bcc2b
+  data.tar.gz: 6221f3df0fda35b927ec4af01be67081df4980dd
 SHA512:
-  metadata.gz: a42fde435f4ae2e386a257ed61fb833b545b7ec94b0a57d0e4d351a58a448030c6fae3db712ee9a87d04499439eb8d91bdf5fde03a39945a082d6895df864caa
-  data.tar.gz: 6ce0e1eb96d7125ee1896bb035c45306d736eb44ab976b15f9c5d8f80bc42def88d86a51a6b0a81c1e81b61f6717cf119e2dfdbcd82dcaab399566ce72bd81c9
+  metadata.gz: 26ffa5dd38d8206e1f50ed7d612b29b516fa6bf44b16f72d2c3602cdd285180e377f119e92fdd06693e2450597b1392ce45639aa086787e8f6950f9e010990d5
+  data.tar.gz: 49655572b15b2d039be1d31a9f1049bfb467b18b8cee3c0a0530ef1d4bb763345883c2d8b058d949af37307682af912ce754411aa34edbad18218328043a15e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.5.7)
+    maremma (3.5.8)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -16,7 +16,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.2)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -38,40 +38,40 @@ GEM
       faraday
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.2)
-    i18n (0.8.1)
-    json (2.0.4)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    hashdiff (0.3.4)
+    i18n (0.8.4)
+    json (2.1.0)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     oj (2.18.5)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (12.0.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)
+    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.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)

data/lib/maremma.rb

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

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.5.7"
+  VERSION = "3.5.8"
 end

data/spec/maremma_spec.rb

@@ -523,6 +523,11 @@ describe Maremma do
       expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Token token=12345")
     end
 
+    it 'github_token' do
+      options = { github_token: '12345' }
+      expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Token 12345")
+    end
+
     it 'basic' do
       options = { username: 'foo', password: '12345' }
       basic = Base64.encode64("foo:12345").rstrip

metadata

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