rubocopfmt 0.1.0.beta5 → 0.1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa9af7cf679b86a5ef27cf338e97c13b8bda718
-  data.tar.gz: bc0456f52025e46daa569daa4c6057a38c95f853
+  metadata.gz: 7416aa6f1bb92c2310a5bf78538f2b2b2f174527
+  data.tar.gz: 76f35e8e1e202652ff0261fc27c25c3b3b110eb4
 SHA512:
-  metadata.gz: 6a761e3295527c8d8f39ce6e31b6ddd29263cd5d79ebba0bb9616e5765be22957c87ea428a3a7f022f77945fd780a55c121aeb029c3ecdad22467bb780c64ba5
-  data.tar.gz: 717eeb9ee0c8134293c07876f8c7e2eac7e729ab75d2ad611f87858627317d7c6cd7e4f9bbe161aa60392d05896d41ff3fac8354e4d2618df0d3d1a49b2567d1
+  metadata.gz: 416b970fe9e5c57460750db621f13047387acd43d5666fa45210321ae7888382aeb71bda2d783c9d23acfb67f7b320613a83897e9037b9a5197f48bd14c43cc5
+  data.tar.gz: c3dd70a67e708707bc458abbafc9efdf51fc5f2e07edf0a85b5a93528acf1c4009d9e432b4f0f8ae81a14245769a05aac0841d0a0866ab715681f9e4e7c0cc0e

data/lib/rubocopfmt/auto_corrector.rb

@@ -4,65 +4,54 @@ require 'rubocopfmt/rubocop_formatter'
 
 module RuboCopFMT
   class AutoCorrector
-    DISABLED_COPS = [
-      'Lint/Debugger',
-      'Lint/UnusedMethodArgument',
-      'Lint/UnusedBlockArgument'
-    ].freeze
-
-    RUBOCOP_ARGV = [
-      '--auto-correct',
-      '--cache', 'false',
-      '--format', 'RuboCopFMT::RubocopFormatter',
-      '--except', DISABLED_COPS.join(',')
-    ].freeze
-
-    attr_reader :source
+    attr_reader :input
     attr_reader :runner
 
-    def initialize(source, path = nil)
-      @source = source
+    def initialize(input, path = nil)
+      @input = input
       @path = path
     end
 
     def correct
       Rainbow.enabled = false if defined?(Rainbow)
+
       @runner = ::RuboCop::Runner.new(options, config_store)
       @runner.run(paths)
+
       options[:stdin]
     end
 
     private
 
-    def config_store
-      return @config_store if @config_store
-
-      @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
+    def paths
+      @paths ||= [@path || 'fake.rb']
     end
 
     def options
-      return @options if @options
-
-      set_options_and_paths
-      @options
+      @options ||= {
+        stdin: @input,
+        auto_correct: true,
+        cache: 'false',
+        formatters: [['RuboCopFMT::RubocopFormatter']],
+        except: disabled_cops
+      }
     end
 
-    def paths
-      return @paths if @paths
-
-      set_options_and_paths
-      @paths
+    def disabled_cops
+      [
+        'Lint/Debugger',
+        'Lint/UnusedMethodArgument',
+        'Lint/UnusedBlockArgument'
+      ]
     end
 
-    def set_options_and_paths
-      argv = RUBOCOP_ARGV + [@path || 'fake.rb']
-      @options, @paths = ::RuboCop::Options.new.parse(argv)
-      @options[:stdin] = source
+    def config_store
+      return @config_store if @config_store
 
-      [@options, @paths]
+      @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
     end
   end
 end

data/lib/rubocopfmt/diff.rb

@@ -27,9 +27,7 @@ module RuboCopFMT
         diff: diff_opts(format)
       )
 
-      out = diff.to_s(:text)
-      out << "\n" if rcs?(format)
-      out
+      diff.diff
     end
 
     private

data/lib/rubocopfmt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocopfmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta5
+  version: 0.1.0.beta6
 platform: ruby
 authors:
 - Jim Myhrberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler