rubocopfmt 0.1.0.beta7 → 0.1.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf78c5ac751ef29855d0ef4d566c9960926173b
-  data.tar.gz: de2da7fbe495d37d12dc79582c2a703084d42e6b
+  metadata.gz: 5f07e82e60b03c9b3d67b6e1eff442d92e1e7a03
+  data.tar.gz: 4109b54c44c6e189029eb8db10549ab27d57f945
 SHA512:
-  metadata.gz: 2259350145f6eeb723038aa9eae4e0505fc737c275024951c9f249190e3dc666aea229d26bbbea391b36f46656988081ec4fa84bb009c0168b07f0ab42b76cee
-  data.tar.gz: a8b3d02c97d42ff7e3f0e610c60a7d7693f653fc2cf013ab5e71d1044d064c4dcffddda1a9409f80ad1eaac5f2ccc81792dbf88434435a673b009b51f5b6fef0
+  metadata.gz: ed13ead3cded942a7a3e917b86af9f60932985efaf12af950311ba9148ced9dc9e6611e2daaf4a3f583e82553b1d43461f848c23111eeb9c168e40507874ec88
+  data.tar.gz: dc096d32c927b0740b87e92ee730f17d555e43149098d05d62f748d8452d067c4f0d8d8da1a7aa477b3a0ed260a60f027e82611047d360f7db68f13241df8eb0

data/README.md

@@ -18,10 +18,10 @@ 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.
-  -F, --stdin-file=<s>     Optionally provide file path when using STDIN.
+  -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
+  -S, --src-dir=<s>        Operate as if code resides in specified directory
   -D, --diff-format=<s>    Display diffs using format: unified, rcs, context
 
   -v, --version            Print version and exit

data/lib/rubocopfmt/cli.rb

@@ -17,15 +17,13 @@ module RuboCopFMT
     end
 
     def run
-      formatter = Formatter.new(options)
-      formatter.run
-      @sources = formatter.sources
+      format_sources
 
-      if @options.list
+      if options.list
         print_corrected_list
-      elsif @options.diff
+      elsif options.diff
         print_diff_of_corrections
-      elsif @options.write
+      elsif options.write
         write_corrected_source
       else
         print_corrected_source
@@ -36,6 +34,12 @@ module RuboCopFMT
 
     private
 
+    def format_sources
+      formatter = Formatter.new(options)
+      formatter.run
+      @sources = formatter.sources
+    end
+
     def print_corrected_list
       sources.each do |source|
         puts source.path if source.corrected?
@@ -49,7 +53,7 @@ module RuboCopFMT
         if source.path && sources.size > 1
           puts "diff #{source.path} rubocopfmt/#{source.path}"
         end
-        puts diff_source(source)
+        puts Diff.render(source, options.diff_format)
       end
     end
 
@@ -64,10 +68,5 @@ module RuboCopFMT
         print source.output
       end
     end
-
-    def diff_source(source)
-      diff = Diff.new(source)
-      diff.render(options.diff_format)
-    end
   end
 end

data/lib/rubocopfmt/cli_options.rb

@@ -18,13 +18,20 @@ module RuboCopFMT
         validate_diff_format(opts)
         validate_paths(opts)
 
+        opts[:input] = read_stdin if opts[:paths].empty?
         opts
       end
 
       private
 
       def parse_args(args)
-        Trollop.options(args) do
+        Trollop.with_standard_exception_handling(parser) do
+          parser.parse(args)
+        end
+      end
+
+      def parser
+        @parser ||= Trollop::Parser.new do
           banner <<-EOF.undent
             Usage: rubocopfmt [options] [path ...]
 
@@ -50,10 +57,23 @@ module RuboCopFMT
         end
       end
 
+      def read_stdin
+        tries = 0
+        begin
+          str = $stdin.binmode.read_nonblock(1)
+        rescue IO::WaitReadable, EOFError
+          IO.select([$stdin.binmode], nil, nil, 0.2)
+          retry if (tries += 1) <= 1
+        end
+
+        parser.die('Failed to read from STDIN', nil) if str.nil?
+        str + $stdin.binmode.read
+      end
+
       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')
+            parser.die(opt, 'requires one or more paths to be specified')
           end
         end
       end
@@ -62,8 +82,10 @@ module RuboCopFMT
         return if opts[:diff_format].nil? \
                   || Diff.valid_format?(opts[:diff_format])
 
-        Trollop.die(:diff_format,
-                    "does not support \"#{opts[:diff_format]}\" format")
+        parser.die(
+          :diff_format,
+          "does not support \"#{opts[:diff_format]}\" format"
+        )
       end
     end
   end

data/lib/rubocopfmt/diff.rb

@@ -12,6 +12,10 @@ module RuboCopFMT
 
     attr_reader :source
 
+    def self.render(source, format = nil)
+      new(source).render(format)
+    end
+
     def self.valid_format?(format)
       FORMATS.key?(format.downcase.to_sym)
     end

data/lib/rubocopfmt/formatter.rb

@@ -13,7 +13,9 @@ module RuboCopFMT
     end
 
     def run
-      sources = build_sources
+      sources = []
+      sources << new_source_from_str(options.input) if options.input
+      sources += options.paths.map { |path| new_source_from_file(path) }
       sources.map(&:auto_correct)
 
       @sources = sources
@@ -25,25 +27,15 @@ module RuboCopFMT
 
     private
 
-    def build_sources
-      if options.paths.empty?
-        [new_source_from_stdin]
-      else
-        options.paths.map do |path|
-          new_source_from_file(path)
-        end
-      end
-    end
-
-    def new_source_from_stdin
-      Source.new($stdin.binmode.read, nil, options.src_dir)
+    def new_source_from_str(str)
+      Source.new(str, nil, options.src_dir)
     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, options.src_dir)
+      input = File.read(path, mode: 'rb')
+      Source.new(input, path, options.src_dir)
     end
   end
 end

data/lib/rubocopfmt/options.rb

@@ -1,5 +1,6 @@
 module RuboCopFMT
   class Options
+    attr_accessor :input
     attr_accessor :src_dir
     attr_accessor :diff_format
 

data/lib/rubocopfmt/version.rb

@@ -1,3 +1,3 @@
 module RuboCopFMT
-  VERSION = '0.1.0.beta7'.freeze
+  VERSION = '0.1.0.beta8'.freeze
 end

data/rubocopfmt.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'byebug'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocopfmt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta7
+  version: 0.1.0.beta8
 platform: ruby
 authors:
 - Jim Myhrberg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement