gloc 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc95fe549dd5543d9065169bb27ed78136f9e7099fef68d77ef960fd538477b8
-  data.tar.gz: 56d52ed6444123d10ace0118d69fb3e645a3dd2230aae7c61e9838d50abe93aa
+  metadata.gz: 5156b6f1cc4eb919a465b8dc8f85de9205985ac8254b4137a69551f7962d460e
+  data.tar.gz: 2bbcb2c970741426522922268d8fcd0889ca34470b9b28eb2a98b4511ef333a6
 SHA512:
-  metadata.gz: ced85c0e8bd14bf7328bf8b23fae5a35f279e9b280642468e6ccc3a7337ec09ed1e819ba06630296dbc1a19df77e4a39adbf20f3e0ee259a6b7b5622f0da3eab
-  data.tar.gz: 829fbb09dd24e5686526c489a7f838fd599457588ca652e43da5c4aaca72418ad16f798921ee8fc96ebb19d1326a1a28e30ab67ac3f6ce22d670fd49b5e1a7e2
+  metadata.gz: 91e48fc39853ecf51a65945df2da0172e6dd9f5b9aa25d36591faf2f5e8681e648aba02d926efb1576945ecaee10d70ef685809d8fcc734ba984a30f5e85ef05
+  data.tar.gz: 96a9431bc608a88c36a95dc2c4b5a955aeb27480c75dd5891f59c44f9d13dd39b341dfde54c5b1d7ba14389e0e0dd38515cc31339c33ac281f18743aa42a1f5c

data/.rubocop.yml

@@ -1,12 +1,14 @@
-Lint/HandleExceptions:
+require:
+  - rubocop-rake
+  - rubocop-minitest
+
+Lint/SuppressedException:
   Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -35,3 +37,6 @@ Style/TrailingCommaInArrayLiteral:
   Enabled: false
 Style/TrailingCommaInHashLiteral:
   Enabled: false
+
+AllCops:
+  NewCops: enable

data/.ruby-version

@@ -1 +1 @@
-2.3.8
+2.6.3

data/Gemfile.lock

@@ -1,52 +1,61 @@
 PATH
   remote: .
   specs:
-    gloc (0.7.0)
+    gloc (0.8.0)
       rainbow (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    coderay (1.1.2)
+    ast (2.4.2)
+    coderay (1.1.3)
     interception (0.5)
-    jaro_winkler (1.5.2)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    parallel (1.14.0)
-    parser (2.6.2.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-rescue (1.5.0)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-rescue (1.5.2)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    psych (3.1.0)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rubocop (0.66.0)
-      jaro_winkler (~> 1.5.1)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.18.4)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.0)
-    unicode-display_width (1.5.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.14.0)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 2.2)
   gloc!
-  minitest
-  pry
-  pry-rescue
-  rake
-  rubocop
+  minitest (~> 5.14)
+  pry (~> 0.14)
+  pry-rescue (~> 1.5)
+  rake (~> 13.0)
+  rubocop (~> 1.18)
+  rubocop-minitest (~> 0.14)
+  rubocop-rake (~> 0.6)
 
 BUNDLED WITH
-   2.0.2
+   2.2.25

data/Rakefile

@@ -1,5 +1,6 @@
 # rubocop:disable Style/SymbolArray
 # rubocop:disable Style/HashSyntax
+# rubocop:disable Rake/Desc
 
 require 'bundler/gem_tasks'
 
@@ -34,5 +35,6 @@ end
 
 Rake::Task['build'].enhance([:default, :ready])
 
+# rubocop:enable Rake/Desc
 # rubocop:enable Style/HashSyntax
 # rubocop:enable Style/SymbolArray

data/exe/gloc

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby -s
 
 #
-# rubocop:disable Layout/AlignHash
+# rubocop:disable Layout/HashAlignment
 # rubocop:disable Layout/ElseAlignment
 # rubocop:disable Layout/EndAlignment
 # rubocop:disable Layout/IndentationWidth
 #
