namespacer-rb 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f81c3fa425b80731d4d5284b91ae35e989d94fe32eed933a945cb66b764aec4
-  data.tar.gz: 4e079d426c518db24555ced5fd890864deeff9236e4314d22fdeb5a88128b75a
+  metadata.gz: d185c337c9121c5caa1b0d5c8050189b5dc7f4bdb2711335eeb1b508a617b4ef
+  data.tar.gz: 34021011d450232a6222b0ba9c6de5f80c6909d487ba733d550e2ff95c02cfd3
 SHA512:
-  metadata.gz: ce7d981e6b1e4649860c3ed40b4ce6a08e027b473de05c691513e0a3f0f7e1b54fa91b1d441d4d9fbb626ea19cc6b2386eebbcb004980cb97432f4de9f0072c7
-  data.tar.gz: a71dae25f3007cc75f225efdfd5e8511c08e93104cc8e16d4e7a23690918903a4f74432dc47012e5aa2fd85a9b29075e96cee42342b00e413e012341b0a26144
+  metadata.gz: 42884144adc93a87ee7af9da506ec51670d6289ef66b2f8ffcde00ab8eeafe40d0fa2e1f58c9239ff576438dddbc6cdb6910ce0b42cab060dae500147c40a248
+  data.tar.gz: 48421f57144fc65224be350c60a7ba8948851624c8d90bf36d218cab05f880075659c058757c7177dc6f68e4f9b8668d720692fe769d2c4bcadb5e7b0337cc01

data/exe/namespacer

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'filemagic'
 require 'namespacer'
 require 'optparse'
 require 'pathname'
@@ -8,13 +9,17 @@ require 'tty-command'
 module Rubyists
   # Namespace for the namespacer CLI
   module Namespacer
-    CliOptions = Struct.new(:recursive, :verbose, :in_place)
+    CliOptions = Struct.new(:recursive, :verbose, :in_place, :fail_rubocop_silently)
     def self.cli_options
       @cli_options ||= CliOptions.new(verbose: false, recursive: false, in_place: false)
     end
 
     def self.cmd
-      @cmd = TTY::Command.new
+      @cmd ||= TTY::Command.new printer: :null
+    end
+
+    def self.magic
+      @magic ||= FileMagic.new(FileMagic::MAGIC_MIME)
     end
   end
 end
@@ -28,6 +33,10 @@ parser = OptionParser.new do |opts|
 
   opts.on('-i', '--in-place', 'Modify files in-place') { |_| options.in_place = true }
 
+  opts.on('-f', '--fail-rubocop-silently', 'Write files even if they are not rubocop-friendly') do |_|
+    options.fail_rubocop_silently = true
+  end
+
   opts.on('-V', '--version', 'Print version') do
     puts "namespacer #{Rubyists::Namespacer::VERSION}"
     exit
@@ -74,21 +83,53 @@ def new_path(path)
   dir.join("#{base}.namespaced#{ext}")
 end
 
-def namespace_file(namespace, path) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  namespaced = Rubyists::Namespacer.namespace!(path.read, namespace)
-  write_path = Rubyists::Namespacer.cli_options.in_place ? path : new_path(path)
-  if Rubyists::Namespacer.cli_options.verbose
-    msg = "Namespacing #{write_path} with #{namespace}"
-    msg << ' (in-place)' if Rubyists::Namespacer.cli_options.in_place
-    warn msg
+def rubocop_cmd(path, ruby_code) # rubocop:disable Metrics/MethodLength
+  result = Rubyists::Namespacer.cmd.run!(:rubocop,
+                                         '-A',
+                                         '--stdin',
+                                         path.basename.to_s,
+                                         '--stderr',
+                                         input: ruby_code,
+                                         only_output_on_error: true)
+  if result.failure?
+    warn "Rubocop failed for #{path}:\n#{result.err}"
+    if Rubyists::Namespacer.cli_options.fail_rubocop_silently
+      warn 'Continuing anyway'
+    else
+      exit 6
+    end
   end
-  cmd = Rubyists::Namespacer.cmd.run(:rubocop,
-                                     '-A',
-                                     '--stdin',
-                                     write_path.basename.to_s,
-                                     '--stderr',
-                                     input: namespaced,
-                                     only_output_on_error: true)
+
+  result
+end
+
+def rubocop_friendly?(path)
+  magic = Rubyists::Namespacer.magic
+  mime = magic.file(path.to_s)
+  return true if mime.include?('text/x-ruby')
+
+  warn "File #{path} is not a Ruby file (#{mime})" if Rubyists::Namespacer.cli_options.verbose
+  false
+end
+
+def log_namespace(namespace, write_path)
+  opts = Rubyists::Namespacer.cli_options
+  return unless opts.verbose
+
+  msg = "Namespacing #{write_path} with #{namespace}"
+  msg << ' (in-place)' if opts.in_place
+  warn msg
+end
+
+def namespace_file(namespace, path)
+  return unless rubocop_friendly?(path)
+
+  opts = Rubyists::Namespacer.cli_options
+  namespaced = Rubyists::Namespacer.namespace!(path.read, namespace)
+  write_path = opts.in_place ? path : new_path(path)
+  log_namespace namespace, write_path
+  cmd = rubocop_cmd(write_path, namespaced)
+  warn "Writing namespaced file to #{write_path}" if opts.verbose
   write_path.write(cmd.out)
 end
 

data/lib/namespacer/version.rb

@@ -2,6 +2,6 @@
 
 module Rubyists
   module Namespacer
-    VERSION = '0.1.4'
+    VERSION = '0.1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namespacer-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Tj (bougyman) Vanderpoel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: ruby-filemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement