umarell 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15598f8e5d0a9e202a5b5a794ce7a41e9745915b3107b553923b51840ad81ff4
-  data.tar.gz: 9c5344b6f68e2c5d37eda47d7596d2c6b69e1a6e6d1bf6775526d54f00b5506a
+  metadata.gz: ef5048068ece7c6751a487e6ac24aea679ff95887041ecb5f216f78d3462ac2e
+  data.tar.gz: b071681a9849c7619459c2966e2d6373950eb38fe6e8d602292f8bfd7d0a0cbb
 SHA512:
-  metadata.gz: 5b023bb874fbe2d2f2ff93fbafcda0228194a6a7775402403636694772b7233d3d05bbb054d78a2db609ac73bb011ee65dd5cf3a0d42c966c840eefbe3d4e59b
-  data.tar.gz: a0c021b90036c659de421943fb2f9466ccf0dc38841e15f72a448c84dc50e48c50f063c3468c23e112c63e3003f75f0ac7340de42e3e02acb89e4e5b4d44b225
+  metadata.gz: 1f98de58f255d491a759296b0e7e58365c477e2323027fbcdb7959e526296ffb708ab384a18fdab16489bdcf74311d860f1153b5294e8ce518c10e8c81ba3cbe
+  data.tar.gz: 49bf2435d7b4ff029d1b424e2359c13a89e6fac5f463273207ca8806a79d800f0e23485a2c0d57acf3c6403c36c0f467d4bb3422825ba655804851e2104351da

data/lib/umarell/arguments.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module Umarell
+  # The class responsible of parsing command line arguments
+  class Arguments
+    attr_reader :autofix, :target
+
+    alias autofix? autofix
+
+    MODIFIED_FILES_TARGET = '`git ls-files -mo --exclude-standard %s`'
+
+    def initialize
+      @autofix = false
+      @modified = false
+      @target = nil
+    end
+
+    # Parse command line arguments
+    def parse
+      parse_options
+      parse_target
+    end
+
+    private
+
+    def parse_options
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: umarell [options] [target]'
+        on_autofix(opts)
+        on_modified(opts)
+        on_version(opts)
+      end.parse!
+    rescue OptionParser::InvalidOption => e
+      exit_with_message("#{e.message}, see 'umarell --help'", 1)
+    end
+
+    def parse_target
+      last_argument = ARGV.pop
+      @target = if @modified
+                  MODIFIED_FILES_TARGET % last_argument
+                else
+                  last_argument
+                end
+    end
+
+    def on_autofix(opts)
+      opts.on('-a', '--autofix', 'Autofix violations (if supported)') do
+        @autofix = true
+      end
+    end
+
+    def on_modified(opts)
+      opts.on('-m', '--modified', 'Run on modified files') do
+        @modified = true
+      end
+    end
+
+    def on_version(opts)
+      opts.on_tail('-v', '--version', 'Show version') do
+        exit_with_message(Version::STRING)
+      end
+    end
+
+    def exit_with_message(message, code = 0)
+      puts "umarell: #{message}"
+      exit code
+    end
+  end
+end

data/lib/umarell/cli.rb

@@ -1,70 +1,53 @@
 # frozen_string_literal: true
 
-require 'optparse'
+require_relative 'arguments'
+require_relative 'command'
 
 module Umarell
   TOOLS = {
-    bundler_audit: 'bundler-audit check --update',
-    brakeman: 'brakeman -w2 -q',
-    rubocop: 'rubocop',
-    reek: 'reek',
-    rails_best_practices: 'rails_best_practices',
-    fasterer: 'fasterer'
+    'bundler-audit' => ['check', '--update'],
+    'brakeman' => ['-w2', '-q'],
+    'rubocop' => [],
+    'reek' => [],
+    'rails_best_practices': [],
+    'fasterer' => []
   }.freeze
 
+  AUTOFIX_SUPPORT = ['rubocop'].freeze
+
   # The class responsible of handling command line logic
   class CLI
-    def initialize(tools = TOOLS)
+    def initialize(tools = TOOLS, arguments = Arguments.new)
       @tools = tools
-      @autofix = false
-      @args = {}
-      @target = ''
+      @arguments = arguments
     end
 
     # Entry point to start the application
     def run
-      parse_args
+      @arguments.parse
       run_commands
     end
 
     private
 
-    def parse_args
-      parse_options
-      @target = ARGV.pop
-      @args[:rubocop] = ['-a'] if @autofix
-    end
-
-    def parse_options
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: umarell [options] [target]'
-
-        opts.on('-a', '--autofix', 'Autofix violations (if supported)') do
-          @autofix = true
-        end
-        opts.on_tail('-v', '--version', 'Show version') do
-          puts Version::STRING
-          exit
-        end
-      end.parse!
-    end
-
     def run_commands
-      @tools.each do |name, command|
-        run_command(name, command, @args.fetch(name) { [] })
+      @tools.each do |name, options|
+        arguments = command_arguments(name, options)
+        Command.new(name, arguments).run
       end
     end
 
-    def run_command(name, command, args)
-      header = decorate_message("Running #{name}")
-      footer = decorate_message("#{name} run complete\n")
-      full_command = "#{command} #{args.join(' ')} #{@target}"
+    def command_arguments(name, options)
+      command_arguments = command_options(name, options)
+      return command_arguments unless @arguments.target
 
-      system "echo '#{header}'; #{full_command}; echo '#{footer}'"
+      command_arguments + [@arguments.target]
     end
 
-    def decorate_message(string)
-      "\e[1;94m~~~~~~~ [Umarell] #{string}\e[0m"
+    def command_options(name, base_options)
+      return base_options unless AUTOFIX_SUPPORT.include?(name)
+
+      base_options + ['-a']
     end
   end
 end

data/lib/umarell/command.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Umarell
+  # The class responsible for running commands
+  class Command
+    def initialize(name, arguments = [])
+      @name = name
+      @arguments = arguments
+    end
+
+    # Run the command
+    def run
+      system "echo '#{header}'; #{self}; echo '#{footer}'"
+    end
+
+    def to_s
+      "#{@name} #{@arguments.join(' ')}"
+    end
+
+    private
+
+    def header
+      decorate_message("Running #{@name}")
+    end
+
+    def footer
+      decorate_message("#{@name} run complete\n")
+    end
+
+    def decorate_message(string)
+      "\e[1;94m~~~~~~~ [Umarell] #{string}\e[0m"
+    end
+  end
+end

data/lib/umarell/version.rb

@@ -2,6 +2,6 @@
 
 module Umarell
   module Version
-    STRING = '1.1.0'
+    STRING = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umarell
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Filippo Liverani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -205,7 +205,9 @@ files:
 - README.md
 - exe/umarell
 - lib/umarell.rb
+- lib/umarell/arguments.rb
 - lib/umarell/cli.rb
+- lib/umarell/command.rb
 - lib/umarell/version.rb
 homepage: https://github.com/nebulab/umarell
 licenses: