rubocopter 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d389ad55ac88f097d06e82294ec6e668d05bd20d
-  data.tar.gz: a3a157cc49c7edcadcd86abc4fcf9c1a041cabc3
+  metadata.gz: 9d2ff96ab1f11fd023566f38011c8797caad35ee
+  data.tar.gz: fc144c71f5b107870eb0396f8a3b693d64d81a13
 SHA512:
-  metadata.gz: e9dd5171972debabbf28376ac45e7603fa2f643219d71d7108f3813899fdb965c9e7907f5aeb8797beed8ed1fe50cab2e90171e24b406aacc8f487dfc008de79
-  data.tar.gz: eb58d30c831d4c9fcd138bf2f5f40845d82be3f2ce85d0a42cba42091cfa7e323c99cce70a78d163e9144cdddc1f0a52875141540a3f22f03b21ce0bc0a20263
+  metadata.gz: 3e5d81fcba6705107722d93ca419c202405f2c42b6c76cb271c1dc422674cdee39dc3804a56ec7e5dc0266505cdf03374a3271a93aaf95af015165a8536e8335
+  data.tar.gz: b74abcd2ab2fdf83137eae74bec90e8215c2dc4cdac95844a79d3e5fed4379e25688d0a5f54fe9fbb42f7e09e5af978a4c730b93d21a08830bfe1fdfb29bea99

data/lib/rubocopter/cli.rb

@@ -7,15 +7,14 @@ require_relative 'version'
 RuboCopter::Options = Struct.new(:hash, :debug)
 
 class RuboCopter::CLI
-
   attr_reader :options
 
   def run(args = ARGV)
-    parse_options(args)
-    check_for_offences
+    remaining_args = parse_options(args)
+    check_for_offences(remaining_args)
     show_results
 
-    return $?.exitstatus
+    $CHILD_STATUS.exitstatus
   end
 
   private
@@ -40,34 +39,40 @@ class RuboCopter::CLI
     rubyfiles
   end
 
-  def check_for_offences
+  def check_for_offences(remaining_args = [])
+    rubocop_options = ['rubocop', '-R']
+    unless remaining_args.include?('--out')
+      rubocop_options += '--out rubocop_result.txt'.split
+    end
+    rubocop_options += remaining_args
+
     # Check for git.
     if `which git` == ''
       puts 'git not detected. Running normal rubocop.'
-      system(Shellwords.join(['rubocop', '-R'] + '--out rubocop_result.txt'.split))
+      system(Shellwords.join(rubocop_options))
       return
     end
 
     # Check for changes
     `git rev-parse`
-    if $?.exitstatus == 0
+    if $CHILD_STATUS.exitstatus == 0
       files = changed_ruby_file_names
       if files.length == 0
         puts 'No changes detected, no reason to run rubocop'
         exit(0)
       else
-        system(Shellwords.join(['rubocop', '-R'] + files + '--out rubocop_result.txt'.split))
+        system(Shellwords.join(rubocop_options + files))
       end
       return
     end
 
     # No git directory
     puts 'git directory not detected. Running normal rubocop.'
-    system(Shellwords.join(['rubocop', '-R'] + '--out rubocop_result.txt'.split))
+    system(Shellwords.join(rubocop_options))
   end
 
   def show_results
-    if File.exists?('rubocop_result.txt')
+    if File.exist?('rubocop_result.txt')
       text = File.open('rubocop_result.txt').read
       puts text
       offense = /(\d+) offense/.match(text.split("\n")[-1])
@@ -85,9 +90,9 @@ class RuboCopter::CLI
     @options = RuboCopter::Options.new('master', false)
 
     opt_parser = OptionParser.new do |opts|
-      opts.banner = "Rubocopter v:#{RuboCopter::VERSION}\nUsage: rubocopter [options]"
+      opts.banner = "Rubocopter v:#{RuboCopter::VERSION}\nRubocop v:#{RuboCop::Version::STRING}\nUsage: rubocopter [options]\n    *Any unknown options will be passed to rubocop directly."
 
-      opts.on('-c HASH', '--commit HASH', 'git hash to compare against') do |hash|
+      opts.on('--commit HASH', 'git hash to compare against') do |hash|
         @options.hash = hash
       end
 
@@ -99,17 +104,31 @@ class RuboCopter::CLI
         remove_git_hooks(hook)
       end
 
-      opts.on("--debug", "Prints runtime") do
+      opts.on('--debug', 'Prints runtime') do
         @options.debug = true
       end
 
-      opts.on("-h", "--help", "Prints this help") do
+      opts.on('-h', '--help', 'Prints this help') do
         puts opts
         exit
       end
     end
 
-    opt_parser.parse!(args)
+    remaining_args = {}
+    begin
+      opt_parser.parse(args)
+    rescue OptionParser::InvalidOption => e
+      remaining_args = e.args.map do |arg|
+        arg_index = args.index(arg)
+        if args[arg_index + 1].start_with?('-')
+          args[arg_index]
+        else
+          [args[arg_index], args[arg_index + 1]]
+        end
+      end.flatten
+    end
+
+    remaining_args
   end
 
   def install_git_hooks(hook)
@@ -138,5 +157,4 @@ class RuboCopter::CLI
     end
     exit(0)
   end
-
 end

data/lib/rubocopter/version.rb

@@ -1,3 +1,3 @@
 module RuboCopter
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocopter
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthew Basset