metrician 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a83deae6837d2eb16e8f36b352bfeebeccc41138
-  data.tar.gz: 3b698ec7a2b20f6afc688ba8f3b7d904316dface
+  metadata.gz: 4ea4543ca702d54b9c5b3b98da80914d17c4804e
+  data.tar.gz: 923cd68e6fd20feb0b1a786c83b53dec87e629a7
 SHA512:
-  metadata.gz: 28d988ff9268492fa52801cac87ec8760a7989f3aae0c6d86d47c67b57f4339255740c7803e95cf302f0ac9caaa5c5e15d16f2a0f25c96fd2d3f601e72a7ed48
-  data.tar.gz: 6c928de3e629ca94e4f79837aae9281ebeb9b6c84610cd28030defb0309c0d75e5c1736e1faaede4fcf8071116d193c0c838ac3bc161910f740bc4486d8314b8
+  metadata.gz: 8c3ef47ea845363d1c5d581435de855b4c115397523aa71d4632489a70dbed294e51779d05582a3d2119ad88800037760348f8acfb4ad1d469753c5df325c454
+  data.tar.gz: f29e315bffa5fa8ccd9dd86d0f39782f174eab18278f4c98ed09e5d898ca6597c4dbcd87efcf97c39ca91a08d62114a833bbbcde1052821d62545f10b13788be

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.0.11 [August 18, 2017]
+* Remove dependence on ActiveSupport
+
 ### 0.0.10 [August 17, 2017]
 * Fix issue with cache lib detection
 

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

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

data/gemfiles/Gemfile.5.0.pg.lock

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

data/gemfiles/Gemfile.dalli_not_memcached.lock

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

data/gemfiles/Gemfile.minimal

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+# Differentiated development dependencies
+gem 'rspec', '~> 3.4'
+
+# Development dependencies
+gem 'instrumental_agent'
+gem 'rake'
+gem 'byebug'
+gem 'gemika'
+gem 'simplecov', :require => false, :group => :test
+
+# Gem under test
+gem 'metrician', :path => '..'

data/gemfiles/Gemfile.minimal.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: ..
+  specs:
+    metrician (0.0.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (9.0.6)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    gemika (0.3.2)
+    instrumental_agent (1.0.1)
+    json (2.1.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.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  gemika
+  instrumental_agent
+  metrician!
+  rake
+  rspec (~> 3.4)
+  simplecov
+
+BUNDLED WITH
+   1.14.2

data/lib/metrician.rb

@@ -1,4 +1,5 @@
 require "English"
+require "metrician/core_ext"
 require "metrician/configuration"
 require "metrician/reporter"
 require "metrician/jobs"

data/lib/metrician/configuration.rb

@@ -9,7 +9,7 @@ module Metrician
 
       config = {}
       config_locations.reverse.each do |location|
-        deep_merge!(config, YAML.load_file(location)) if File.exist?(location)
+        config.deep_merge!(YAML.load_file(location)) if File.exist?(location)
       end
       config
     end
@@ -42,24 +42,5 @@ module Metrician
       Metrician::Jobs.reset
       Metrician::Middleware.reset
     end
-
-    def self.deep_merge!(this_hash, other_hash, &block)
-      return this_hash unless other_hash
-      other_hash.each_pair do |current_key, other_value|
-        this_value = this_hash[current_key]
-
-        this_hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-          this_value.deep_merge(other_value, &block)
-        else
-          if block_given? && this_hash.key?(current_key)
-            block.call(current_key, this_value, other_value)
-          else
-            other_value
-          end
-        end
-      end
-
-      this_hash
-    end
   end
 end

data/lib/metrician/core_ext.rb

@@ -0,0 +1,48 @@
+begin
+  require 'active_support/core_ext/hash/deep_merge'
+rescue LoadError
+  class Hash
+    # active_support
+    def deep_merge(other_hash, &block)
+      dup.deep_merge!(other_hash, &block)
+    end if !{}.respond_to?(:deep_merge)
+
+    def deep_merge!(other_hash, &block)
+      other_hash.each_pair do |current_key, other_value|
+        this_value = self[current_key]
+
+        self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+          this_value.deep_merge(other_value, &block)
+        else
+          if block_given? && key?(current_key)
+            block.call(current_key, this_value, other_value)
+          else
+            other_value
+          end
+        end
+      end
+
+      self
+    end if !{}.respond_to?(:deep_merge!)
+  end
+end
+
+begin
+  require 'active_support/core_ext/string/inflections'
+rescue LoadError
+  class String
+    # active_support
+    def underscore
+      camel_cased_word = self
+      return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
+      word = camel_cased_word.to_s.gsub(/::/, '/')
+      # word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1 && '_'}#{$2.downcase}" }
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word    end
+  end if !"".respond_to?(:underscore)
+end
+
+

data/lib/metrician/version.rb

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

data/script/test

@@ -19,6 +19,14 @@ for ruby_version in `ruby -ryaml -e 'puts YAML.load(File.read(".travis.yml"))["r
   } || success="false"
 done
 
+minimum_coverage="90"
+if ! bundle exec ruby -e "require 'simplecov'; exit SimpleCov::LastRun.read['result']['covered_percent'] >= ${minimum_coverage}"; then
+  success="false"
+  echo
+  echo "Coverage fell below minimum of ${minimum_coverage}:"
+  cat coverage/.last_run.json
+fi
+
 if [ $success == "true" ]; then
   tput bold    # bold text
   tput setaf 2 # green text

data/spec/metrician_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "instrumental_agent"
+require "tempfile"
 
 module Metrician
   def self.null_agent(agent_class: Instrumental::Agent)
@@ -7,6 +8,12 @@ module Metrician
   end
 end
 
+def should_skip?(gem_name)
+  unless Gemika::Env.gem?(gem_name)
+    "Skipping tests because gem '#{gem_name}' isn't loaded. Make sure this is correct for the current Gemfile."
+  end
+end
+
 RSpec.describe Metrician do
   before(:each) do
     Metrician.reset
@@ -63,14 +70,17 @@ RSpec.describe Metrician do
   describe "exception tracking" do
     before do
       Metrician.configuration[:exception][:enabled] = true
-      Honeybadger.configure do |config|
-        config.disabled = true
-      end
       @agent = Metrician.null_agent
       Metrician.activate(@agent)
     end
 
-    describe "honeybadger" do
+    describe "honeybadger", skip: should_skip?('honeybadger') do
+      before do
+        Honeybadger.configure do |config|
+          config.disabled = true
+        end
+      end
+
       specify "exceptions are instrumented" do
         @agent.stub(:increment)
         @agent.should_receive(:increment).with("app.tracked_exception", 1)
@@ -105,7 +115,7 @@ RSpec.describe Metrician do
     end
   end
 
-  describe "ActiveRecord" do
+  describe "ActiveRecord", skip: should_skip?('activerecord') do
     before do
       @agent = Metrician.null_agent
       Metrician.activate(@agent)
@@ -144,7 +154,7 @@ RSpec.describe Metrician do
   end
 
   describe "job systems" do
-    describe "delayed_job" do
+    describe "delayed_job", skip: should_skip?('delayed_job') do
       before do
         @agent = Metrician.null_agent
         Metrician.activate(@agent)
@@ -176,7 +186,7 @@ RSpec.describe Metrician do
       end
     end
 
-    describe "resque" do
+    describe "resque", skip: should_skip?('resque') do
       before do
         Resque.inline = true
         @agent = Metrician.null_agent
@@ -202,7 +212,7 @@ RSpec.describe Metrician do
       end
     end
 
-    describe "sidekiq" do
+    describe "sidekiq", skip: should_skip?('sidekiq') do
       before do
         Sidekiq::Testing.inline!
         @agent = Metrician.null_agent
@@ -260,7 +270,7 @@ RSpec.describe Metrician do
   end
 
   describe "cache systems" do
-    specify "redis is instrumented" do
+    specify "redis is instrumented", skip: should_skip?('redis') do
       agent = Metrician.null_agent
       Metrician.activate(agent)
       client = Redis.new
@@ -269,13 +279,8 @@ RSpec.describe Metrician do
       client.get("foo-#{rand(100_000)}")
     end
 
-    memcached_clients = [
-      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
+    shared_examples "memcache libs" do
+      it "is instrumented" do
         agent = Metrician.null_agent
         Metrician.activate(agent)
         agent.stub(:gauge)
@@ -289,6 +294,16 @@ RSpec.describe Metrician do
         end
       end
     end
+
+    describe "memcached gem", skip: should_skip?('memcached') do
+      let(:client) { ::Memcached.new("localhost:11211") }
+      it_behaves_like "memcache libs"
+    end
+
+    describe "dalli gem", skip: should_skip?('dalli') do
+      let(:client) { ::Dalli::Client.new("localhost:11211") }
+      it_behaves_like "memcache libs"
+    end
   end
 
   describe "external service timing" do
@@ -302,8 +317,8 @@ RSpec.describe Metrician do
     end
   end
 
-  describe "request timing" do
-    include Rack::Test::Methods
+  describe "request timing", skip: should_skip?('rack') do
+    include Rack::Test::Methods if Gemika::Env.gem?('rack')
 
     let(:agent) { Metrician.null_agent }
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'simplecov'
 SimpleCov.start
 SimpleCov.command_name "#{RUBY_VERSION}_#{File.basename(ENV["BUNDLE_GEMFILE"])}"
-SimpleCov.minimum_coverage 90
-SimpleCov.refuse_coverage_drop
 
 ENV["RAILS_ENV"] = "test"
 

data/spec/support/database.rb

@@ -1,33 +1,35 @@
-database = Gemika::Database.new
-database.connect
+if Gemika::Env.gem?('activerecord')
+  database = Gemika::Database.new
+  database.connect
 
-if Gemika::Env.gem?('activerecord', '< 5')
-  class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+  if Gemika::Env.gem?('activerecord', '< 5')
+    class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+    end
   end
-end
 
-database.rewrite_schema! do
+  database.rewrite_schema! do
 
-  create_table :users do |t|
-    t.string :name
-    t.string :email
-    t.string :city
-  end
+    create_table :users do |t|
+      t.string :name
+      t.string :email
+      t.string :city
+    end
 
-  create_table :delayed_jobs, force: true do |table|
-    table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
-    table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
-    table.text :handler,                 null: false # YAML-encoded string of the object that will do work
-    table.text :last_error                           # reason for last failure (See Note below)
-    table.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-    table.datetime :locked_at                        # Set when a client is working on this object
-    table.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
-    table.string :locked_by                          # Who is working on this object (if locked)
-    table.string :queue                              # The name of the queue this job is in
-    table.timestamps null: true
-  end
+    create_table :delayed_jobs, force: true do |table|
+      table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
+      table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
+      table.text :handler,                 null: false # YAML-encoded string of the object that will do work
+      table.text :last_error                           # reason for last failure (See Note below)
+      table.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                        # Set when a client is working on this object
+      table.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string :locked_by                          # Who is working on this object (if locked)
+      table.string :queue                              # The name of the queue this job is in
+      table.timestamps null: true
+    end
 
-  add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
+    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
 
+  end
 end

data/spec/support/models.rb

@@ -1,2 +1,4 @@
-class User < ActiveRecord::Base
+if Gemika::Env.gem?('activerecord')
+  class User < ActiveRecord::Base
+  end
 end

data/spec/support/test_rails_app.rb

@@ -1,21 +1,23 @@
-require "rails/all"
+if Gemika::Env.gem?('activerecord')
+  require "rails/all"
 
-class TestRailsApp < Rails::Application
-  secrets.secret_token    = "secret_token"
-  secrets.secret_key_base = "secret_key_base"
+  class TestRailsApp < Rails::Application
+    secrets.secret_token    = "secret_token"
+    secrets.secret_key_base = "secret_key_base"
 
-  config.logger = Logger.new($stdout)
-  Rails.logger = config.logger
+    config.logger = Logger.new($stdout)
+    Rails.logger = config.logger
 
-  routes.draw do
-    get "/", to: "foobars#index"
+    routes.draw do
+      get "/", to: "foobars#index"
+    end
   end
-end
 
-class FoobarsController < ActionController::Base
-  include Rails.application.routes.url_helpers
+  class FoobarsController < ActionController::Base
+    include Rails.application.routes.url_helpers
 
-  def index
-    render inline: "foobar response"
+    def index
+      render inline: "foobar response"
+    end
   end
-end
+end

data/spec/support/test_sidekiq_worker.rb

@@ -1,8 +1,10 @@
-class TestSidekiqWorker
-  include Sidekiq::Worker
+if Gemika::Env.gem?('sidekiq')
+  class TestSidekiqWorker
+    include Sidekiq::Worker
 
-  def perform(options = {})
-    return if options["success"]
-    raise "suck it nerd" if options["error"]
+    def perform(options = {})
+      return if options["success"]
+      raise "suck it nerd" if options["error"]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metrician
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Expected Behavior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: instrumental_agent
@@ -133,8 +133,11 @@ files:
 - gemfiles/Gemfile.5.0.pg.lock
 - gemfiles/Gemfile.dalli_not_memcached
 - gemfiles/Gemfile.dalli_not_memcached.lock
+- gemfiles/Gemfile.minimal
+- gemfiles/Gemfile.minimal.lock
 - lib/metrician.rb
 - lib/metrician/configuration.rb
+- lib/metrician/core_ext.rb
 - lib/metrician/jobs.rb
 - lib/metrician/jobs/delayed_job_callbacks.rb
 - lib/metrician/jobs/resque_plugin.rb