+# rubocop:disable Lint/DuplicateBranch:
+#
 # rubocop:disable Style/EmptyCaseCondition
 # rubocop:disable Style/GlobalVars
 # rubocop:disable Style/RegexpLiteral
@@ -14,7 +16,7 @@
 require 'English'
 require 'ostruct'
 
-source_files = if STDIN.tty? || $tty
+source_files = if $stdin.tty? || $tty
   `git rev-parse --show-toplevel &> /dev/null`
   if $CHILD_STATUS.success?
     # we're inside a git repo so
@@ -27,8 +29,8 @@ source_files = if STDIN.tty? || $tty
   end
 else
   # assume we're running it in a pipeline
-  # and read list of filenames from STDIN
-  STDIN.read.split($RS).map(&:chomp)
+  # and read list of filenames from $stdin
+  $stdin.read.split($RS).map(&:chomp)
 end
 
 # exclude binary files from stats
@@ -96,7 +98,7 @@ STATS_FOR = Hash.new do |stats_for_ext, ext|
 end
 
 source_files.each do |file|
-  ext = '*' + File.extname(file) # e.g. '*.rb' or '*' if no ext!
+  ext = File.extname(file).prepend('*') # e.g. '*.rb' or '*' if no ext!
 
   blank_regex   = BLANKS[ext]
   comment_regex = COMMENTS[ext]
@@ -120,17 +122,13 @@ sort_metric = case
               else :code_count
               end
 
-file_stats = Hash[
-  STATS_FOR_FILE.sort_by { |_, stats|
-    stats.send(sort_metric)
-  }.reverse
-]
+file_stats = STATS_FOR_FILE.sort_by { |_, stats|
+  stats.send(sort_metric)
+}.reverse.to_h
 
-source_stats = Hash[
-  STATS_FOR.sort_by { |_, stats|
-    stats.send(sort_metric)
-  }.reverse
-]
+source_stats = STATS_FOR.sort_by { |_, stats|
+  stats.send(sort_metric)
+}.reverse.to_h
 
 source_stats['TOTAL'] = OpenStruct.new(
   file_count:    source_stats.values.map(&:file_count).reduce(:+)    || 0,
@@ -144,7 +142,7 @@ source_stats['TOTAL'] = OpenStruct.new(
 # JSON formatting for non-TTY output
 #
 
-unless STDOUT.tty? || $tty || $visual
+unless $stdout.tty? || $tty || $visual
   require 'json'
 
   class OpenStruct
@@ -175,7 +173,7 @@ unless $visual
   # fancy formatting for TTY output
   #
 
-  source_stats.values.each do |stats_for_ext|
+  source_stats.each_value 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
@@ -242,10 +240,12 @@ end
 # rubocop:enable Style/GlobalVars
 # rubocop:enable Style/EmptyCaseCondition
 #
+# rubocop:enable Lint/DuplicateBranch:
+#
 # rubocop:enable Layout/IndentationWidth
 # rubocop:enable Layout/EndAlignment
 # rubocop:enable Layout/ElseAlignment
-# rubocop:enable Layout/AlignHash
+# rubocop:enable Layout/HashAlignment
 #
 
 # That's all Folks!

data/gloc.gemspec

@@ -22,12 +22,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = ['>= 2.6.0', '< 2.7.0']
+
   spec.add_dependency 'rainbow', '~> 3.0'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-rescue'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'minitest', '~> 5.14'
+  spec.add_development_dependency 'pry', '~> 0.14'
+  spec.add_development_dependency 'pry-rescue', '~> 1.5'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 1.18'
+  spec.add_development_dependency 'rubocop-minitest', '~> 0.14'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6'
 end

data/lib/gloc/version.rb

@@ -1,6 +1,6 @@
 module GLOC
   NAME = 'gloc'.freeze
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Peter Vandenberk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -28,86 +28,114 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Simple "lines of code" utility, based on file extensions!
 email:
 - pvandenberk@mac.com
@@ -138,7 +166,7 @@ homepage: https://github.com/pvdb/gloc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,15 +174,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Not `loc`, not `cloc`, not `tokei`, not `SLOCCOUNT`, ...
 test_files: []