rubocopfmt 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a012ee79b8442b495047743bacaa7638bd12f39e
-  data.tar.gz: 0f68b98d269a76ea2a4049c1dc8ffc66f56e6653
+  metadata.gz: 5964e7d80d992e05a65799d94271249cfe563e36
+  data.tar.gz: 97623211f9bf546a16654aecda5117b2a3f9b1bd
 SHA512:
-  metadata.gz: 2db966f9d9b1e13cc952dfa6121cec9e08c63e7774ac0c5bd86d90175c43acb0a4611ebdc3b9ea57c42106d6df59a06edc6846e89bc312078017db352e9cbfb6
-  data.tar.gz: 4c957d666f21e30862be1b889659bcf36b6b9ab08cc2aa2307368e7673410dbb4b5eb8da074bbc5bcbf9a0526ba7963e08061baa8a1cce997cb9ad111426d6ab
+  metadata.gz: f38caac15512b59497dd4b07dda77beb1da67bd854cddd4e90c9b6f36dc82a9e84479f23c8ec4acdf79096926bf7c64e5266d2b042fe909bee8c268bfe55f753
+  data.tar.gz: 85d365454150441eb9cd9aea763e2ef9f7f7819086b47c5610eed1d769d9363129b7ff90882daf90696ee5d5ffde268c1a1e407b73a9967a27396894997369c3

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.1
+  - 2.2
   - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.13.6

data/README.md

@@ -1,4 +1,4 @@
-# rubocopfmt
+# rubocopfmt [![Build Status](https://api.travis-ci.org/jimeh/rubocopfmt.svg)](https://travis-ci.org/jimeh/rubocopfmt)
 
 Easy formatting of Ruby code
 using [RuboCop](https://github.com/bbatsov/rubocop). Analogous
@@ -7,7 +7,7 @@ to [`gofmt`](https://golang.org/cmd/gofmt/).
 ## Installation
 
 ```
-gem install rubocopfmt
+gem install rubocopfmt --pre
 ```
 
 ## Usage

data/lib/rubocopfmt/auto_corrector.rb

@@ -9,42 +9,59 @@ module RuboCopFMT
       'Lint/UnusedBlockArgument'
     ].freeze
 
-    RUBOCOP_OPTS = [
+    RUBOCOP_ARGV = [
       '--auto-correct',
       '--cache', 'false',
       '--format', 'RuboCopFMT::Formatter',
-      '--except', DISABLED_COPS.join(','),
-      'fake.rb'
+      '--except', DISABLED_COPS.join(',')
     ].freeze
 
     attr_reader :source
     attr_reader :runner
 
-    def initialize(source)
+    def initialize(source, path = nil)
       @source = source
+      @path = path
     end
 
     def correct
-      options, paths = RuboCop::Options.new.parse(RUBOCOP_OPTS)
-      config_store = RuboCop::ConfigStore.new
-
-      options[:stdin] = source
-
       Rainbow.enabled = false
-      config_store.options_config = options[:config] if options[:config]
-      config_store.force_default_config! if options[:force_default_config]
-
       @runner = RuboCop::Runner.new(options, config_store)
       @runner.run(paths)
       options[:stdin]
     end
 
-    def warnings
-      runner && runner.warnings
+    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
+    end
+
+    def options
+      return @options if @options
+
+      set_options_and_paths
+      @options
+    end
+
+    def paths
+      return @paths if @paths
+
+      set_options_and_paths
+      @paths
     end
 
-    def errors
-      runner && runner.errors
+    def set_options_and_paths
+      argv = RUBOCOP_ARGV + [@path || 'fake.rb']
+      @options, @paths = RuboCop::Options.new.parse(argv)
+      @options[:stdin] = source
+
+      [@options, @paths]
     end
   end
 end

data/lib/rubocopfmt/cli.rb

@@ -37,7 +37,7 @@ module RuboCopFMT
     end
 
     def require_real_files(flag)
-      return unless @options.files.empty?
+      return unless @options.paths.empty?
 
       $stderr.puts "ERROR: To use #{flag} you must specify one or more files"
       exit 1
@@ -78,10 +78,10 @@ module RuboCopFMT
     def sources
       return @sources if @sources
 
-      if options.files.empty?
-        @sources = [new_source_from_stdin]
+      if options.paths.empty?
+        @sources = [new_source_from_stdin(options.stdin_file)]
       else
-        @sources = options.files.map do |path|
+        @sources = options.paths.map do |path|
           new_source_from_file(path)
         end
       end
@@ -97,8 +97,8 @@ module RuboCopFMT
       diff.to_s(:text)
     end
 
-    def new_source_from_stdin
-      Source.new($stdin.binmode.read)
+    def new_source_from_stdin(path = nil)
+      Source.new($stdin.binmode.read, path)
     end
 
     def new_source_from_file(path)

data/lib/rubocopfmt/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def undent
+    gsub(/^.{#{slice(/^ +/).length}}/, '')
+  end
+end

data/lib/rubocopfmt/options.rb

@@ -2,10 +2,12 @@ require 'rubocopfmt/options_parser'
 
 module RuboCopFMT
   class Options
-    def files
-      @files.nil? ? [] : @files
+    attr_accessor :stdin_file
+
+    def paths
+      @paths.nil? ? [] : @paths
     end
-    attr_writer :files
+    attr_writer :paths
 
     def diff
       @diff.nil? ? false : @diff

data/lib/rubocopfmt/options_parser.rb

@@ -1,6 +1,7 @@
-require 'optparse'
+require 'trollop'
 require 'rubocop'
 
+require 'rubocopfmt/core_ext/string'
 require 'rubocopfmt/options'
 require 'rubocopfmt/version'
 
@@ -12,7 +13,7 @@ module RuboCopFMT
         options ||= Options.new
 
         parse_flags(args, options)
-        options.files = args unless args.empty?
+        options.paths = args unless args.empty?
 
         options
       end
@@ -20,45 +21,33 @@ module RuboCopFMT
       private
 
       def parse_flags(args, options)
-        parser = OptionParser.new do |opts|
-          opts.program_name = 'rubocopfmt'
-          opts.version = RuboCopFMT::VERSION
+        opts = Trollop.options(args) do
+          banner <<-EOF.undent
+            Usage: rubocopfmt [options] [path ...]
 
-          opts.banner = 'Usage: rubocopfmt [options] [path ...]'
-          opts.separator ''
-          opts.separator 'Reads from STDIN if no path is given.'
-          opts.separator ''
-          opts.separator 'Options:'
+            Reads from STDIN if no path is given.
 
-          opts.on(
-            '-d', '--diff',
-            'Display diffs instead of rewriting files.'
-          ) { |v| options.diff = v }
+            Options:
+          EOF
 
-          opts.on(
-            '-l', '--list',
-            'List files whose formatting is incorrect.'
-          ) { |v| options.list = v }
+          version "rubocopfmt #{RuboCopFMT::VERSION}" \
+                  " (rubocop #{RuboCop::Version::STRING})"
 
-          opts.on(
-            '-w', '--write',
-            'Write result to (source) file instead of STDOUT.'
-          ) { |v| options.write = v }
+          opt :diff, 'Display diffs instead of rewriting files.'
+          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
+          banner ''
 
-          opts.separator ''
-
-          opts.on('-v', '--version', 'Show version.') do
-            puts "#{opts.program_name} #{opts.version}" \
-                 " (rubocop #{RuboCop::Version::STRING})"
-            exit
-          end
-
-          opts.on('-h', '--help', 'Show this message.') do
-            puts opts
-            exit
-          end
+          conflicts :diff, :list, :write
         end
-        parser.parse!(args)
+
+        options.diff = opts[:diff]
+        options.list = opts[:list]
+        options.write = opts[:write]
+        options.stdin_file = opts[:stdin_file]
+        options
       end
     end
   end

data/lib/rubocopfmt/source.rb

@@ -14,7 +14,7 @@ module RuboCopFMT
     def auto_correct
       return unless output.nil?
 
-      @corrector = AutoCorrector.new(input)
+      @corrector = AutoCorrector.new(input, path)
       @output = @corrector.correct
     end
 

data/lib/rubocopfmt/version.rb

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

data/rubocopfmt.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug'
 
   spec.add_runtime_dependency 'rubocop', '~> 0.46'
+  spec.add_runtime_dependency 'trollop', '~> 2.1'
   spec.add_runtime_dependency 'diffy', '~> 3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocopfmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - Jim Myhrberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.46'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ files:
 - lib/rubocopfmt.rb
 - lib/rubocopfmt/auto_corrector.rb
 - lib/rubocopfmt/cli.rb
+- lib/rubocopfmt/core_ext/string.rb
 - lib/rubocopfmt/errors.rb
 - lib/rubocopfmt/formatter.rb
 - lib/rubocopfmt/options.rb