flog 4.6.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0fc313dc7f3892e2ac94b838dc0b6aeaf7930e7594f182a0ddebec2c540da7b
-  data.tar.gz: 663fc807ac517de1f01a6ac633b0a76b3a4a8f70590a2bdc76d09d0c2ef0ef5e
+  metadata.gz: 71073335bad47948fc2c595a09ae883aeb2fbc119056c9ddd9922c374d278199
+  data.tar.gz: 5c224d4e435702cd05363f78a5103139f43aed18a6e257c50f6917215bdd2ffa
 SHA512:
-  metadata.gz: 7c18ca2c0517e1d9d0b618216d6385fbe1c7e28e9f10bd64455e0c70b68424a9e74f8aebe98e6487486a6d50550acf5d2210fc87378f54073e7db8d918acd398
-  data.tar.gz: 0a19ae61b73cb0f91ccbf245aeb2853e27f0765fc10586f1b6b333e71e3d97534a030a30c68a169f2a1f4e15d1433edb3c84b07cfb5ec19d1f4845f62bce8b6a
+  metadata.gz: da67084a75b7bbff54bb536abaeaac2b63be971cd1d11b74cafd340175b70a2a0d149d840300cd920100c2e691d5e68ed95a72f8fe1c80602def3647f761c0d3
+  data.tar.gz: 2b2b77800a343ae038ebe6499720bc7fcc18f3fff899c07c5d14c011f1456d4d2d8bceab33da9ce6ceff8d7c96d907942842696812081d0d1bd7293ff9357bd7

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 4.6.3 / 2019-09-14
+
+* 1 minor enhancement:
+
+  * Removed --18 and --19 options to cmdline. No real value anymore.
+
+* 2 bug fixes:
+
+  * Fixed some sexp access under STRICT_SEXP=2.
+  * Fixed option / arg processing bug that caused a hang (reading from stdin).
+
 === 4.6.2 / 2018-02-14
 
 * 1 bug fix:

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.6.2" # :nodoc:
+  VERSION = "4.6.3" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -143,10 +143,12 @@ class Flog < MethodBasedSexpProcessor
   def dsl_name? args
     return false unless args and not args.empty?
 
-    first_arg = args.first
-    first_arg = first_arg[1] if first_arg[0] == :hash
+    first_arg, = args
+    first_arg = first_arg[1] if first_arg.sexp_type == :hash
 
-    [:lit, :str].include? first_arg[0] and first_arg[1]
+    type, value, * = first_arg
+
+    value if [:lit, :str].include? type
   end
 
   ##
@@ -362,7 +364,7 @@ class Flog < MethodBasedSexpProcessor
 
     add_to_score :block_pass
 
-    case arg.first
+    case arg.sexp_type
     when :lvar, :dvar, :ivar, :cvar, :self, :const, :colon2, :nil then # f(&b)
       # do nothing
     when :lit, :call then                                              # f(&:b)
@@ -455,7 +457,7 @@ class Flog < MethodBasedSexpProcessor
     exp.delete 0 # { || ... } has 0 in arg slot
 
     if context == [:block, :iter] or context == [:iter] then
-      recv = exp.first
+      recv, = exp
 
       # DSL w/ names. eg task :name do ... end
       #   looks like s(:call, nil, :task, s(:lit, :name))

data/lib/flog_cli.rb

@@ -19,11 +19,11 @@ class FlogCLI
     expander = PathExpander.new args, "**/*.{rb,rake}"
     files = expander.process
 
+    options = parse_options args
+
     abort "no files or stdin (-) to process, aborting." if
       files.empty? and args.empty?
 
-    options = parse_options args
-
     flogger = new options
     flogger.flog(*files)
     flogger.report
@@ -131,14 +131,6 @@ class FlogCLI
         option[:verbose] = true
       end
 
-      opts.on("--18", "Use a ruby 1.8 parser.") do
-        option[:parser] = Ruby18Parser
-      end
-
-      opts.on("--19", "Use a ruby 1.9 parser.") do
-        option[:parser] = Ruby19Parser
-      end
-
       next if self.plugins.empty?
       opts.separator "Plugin options:"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,15 +21,15 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
-  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
-  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
-  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
-  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
-  V+HB+LYYhXWitInO/eXxDrFB
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
+  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
+  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
+  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
+  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
+  UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -49,22 +49,22 @@ dependencies:
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
@@ -83,30 +83,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.18'
 description: |-
   Flog reports the most tortured code in an easy to read pain
   report. The higher the score, the more pain the code is in.
@@ -153,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report