rubocopfmt 0.1.0.beta2 → 0.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5964e7d80d992e05a65799d94271249cfe563e36
-  data.tar.gz: 97623211f9bf546a16654aecda5117b2a3f9b1bd
+  metadata.gz: 670799ba9de4c1e7446930905a3decb4212e6ae9
+  data.tar.gz: 2f02bc7f06cad9d23c8f74dc476d53d50cad8d77
 SHA512:
-  metadata.gz: f38caac15512b59497dd4b07dda77beb1da67bd854cddd4e90c9b6f36dc82a9e84479f23c8ec4acdf79096926bf7c64e5266d2b042fe909bee8c268bfe55f753
-  data.tar.gz: 85d365454150441eb9cd9aea763e2ef9f7f7819086b47c5610eed1d769d9363129b7ff90882daf90696ee5d5ffde268c1a1e407b73a9967a27396894997369c3
+  metadata.gz: 3c64289852893568c1eefb3edff608ca6e70cfc84436e789dcbabd5f01ca2d7bbf9cc3adc7eede5973af4e0ded3559147afe51077045d10b881532fc8310b442
+  data.tar.gz: 580314ca1bb4c094313d002bc8d522f315c6bdb11831640358cd3696ca56f55f2e271c2374d7e1571a7ea72222ea3eacce3c1bbcc29c967b2278cec6a9f8b07c

data/README.md

@@ -18,12 +18,14 @@ Usage: rubocopfmt [options] [path ...]
 Reads from STDIN if no path is given.
 
 Options:
-    -d, --diff                       Display diffs instead of rewriting files.
-    -l, --list                       List files whose formatting is incorrect.
-    -w, --write                      Write result to (source) file instead of STDOUT.
-
-    -v, --version                    Show version.
-    -h, --help                       Show this message.
+  -d, --diff               Display diffs instead of rewriting files.
+  -l, --list               List files whose formatting is incorrect.
+  -w, --write              Write result to (source) file instead of STDOUT.
+  -F, --stdin-file=<s>     Optionally provide file path when using STDIN.
+  -D, --diff-format=<s>    Display diffs using format: unified, rcs, context
+
+  -v, --version            Print version and exit
+  -h, --help               Show this message
 ```
 
 ## Configure

data/lib/rubocopfmt/auto_corrector.rb

@@ -1,4 +1,5 @@
-require 'rubocopfmt/options_parser'
+require 'rubocop'
+
 require 'rubocopfmt/formatter'
 
 module RuboCopFMT
@@ -25,7 +26,7 @@ module RuboCopFMT
     end
 
     def correct
-      Rainbow.enabled = false
+      Rainbow.enabled = false if defined?(Rainbow)
       @runner = RuboCop::Runner.new(options, config_store)
       @runner.run(paths)
       options[:stdin]

data/lib/rubocopfmt/cli.rb

@@ -1,7 +1,6 @@
-require 'diffy'
-require 'rubocop'
-
+require 'rubocopfmt/diff'
 require 'rubocopfmt/errors'
+require 'rubocopfmt/options_parser'
 require 'rubocopfmt/source'
 
 module RuboCopFMT
@@ -32,10 +31,6 @@ module RuboCopFMT
 
     private
 
-    def auto_correct_sources
-      sources.map(&:auto_correct)
-    end
-
     def require_real_files(flag)
       return unless @options.paths.empty?
 
@@ -45,16 +40,14 @@ module RuboCopFMT
 
     def print_corrected_list
       require_real_files('--list')
-      auto_correct_sources
 
-      sources.each { |c| puts c.path if c.corrected? }
+      for_corrected_source do |source|
+        puts source.path
+      end
     end
 
     def print_diff_of_corrections
-      auto_correct_sources
-
-      sources.each do |source|
-        next unless source.corrected?
+      for_corrected_source do |source|
         puts "diff #{source.path} rubocopfmt/#{source.path}" if source.path
         puts diff_source(source)
       end
@@ -62,17 +55,16 @@ module RuboCopFMT
 
     def write_corrected_source
       require_real_files('--write')
-      auto_correct_sources
 
-      sources.each do |source|
-        File.write(source.path, source.output) if source.corrected?
+      for_corrected_source do |source|
+        File.write(source.path, source.output)
       end
     end
 
     def print_corrected_source
-      auto_correct_sources
-
-      sources.each { |source| print source.output }
+      for_corrected_source(skip_unchanged: false) do |source|
+        print source.output
+      end
     end
 
     def sources
@@ -87,14 +79,18 @@ module RuboCopFMT
       end
     end
 
-    def diff_source(source)
-      diff = Diffy::Diff.new(
-        source.input, source.output,
-        include_diff_info: true,
-        diff: '-U 3'
-      )
+    def for_corrected_source(skip_unchanged: true)
+      sources.each do |source|
+        source.auto_correct
+        next if skip_unchanged && !source.corrected?
 
-      diff.to_s(:text)
+        yield(source)
+      end
+    end
+
+    def diff_source(source)
+      diff = Diff.new(source)
+      diff.render(options.diff_format)
     end
 
     def new_source_from_stdin(path = nil)

data/lib/rubocopfmt/diff.rb

@@ -0,0 +1,40 @@
+require 'diffy'
+
+module RuboCopFMT
+  class Diff
+    FORMATS = {
+      unified: '-U 3',
+      rcs: '-n',
+      context: '-C 3'
+    }.freeze
+
+    DEFAULT_FORMAT = :unified
+
+    attr_reader :source
+
+    def self.valid_format?(format)
+      FORMATS.key?(format.downcase.to_sym)
+    end
+
+    def initialize(source)
+      @source = source
+    end
+
+    def render(format = nil)
+      diff = Diffy::Diff.new(
+        source.input, source.output,
+        include_diff_info: true,
+        diff: diff_opts(format)
+      )
+
+      diff.to_s(:text)
+    end
+
+    private
+
+    def diff_opts(format = nil)
+      return FORMATS[format.downcase.to_sym] if format
+      FORMATS[DEFAULT_FORMAT]
+    end
+  end
+end

data/lib/rubocopfmt/options.rb

@@ -3,6 +3,7 @@ require 'rubocopfmt/options_parser'
 module RuboCopFMT
   class Options
     attr_accessor :stdin_file
+    attr_accessor :diff_format
 
     def paths
       @paths.nil? ? [] : @paths

data/lib/rubocopfmt/options_parser.rb

@@ -37,16 +37,26 @@ module RuboCopFMT
           opt :list, 'List files whose formatting is incorrect.'
           opt :write, 'Write result to (source) file instead of STDOUT.'
           opt :stdin_file, 'Optionally provide file path when using STDIN.',
-              short: 'f', type: :string
+              short: 'F', type: :string
+          opt :diff_format, 'Display diffs using format: unified, rcs, context',
+              short: 'D', type: :string
           banner ''
 
           conflicts :diff, :list, :write
+          conflicts :diff_format, :list, :write
+        end
+
+        if opts[:diff_format] && !Diff.valid_format?(opts[:diff_format])
+          Trollop.die :diff_format,
+                      "does not support \"#{opts[:diff_format]}\" format"
+        end
+
+        opts[:diff] = true if opts[:diff_format] && !opts[:diff]
+
+        opts.each do |k, v|
+          options.send("#{k}=", v) if options.respond_to?("#{k}=")
         end
 
-        options.diff = opts[:diff]
-        options.list = opts[:list]
-        options.write = opts[:write]
-        options.stdin_file = opts[:stdin_file]
         options
       end
     end

data/lib/rubocopfmt/version.rb

@@ -1,3 +1,3 @@
 module RuboCopFMT
-  VERSION = '0.1.0.beta2'.freeze
+  VERSION = '0.1.0.beta3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocopfmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0.beta3
 platform: ruby
 authors:
 - Jim Myhrberg
@@ -130,6 +130,7 @@ files:
 - lib/rubocopfmt/auto_corrector.rb
 - lib/rubocopfmt/cli.rb
 - lib/rubocopfmt/core_ext/string.rb
+- lib/rubocopfmt/diff.rb
 - lib/rubocopfmt/errors.rb
 - lib/rubocopfmt/formatter.rb
 - lib/rubocopfmt/options.rb