timber 1.1.14 → 2.0.0

data/timber.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Timber Technologies, Inc."]
   s.email       = ["hi@timber.io"]
   s.homepage    = "https://github.com/timberio/timber-ruby"
-  s.summary     = "Instant log gratification."
+  s.summary     = "Log Better. Solve Problems Faster. https://timber.io"
 
   s.required_ruby_version     = '>= 1.9.0'
 
@@ -18,6 +18,32 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("msgpack", "~> 1.0")
-  s.add_development_dependency("appraisal", "~> 2.1")
+  s.add_dependency('msgpack', '~> 1.0')
+
+  s.add_development_dependency('rails_stdout_logging')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 3.4')
+  s.add_development_dependency('rspec-its')
+  s.add_development_dependency('timecop')
+
+  if RUBY_PLATFORM == "java"
+    s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
+  else
+    s.add_development_dependency('sqlite3')
+  end
+
+  if RUBY_VERSION
+    ruby_version = Gem::Version.new(RUBY_VERSION)
+
+    if ruby_version < Gem::Version.new("2.0.0")
+      s.add_development_dependency('public_suffix', '~> 1.4.6')
+      s.add_development_dependency('term-ansicolor', '~> 1.3.2')
+      s.add_development_dependency('tins', '~> 1.5.0')
+      s.add_development_dependency('webmock', '~> 2.2.0')
+    else
+      s.add_development_dependency('webmock', '~> 2.3')
+    end
+  else
+    s.add_development_dependency('webmock', '~> 2.3')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 2.0.0
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -25,35 +25,134 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rails_stdout_logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 description: 
 email:
 - hi@timber.io
-executables: []
+executables:
+- timber
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - ".yardopts"
-- Appraisals
 - Gemfile
 - LICENSE.md
 - README.md
-- circle.yml
+- bin/timber
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.2.gemfile
+- gemfiles/rails-4.0.gemfile
+- gemfiles/rails-4.1.gemfile
+- gemfiles/rails-4.2.gemfile
+- gemfiles/rails-5.0.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/timber.rb
+- lib/timber/cli.rb
+- lib/timber/cli/api.rb
+- lib/timber/cli/application.rb
+- lib/timber/cli/install.rb
+- lib/timber/cli/io_helper.rb
+- lib/timber/cli/messages.rb
 - lib/timber/config.rb
 - lib/timber/context.rb
 - lib/timber/contexts.rb
@@ -69,48 +168,53 @@ files:
 - lib/timber/events/controller_call.rb
 - lib/timber/events/custom.rb
 - lib/timber/events/exception.rb
+- lib/timber/events/http_client_request.rb
+- lib/timber/events/http_client_response.rb
 - lib/timber/events/http_server_request.rb
 - lib/timber/events/http_server_response.rb
 - lib/timber/events/sql_query.rb
 - lib/timber/events/template_render.rb
 - lib/timber/frameworks.rb
 - lib/timber/frameworks/rails.rb
+- lib/timber/integrations.rb
+- lib/timber/integrations/action_controller/log_subscriber.rb
+- lib/timber/integrations/action_controller/log_subscriber/timber_log_subscriber.rb
+- lib/timber/integrations/action_dispatch/debug_exceptions.rb
+- lib/timber/integrations/action_view/log_subscriber.rb
+- lib/timber/integrations/action_view/log_subscriber/timber_log_subscriber.rb
+- lib/timber/integrations/active_record/log_subscriber.rb
+- lib/timber/integrations/active_record/log_subscriber/timber_log_subscriber.rb
+- lib/timber/integrations/active_support/tagged_logging.rb
+- lib/timber/integrations/rack.rb
+- lib/timber/integrations/rack/exception_event.rb
+- lib/timber/integrations/rack/http_context.rb
+- lib/timber/integrations/rack/http_events.rb
+- lib/timber/integrations/rack/user_context.rb
+- lib/timber/integrations/rails/rack_logger.rb
+- lib/timber/integrator.rb
 - lib/timber/log_devices.rb
 - lib/timber/log_devices/http.rb
 - lib/timber/log_entry.rb
 - lib/timber/logger.rb
