ruumba 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720efab8198b60cdffe7d365d875120915545701
-  data.tar.gz: d110e7fff04bce288f9d1fa3888515d73f41355d
+  metadata.gz: 1780f255bb4860a2e5ec396d04a9f2f4e1f78292
+  data.tar.gz: 67cd8d13e193589e2457cd430781e13dea848b23
 SHA512:
-  metadata.gz: 07e940ab956ebaaf848c1e87b729963b2356d8cdd5d153fd5cb3c84da061b3e95a102a8cb12030a9be5b7f8420a81d692eea97a05e141cad3c4d9a4cdd6619eb
-  data.tar.gz: 81bdfa3737493fa3ece728be44f6f7895794132ea5f27a0b008e041134b58f711b4994c31c95592d38d0fd08e0cae78abbb481c86f2d7cf719d8007fab1184de
+  metadata.gz: 8ae430ea86b94aa6c4aedcdcbcd9fd1c4d49f81920240ff6bf4e391b70ea678585cb26166b821eda0067140e8acc808bccee33bfa396066dd10fd2a6a818d574
+  data.tar.gz: 33dbdaef53dfb16676740b451cd176df4c330218ebb2d4ce1dfa9550580c8180ce2ba277d7a57cbb4da0bd440165c35f38aabf0680ed787ec7aea9d6d96c1f0f

data/bin/ruumba

@@ -22,15 +22,17 @@ opts_parser = OptionParser.new do |opts|
   end
 
   opts.on('-c', '--config [CONFIG]', 'Use this config for rubocop') do |c|
-    options[:arguments] << "--config #{File.expand_path(c)}"
+    options[:arguments] << '--config'
+    options[:arguments] << File.expand_path(c)
   end
 
   opts.on('-D', '--display-cop-names', 'Display cop names') do ||
-    options[:arguments] << "--display-cop-names"
+    options[:arguments] << '--display-cop-names'
   end
 
   opts.on('-F', '--fail-level [LEVEL]', 'Rubocop fail level') do |l|
-    options[:arguments] << "--fail-level #{l}"
+    options[:arguments] << '--fail-level'
+    options[:arguments] << l
   end
 
   opts.on('-e', '--disable-ruby-ext', 'Disable auto-append of .rb extension') do
@@ -38,26 +40,31 @@ opts_parser = OptionParser.new do |opts|
   end
 
   opts.on('--only [COP1,COP2,...]', 'Run only the given cop(s).') do |cops|
-    options[:arguments] << "--only #{cops}"
+    options[:arguments] << '--only'
+    options[:arguments] << cops
   end
 
   opts.on('-r', '--require [FILE]', 'Require Ruby file.') do |file|
-    options[:arguments] << "--require #{file}"
+    options[:arguments] << '--require'
+    options[:arguments] << file
   end
 
   opts.on('-o', '--out [FILE]', 'Write output to a file instead of STDOUT.') do |file|
-    options[:arguments] << "--out #{file}"
+    options[:arguments] << '--out'
+    options[:arguments] << file
   end
 
   opts.on('-f', '--format [FORMAT]', 'Choose an output formatter.') do |format|
-    options[:arguments] << "--format #{format}"
+    options[:arguments] << '--format'
+    options[:arguments] << format
   end
 end
 
-begin opts_parser.parse!
-  rescue OptionParser::InvalidOption => e
+begin
+  opts_parser.parse!
+rescue OptionParser::InvalidOption => e
   abort "An error occurred: #{e}. Run ruumba -h for help."
 end
 
 analyzer = Ruumba::Analyzer.new(options)
-analyzer.run
+exit(analyzer.run)

data/lib/ruumba/analyzer.rb

@@ -3,6 +3,8 @@
 require 'securerandom'
 require 'pathname'
 require 'tmpdir'
+require 'open3'
+require 'English'
 
 # Ruumba: RuboCop's sidekick.
 module Ruumba
@@ -32,13 +34,58 @@ module Ruumba
     # @param [String] filename The filename.
     # @return [String] The extracted Ruby code.
     def extract(filename)
