gloc 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9597ef8cbe66bd1bbabd842ce14ec2f704480ceaadf0dd31c378b6e9d5c9e32
-  data.tar.gz: 20fc8dd502a50480c0432f6b7261da11217e1c8d74e4d33a29a2f2c2deeba60e
+  metadata.gz: 8a54a3fda53607841e4ebd43bd11ca75497650dda5ca6499b8b6c03df1f7cbb5
+  data.tar.gz: 2ecdf050623c6e8ed1668683013e18dad09453d0966dac53f7b8661cf12a6984
 SHA512:
-  metadata.gz: 8c071d0a4803d928cd37d6394c084449776ed7f9162248fc5dcbdf61890ff46f4353a30673d6fefff1ae386ff921d840580dc3949ee0454fdffeb215269010fb
-  data.tar.gz: 463124056b75f7099654b03d338d94c0be65789d54058eed901c8bbd39ef89745fb262dc327c0538ad127058f394b1f2d3f1dcfa5285ce82d5de914b94303d77
+  metadata.gz: bb59760f48ef824d7aeadfbe305badf9e6c94e662f6c63ae94e5f92f5624eaeea883a4848e1102357e1d7324fd66d38cec900bbf1dbe0886ea4df4d328c269b5
+  data.tar.gz: '08f53b35d6e344913dcf6401dc7a282b25f95204074e961d755535f493a96256f5e16112da95a6fe026412fd32e67884db78106bfc52d0765b317fc6a0ed026a'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloc (0.5.0)
+    gloc (0.6.0)
       rainbow (~> 3.0)
 
 GEM

data/README.md

@@ -99,6 +99,22 @@ The results are sorted by "lines of code" by default _(with "lines of code" defi
     gloc -comment   # sort by the number of comment lines
     gloc -code      # sort by lines of code (default)
 
+## Processing
+
+When `gloc`'s STDOUT isn't a TTY, it outputs the LoC stats in JSON format, for further parsing and processing.
+
+This also means you can pretty-print the LoC stats as follows:
+
+    gloc | jq
+
+... which uses the [the indispensable jq utility][jq] (`brew install jq`) for processing the JSON output.
+
+To "force" the typical TTY output even when STDOUT isn't a TTY, you can use the `-tty` option as follows:
+
+    gloc -tty | pbcopy
+
+... which copies the non-JSON version of the LoC stats to the clipboard.
+
 ## Known Issues and Possible Enhancements
 
 * identify comment-only lines for a lot more languages

data/exe/gloc

@@ -144,7 +144,7 @@ source_stats['TOTAL'] = OpenStruct.new(
 # JSON formatting for non-TTY output
 #
 
-unless STDOUT.tty? || $tty
+unless STDOUT.tty? || $tty || $visual
   require 'json'
 
   class OpenStruct
@@ -158,79 +158,85 @@ unless STDOUT.tty? || $tty
   exit
 end
 
-#
-# fancy formatting for TTY output
-#
-
-class String
-  def commify
-    gsub(/(\d)(?=(\d{3})+(\..*)?$)/, '\1,')
+unless $visual
+  class String
+    def commify
+      gsub(/(\d)(?=(\d{3})+(\..*)?$)/, '\1,')
+    end
   end
-end
 
-class Numeric
-  def commify
-    to_s.commify
+  class Numeric
+    def commify
+      to_s.commify
+    end
   end
-end
 
-source_stats.values.each do |stats_for_ext|
-  stats_for_ext.file_count    = stats_for_ext.file_count.commify
-  stats_for_ext.line_count    = stats_for_ext.line_count.commify
-  stats_for_ext.blank_count   = stats_for_ext.blank_count.commify
-  stats_for_ext.comment_count = stats_for_ext.comment_count.commify
-  stats_for_ext.code_count    = stats_for_ext.code_count.commify
-end
+  #
+  # fancy formatting for TTY output
+  #
 
-DIVIDER  = ('-' * 80) # because loc uses 80 columns
-TEMPLATE = ' %-13s %12s %12s %12s %12s %12s'.freeze
+  source_stats.values.each do |stats_for_ext|
+    stats_for_ext.file_count    = stats_for_ext.file_count.commify
+    stats_for_ext.line_count    = stats_for_ext.line_count.commify
+    stats_for_ext.blank_count   = stats_for_ext.blank_count.commify
+    stats_for_ext.comment_count = stats_for_ext.comment_count.commify
+    stats_for_ext.code_count    = stats_for_ext.code_count.commify
+  end
 
-puts format(
-  "#{DIVIDER}\n#{TEMPLATE}\n#{DIVIDER}",
-  'Language', 'Files', 'Lines', 'Blank', 'Comment', 'Code'
-)
+  DIVIDER  = ('-' * 80) # because loc uses 80 columns
+  TEMPLATE = ' %-13s %12s %12s %12s %12s %12s'.freeze
 
-source_stats.each do |file_ext, stats|
   puts format(
-    TEMPLATE,
-    file_ext,
-    stats.file_count,
-    stats.line_count,
-    stats.blank_count,
-    stats.comment_count,
-    stats.code_count,
+    "#{DIVIDER}\n#{TEMPLATE}\n#{DIVIDER}",
+    'Language', 'Files', 'Lines', 'Blank', 'Comment', 'Code'
   )
-end
-
-puts format(
-  "#{DIVIDER}\n#{TEMPLATE}\n#{DIVIDER}",
-  'Total', *source_stats.delete('TOTAL').to_h.values
-)
-
-exit unless $visual # show summary stats only
-
-require 'rainbow'
-require 'io/console'
 
-max_line_count   = file_stats.values.map(&:line_count).max
-longest_filename = file_stats.keys.map(&:first).map(&:length).max
-_, console_width = IO.console.winsize
-available_width  = Float(console_width - longest_filename - 5)
-
-file_stats.each_pair do |(file, _, _), stats|
-  code_width    = (available_width * stats.code_count / max_line_count)
-  comment_width = (available_width * stats.comment_count / max_line_count)
-  blank_width   = (available_width * stats.blank_count / max_line_count)
+  source_stats.each do |file_ext, stats|
+    next if file_ext == 'TOTAL'
+
+    puts format(
+      TEMPLATE,
+      file_ext,
+      stats.file_count,
+      stats.line_count,
+      stats.blank_count,
+      stats.comment_count,
+      stats.code_count,
+    )
+  end
 
   puts format(
-    " %-#{longest_filename}<file>s | %<code>s%<comment>s%<blank>s",
-    file: file,
-    code:    Rainbow('+' * code_width).green,
-    comment: Rainbow('-' * comment_width).red,
-    blank:   Rainbow('⍽' * blank_width).blue,
+    "#{DIVIDER}\n#{TEMPLATE}\n#{DIVIDER}",
+    'Total', *source_stats.fetch('TOTAL').to_h.values
   )
 end
 
+if $visual
+  require 'rainbow'
+  require 'io/console'
+
+  max_line_count   = file_stats.values.map(&:line_count).max
+  longest_filename = file_stats.keys.map(&:first).map(&:length).max
+  _, console_width = IO.console.winsize
+  available_width  = Float(console_width - longest_filename - 5)
+
+  abort 'Terminal not wide enough... aborting!' if available_width.negative?
+
+  file_stats.each_pair do |(file, _, _), stats|
+    code_width    = (available_width * stats.code_count / max_line_count)
+    comment_width = (available_width * stats.comment_count / max_line_count)
+    blank_width   = (available_width * stats.blank_count / max_line_count)
+
+    puts format(
+      " %-#{longest_filename}<file>s | %<code>s%<comment>s%<blank>s",
+      file: file,
+      code:    Rainbow('+' * code_width).green,
+      comment: Rainbow('-' * comment_width).red,
+      blank:   Rainbow('⍽' * blank_width).blue,
+    )
+  end
+end
+
 #
 # rubocop:enable Style/RegexpLiteral
 # rubocop:enable Style/GlobalVars

data/lib/gloc/version.rb

@@ -1,6 +1,6 @@
 module GLOC
   NAME = 'gloc'.freeze
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 
   def self.version
     "#{NAME} v#{VERSION}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Not `loc`, not `cloc`, not `tokei`, not `SLOCCOUNT`, ...