grifter 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de74bedb4fcbf35e8aa659410106f4ff6ae155c
-  data.tar.gz: d221fd3def4e4e9983be77816cf8491a04cecb9c
+  metadata.gz: d2c54da2e22c05f1fe1e54832443f49690ee3e65
+  data.tar.gz: 6a73c714c0feaa35af907459f6c93b2ed7df5aaf
 SHA512:
-  metadata.gz: 121cb4b203880a5829eb4b840e0a7b00b52c546ecfa580b31ab9458a79b0c4fcc172f5c3c974e8993f1803841dba8defd25acc99e9d9f6dd11462b5babd5d2d3
-  data.tar.gz: 2f806a27a2f8e6a9d0d63b239a09b22ca0a4e17bfddcb9c5e4657d5699a3d848d011f1e4c0f1970e4121b003e10a29524422ba2d66c9bd57e984a00d9bc0fd89
+  metadata.gz: be801d6213e1e01cf3f773c9394b2d23cf83a6606672dc2479ffb4776a4f616df5a1d241673888091586d91644b172767b40b1944e9334a1b20cf998e8615db5
+  data.tar.gz: 887376d1d89aaf420a80d4c5c1a9f7601c7a9d67a275b8ce4d5b1f0ac8e4edeb57d9d116d5d155ff6c86d9c38a7ca4f5567033745eb3bfad48588c6d701094e0

data/Gemfile

@@ -9,5 +9,5 @@ group :development do
   gem 'rspec'
   gem 'pry'
   gem 'awesome_print'
-  gem 'jeweler'
+  gem 'jeweler', '~> 2.1.1'
 end

data/Gemfile.lock

@@ -1,38 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.4)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.6)
-    atomic (1.1.16)
-    awesome_print (1.2.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    awesome_print (1.6.1)
     builder (3.2.2)
     coderay (1.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    ethon (0.7.0)
+    ethon (0.7.4)
       ffi (>= 1.3.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    git (1.2.6)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+    ffi (1.9.8)
+    git (1.3.0)
+    github_api (0.14.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      hashie (>= 3.4)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.21)
-    i18n (0.6.9)
-    jeweler (2.0.1)
+    hashie (3.4.4)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -41,45 +38,53 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
+      semver
+    json (1.8.3)
+    jwt (1.5.1)
     method_source (0.8.2)
-    mini_portile (0.5.3)
-    minitest (4.7.5)
-    multi_json (1.9.2)
+    mini_portile2 (2.1.0)
+    minitest (5.8.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.2.1)
-    rdoc (4.1.1)
+    rack (1.6.4)
+    rake (11.1.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.5.0)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
-    tzinfo (0.3.39)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    semver (1.0.1)
+    slop (3.6.0)
+    thread_safe (0.3.5)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -88,8 +93,11 @@ DEPENDENCIES
   activesupport (>= 3.2)
   awesome_print
   faraday (= 0.9.0)
-  jeweler
+  jeweler (~> 2.1.1)
   json
   pry
   rspec
   typhoeus (~> 0.6.8)
+
+BUNDLED WITH
+   1.11.2

data/grifter.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: grifter 0.4.2 ruby lib
+# stub: grifter 0.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.4.2"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Robert Schultheis"]
-  s.date = "2014-03-28"
+  s.date = "2016-06-07"
   s.description = "convention based approach to interfacing with an HTTP JSON API."
   s.email = "rob@knewton.com"
   s.executables = ["grift"]
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/knewton/grifter"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.0"
+  s.rubygems_version = "2.5.1"
   s.summary = "Make calls to HTTP JSON APIs with ease and confidence"
 
   if s.respond_to? :specification_version then
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1.1"])
     else
       s.add_dependency(%q<faraday>, ["= 0.9.0"])
       s.add_dependency(%q<json>, [">= 0"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
     end
   else
     s.add_dependency(%q<faraday>, ["= 0.9.0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
   end
 end
 

data/lib/grifter.rb

@@ -49,7 +49,7 @@ class Grifter
       self.grifter_authenticate_do
     end
 
-    start_instrumentation if @config[:instrumentation] = true
+    start_instrumentation if @config[:instrumentation]
   end
 
   attr_reader :services

data/lib/grifter/configuration.rb

@@ -10,6 +10,10 @@ class Grifter
         h[k.intern] = case v
                       when Hash
                         recursive_symbolize v
+                      when Array # this only handles list of strings, which is good enough
+                        v.map do |item|
+                          item.to_sym
+                        end
                       else
                         v
                       end
@@ -34,7 +38,7 @@ class Grifter
 
     def load_config_file options={}
       options = {
-        config_file: ENV['GRIFTER_CONFIG_FILE'] ? ENV['GRIFTER_CONFIG_FILE'] : 'grifter.yml',
+        config_file: ENV.fetch('GRIFTER_CONFIG_FILE', 'grifter.yml'),
         environment: ENV['GRIFTER_ENVIRONMENT'],
       }.merge(options)
       Grifter::Log.debug "Loading config file '#{options[:config_file]}'"
@@ -73,12 +77,35 @@ class Grifter
 
       #merge any environment overrides into the service block
       if options[:environment]
-        config[:environment] = options[:environment].to_sym
-        unless config[:environments] && config[:environments][config[:environment]]
-          raise GrifterConfigurationError.new "No such environment specified in config: '#{config[:environment]}'"
+
+        unless config[:environments]
+          raise GrifterConfigurationError.new "You specified a grifter environment, but there is no environments section in the grifter configuration"
+        end
+
+        requested_environment_name = options[:environment].to_sym
+        if config[:environments].has_key? requested_environment_name
+          # the environment was literally specified
+          env_config = config[:environments][options[:environment].to_sym]
+          config[:environment] = options[:environment].to_sym
+        else
+          # the environment may be an alias
+          config[:environments].each_pair do |env_name, env_overrides|
+            if env_overrides[:aliases] and
+              env_overrides[:aliases].include? requested_environment_name
+              env_config = env_overrides
+              config[:environment] = env_name
+              break
+            end
+          end
         end
 
-        config[:environments][config[:environment]].each_pair do |service_name, service_overrides|
+        if env_config.nil? || config[:environment].nil?
+          raise GrifterConfigurationError.new "No such environment or environment alias specified in config: '#{requested_environment_name.to_s}'"
+        end
+
+        env_config.delete :aliases
+
+        env_config.each_pair do |service_name, service_overrides|
           service_overrides.merge!(get_service_config_from_url(service_overrides.delete(:url)))
           config[:services][service_name].merge! service_overrides
         end

data/lib/grifter/http_service.rb

@@ -109,8 +109,8 @@ class Grifter
 
       #doing it this way avoids problem with OPTIONS method: https://github.com/lostisland/faraday/issues/305
       response = nil
-      metrics_obj = { method: method, service: @name, path: path }
-      ActiveSupport::Notifications.instrument('request.grifter', metrics_obj) do
+      metrics_obj = { method: method, service: @name, path: path, request_body: body, request_headers: req_headers }
+      ActiveSupport::Notifications.instrument(Grifter::Instrumentation::InstrumentationQueueName, metrics_obj) do
         response = @conn.run_request(method, nil, nil, nil) do |req|
           req.path = parsed.path
           req.params = metrics_obj[:params] = query_hash if query_hash

data/lib/grifter/instrumentation.rb

@@ -2,11 +2,13 @@ require 'active_support/notifications'
 class Grifter
   module Instrumentation
 
+    InstrumentationQueueName = 'request.grifter'
+
     Sample = Struct.new(:service_name, :method, :path, :status, :duration_ms, :end_time)
 
     def start_instrumentation
       @all_requests ||= []
-      ActiveSupport::Notifications.subscribe('request.grifter') do |name, start_time, end_time, _, data|
+      ActiveSupport::Notifications.subscribe(InstrumentationQueueName) do |name, start_time, end_time, _, data|
         #do nothing if exception happened, else we might interfere with exception handling
         unless data[:exception]
           duration_ms = ((end_time.to_f - start_time.to_f) * 1000).to_i
@@ -24,6 +26,9 @@ class Grifter
     end
 
     def metrics_all_requests
+      if @all_requests.nil?
+        raise "Grifter instrumentation was not enabled. Set instrumentation: true in grifter.yml, or call start_instrumentation"
+      end
       @all_requests
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.5
 platform: ruby
 authors:
 - Robert Schultheis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -112,16 +112,16 @@ dependencies:
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 description: convention based approach to interfacing with an HTTP JSON API.
 email: rob@knewton.com
 executables:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Make calls to HTTP JSON APIs with ease and confidence