pisoni 1.23.1 → 1.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c0d644f09f13b9842035dd8d79c81d5a3b96dda73ef5f6be9ea3cfde25f04e4
-  data.tar.gz: 439dbc720c9b97fa4d0233873e63ee9fce07530c68aa7f09b5a569109e372bf1
+  metadata.gz: 9b32b9bf7d4534092ec0a19ef433f354ba6eb2aebf87b315ed53132541ada123
+  data.tar.gz: b45e5cf8b827909cb87b16336f20ee22186b9e302ce4ff6b948cd822aa556ae2
 SHA512:
-  metadata.gz: 497ff1601eb48abaf834ef26284d34e4115d939e5abe069351a5188856a027fe720fd3880ed2961b459d1494b988787b7fa12d1849836863a809fd1a68890534
-  data.tar.gz: b3cd58bb92cfa762a74ed1a2eecebba56e78ff2b3c584af7aa3580501569db54217bb0ec435941182f66b6d2711300d820edf453b04b69c8c3bf7beed3155ddf
+  metadata.gz: 7ed1c92963ec49ba67db747d8070b5020119b5ff61599f499cf1fd628ff0c6d09c4adf286159c3c46dfd119f14ce326e05a0b429cc63b4784efeaee05478a007
+  data.tar.gz: 8138a68e836ac62f461de46659746b6cc66b2da121c8843132e08570cf141fb551c0ffa738cb5a081e87c5e4e816a969ae3cc3ba3ec95b99100ca8483213f4ae

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Notable changes to Pisoni will be tracked in this document.
 
+## 1.23.2 - 2018-06-04
+
+### Changed
+
+- Use `[pisoni]` as default logline prefix instead of `[core]`. ([#5](https://github.com/3scale/pisoni/pull/5))
+- Relax requirement on Faraday version and warn when the user might find issues
+  with old versions. ([#4](https://github.com/3scale/pisoni/pull/4))
+
 ## 1.23.1 - 2018-05-29
 
 ### Added

data/Makefile

@@ -4,7 +4,7 @@ PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 include $(PROJECT_PATH)/.env
 
 include $(PROJECT_PATH)/mk/compose.mk
-COMPOSE := $(COMPOSE_BIN) -f $(PROJECT_PATH)/docker/docker-compose.yml
+COMPOSE ?= $(COMPOSE_BIN) -f $(PROJECT_PATH)/docker/docker-compose.yml -f $(PROJECT_PATH)/docker/docker-compose.apisonator.yml
 
 CI_IMAGE_REPO ?= quay.io/3scale
 CI_IMAGE_NAME ?= pisoni-ci
@@ -12,9 +12,14 @@ CI_IMAGE ?= $(CI_IMAGE_REPO)/$(CI_IMAGE_NAME)
 CI_DOCKERFILE ?= $(PROJECT_PATH)/docker/Dockerfile.ci
 
 include $(PROJECT_PATH)/mk/ci-image.mk
+include $(PROJECT_PATH)/mk/ci.mk
 
 all: clean pull build test
 
+$(call ci_build_target,ci-pull,pull)
+$(call ci_build_target,ci-test,test)
+$(call ci_build_target,ci-compose-config,compose-config)
+
 .PHONY: compose-config
 compose-config: compose
 	$(COMPOSE) config

data/README.md

@@ -1,3 +1,6 @@
+[![CircleCI](https://circleci.com/gh/3scale/pisoni.svg?style=shield)](https://circleci.com/gh/3scale/pisoni)
+[![Maintainability](https://api.codeclimate.com/v1/badges/4b18ae93abefdba17e0b/maintainability)](https://codeclimate.com/github/3scale/pisoni/maintainability)
+
 # Pisoni
 
 Pisoni is a Ruby client for the internal API of the

data/bors.toml

@@ -0,0 +1,3 @@
+status = ["ci/circleci"]
+pr_status = ["ci/circleci", "codeclimate"]
+delete_merged_branches = true

data/lib/3scale/core/logger.rb

@@ -5,7 +5,7 @@ module ThreeScale
     module Logger
       InjectedLogger.use(:error, :info, :debug) {}
       InjectedLogger.after_injection do |logger|
-        logger.prefix = '[core]' unless logger.prefix
+        logger.prefix = '[pisoni]' unless logger.prefix
       end
     end
   end

data/lib/3scale/core/service_error.rb

@@ -14,9 +14,9 @@ module ThreeScale
         result = api_do_get(options,
                             { uri: service_errors_uri(service_id),
                               prefix: '',
-                              rprefix: :errors }) do |result|
-          if result[:response].status == 400 &&
-              result[:response_json][:error] == 'per_page needs to be > 0'
+                              rprefix: :errors }) do |res|
+          if res[:response].status == 400 &&
+              res[:response_json][:error] == 'per_page needs to be > 0'
             raise InvalidPerPage.new
           end
           true

data/lib/3scale/core/transaction.rb

@@ -12,8 +12,8 @@ module ThreeScale
 
       def self.load_all(service_id)
         result = api_do_get({}, { uri: transactions_uri(service_id),
-                                  rprefix: :transactions })  do |result|
-          return nil if result[:response].status == 404
+                                  rprefix: :transactions })  do |res|
+          return nil if res[:response].status == 404
           true
         end
 

data/lib/3scale/core/utilization.rb

@@ -13,8 +13,8 @@ module ThreeScale
       def self.load(service_id, app_id)
         result = api_do_get({},
                             uri: utilization_uri(service_id, app_id),
-                            rprefix: :utilization) do |result|
-          return nil if result[:response].status == 404
+                            rprefix: :utilization) do |res|
+          return nil if res[:response].status == 404
           true
         end
 

data/lib/3scale/core/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Core
-    VERSION = '1.23.1'
+    VERSION = '1.23.2'
   end
 end

data/lib/3scale/core.rb

@@ -1,6 +1,14 @@
 require 'uri'
 require 'json'
 require 'faraday'
+require 'net/http/persistent'
+
+# Warn that Faraday < 0.13 and Net::HTTP::Persistent >= 3.0.0 don't mix well
+if Faraday::VERSION =~ /0\.([0-9]|1[012])\.\d+/ &&
+    Net::HTTP::Persistent::VERSION =~ /^[^012]\.\d+\.\d+/
+  warn 'The combination of faraday < 0.13 and net-http-persistent 3.0+ is ' \
+    'known to have issues. See https://github.com/lostisland/faraday/issues/617'
+end
 
 require '3scale/core/version'
 require '3scale/core/logger'

data/pisoni.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.description = 'Client for the Apisonator internal API for model data.'
   s.license     = 'Apache-2.0'
 
-  s.add_dependency 'faraday', '~> 0.13.1'
-  s.add_dependency 'json', '~> 1.8.1'
-  s.add_dependency 'injectedlogger', '~> 0.0.13'
+  s.add_dependency 'faraday', '>= 0.9.1'
+  s.add_dependency 'json', '>= 1.8.1'
+  s.add_dependency 'injectedlogger', '>= 0.0.13'
   s.add_dependency 'net-http-persistent'
 
   s.add_development_dependency 'rake'

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: pisoni
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.23.2
 platform: ruby
 authors:
 - Alejandro Martinez Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: injectedlogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.13
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,7 @@ files:
 - NOTICE
 - README.md
 - Rakefile
+- bors.toml
 - lib/3scale/core.rb
 - lib/3scale/core/alert_limit.rb
 - lib/3scale/core/api_client.rb