rubocopfmt 0.1.0.beta6 → 0.1.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7416aa6f1bb92c2310a5bf78538f2b2b2f174527
-  data.tar.gz: 76f35e8e1e202652ff0261fc27c25c3b3b110eb4
+  metadata.gz: 7bf78c5ac751ef29855d0ef4d566c9960926173b
+  data.tar.gz: de2da7fbe495d37d12dc79582c2a703084d42e6b
 SHA512:
-  metadata.gz: 416b970fe9e5c57460750db621f13047387acd43d5666fa45210321ae7888382aeb71bda2d783c9d23acfb67f7b320613a83897e9037b9a5197f48bd14c43cc5
-  data.tar.gz: c3dd70a67e708707bc458abbafc9efdf51fc5f2e07edf0a85b5a93528acf1c4009d9e432b4f0f8ae81a14245769a05aac0841d0a0866ab715681f9e4e7c0cc0e
+  metadata.gz: 2259350145f6eeb723038aa9eae4e0505fc737c275024951c9f249190e3dc666aea229d26bbbea391b36f46656988081ec4fa84bb009c0168b07f0ab42b76cee
+  data.tar.gz: a8b3d02c97d42ff7e3f0e610c60a7d7693f653fc2cf013ab5e71d1044d064c4dcffddda1a9409f80ad1eaac5f2ccc81792dbf88434435a673b009b51f5b6fef0

data/lib/rubocopfmt/cli.rb

@@ -17,9 +17,9 @@ module RuboCopFMT
     end
 
     def run
-      runner = Formatter.new(options)
-      runner.run
-      @sources = runner.sources
+      formatter = Formatter.new(options)
+      formatter.run
+      @sources = formatter.sources
 
       if @options.list
         print_corrected_list

data/lib/rubocopfmt/cli_options.rb

@@ -33,14 +33,14 @@ 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.'
-          opt :write, 'Write result to (source) file instead of STDOUT.'
-          opt :stdin_file, 'Optionally provide file path when using STDIN.',
-              short: 'F', type: :string
+          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 :src_dir, 'Operate as if code resides in specified directory',
+              short: 'S', type: :string
           opt :diff_format, 'Display diffs using format: unified, rcs, context',
               short: 'D', type: :string
           banner ''

data/lib/rubocopfmt/diff.rb

@@ -32,10 +32,6 @@ module RuboCopFMT
 
     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

@@ -27,7 +27,7 @@ module RuboCopFMT
 
     def build_sources
       if options.paths.empty?
-        [new_source_from_stdin(options.stdin_file)]
+        [new_source_from_stdin]
       else
         options.paths.map do |path|
           new_source_from_file(path)
@@ -35,15 +35,15 @@ module RuboCopFMT
       end
     end
 
-    def new_source_from_stdin(path = nil)
-      Source.new($stdin.binmode.read, path)
+    def new_source_from_stdin
+      Source.new($stdin.binmode.read, 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)
+      Source.new(source, path, options.src_dir)
     end
   end
 end

data/lib/rubocopfmt/options.rb

@@ -1,6 +1,6 @@
 module RuboCopFMT
   class Options
-    attr_accessor :stdin_file
+    attr_accessor :src_dir
     attr_accessor :diff_format
 
     def paths

data/lib/rubocopfmt/source.rb

@@ -5,16 +5,18 @@ module RuboCopFMT
     attr_reader :path
     attr_reader :input
     attr_reader :output
+    attr_reader :src_dir
 
-    def initialize(input, path = nil)
+    def initialize(input, path = nil, src_dir = nil)
       @input = input
       @path = path
+      @src_dir = src_dir
     end
 
     def auto_correct
       return unless output.nil?
 
-      @corrector = AutoCorrector.new(input, path)
+      @corrector = AutoCorrector.new(input, full_path)
       @output = @corrector.correct
     end
 
@@ -24,5 +26,17 @@ module RuboCopFMT
 
       @corrected = (@input != @output)
     end
+
+    private
+
+    def full_path
+      full_path = path || '__fake__.rb'
+
+      if src_dir.nil?
+        full_path
+      else
+        File.join(src_dir, File.basename(full_path))
+      end
+    end
   end
 end

data/lib/rubocopfmt/version.rb

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

metadata

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