whoop 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83de2300eaec2004c4bc867fef14a91689222018eee43b12fab6b9a29d425e5a
-  data.tar.gz: 0c3c9b1d21fede7bccf827a73e8c6c3d11b6ddeb6837a4444d664687c03583f7
+  metadata.gz: c210634d7bf20b36da58aaaac74e882303f4336774eec34ecd7bf9759855827b
+  data.tar.gz: d3bc51f178779de13a22e6e79b2e42cb3c80356657d7f5c11b4973e5dce3a809
 SHA512:
-  metadata.gz: 65ad2d5801a70c8d1dec7d7291bfa0c1fef3d2d181e6a1abb75ab41a8e9dd3e0b3550a2a51ddc58880c541838c2b6f603532a134bbbfe8ee633e66103aef0cbb
-  data.tar.gz: 3a1662b1192c5d1828ff8a7cb7bdf5914b4e4fc1313dd23ccf38e9460cd5c8e8187e1c6a3fe695c2e3552ef04b654cb3effdc28794731f12364c3c078c25772e
+  metadata.gz: c9d27fa6de48e6e61588d296dee684a6a87b22586541f8a10329c29b126fe2f0a59224c8174cc4a9514ab49155ff5f082457a656c4addb2be0db51f1f0dada19
+  data.tar.gz: 714ad58469426ae297bb3733daff3bb62256db471b653ecbef069bc906caf32ff01e4fe7413fdb6a20536cdbdd0b5e50b1c649122ab231d33477aeaa0b9c96b5

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    whoop (1.0.0)
-      activesupport
+    whoop (1.0.2)
+      activerecord (>= 6.1.4)
+      activesupport (>= 6.1.4)
       anbt-sql-formatter
       colorize
       rouge
@@ -10,6 +11,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
     activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)

data/README.md

@@ -64,7 +64,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/whoop. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/whoop/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/coderberry/whoop. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/coderberry/whoop/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -72,7 +72,7 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Whoop project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/whoop/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the Whoop project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/coderberry/whoop/blob/main/CODE_OF_CONDUCT.md).
 
 ## Attribution
 

data/Rakefile

@@ -4,7 +4,26 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
+GEM_NAME = "whoop"
+GEM_VERSION = Whoop::VERSION
 
 require "standard/rake"
+require "bump/tasks"
 
 task default: %i[spec standard]
+
+task :build do
+  system "gem build #{GEM_NAME}.gemspec"
+end
+
+task install: :build do
+  system "gem install #{GEM_NAME}-#{GEM_VERSION}.gem"
+end
+
+task publish: :build do
+  system "gem push #{GEM_NAME}-#{GEM_VERSION}.gem"
+end
+
+task :clean do
+  system "rm *.gem"
+end

data/lib/whoop/formatters/json_formatter.rb

@@ -15,7 +15,11 @@ module Whoop
 
         formatter = Rouge::Formatters::TerminalTruecolor.new
         lexer = Rouge::Lexers::JSON.new
-        formatter.format(lexer.lex(pretty_json))
+
+        [
+          "json:\n\n".colorize(:light_black).underline,
+          formatter.format(lexer.lex(pretty_json))
+        ].join
       end
     end
   end

data/lib/whoop/formatters/sql_formatter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "anbt-sql-formatter/formatter"
+require "active_record"
 
 module Whoop
   module Formatters
@@ -16,15 +17,47 @@ module Whoop
 
         formatter = Rouge::Formatters::TerminalTruecolor.new
         lexer = Rouge::Lexers::SQL.new
-        formatter.format(lexer.lex(pretty_sql))
+
+        formatted_sql = formatter.format(lexer.lex(pretty_sql))
+        return formatted_sql unless explain
+
+        raw_explain = exec_explain(sql)
+        formatted_explain = formatter.format(lexer.lex(raw_explain))
+
+        [
+          "sql:\n\n".colorize(:light_black).underline,
+          formatted_sql,
+          "\n\n",
+          "query plan:\n\n".colorize(:light_black).underline,
+          formatted_explain
+        ].join
       end
 
+      # Generate a pretty SQL query
+      # @param [String] sql The SQL query
+      # @return [String] The formatted SQL query
       def self.generate_pretty_sql(sql)
         rule = AnbtSql::Rule.new
         rule.indent_string = "  "
         formatter = AnbtSql::Formatter.new(rule)
         formatter.format(sql.dup)
       end
+
+      # Execute the `EXPLAIN` query
+      # @param [String] sql The SQL query
+      # @return [String] The formatted query plan
+      def self.exec_explain(sql)
+        result = ActiveRecord::Base.connection.exec_query("EXPLAIN #{sql}")
+        lines = result.rows.map(&:first)
+
+        pretty_explain = []
+        pretty_explain += lines.map { |line| " #{line}" }
+        nrows = result.rows.length
+        rows_label = nrows == 1 ? "row" : "rows"
+        pretty_explain << "\n(#{nrows} #{rows_label})"
+
+        pretty_explain.join("\n")
+      end
     end
   end
 end

data/lib/whoop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whoop
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/whoop.rb

@@ -19,6 +19,8 @@ module Whoop
   mattr_accessor :level
   @@level = :debug
 
+  # Configure the logger
+  # @yield [Whoop::Configuration] The configuration object
   def self.setup
     yield(self)
   end

data/sig/whoop.rbs

@@ -6,7 +6,8 @@ module Whoop
   VERSION: untyped
 
   # sord omit - no YARD return type given, using untyped
-  def self.setup: () ?{ (Whoop _self) -> void } -> untyped
+  # Configure the logger
+  def self.setup: () -> untyped
 
   module Main
     COLORS: untyped
@@ -89,9 +90,19 @@ module Whoop
       # _@return_ — The formatted SQL query
       def self.format: (String sql, ?colorize: bool, ?explain: bool) -> String
 
-      # sord omit - no YARD type given for "sql", using untyped
-      # sord omit - no YARD return type given, using untyped
-      def self.generate_pretty_sql: (untyped sql) -> untyped
+      # Generate a pretty SQL query
+      # 
+      # _@param_ `sql` — The SQL query
+      # 
+      # _@return_ — The formatted SQL query
+      def self.generate_pretty_sql: (String sql) -> String
+
+      # Execute the `EXPLAIN` query
+      # 
+      # _@param_ `sql` — The SQL query
+      # 
+      # _@return_ — The formatted query plan
+      def self.exec_explain: (String sql) -> String
     end
 
     module JsonFormatter

data/whoop.gemspec

@@ -31,7 +31,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord", ">= 6.1.4"
+  spec.add_dependency "activesupport", ">= 6.1.4"
   spec.add_dependency "anbt-sql-formatter"
   spec.add_dependency "colorize"
   spec.add_dependency "rouge"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whoop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Eric Berry
@@ -10,20 +10,34 @@ bindir: exe
 cert_chain: []
 date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: anbt-sql-formatter
   requirement: !ruby/object:Gem::Requirement