-- lib/timber/overrides/logger_add.rb
+- lib/timber/overrides.rb
+- lib/timber/overrides/lograge.rb
+- lib/timber/overrides/rails_server.rb
 - lib/timber/overrides/rails_stdout_logging.rb
-- lib/timber/probe.rb
-- lib/timber/probes.rb
-- lib/timber/probes/action_controller_log_subscriber.rb
-- lib/timber/probes/action_controller_log_subscriber/log_subscriber.rb
-- lib/timber/probes/action_controller_user_context.rb
-- lib/timber/probes/action_dispatch_debug_exceptions.rb
-- lib/timber/probes/action_view_log_subscriber.rb
-- lib/timber/probes/action_view_log_subscriber/log_subscriber.rb
-- lib/timber/probes/active_record_log_subscriber.rb
-- lib/timber/probes/active_record_log_subscriber/log_subscriber.rb
-- lib/timber/probes/active_support_tagged_logging.rb
-- lib/timber/probes/rails_rack_logger.rb
-- lib/timber/rack_middlewares.rb
-- lib/timber/rack_middlewares/http_context.rb
 - lib/timber/util.rb
 - lib/timber/util/active_support_log_subscriber.rb
 - lib/timber/util/hash.rb
+- lib/timber/util/http_event.rb
 - lib/timber/util/object.rb
+- lib/timber/util/request.rb
 - lib/timber/util/struct.rb
 - lib/timber/version.rb
 - spec/README.md
 - spec/spec_helper.rb
 - spec/support/action_controller.rb
-- spec/support/action_view.rb
 - spec/support/active_record.rb
-- spec/support/coveralls.rb
 - spec/support/rails.rb
 - spec/support/rails/templates/_partial.html
 - spec/support/rails/templates/template.html
-- spec/support/simplecov.rb
 - spec/support/socket_hostname.rb
 - spec/support/timber.rb
 - spec/support/timecop.rb
@@ -124,17 +228,15 @@ files:
 - spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
+- spec/timber/integrations/action_controller/log_subscriber_spec.rb
+- spec/timber/integrations/action_dispatch/debug_exceptions_spec.rb
+- spec/timber/integrations/action_view/log_subscriber_spec.rb
+- spec/timber/integrations/active_record/log_subscriber_spec.rb
+- spec/timber/integrations/rack/http_context_spec.rb
+- spec/timber/integrations/rails/rack_logger_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
-- spec/timber/overrides/logger_add_spec.rb
-- spec/timber/probes/action_controller_log_subscriber_spec.rb
-- spec/timber/probes/action_controller_user_context_spec.rb
-- spec/timber/probes/action_dispatch_debug_exceptions_spec.rb
-- spec/timber/probes/action_view_log_subscriber_spec.rb
-- spec/timber/probes/active_record_log_subscriber_spec.rb
-- spec/timber/probes/rails_rack_logger_spec.rb
-- spec/timber/rack_middlewares/http_context_spec.rb
 - timber.gemspec
 homepage: https://github.com/timberio/timber-ruby
 licenses: []
@@ -158,18 +260,15 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Instant log gratification.
+summary: Log Better. Solve Problems Faster. https://timber.io
 test_files:
 - spec/README.md
 - spec/spec_helper.rb
 - spec/support/action_controller.rb
-- spec/support/action_view.rb
 - spec/support/active_record.rb
-- spec/support/coveralls.rb
 - spec/support/rails.rb
 - spec/support/rails/templates/_partial.html
 - spec/support/rails/templates/template.html
-- spec/support/simplecov.rb
 - spec/support/socket_hostname.rb
 - spec/support/timber.rb
 - spec/support/timecop.rb
@@ -183,14 +282,12 @@ test_files:
 - spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