-      File.read(filename).scan(ERB_REGEX).map(&:last)
-        .reject { |line| line[0] == '#' }
-        .map(&:strip).join("\n")
+      file_text, matches = parse_file(filename)
+
+      extracted_ruby = ''
+
+      last_match = [0, 0]
+      matches.each do |start_index, end_index|
+        handled_region_before(start_index, last_match.last, file_text, extracted_ruby)
+
+        extracted_ruby << extract_match(file_text, start_index, end_index)
+
+        last_match = [start_index, end_index]
+      end
+
+      extracted_ruby << file_text[last_match.last..-1].gsub(/./, ' ')
     end
 
     private
 
+    def parse_file(filename)
+      # http://edgeguides.rubyonrails.org/active_support_core_extensions.html#output-safety
+      # replace '<%==' with '<%= raw' to avoid generating invalid ruby code
+      file_text = File.read(filename).gsub(/<%==/, '<%= raw')
+
+      matching_regions = file_text.enum_for(:scan, ERB_REGEX)
+                                  .map { Regexp.last_match.offset(1) }
+
+      [file_text, matching_regions]
+    end
+
+    def handled_region_before(match_start, prev_end_index,
+                              file_text, extracted_ruby)
+      return unless match_start > prev_end_index
+
+      region_before = file_text[prev_end_index..match_start - 1]
+
+      extracted_ruby << region_before.gsub(/./, ' ')
+
+      # if the last match was on the same line, we need to use a semicolon to
+      # separate statements
+      extracted_ruby[prev_end_index] = ';' if needs_stmt_delimiter?(prev_end_index, region_before)
+    end
+
+    def needs_stmt_delimiter?(last_match, region_before)
+      last_match.positive? && region_before.index("\n").nil?
+    end
+
+    def extract_match(file_text, start_index, end_index)
+      file_text[start_index...end_index].tap do |region|
+        region.gsub!(/./, ' ') if region[0] == '#'
+      end
+    end
+
     def create_temp_dir
       if @options[:tmp_folder]
         Pathname.new(File.expand_path(@options[:tmp_folder]))
@@ -62,12 +109,42 @@ module Ruumba
     end
 
     def run_rubocop(target, tmp)
-      args = (@options[:arguments] || []).join(' ')
+      args = ['rubocop'] + (@options[:arguments] || []) + [target.to_s]
       todo = tmp + '.rubocop_todo.yml'
 
-      system("cd #{tmp} && rubocop #{args} #{target}").tap do
-        FileUtils.cp(todo, ENV['PWD']) if File.exist?(todo)
-        FileUtils.rm_rf(tmp) unless @options[:tmp_folder]
+      pwd = ENV['PWD']
+
+      replacements = []
+
+      replacements << [/^#{Regexp.quote(tmp.to_s)}/, pwd]
+
+      unless @options[:disable_rb_extension]
+        replacements << [/\.erb\.rb/, '.erb']
+      end
+
+      result = Dir.chdir(tmp) do
+        stdout, stderr, status = Open3.capture3(*args)
+
+        munge_output(stdout, stderr, replacements)
+
+        status.exitstatus
+      end
+
+      FileUtils.cp(todo, pwd) if File.exist?(todo)
+      FileUtils.rm_rf(tmp) unless @options[:tmp_folder]
+
+      result
+    end
+
+    def munge_output(stdout, stderr, replacements)
+      [[STDOUT, stdout], [STDERR, stderr]].each do |output_stream, output|
+        next if output.nil? || output.empty?
+
+        replacements.each do |pattern, replacement|
+          output.gsub!(pattern, replacement)
+        end
+
+        output_stream.puts(output)
       end
     end
   end

data/lib/ruumba/rake_task.rb

@@ -19,7 +19,7 @@ module Ruumba
 
       desc 'Run RuboCop on ERB files'
       task(name, *args) do |_, task_args|
-        block.call(*[self, task_args].slice(0, block.arity)) if block
+        yield(*[self, task_args].slice(0, block.arity)) if block
         run
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruumba
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Eric Weinstein
@@ -65,4 +65,3 @@ specification_version: 4
 summary: Allows users to lint Ruby code in ERB templates the same way they lint source
   code (using RuboCop).
 test_files: []
-has_rdoc: