metrician 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50753f3c05fa7176d026cb28dad17d914eaba6dd
-  data.tar.gz: a2488841dfdf26f306eee4f874e59ab9e065506e
+  metadata.gz: a83deae6837d2eb16e8f36b352bfeebeccc41138
+  data.tar.gz: 3b698ec7a2b20f6afc688ba8f3b7d904316dface
 SHA512:
-  metadata.gz: cf88d35020ebcc9294f25c3933097f8627d6dec8c5d3658e035382df7ba96899dc84cc18040a9ce40755bd286923b5cb23522c28689ed17f68d854748cc760c7
-  data.tar.gz: 3b3a1bcf966aef58b7bec42d246ad461e022f42b13f1952c6a78949c68dd208463767c7ba03657fc075ef7bc87670e69aab76fd93b0d101e9281c8783743fd06
+  metadata.gz: 28d988ff9268492fa52801cac87ec8760a7989f3aae0c6d86d47c67b57f4339255740c7803e95cf302f0ac9caaa5c5e15d16f2a0f25c96fd2d3f601e72a7ed48
+  data.tar.gz: 6c928de3e629ca94e4f79837aae9281ebeb9b6c84610cd28030defb0309c0d75e5c1736e1faaede4fcf8071116d193c0c838ac3bc161910f740bc4486d8314b8

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.4.2.sidekiq-4
   - gemfiles/Gemfile.5.0.pg
+  - gemfiles/Gemfile.dalli_not_memcached
 
 matrix:
   exclude:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.0.10 [August 17, 2017]
+* Fix issue with cache lib detection
+
 ### 0.0.9 [August 16, 2017]
 * Rename some metrics and add common prefix
 

data/README.md

@@ -2,7 +2,7 @@
 
 Automatically get metrics for [Instrumental](https://instrumentalapp.com) from your Ruby on Rails (RoR) application.
 
-[![Build Status](https://travis-ci.org/Instrumental/metrician.svg?branch=master)](https://travis-ci.org/Instrumental/metrician)
+[![Build Status](https://travis-ci.org/Instrumental/metrician-ruby.svg?branch=master)](https://travis-ci.org/Instrumental/metrician-ruby)
 
 ## Automatic Metrics For Ruby
 

data/gemfiles/Gemfile.4.2.sidekiq-4.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    metrician (0.0.9)
+    metrician (0.0.10)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/Gemfile.5.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    metrician (0.0.9)
+    metrician (0.0.10)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/Gemfile.dalli_not_memcached

@@ -0,0 +1,26 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'rails', '~>4.2.0'
+
+# Differentiated development dependencies
+gem 'mysql2', '= 0.3.17'
+gem 'sidekiq', '~>4.0', require: 'sidekiq/testing'
+gem 'rspec', '~> 3.4'
+
+# Development dependencies
+gem 'instrumental_agent'
+gem 'rake'
+gem 'byebug'
+gem 'gemika'
+gem 'database_cleaner'
+gem 'delayed_job_active_record'
+gem 'resque'
+gem 'redis'
+gem 'dalli', '~>2.6'
+gem 'rack-test'
+gem 'simplecov', :require => false, :group => :test
+gem 'honeybadger'
+
+# Gem under test
+gem 'metrician', :path => '..'

data/gemfiles/Gemfile.dalli_not_memcached.lock

@@ -0,0 +1,183 @@
+PATH
+  remote: ..
+  specs:
+    metrician (0.0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
+      globalid (>= 0.3.0)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    builder (3.2.3)
+    byebug (9.0.6)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
+    dalli (2.7.6)
+    database_cleaner (1.6.1)
+    delayed_job (4.1.3)
+      activesupport (>= 3.0, < 5.2)
+    delayed_job_active_record (4.1.2)
+      activerecord (>= 3.0, < 5.2)
+      delayed_job (>= 3.0, < 5)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubis (2.7.0)
+    gemika (0.3.2)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    honeybadger (3.1.2)
+    i18n (0.8.6)
+    instrumental_agent (1.0.1)
+    json (2.1.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    mono_logger (1.1.0)
+    multi_json (1.12.1)
+    mysql2 (0.3.17)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (1.6.8)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.9)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.27.4)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    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.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sidekiq (4.2.10)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    simplecov (0.15.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  dalli (~> 2.6)
+  database_cleaner
+  delayed_job_active_record
+  gemika
+  honeybadger
+  instrumental_agent
+  metrician!
+  mysql2 (= 0.3.17)
+  rack-test
+  rails (~> 4.2.0)
+  rake
+  redis
+  resque
+  rspec (~> 3.4)
+  sidekiq (~> 4.0)
+  simplecov
+
+BUNDLED WITH
+   1.14.2

data/lib/metrician/reporters/memcache.rb

@@ -13,10 +13,10 @@ module Metrician
     end
 
     def client_classes
-      [
-        self.class.memcached_gem? && Memcached,
-        self.class.dalli_gem? && Dalli::Client,
-      ].compact
+      classes = []
+      classes << Memcached if self.class.memcached_gem?
+      classes << Dalli::Client if self.class.dalli_gem?
+      classes
     end
 
     def self.enabled?

data/lib/metrician/version.rb

@@ -1,5 +1,5 @@
 module Metrician
 
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 
 end

data/script/test

@@ -26,6 +26,7 @@ if [ $success == "true" ]; then
   echo "=              Passed                ="
   echo "======================================"
   tput sgr0    # reset to default text
+  exit 0
 else
   tput bold    # bold text
   tput setaf 1 # red text
@@ -33,4 +34,5 @@ else
   echo "=              FAILED                ="
   echo "======================================"
   tput sgr0    # reset to default text
+  exit 1
 fi

data/spec/metrician_spec.rb

@@ -270,9 +270,9 @@ RSpec.describe Metrician do
     end
 
     memcached_clients = [
-      ::Memcached.new("localhost:11211"),
+      Gemika::Env.gem?('memcached') ? ::Memcached.new("localhost:11211") : nil, # allow testing only one for Gemfile.dalli_not_memcached
       ::Dalli::Client.new("localhost:11211"),
-    ]
+    ].compact
 
     memcached_clients.each do |client|
       specify "memcached is instrumented (#{client.class.name})" do
@@ -283,7 +283,8 @@ RSpec.describe Metrician do
         agent.should_receive(:gauge).with("app.cache.command", anything)
         begin
           client.get("foo-#{rand(100_000)}")
-        rescue Memcached::NotFound
+        rescue => ex
+          raise unless ex.class.name == "Memcached::NotFound"
           # memcached raises this when there is no value for "foo-N" set
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metrician
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Expected Behavior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: instrumental_agent
@@ -131,6 +131,8 @@ files:
 - gemfiles/Gemfile.4.2.sidekiq-4.lock
 - gemfiles/Gemfile.5.0.pg
 - gemfiles/Gemfile.5.0.pg.lock
+- gemfiles/Gemfile.dalli_not_memcached
+- gemfiles/Gemfile.dalli_not_memcached.lock
 - lib/metrician.rb
 - lib/metrician/configuration.rb
 - lib/metrician/jobs.rb