sql_footprint 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1808864d64806786586f98122e3f3d0881c36a48
-  data.tar.gz: c90cd6dd406e18a8e703b3524f548ebd5450953e
+  metadata.gz: 345372cb4105c987060e487d17b4dd6031ac0828
+  data.tar.gz: cd0d79b65ad986d3aae9629e9baf6ef2760364f3
 SHA512:
-  metadata.gz: 82d008d6324252cec284f59b423eb5b3db9741a2b36e1b718fb74fec66b15d6b9d66c7d8ad446fb7a628d808b1446ad40a0251995a6bc8a9fa9bc4719ede07fa
-  data.tar.gz: b910dcdf01af5715bab1a0b5149c6b8ef52bafbf75798e7c32b45e7cca08a4a2d097d58f19f5c9939b54fc73832b9765c8ec794808c76e07c89cd3b15ea6d836
+  metadata.gz: ec978a30dd1f59dfe9f199d3ff723fb0ae9064fc1d641fbb04e04bbfa269f914255bd152113b693bd3491af8b8449eb5402ca5321fea6210424835d1b32db93c
+  data.tar.gz: 078aab8ffc686233865ac57cd68f81c121d921c029fb3911c2c78750ce8ccb966d98855964637c368a1d5c35b3babbba58adf21b623f106455b79a9af57fc524

data/.travis.yml

@@ -5,7 +5,11 @@ script:
 sudo: false
 rvm:
   - 1.9.3
-  - 2.0
+  - 2.0.0
   - 2.1
   - 2.2
-  - rbx-2
+  - 2.3.0
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx

data/lib/sql_footprint.rb

@@ -1,88 +1,64 @@
 require 'sql_footprint/version'
+require 'set'
+require 'active_support/notifications'
 
 module SqlFootprint
-  def self.start
-    @original_logger = ActiveRecord::Base.logger
-    @logger = Logger.new
-    ActiveRecord::Base.logger = @logger
+  ActiveSupport::Notifications.subscribe('sql.active_record') do |_, _, _, _, payload|
+    capture payload.fetch(:sql)
   end
 
-  def self.stop
-    ActiveRecord::Base.logger = @original_logger
-    File.open('footprint.sql', 'w') do |f|
-      @logger.logs.each do |log|
-        f.puts log
-      end
-    end
-  end
-
-  def self.exclude
-    ActiveRecord::Base.logger = @original_logger
-    yield
-  ensure
-    ActiveRecord::Base.logger = @logger
-  end
-
-  class Logger
-    def initialize
-      @logs = []
+  class << self
+    def start
+      @capture = true
+      @lines   = Set.new
     end
 
-    attr_reader :logs
-
-    def error param
-      raise param
-    end
-
-    def debug text
-      if sql? text
-        sql = format_sql(text)
-        logs << sql unless logs.include?(sql)
-        logs.sort!
+    def stop
+      @capture = false
+      File.open('footprint.sql', 'w') do |f|
+        lines.each do |line|
+          f.puts line
+        end
       end
     end
 
-    def debug?
-      true
+    def exclude
+      @capture = false
+      yield
+    ensure
+      @capture = true
     end
 
-    private
-
-    SQL_REGEXS = [/SQL/, /Load\s\(/, /Exists\s\(/].map(&:freeze).freeze
-
-    def sql? text
-      SQL_REGEXS.any? { |regex| regex.match(text) }
+    def lines
+      @lines.sort
     end
 
-    def format_sql text
-      strip_values(text).split("\e\[0m")
-                        .select { |t| !t.include?('SQL') }
-                        .find { |t| !/Load\s\(/.match(t) }
-                        .gsub(/\e\[1m/, '')
-                        .strip
+    def capture sql
+      return unless @capture
+      @lines << strip_values(sql)
     end
 
-    def strip_values text
-      text = text.gsub(/\[\[.*\]\]/, '')
-      text = strip_string_values(text)
-      text = strip_integer_values(text)
-      strip_in_clause_values(text)
+    def strip_values sql
+      sql = sql.gsub(/\[\[.*\]\]/, '')
+      sql = strip_string_values(sql)
+      sql = strip_integer_values(sql)
+      strip_in_clause_values(sql)
     end
 
-    def strip_in_clause_values text
-      text.gsub(/\sIN\s\((.*)\)/) do |_match|
+    def strip_in_clause_values sql
+      sql.gsub(/\sIN\s\((.*)\)/) do |_match|
         ' IN (values-redacted)'
       end
     end
 
-    def strip_integer_values text
-      text.gsub(/\s\=\s([0-9]+)/) do |_match|
+    def strip_integer_values sql
+      sql.gsub(/\s\=\s([0-9]+)/) do |_match|
         ' = number-redacted'
       end
     end
 
-    def strip_string_values text
-      text.gsub(/\s\=\s\'(.*)\'/) do |_match|
+    def strip_string_values sql
+      sql.gsub(/\s\=\s\'(.*)\'/) do |_match|
         " = 'value-redacted'"
       end
     end

data/lib/sql_footprint/version.rb

@@ -1,3 +1,3 @@
 module SqlFootprint
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/sql_footprint.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Brandon Joyce']
   spec.email         = ['bjoyce@covermymeds.com']
 
-  spec.summary       = 'Keeps your DB guy happy.'
+  spec.summary       = 'Keeps your DBA happy.'
   spec.description   = 'Check your footprint file into source control'
   spec.homepage      = 'https://github.com/covermymeds/sql_footprint'
 
@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activerecord', '~> 4.0'
+  spec.add_dependency 'activesupport', '~> 4.0'
+
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'activerecord', '~> 4.0.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rubocop', '~> 0.37.0'

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: sql_footprint
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Brandon Joyce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   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: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   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'
 description: Check your footprint file into source control
@@ -129,10 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -150,18 +164,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Keeps your DB guy happy.
+summary: Keeps your DBA happy.
 test_files: []
+has_rdoc: