maximus 0.1.6.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dacd7121350ac5d7ac834d3df60a3691712fb0a
-  data.tar.gz: 5d2662c81e42754cb68dcd15a556b93e83ae4b01
+  metadata.gz: 89b8a115dfe0b3ff7f8bfcb30d3b6295fca5b1f4
+  data.tar.gz: 600fa052c43c0c44ddc791de17530f3bd6b7d08f
 SHA512:
-  metadata.gz: 97a96d4a95abfd20cacd25c4d277e0b8981b0a63b04667456ffa69efd5d0390b03042e7dde811d40a73af0be54bd5dcf84e591f8b99a89cc7fb41767790e1884
-  data.tar.gz: c7a3fd83cc45e5e72fa8f93cf184a2c99649e1401bd73bd06919b9ff8c558ac795b513f9f0f250364f22173ae8f650132420d4f5ae9bc29c46e7055c8a28d78a
+  metadata.gz: 1a7fba31628c2a22eef4a06d962e61bd74834e2b8519be049599d33fdc38ca7c7bbed4a20cef8429265276648ca7556246056e5ccdc40e01419aeb7b663ce636
+  data.tar.gz: 1890c4069918ffd811154b2330c949253b2e012d7dde633aa316432c4f809a849a3ba0409a476e5c7b1d098699f82952406e2e50e6b038b055a3524e77ceaf54

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change log
 
-## master
+## 0.1.7 (April 9, 2015)
+
+Features:
+
+* More file associations for linting
+* Framework option in config
+* Additional associations sorted when evaluating a codebase
+
+Bugfixes:
+
+* Fix #11 (`maximus -a` fails)
 
 ## 0.1.6.1 (March 1, 2015)
 

data/lib/maximus.rb

@@ -1,4 +1,5 @@
 require 'maximus/version'
+require 'maximus/git_helper'
 require 'maximus/helper'
 require 'maximus/config'
 require 'maximus/git_control'

data/lib/maximus/cli.rb

@@ -32,19 +32,16 @@ class Maximus::CLI < Thor
   desc "frontend", "Execute all front-end tasks"
   def frontend
     ['scsslint', 'jshint'].each { |e| check_exclude(e) }
-    @config.destroy_temp
   end
 
   desc "backend", "Lint with all backend lints"
   def backend
     ['rubocop', 'railsbp', 'brakeman'].each { |e| check_exclude(e) }
-    @config.destroy_temp
   end
 
   desc "statistics", "Run all statistics"
   def statistics
     ['stylestats', 'phantomas', 'wraith'].each { |e| check_exclude(e) }
-    @config.destroy_temp
   end
 
   # Alias ruby to backend
@@ -59,17 +56,23 @@ class Maximus::CLI < Thor
     all_tasks = ['frontend', 'backend', 'statistics']
 
     # If all flag is enabled, run everything
-    return all_tasks.each { |a| send(a) } if options[:all]
+    if options[:all]
+      all_tasks.each { |a| send(a) }
 
-    # Lint by category unless all flags are blank
-    return all_tasks.each { |a| check_option(a) } unless options[:frontend].blank? && options[:backend].blank? && options[:statistics].blank?
+    elsif options[:frontend].present? && options[:backend].present? && options[:statistics].present?
+      all_tasks.each { |a| check_option(a) }
 
     # If include flag is enabled, run based on what's included
-    return options[:include].each { |i| send(i) } unless options[:include].blank?
+    elsif options[:include].present?
+      options[:include].each { |i| send(i) }
+
+    else
+      # If all flag is not enabled, lint working copy as it's supposed to be
+      @config.settings[:commit] = options[:git]
+      Maximus::GitControl.new({config: @config}).lints_and_stats(true)
+
+    end
 
-    # If all flag is not enabled, lint working copy as it's supposed to be
-    @config.settings[:commit] = options[:git]
-    Maximus::GitControl.new({config: @config}).lints_and_stats(true)
     @config.destroy_temp
   end
 
@@ -80,6 +83,7 @@ class Maximus::CLI < Thor
   end
 
   no_commands do
+
     # Only run command if option is present
     def check_option(opt)
       send(opt) if options[opt.to_sym]

data/lib/maximus/config.rb

@@ -32,6 +32,8 @@ module Maximus
     # @option opts [String] :commit accepts sha, "working", "last", or "master".
     # @option opts [String] :config_file ('maximus.yml') path to config file
     # @option opts [Boolean] :compile_assets (true) compile and destroy assets automagically
+    # @option opts [String] :framework (nil) accepts 'rails' and 'middleman' (should only be used
+    #   when calling Maximus from a Ruby script)
     # @return [#load_config_file #group_families #evaluate_settings] this method is used to set up instance variables
     def initialize(opts = {})
 
@@ -41,10 +43,11 @@ module Maximus
       default_options = YAML.load_file(File.join(File.dirname(__FILE__), 'config', 'maximus.yml')).symbolize_keys
       default_options[:root_dir] = root_dir
       default_options[:port] = 3000 if is_rails?
+      default_options[:port] = 4567 if is_middleman?
 
-      @root = opts[:root_dir] ? opts[:root_dir] : default_options[:root_dir]
+      root = opts[:root_dir] ? opts[:root_dir] : default_options[:root_dir]
 
-      yaml = default_options.merge load_config_file(opts[:config_file])
+      yaml = default_options.merge load_config_file(opts[:config_file], root)
       @settings = yaml.merge opts
 
       @settings[:git_log] = false if @settings[:git_log].nil?
@@ -74,16 +77,9 @@ module Maximus
         case key
 
           when :jshint, :JSHint, :JShint
-
-            # @todo DRY this load_config up, but can't call it at the start because of the
-            #   global config variables (last when statement in this switch)
             value = load_config(value)
 
-            if settings_data[key].is_a?(Hash) && settings_data[key].key?('jshintignore')
-              jshintignore_file = []
-              settings_data[key]['jshintignore'].each { |i| jshintignore_file << "#{i}\n" }
-              @settings[:jshintignore] = temp_it('jshintignore.json', jshintignore_file)
-            end
+            jshint_ignore settings_data[key]
             @settings[:jshint] = temp_it('jshint.json', value.to_json)
 
           when :scsslint, :SCSSlint
@@ -120,12 +116,10 @@ module Maximus
         end
       end
 
-      # Finally, we're done
       @settings
     end
 
-    # If output should be returned to console
-    #   in a pretty display
+    # If output should be returned to console in a pretty display
     # @return [Boolean]
     def is_dev?
       @settings[:is_dev]
@@ -160,7 +154,7 @@ module Maximus
     end
 
 
-    private
+    protected
 
       # Look for a maximus config file
       #
@@ -171,13 +165,14 @@ module Maximus
       #
       # @since 0.1.4
       # @param file_path [String]
+      # @param root [String] file path to root directory
       # @return @settings [Hash]
-      def load_config_file(file_path)
+      def load_config_file(file_path, root)
 
-        conf_location = if !file_path.nil? && File.exist?(file_path)
+        conf_location = if file_path.present? && File.exist?(file_path)
           file_path
         else
-          config_exists('.maximus.yml') || config_exists('maximus.yml') || config_exists('config/maximus.yml')
+          config_exists('.maximus.yml', root) || config_exists('maximus.yml', root) || config_exists('config/maximus.yml', root)
         end
 
         return {} if conf_location.is_a?(FalseClass)
@@ -247,19 +242,6 @@ module Maximus
         file.path
       end
 
-      # See if a config file exists
-      #
-      # @see load_config_file
-      #
-      # This is used exclusively for the load_config_file method
-      # @param file [String] file name
-      # @return [String, FalseClass] if file is found return the absolute path
-      #   otherwise return false so we can keep checking
-      def config_exists(file)
-        present_location = File.join(@root, file)
-        File.exist?(present_location) ? present_location : false
-      end
-
       # Accounting for space-separated command line arrays
       # @since 0.1.4
       # @param paths [Array]
@@ -352,5 +334,34 @@ module Maximus
 
       end
 
+
+    private
+
+      # See if a config file exists
+      #
+      # @see load_config_file
+      #
+      # This is used exclusively for the load_config_file method
+      # @param file [String] file name
+      # @param root [String] file path to root directory
+      # @return [String, FalseClass] if file is found return the absolute path
+      #   otherwise return false so we can keep checking
+      def config_exists(file, root)
+        present_location = File.join(root, file)
+        File.exist?(present_location) ? present_location : false
+      end
+
+      # Save jshintignore if available
+      # @since 0.1.7
+      # @param settings_data_key [Hash]
+      # @return updates settings
+      def jshint_ignore(settings_data_key)
+        return unless settings_data_key.is_a?(Hash) && settings_data_key.key?('jshintignore')
+
+        jshintignore_file = []
+        settings_data_key['jshintignore'].each { |i| jshintignore_file << "#{i}\n" }
+        @settings[:jshintignore] = temp_it('jshintignore.json', jshintignore_file)
+      end
+
   end
