check_super_calls 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fffeebd6de7104804fb82b76fafe36caf753ad38
-  data.tar.gz: 327165d03ff3efc22a7505cfc74474f96623417d
+  metadata.gz: 353bb678187ad21a9cb272f40d513bfd4ddc21a0
+  data.tar.gz: 7abec018a3e0c685775db097e1b8c76c6717d1d0
 SHA512:
-  metadata.gz: b3ec8b1c91f7f853570449e0af86e25227072408e749a2a18766ae5f0bd06188443a5529c2c9f352167f22fd5e8a27c5535735ee5e063055395a7e0a77d53f50
-  data.tar.gz: 3a7d7d2f4a8a71c673dbc0ce6a6edb65c135040c0c3b2400fcdc9f8a47a70c25b85d1d8f0ff5c3b21c18947a891f4a7292312f2cb5f0ef8cba7c19c98bdec195
+  metadata.gz: cf74d44ed5236de3eeb9dac927924c87f7fc38244e53173cbf03ff0e42d9afef2263ed32854882d3c2cf83719866fd2cbe6a870fee9f8e9dcd18e8d3cbf58093
+  data.tar.gz: a1e57c4907004f0d5ff1843e8eb67a646def312ec4c739e06e9ac78cddd3c005bf0a14cc009bd9f055d5f124f879e2eeaeba76dac6352d4d63e1a1e9d892463a

data/lib/check_super_calls.rb

@@ -5,10 +5,15 @@ require 'check_super_calls/shell_adapter.rb'
 module CheckSuperCalls
   class Error < StandardError; end
   # Your code goes here...
-  def self.main(_args)
-    options = Parser.parse(ARGV)
+  def self.main(args)
+    arguments_string = args.join(' ')
+    options = Parser.parse(args)
 
     shell = ShellAdapter.new
-    result = shell.process_files(nil, options.input_directory)
+    result = shell.process_files(options.ignore_regex_string, options.input_directory)
+
+    puts "#{$PROGRAM_NAME} #{arguments_string}" if options.echo_invocation
+    puts "Total issues: #{result.length || 0}" if options.print_totals
+    puts result unless result.nil?
   end
 end

data/lib/check_super_calls/arguments_parser.rb

@@ -1,13 +1,20 @@
 require 'optparse'
 
 # https://docs.ruby-lang.org/en/2.1.0/OptionParser.html
-Options = Struct.new(:input_directory)
+Options = Struct.new(:input_directory,
+                     :ignore_regex_string,
+                     :echo_invocation,
+                     :print_totals)
+
+SCRIPT_NAME = 'check-super-calls'.freeze
 
 # Parses command line arguments
 class Parser
   def self.default_options
     result = Options.new
     result.input_directory = '.'
+    result.echo_invocation = false
+    result.print_totals = false
     result
   end
   private_class_method :default_options
@@ -19,14 +26,31 @@ class Parser
     result = default_options
 
     options_parser = OptionParser.new do |o|
-      o.banner = 'Usage: check-super-calls.rb [input directory]'
-
+      o.banner = 'Usage: {SCRIPT_NAME} [input directory]'
+      # nandrei add an ignore option.
       o.on('-h',
            '--help',
            'Prints this help') do
         puts options_parser
         exit 0
       end
+      o.on('-iIGNORE',
+           '--ignore-regex=IGNORE',
+           'Case sensitive ignore files regex. Eg. "Ignore|Debug"') do |v|
+        result.ignore_regex_string = v
+      end
+
+      o.on('-e',
+           '--echo',
+           'Echo invocation') do |_v|
+        result.echo_invocation = true
+      end
+
+      o.on('-t',
+           '--total',
+           'Print total') do |_v|
+        result.print_totals = true
+      end
     end
 
     begin

data/lib/check_super_calls/helpers.rb

@@ -2,18 +2,17 @@ require 'find'
 
 # Convenience utilities.
 
-def find_files(ignore_list, base_path, extension)
+def find_files(ignore_regex_string, base_path, extension)
   file_paths = []
+  ignore_regex = Regexp.new(ignore_regex_string) unless ignore_regex_string.nil?
   Find.find(base_path) do |path|
     next if File.directory? path
     next if path !~ extension
-
-    ignore_matches = (ignore_list || []).select do |item|
-      path.include? item
+    if ignore_regex
+      next if path =~ ignore_regex
     end
-    should_ignore = ignore_matches.any?
 
-    file_paths << path unless should_ignore
+    file_paths << path
   end
   file_paths
 end

data/lib/check_super_calls/languages/swift.rb

@@ -1,5 +1,9 @@
 require_relative 'pattern.rb'
 
+# consider
+# https://github.com/realm/SwiftLint/blob/0.13.2/Source/SwiftLintFramework/Rules/RuleConfigurations/OverridenSuperCallConfiguration.swift#L12
+# consider prohibited super calls https://github.com/realm/SwiftLint/pull/971
+
 class Swift
   attr_accessor :file_regex, :patterns
   def initialize

data/lib/check_super_calls/shell_adapter.rb

@@ -4,24 +4,27 @@ require_relative 'languages/obj_c.rb'
 
 # Adapter which handles shell access.
 class ShellAdapter
-  def process_files(ignore_list, base_path)
+  def process_files(ignore_regex_string, base_path)
+    result = []
+
     [
       Swift.new,
       ObjC.new
     ].each do |language|
-      result = find_files(ignore_list, base_path, language.file_regex)
+      files = find_files(ignore_regex_string, base_path, language.file_regex)
 
-      result.each do |file|
+      files.each do |file|
         file_content = File.open(file, 'r:UTF-8').read
 
         language.patterns.each do |pattern|
           next if file_content !~ pattern.definition
 
           if file_content !~ pattern.check
-            puts file + ': ' + pattern.name + ' not called'
+            result += [file + ': ' + pattern.name + ' not called']
           end
         end
       end
     end
+    result
   end
 end

data/lib/check_super_calls/version.rb

@@ -1,3 +1,3 @@
 module CheckSuperCalls
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: check_super_calls
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrei Nagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler