rubocopfmt 0.1.0.beta4 → 0.1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4caf033607e3f55dc1e4dce78e4f5ffeded58566
-  data.tar.gz: ef5a0d55ffa56e6e2103dfdbb6e90aeffb0d731b
+  metadata.gz: 0fa9af7cf679b86a5ef27cf338e97c13b8bda718
+  data.tar.gz: bc0456f52025e46daa569daa4c6057a38c95f853
 SHA512:
-  metadata.gz: 3d8618a439c6691bf5b52ecdee3a9e67513985d5dc5364c3e1d185d80c9b3dd9285422763e20ced467efac3de92eb22f10c72cf38b4b17f5e357da1a5984c16c
-  data.tar.gz: 7205b46d71e7fc7382bfe4baa5599003ed769a6250243827f6b45b9acf49f2f56b8aa1726a9efb4afbcd4654a4bcd989d7ed2ad4fcd22a6f2fffc62c659ea78f
+  metadata.gz: 6a761e3295527c8d8f39ce6e31b6ddd29263cd5d79ebba0bb9616e5765be22957c87ea428a3a7f022f77945fd780a55c121aeb029c3ecdad22467bb780c64ba5
+  data.tar.gz: 717eeb9ee0c8134293c07876f8c7e2eac7e729ab75d2ad611f87858627317d7c6cd7e4f9bbe161aa60392d05896d41ff3fac8354e4d2618df0d3d1a49b2567d1

data/lib/rubocopfmt/auto_corrector.rb

@@ -1,6 +1,6 @@
 require 'rubocop'
 
-require 'rubocopfmt/formatter'
+require 'rubocopfmt/rubocop_formatter'
 
 module RuboCopFMT
   class AutoCorrector
@@ -13,7 +13,7 @@ module RuboCopFMT
     RUBOCOP_ARGV = [
       '--auto-correct',
       '--cache', 'false',
-      '--format', 'RuboCopFMT::Formatter',
+      '--format', 'RuboCopFMT::RubocopFormatter',
       '--except', DISABLED_COPS.join(',')
     ].freeze
 
@@ -27,7 +27,7 @@ module RuboCopFMT
 
     def correct
       Rainbow.enabled = false if defined?(Rainbow)
-      @runner = RuboCop::Runner.new(options, config_store)
+      @runner = ::RuboCop::Runner.new(options, config_store)
       @runner.run(paths)
       options[:stdin]
     end
@@ -37,7 +37,7 @@ module RuboCopFMT
     def config_store
       return @config_store if @config_store
 
-      @config_store = RuboCop::ConfigStore.new
+      @config_store = ::RuboCop::ConfigStore.new
       @config_store.options_config = options[:config] if options[:config]
       @config_store.force_default_config! if options[:force_default_config]
       @config_store
@@ -59,7 +59,7 @@ module RuboCopFMT
 
     def set_options_and_paths
       argv = RUBOCOP_ARGV + [@path || 'fake.rb']
-      @options, @paths = RuboCop::Options.new.parse(argv)
+      @options, @paths = ::RuboCop::Options.new.parse(argv)
       @options[:stdin] = source
 
       [@options, @paths]

data/lib/rubocopfmt/cli.rb

@@ -1,7 +1,7 @@
 require 'rubocopfmt/diff'
 require 'rubocopfmt/errors'
-require 'rubocopfmt/options_parser'
-require 'rubocopfmt/source'
+require 'rubocopfmt/cli_options'
+require 'rubocopfmt/formatter'
 
 module RuboCopFMT
   class CLI
@@ -10,12 +10,17 @@ module RuboCopFMT
     end
 
     attr_reader :options
+    attr_reader :sources
 
     def initialize(args)
-      @options = OptionsParser.parse(args)
+      @options = CLIOptions.parse(args)
     end
 
     def run
+      runner = Formatter.new(options)
+      runner.run
+      @sources = runner.sources
+
       if @options.list
         print_corrected_list
       elsif @options.diff
@@ -31,23 +36,16 @@ module RuboCopFMT
 
     private
 
-    def require_real_files(flag)
-      return unless @options.paths.empty?
-
-      $stderr.puts "ERROR: To use #{flag} you must specify one or more files"
-      exit 1
-    end
-
     def print_corrected_list
-      require_real_files('--list')
-
-      for_corrected_source do |source|
-        puts source.path
+      sources.each do |source|
+        puts source.path if source.corrected?
       end
     end
 
     def print_diff_of_corrections
-      for_corrected_source do |source|
+      sources.each do |source|
+        next unless source.corrected?
+
         if source.path && sources.size > 1
           puts "diff #{source.path} rubocopfmt/#{source.path}"
         end
@@ -56,37 +54,14 @@ module RuboCopFMT
     end
 
     def write_corrected_source
-      require_real_files('--write')
-
-      for_corrected_source do |source|
-        File.write(source.path, source.output)
+      sources.each do |source|
+        File.write(source.path, source.output) if source.corrected?
       end
     end
 
     def print_corrected_source
-      for_corrected_source(skip_unchanged: false) do |source|
-        print source.output
-      end
-    end
-
-    def sources
-      return @sources if @sources
-
-      if options.paths.empty?
-        @sources = [new_source_from_stdin(options.stdin_file)]
-      else
-        @sources = options.paths.map do |path|
-          new_source_from_file(path)
-        end
-      end
-    end
-
-    def for_corrected_source(skip_unchanged: true)
       sources.each do |source|
-        source.auto_correct
-        next if skip_unchanged && !source.corrected?
-
-        yield(source)
+        print source.output
       end
     end
 
@@ -94,16 +69,5 @@ module RuboCopFMT
       diff = Diff.new(source)
       diff.render(options.diff_format)
     end
-
-    def new_source_from_stdin(path = nil)
-      Source.new($stdin.binmode.read, path)
-    end
-
-    def new_source_from_file(path)
-      raise FileNotFound, "File not found: #{path}" unless File.exist?(path)
-
-      source = File.read(path, mode: 'rb')
-      Source.new(source, path)
-    end
   end
 end

data/lib/rubocopfmt/{options_parser.rb → cli_options.rb}

@@ -6,22 +6,25 @@ require 'rubocopfmt/options'
 require 'rubocopfmt/version'
 
 module RuboCopFMT
-  class OptionsParser
+  class CLIOptions
     class << self
-      def parse(args, options = nil)
+      def parse(args)
         args = args.clone
-        options ||= Options.new
 
-        parse_flags(args, options)
-        options.paths = args unless args.empty?
+        opts = parse_args(args)
+        opts[:paths] = args
+        opts[:diff] = true if opts[:diff_format] && !opts[:diff]
+
+        validate_diff_format(opts)
+        validate_paths(opts)
 
-        options
+        opts
       end
 
       private
 
-      def parse_flags(args, options)
-        opts = Trollop.options(args) do
+      def parse_args(args)
+        Trollop.options(args) do
           banner <<-EOF.undent
             Usage: rubocopfmt [options] [path ...]
 
@@ -30,8 +33,8 @@ module RuboCopFMT
             Options:
           EOF
 
-          version "rubocopfmt #{RuboCopFMT::VERSION}" \
-                  " (rubocop #{RuboCop::Version::STRING})"
+          version "rubocopfmt #{RuboCopFMT::VERSION} " \
+                  "(rubocop #{::RuboCop::Version::STRING})"
 
           opt :diff, 'Display diffs instead of rewriting files.'
           opt :list, 'List files whose formatting is incorrect.'
@@ -45,19 +48,22 @@ module RuboCopFMT
           conflicts :diff, :list, :write
           conflicts :diff_format, :list, :write
         end
+      end
 
-        if opts[:diff_format] && !Diff.valid_format?(opts[:diff_format])
-          Trollop.die :diff_format,
-                      "does not support \"#{opts[:diff_format]}\" format"
+      def validate_paths(opts)
+        [:list, :write].each do |opt|
+          if opts[opt] && opts[:paths].empty?
+            Trollop.die(opt, 'requires one or more paths to be specified')
+          end
         end
+      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
+      def validate_diff_format(opts)
+        return if opts[:diff_format].nil? \
+                  || Diff.valid_format?(opts[:diff_format])
 
-        options
+        Trollop.die(:diff_format,
+                    "does not support \"#{opts[:diff_format]}\" format")
       end
     end
   end

data/lib/rubocopfmt/diff.rb

@@ -27,11 +27,17 @@ module RuboCopFMT
         diff: diff_opts(format)
       )
 
-      diff.to_s(:text)
+      out = diff.to_s(:text)
+      out << "\n" if rcs?(format)
+      out
     end
 
     private
 
+    def rcs?(format)
+      diff_opts(format) == FORMATS[:rcs]
+    end
+
     def diff_opts(format = nil)
       format ? FORMATS[format.downcase.to_sym] : DEFAULT_FORMAT
     end

data/lib/rubocopfmt/formatter.rb

@@ -1,6 +1,49 @@
-require 'rubocop'
+require 'rubocopfmt/errors'
+require 'rubocopfmt/options'
+require 'rubocopfmt/source'
 
 module RuboCopFMT
-  # Does nothing, as we want nothing output but the corrected source code.
-  class Formatter < RuboCop::Formatter::BaseFormatter; end
+  class Formatter
+    attr_reader :sources
+
+    def initialize(opts = {})
+      opts.each do |k, v|
+        options.send("#{k}=", v) if options.respond_to?("#{k}=")
+      end
+    end
+
+    def run
+      sources = build_sources
+      sources.map(&:auto_correct)
+
+      @sources = sources
+    end
+
+    def options
+      @options ||= Options.new
+    end
+
+    private
+
+    def build_sources
+      if options.paths.empty?
+        [new_source_from_stdin(options.stdin_file)]
+      else
+        options.paths.map do |path|
+          new_source_from_file(path)
+        end
+      end
+    end
+
+    def new_source_from_stdin(path = nil)
+      Source.new($stdin.binmode.read, path)
+    end
+
+    def new_source_from_file(path)
+      raise FileNotFound, "File not found: #{path}" unless File.exist?(path)
+
+      source = File.read(path, mode: 'rb')
+      Source.new(source, path)
+    end
+  end
 end

data/lib/rubocopfmt/options.rb

@@ -1,5 +1,3 @@
-require 'rubocopfmt/options_parser'
-
 module RuboCopFMT
   class Options
     attr_accessor :stdin_file

data/lib/rubocopfmt/rubocop_formatter.rb

@@ -0,0 +1,6 @@
+require 'rubocop'
+
+module RuboCopFMT
+  # Does nothing, as we want nothing output but the corrected source code.
+  class RubocopFormatter < ::RuboCop::Formatter::BaseFormatter; end
+end

data/lib/rubocopfmt/version.rb

@@ -1,3 +1,3 @@
 module RuboCopFMT
-  VERSION = '0.1.0.beta4'.freeze
+  VERSION = '0.1.0.beta5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocopfmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta4
+  version: 0.1.0.beta5
 platform: ruby
 authors:
 - Jim Myhrberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,12 +130,13 @@ files:
 - lib/rubocopfmt.rb
 - lib/rubocopfmt/auto_corrector.rb
 - lib/rubocopfmt/cli.rb
+- lib/rubocopfmt/cli_options.rb
 - lib/rubocopfmt/core_ext/string.rb
 - lib/rubocopfmt/diff.rb
 - lib/rubocopfmt/errors.rb
 - lib/rubocopfmt/formatter.rb
 - lib/rubocopfmt/options.rb
-- lib/rubocopfmt/options_parser.rb
+- lib/rubocopfmt/rubocop_formatter.rb
 - lib/rubocopfmt/source.rb
 - lib/rubocopfmt/version.rb
 - rubocopfmt.gemspec