+- spec/timber/integrations/action_controller/log_subscriber_spec.rb
+- spec/timber/integrations/action_dispatch/debug_exceptions_spec.rb
+- spec/timber/integrations/action_view/log_subscriber_spec.rb
+- spec/timber/integrations/active_record/log_subscriber_spec.rb
+- spec/timber/integrations/rack/http_context_spec.rb
+- spec/timber/integrations/rails/rack_logger_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
-- spec/timber/overrides/logger_add_spec.rb
-- spec/timber/probes/action_controller_log_subscriber_spec.rb
-- spec/timber/probes/action_controller_user_context_spec.rb
-- spec/timber/probes/action_dispatch_debug_exceptions_spec.rb
-- spec/timber/probes/action_view_log_subscriber_spec.rb
-- spec/timber/probes/active_record_log_subscriber_spec.rb
-- spec/timber/probes/rails_rack_logger_spec.rb
-- spec/timber/rack_middlewares/http_context_spec.rb

data/Appraisals

@@ -1,41 +0,0 @@
-appraise "rails-2.3.X" do
-  gem "rails", "~> 2.3.18"
-end
-
-appraise "rails-3.0.X" do
-  gem "rails", "~> 3.0.20"
-end
-
-appraise "rails-3.1.X" do
-  gem "rails", "~> 3.1.12"
-end
-
-appraise "rails-3.2.X" do
-  gem "rails", "~> 3.2.22"
-end
-
-appraise "rails-4.0.X" do
-  gem "minitest"
-  gem "rails", "~> 4.0.13"
-end
-
-appraise "rails-4.1.X" do
-  gem "minitest"
-  gem "rails", "~> 4.1.15"
-end
-
-appraise "rails-4.2.X" do
-  gem "minitest"
-  gem "rails", "~> 4.2.7"
-end
-
-appraise "rails-5.0.X" do
-  gem "minitest"
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails-edge" do
-  gem 'rack', github: 'rack/rack', branch: 'master'
-  gem 'arel', github: 'rails/arel', branch: 'master'
-  gem 'rails', github: 'rails/rails', branch: 'master'
-end

data/circle.yml

@@ -1,33 +0,0 @@
-machine:
-  environment:
-    COVERALLS_REPO_TOKEN: fzLA6t2EFT4KBemv3du0AdHGcqTzyRzlr
-
-dependencies:
-  override:
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal generate
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-2.3.X bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.0.X bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.1.X bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.2.X bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 bundle install
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal install
-
-test:
-  override:
-    - RAILS_23=true PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-2.3.X rspec --tag rails_23
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.0.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.1.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-1.9.3-p448/bin:$PATH rvm-exec 1.9.3 appraisal rails-3.2.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal rails-4.0.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal rails-4.1.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal rails-4.2.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal rails-5.0.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.2.6/bin:$PATH rvm-exec 2.2.6 appraisal rails-edge rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal rails-4.0.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal rails-4.1.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal rails-4.2.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal rails-5.0.X rspec
-    - PATH=/home/ubuntu/.rvm/gems/ruby-2.3.3/bin:$PATH rvm-exec 2.3.3 appraisal rails-edge rspec

data/lib/timber/overrides/logger_add.rb

@@ -1,38 +0,0 @@
-module Timber
-  module Overrides
-    module LoggerAdd
-      def self.included(klass)
-        klass.class_eval do
-          alias_method :_timber_original_add, :add
-
-          def add(severity, message = nil, progname = nil)
-            # Extract the message: https://github.com/ruby/ruby/blob/f6e77b9d3555c1fbaa8aab1cdc0bd6bde95f62c6/lib/logger.rb#L461-L468
-            progname ||= @progname
-            if message.nil?
-              if block_given?
-                message = yield
-              else
-                message = progname
-                progname = @progname
-              end
-            end
-
-            if message.is_a?(::Timber::Event)
-              if self.is_a?(::Timber::Logger)
-                _timber_original_add(severity, message, progname)
-              else
-                _timber_original_add(severity, message.message, progname)
-              end
-            else
-              _timber_original_add(severity, message, progname)
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-require "logger"
-
-::Logger.send(:include, Timber::Overrides::LoggerAdd)