-end
+end

data/lib/maximus/config/maximus.yml

@@ -4,6 +4,7 @@ domain: 'http://localhost'
 #   here because this is the default file. If set to true, output is logged directly
 #   to the parent process and does not appear in the log.
 is_dev: false
+
 paths:
   home: '/'
 

data/lib/maximus/git_control.rb

@@ -1,4 +1,5 @@
 require 'git'
+require 'active_support/core_ext/kernel/reporting'
 
 module Maximus
   # Git management
@@ -6,6 +7,7 @@ module Maximus
   class GitControl
 
     include Helper
+    include GitHelper
 
     # Set up instance variables
     #
@@ -78,17 +80,17 @@ module Maximus
 
         # Grab all files in that commit and group them by extension
         #   If working copy, just give the diff names of the files changed
-        files = @psuedo_commit ? `git -C #{@config.working_dir} diff --name-only` : `git -C #{@config.working_dir} show --pretty="format:" --name-only #{git_sha}`
+        files = @psuedo_commit ? working_copy_files : files_by_sha(git_sha)
 
-        diff_return[git_sha.to_s] = match_associations(git_sha, files)
+        diff_return[git_sha] = match_associations(git_sha, files)
       end
+
       diff_return
     end
 
     # Run appropriate lint for every sha in commit history.
     # For each sha a new branch is created then deleted
     #
-    # This is where everything goes down
     # @example sample output
     #   {
     #     'sha': {
@@ -128,11 +130,8 @@ module Maximus
             file_paths: (lint_file_paths(files, ext) if lint_by_path)
           }
 
-          if nuclear
-            git_ouput[sha] = lints_and_stats_nuclear(lint_opts)
-          else
-            git_ouput[sha] = lints_and_stats_switch(ext, lint_opts)
-          end
+          git_ouput[sha] = nuclear ? lints_and_stats_nuclear(lint_opts) : lints_and_stats_switch(ext, lint_opts)
+
         end
 
         destroy_branch(base_branch, sha) unless @psuedo_commit
@@ -141,30 +140,20 @@ module Maximus
       git_ouput
     end
 
-    # Find first commit
-    # @since 0.1.5
-    # @return [String]
-    def first_commit
-      `git -C #{@config.working_dir} rev-list --max-parents=0 HEAD`.strip!
-    end
-
-    # Get commit before current
-    # @since 0.1.5
-    # @param current_commit [String] (head_sha) commit to start at
-    # @param previous_by [Integer] (1) commit n commits ago
-    # @return [String]
-    def previous_commit(current_commit = head_sha, previous_by = 1)
-      `git -C #{@config.working_dir} rev-list --max-count=#{previous_by + 1} #{current_commit} --reverse | head -n1`.strip!
-    end
-
     # Define associations to linters based on file extension
     # @return [Hash] linters and extension arrays
     def associations
       {
+        css:    ['css'],
         scss:   ['scss', 'sass'],
         js:     ['js'],
         ruby:   ['rb', 'Gemfile', 'lock', 'yml', 'Rakefile', 'ru', 'rdoc', 'rake', 'Capfile', 'jbuilder'],
-        rails:  ['slim', 'haml', 'jbuilder', 'erb']
+        rails:  ['slim', 'haml', 'jbuilder', 'erb'],
+        images: ['png', 'jpg', 'jpeg', 'gif'],
+        static: ['pdf', 'txt', 'doc', 'docx', 'csv', 'xls', 'xlsx'],
+        markup: ['html', 'xml', 'xhtml'],
+        markdown: ['md', 'markdown', 'mdown'],
+        php:    ['php', 'ini']
       }
     end
 
@@ -186,7 +175,7 @@ module Maximus
       # @param sha2 [String]
       # @return [Array] shas
       def commit_range(sha1, sha2)
-        git_spread = @psuedo_commit ? "git #{sha1}" : `git -C #{@config.working_dir} rev-list #{sha1}..#{sha2} --no-merges`
+        git_spread = @psuedo_commit ? "git #{sha1}" : sha_range(sha1, sha2)
         git_spread = git_spread.nil? ? [] : git_spread.split("\n")
 
         git_spread << sha1 unless @psuedo_commit
@@ -205,40 +194,6 @@ module Maximus
         end
       end
 
-      # Create branch to run report on
-      # @todo better way to silence git, in case there's a real error?
-      # @since 0.1.5
-      # @param sha [String]
-      def create_branch(sha)
-        quietly { `git -C #{@config.working_dir} checkout #{sha} -b maximus_#{sha}` }
-      end
-
-      # Destroy created branch
-      # @todo better way to silence git, in case there's a real error?
-      # @since 0.1.5
-      # @param base_branch [String] branch we started on
-      # @param sha [String] used to check against created branch name
-      def destroy_branch(base_branch, sha)
-        quietly {
-          if base_branch == "maximus_#{sha}"
-            @g.branch('master').checkout
-          else
-            @g.branch(base_branch).checkout
-          end
-          @g.branch("maximus_#{sha}").delete
-        }
-      end
-
-      # Get list of file paths
-      # @param files [Hash] hash of files denoted by key 'filename'
-      # @param ext [String] file extension - different extensions are joined different ways
-      # @return [String] file paths delimited by comma or space
-      def lint_file_paths(files, ext)
-        file_list = files.map { |f| f[:filename] }.compact
-        # Lints accept files differently
-        ext == :ruby ? file_list.join(' ') : file_list.join(',')
-      end
-
       # Determine which lines were added (where and how many) in a commit
       #
       # @example output from method
@@ -249,9 +204,9 @@ module Maximus
       #
       # @param git_sha [String] sha of the commit
       # @return [Hash] ranges by lines added in a commit by file name
-      def lines_added(git_sha)
+      def lines_added(commit_sha)
         new_lines = {}
-        git_lines = `#{File.join(File.dirname(__FILE__), 'reporter', 'git-lines.sh')} #{@config.working_dir} #{git_sha}`.split("\n")
+        git_lines = lines_by_sha(commit_sha)
         git_lines.each do |filename|
           fsplit = filename.split(':')
           # if file isn't already part of the array
@@ -264,24 +219,6 @@ module Maximus
         new_lines
       end
 
-      # Get last commit on current branch
-      # @return [String] sha
-      def head_sha
-        @g.object('HEAD').sha
-      end
-
-      # Get current branch name
-      # @return [String]
-      def branch
-        `env -i git rev-parse --abbrev-ref HEAD`.strip!
-      end
-
-      # Get last commit sha on the master branch
-      # @return [String]
-      def master_commit_sha
-        @g.branches[:master].blank? ? head_sha : @g.branches[:master].gcommit.sha
-      end
-
       # Get general stats of commit on HEAD versus last commit on master branch
       # @modified 0.1.4
       # @param old_commit [Git::Object]
@@ -291,9 +228,11 @@ module Maximus
         stats = @g.diff(old_commit, new_commit).stats
         lines = lines_added(new_commit.sha)
         return if !lines.is_a?(Hash) || stats.blank?
+
         lines.each do |filename, filelines|
           stats[:files][filename][:lines_added] = filelines if stats[:files].key?(filename)
         end
+
         stats
       end
 
@@ -304,8 +243,7 @@ module Maximus
       # @param commit_sha [String]
       # @return [Hash] stat data similar to Ruby-git's Diff.stats return
       def diff_initial(commit_sha)
-        # Start after the commit information
-        data = `git -C #{@config.working_dir} log --numstat --oneline #{commit_sha}`.split("\n")[1..-1]
+        data = commit_information(commit_sha)
         value = {
           total: {
             insertions: 0,
@@ -329,42 +267,31 @@ module Maximus
         value
       end
 
-      # Get remote URL
-      # @return [String, nil] nil returns if remotes is blank
-      def remote
-        @g.remotes.first.url unless @g.remotes.blank?
-      end
-
       # Associate files by extension and match their changes
       # @since 0.1.5
-      # @param git_sha [String]
-      # @param files [String] list of files from git return
+      # @param commit_sha [String]
+      # @param files [String] list of files from git
       # @return [Hash] files with matched extensions and changes
-      def match_associations(git_sha, files)
-        new_lines = lines_added(git_sha)
+      def match_associations(commit_sha, files)
+        new_lines = lines_added(commit_sha)
 
-        # File.extname is not used here in case dotfiles are encountered
         files = files.split("\n").group_by { |f| f.split('.').pop }
 
-        # Don't worry about files that we don't have a lint or a statistic for
-        flat_associations = associations.clone.flatten(2)
-        files.delete_if { |k,v| !flat_associations.include?(k) || k.nil? }
-
         associations.each do |ext, related|
           files[ext] ||= []
           related.each do |child|
-            unless files[child].blank?
-              files[child].each do |c|
-                # hack to ignore deleted files
-                files[child] = new_lines[c].blank? ? [] : [ filename: File.join(@config.working_dir, c), changes: new_lines[c] ]
-              end
-              files[ext].concat(files[child])
-              files.delete(child)
+            next if files[child].blank?
+
+            files[child].each do |c|
+              # hack to ignore deleted files
+              files[child] = new_lines[c].blank? ? [] : [ filename: File.join(@config.working_dir, c), changes: new_lines[c] ]
             end
+            files[ext].concat(files[child])
+            files.delete(child)
           end
         end
 
-        files.delete_if { |k,v| v.blank? }
+        files.delete_if { |k,v| v.blank? || k.nil? }
         files
       end
 
@@ -433,5 +360,38 @@ module Maximus
         result
       end
 
+
+    private
+
+      # Create branch to run report on
+      # @since 0.1.5
+      # @param sha [String]
+      def create_branch(sha)
+        silence_stream(STDERR) { `git -C #{@config.working_dir} checkout #{sha} -b maximus_#{sha}` }
+      end
+
+      # Destroy created branch
+      # @since 0.1.5
+      # @param base_branch [String] branch we started on
+      # @param sha [String] used to check against created branch name
+      def destroy_branch(base_branch, sha)
+        if base_branch == "maximus_#{sha}"
+          @g.branch('master').checkout
+        else
+          @g.branch(base_branch).checkout
+        end
+        @g.branch("maximus_#{sha}").delete
+      end
+
+      # Get list of file paths
+      # @param files [Hash] hash of files denoted by key 'filename'
+      # @param ext [String] file extension - different extensions are joined different ways
+      # @return [String] file paths delimited by comma or space
+      def lint_file_paths(files, ext)
+        file_list = files.map { |f| f[:filename] }.compact
+        # Lints accept files differently
+        ext == :ruby ? file_list.join(' ') : file_list.join(',')
+      end
+
   end
 end

data/lib/maximus/git_helper.rb

@@ -0,0 +1,79 @@
+module Maximus
+  # Methods used for git commands
+  # @since 0.1.7
+  module GitHelper
+
+    # Find first commit
+    # @since 0.1.5
+    # @return [String]
+    def first_commit
+      `git -C #{@config.working_dir} rev-list --max-parents=0 HEAD`.strip!
+    end
+
+    # Get commit before current
+    # @since 0.1.5
+    # @param current_commit [String] (head_sha) commit to start at
+    # @param previous_by [Integer] (1) commit n commits ago
+    # @return [String]
+    def previous_commit(current_commit = head_sha, previous_by = 1)
+      `git -C #{@config.working_dir} rev-list --max-count=#{previous_by + 1} #{current_commit} --reverse | head -n1`.strip!
+    end
+
+    # Get last commit on current branch
+    # @return [String] sha
+    def head_sha
+      @g.object('HEAD').sha
+    end
+
+    # Get current branch name
+    # @return [String]
+    def branch
+      `env -i git rev-parse --abbrev-ref HEAD`.strip!
+    end
+
+    # Get last commit sha on the master branch
+    # @return [String]
+    def master_commit_sha
+      @g.branches[:master].blank? ? head_sha : @g.branches[:master].gcommit.sha
+    end
+
+    # Get remote URL
+    # @return [String, nil] nil returns if remotes is blank
+    def remote
+      @g.remotes.first.url unless @g.remotes.blank?
+    end
+
+    # Return file names of working copy files
+    # @since 0.1.7
+    def working_copy_files
+      `git -C #{@config.working_dir} diff --name-only`
+    end
+
+    # Grab files by sha
+    # @since 0.1.7
+    def files_by_sha(commit_sha)
+      `git -C #{@config.working_dir} show --pretty="format:" --name-only #{commit_sha}`
+    end
+
+    # Retrieve list of shas between two commits
+    # @since 0.1.7
+    def sha_range(sha1, sha2)
+      `git -C #{@config.working_dir} rev-list #{sha1}..#{sha2} --no-merges`
+    end
+
+    # A commit's insertions, deletions, and file names
+    # @since 0.1.7
+    def commit_information(commit_sha)
+      # Start after the commit message
+      `git -C #{@config.working_dir} log --numstat --oneline #{commit_sha}`.split("\n")[1..-1]
+    end
+
+    # Retrieve insertions by commit with a custom script
+    # @since 0.1.7
+    # @return [Array]
+    def lines_by_sha(commit_sha)
+      `#{File.join(File.dirname(__FILE__), 'reporter', 'git-lines.sh')} #{@config.working_dir} #{commit_sha}`.split("\n")
+    end
+
+  end
+end

data/lib/maximus/helper.rb

@@ -14,14 +14,14 @@ module Maximus
     # This will usually be stored as a class variable in the inherited class
     # @return [Boolean]
     def is_rails?
-      defined?(Rails)
+      (@config.settings[:framework] == 'rails' unless @config.blank?) || defined?(Rails)
     end
 
     # See if project is a Middleman app
-    # @since 0.1.7
+    # @since 0.1.6.1
     # @return [Boolean]
     def is_middleman?
-      Gem::Specification::find_all_by_name('middleman').any?
+      (@config.settings[:framework] == 'middleman' unless @config.blank?) || Gem::Specification::find_all_by_name('middleman').any?
     end
 
     # Get root directory of file being called
@@ -110,7 +110,7 @@ module Maximus
           end
         end
       else
-        path = path.gsub('/**', '').gsub('/*', '').split('.')[0..1].first if path.include?('*')
+        path = path.gsub('/**', '').gsub('/*', '').gsub(/\/\.*/, '') if path.include?('*')
         if File.exist?(path)
           return true
         else
@@ -121,17 +121,18 @@ module Maximus
     end
 
     # Default paths to check for lints and some stats
-    # @since 0.1.7
+    # @since 0.1.6.1
+    # Note: is_rails? must be defined second-to-last if more frameworks are added
     # @param root [String] base directory
     # @param folder [String] nested folder to search for for Rails or Middleman
     # @param extension [String] file glob type to search for if neither
     # @return [String] path to desired files
     def discover_path(root = @config.working_dir, folder = '', extension = '')
       return @path unless @path.blank?
-      if is_rails?
-        File.join(root, 'app', 'assets', folder)
-      elsif is_middleman?
+      if is_middleman?
         File.join(root, 'source', folder)
+      elsif is_rails?
+        File.join(root, 'app', 'assets', folder)
       else
         extension.blank? ? File.join(root) : File.join(root, '/**', "/*.#{extension}")
       end

data/lib/maximus/lint.rb

@@ -56,11 +56,11 @@ module Maximus
 
       evaluate_severities(data)
 
-      puts lint_summarize
+      puts summarize
 
       if @config.is_dev?
-        puts lint_dev_format(data)
-        lint_ceiling
+        puts dev_format(data)
+        ceiling_warning
       else
         # Because this should be returned in the format it was received
         @output[:raw_data] = data.to_json
@@ -84,12 +84,12 @@ module Maximus
       # @param lint [Hash] output lint data
       # @param files [Hash<String: String>] filename: filepath
       # @return [Array] lints that match the lines in commit
-      def relevant_lints(lint, files)
+      def relevant_output(lint, files)
         all_files = {}
         files.each do |file|
 
           # sometimes data will be blank but this is good - it means no errors were raised in the lint
-          next if lint.blank?
+          next if lint.blank? || file.blank? || !file.is_a?(Hash) || !file.key?(:filename)
           lint_file = lint[file[:filename]]
 
           next if lint_file.blank?
@@ -99,9 +99,6 @@ module Maximus
 
           all_files[revert_name] = []
 
-          # @todo originally I tried .map and delete_if, but this works,
-          #   and the other method didn't cover all bases.
-          #   Gotta be a better way to write this though
           lint_file.each do |l|
             if expanded.include?(l['line'].to_i)
               all_files[revert_name] << l
@@ -167,13 +164,12 @@ module Maximus
         changes_array.map { |e| (e[0]..e[1]).to_a }.flatten!
       end
 
+
     private
 
       # Send abbreviated results to console or to the log
       # @return [String] console message to display
-      def lint_summarize
-        puts "#{'Warning'.color(:red)}: #{@output[:lint_errors].length} errors found in #{@task}" if @output[:lint_errors].length > 0
-
+      def summarize
         success = @task.color(:green)
         success << ": "
         success << "[#{@output[:lint_warnings].length}]".color(:yellow)
@@ -183,6 +179,7 @@ module Maximus
           success << " [#{@output[:lint_refactors].length}]".color(:white)
           success << " [#{@output[:lint_fatals].length}]".color(:magenta)
         end
+        success << "\n#{'Warning'.color(:red)}: #{@output[:lint_errors].length} errors found in #{@task}" if @output[:lint_errors].length > 0
 
         success
       end
@@ -190,10 +187,10 @@ module Maximus
       # If there's just too much to handle, through a warning.
       # @param lint_length [Integer] count of how many lints
       # @return [String] console message to display
-      def lint_ceiling
+      def ceiling_warning
         lint_length = (@output[:lint_errors].length + @output[:lint_warnings].length + @output[:lint_conventions].length + @output[:lint_refactors].length + @output[:lint_fatals].length)
-
         return unless lint_length > 100
+
         failed_task = @task.color(:green)
         errors = "#{lint_length} failures.".color(:red)
         errormsg = [
@@ -214,24 +211,19 @@ module Maximus
       # Dev display, executed only when called from command line
       # @param errors [Hash] data from lint
       # @return [String] console message to display
-      def lint_dev_format(errors = @output[:raw_data])
+      def dev_format(errors = @output[:raw_data])
         return if errors.blank?
+
         pretty_output = ''
         errors.each do |filename, error_list|
           filename = strip_working_dir(filename)
           pretty_output << "\n#{filename.color(:cyan).underline} \n"
           error_list.each do |message|
-            pretty_output << case message['severity']
-              when 'warning' then 'W'.color(:yellow)
-              when 'error' then 'E'.color(:red)
-              when 'convention' then 'C'.color(:cyan)
-              when 'refactor' then 'R'.color(:white)
-              when 'fatal' then 'F'.color(:magenta)
-              else '?'.color(:blue)
-            end
+            pretty_output << severity_color(message['severity'])
             pretty_output << " #{message['line'].to_s.color(:blue)} #{message['linter'].color(:green)}: #{message['reason']} \n"
           end
         end
+        pretty_output << "-----\n\n"
         pretty_output
       end
 
@@ -240,10 +232,10 @@ module Maximus
       # @param path [String]
       # @return [String]
       def strip_working_dir(path)
-        path.gsub("#{@config.working_dir}/", '')
+        path.gsub(@config.working_dir, '')
       end
 
-      # Handle data and generate relevant_lints if appropriate
+      # Handle data and generate relevant_output if appropriate
       # @since 0.1.6
       # @see #refine
       # @param data [String, Hash]
@@ -256,10 +248,21 @@ module Maximus
 
         data = JSON.parse(data) if data.is_a?(String)
 
-        @output[:relevant_lints] = relevant_lints( data, @git_files ) unless @git_files.blank?
-        data = @output[:relevant_lints] unless @settings[:commit].blank?
+        @output[:relevant_output] = relevant_output( data, @git_files ) unless @git_files.blank?
+        data = @output[:relevant_output] unless @settings[:commit].blank?
         data
       end
 
+      def severity_color(severity)
+        case severity
+          when 'warning' then 'W'.color(:yellow)
+          when 'error' then 'E'.color(:red)
+          when 'convention' then 'C'.color(:cyan)
+          when 'refactor' then 'R'.color(:white)
+          when 'fatal' then 'F'.color(:magenta)
+          else '?'.color(:blue)
+        end
+      end
+
   end
 end

data/lib/maximus/version.rb

@@ -1,3 +1,3 @@
 module Maximus
-  VERSION = "0.1.6.1"
+  VERSION = "0.1.7"
 end

data/spec/support/config_helper.rb

@@ -1,4 +1,3 @@
-
 module ConfigHelper
 
   def create_config(contents = '', location = '.maximus.yml')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maximus
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Tim Shedor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -232,6 +232,7 @@ files:
 - lib/maximus/config/wraith/nojs.js
 - lib/maximus/config/wraith/snap.js
 - lib/maximus/git_control.rb
+- lib/maximus/git_helper.rb
 - lib/maximus/helper.rb
 - lib/maximus/lint.rb
 - lib/maximus/lints/brakeman.rb
@@ -276,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Make your code spic and <span>