renegade 0.1.33 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46355bf57e7ff7ccd92cca140c467c5808534be
-  data.tar.gz: 3596159941ef7e480c6667576e4f1582efe2cce2
+  metadata.gz: 3fdcc4d4286010b0ab5c4a48cc331044217cf32c
+  data.tar.gz: 0c21b2038427d11613c95590107bf85afd4db78f
 SHA512:
-  metadata.gz: 7e32a89837d2a6127ebe23b3a881be43f5340b444c68217f4944a9b71f093c6ad36f7216052d8ee6b0e2362d51f194c3c964f40f3e5b1551b8579b0bfdda5f16
-  data.tar.gz: b1d43597c1c4e8dc55eeca8bceca8cda1cc973e03acf034b581e700ae43e6c2007476b6c4b82ce07ad2b2367038733f4603ed36023069d5501b07fef0c45e02a
+  metadata.gz: c2d245a34f00f9c98a289aaf525ecde69b95f399f219b7ddd1b70d954235e02cde6691908ea42faaf8693aff59f345ebe67db290855fbfe095169f6a38ab4bc3
+  data.tar.gz: 9af1bb1b8f2b941e399448f4677c805b6fe7d9e02240d8290a86fd5943854afd635e9fa0e8b893802b3c5fd3956b19926eae665cd31e327d332321309da461be

data/lib/renegade/branch_name.rb

@@ -9,24 +9,23 @@ module Renegade
     REGEX_STORY_BRANCH = /^(?:story)-(\d{4,6})-?(.*)?$/
     REGEX_BUG_BRANCH = /^(?:bug)-(\d{4,6})-?(.*)?$/
 
-    def initialize(label)
+    def initialize
       # Instance variables
-      @label = label
+      @label = 'Branch Name'
       @warnings = []
       @errors = []
     end
 
-    def run
-      branch_name = `git name-rev --name-only HEAD`
+    def run(branch_name)
+      # branch_name = `git name-rev --name-only HEAD`
 
       Status.report(@label, check_branch_name(branch_name), true)
     end
 
     def check_branch_name(branch_name)
-      if REGEX_STORY_BRANCH.match(branch_name)
-        # placeholder
-        return true
-      elsif REGEX_BUG_BRANCH.match(branch_name)
+      if REGEX_STORY_BRANCH.match(branch_name) ||
+         REGEX_BUG_BRANCH.match(branch_name) ||
+         branch_name == 'master'
         # placeholder
         return true
       else

data/lib/renegade/commit_message.rb

@@ -7,9 +7,8 @@ module Renegade
 
     COMMIT_FORMAT = /^(?:(?:BugId: |Story: B+-|Epic: E-0)[1-9]\d* \| )(.*)/
 
-    def initialize(label)
+    def initialize
       # Instance variables
-      @label = label
       @warnings = []
       @errors = []
 
@@ -48,11 +47,11 @@ module Renegade
     end
 
     def check_commit_message_format_error
-      'You must include a valid BugId, Story or Epic number.' + "\n"\
-      '  Examples:' + "\n"\
-      '  - BugId: 12345 | Helpful comment describing bug fix' + "\n"\
-      '  - Story: B-12345 | Helpful comment describing story' + "\n"\
-      '  - Epic: E-12345 | Epic comment'
+      "You must include a valid BugId, Story or Epic number.\n"\
+        "  Examples:\n"\
+        "  - BugId: 12345 | Helpful comment describing bug fix\n"\
+        "  - Story: B-12345 | Helpful comment describing story\n"\
+        '  - Epic: E-12345 | Epic comment'
     end
 
     # Check commit message contains no non-ASCII characters

data/lib/renegade/conflict_markers.rb

@@ -1,31 +1,22 @@
-require 'open3'
 require 'renegade/status'
 
 module Renegade
   ##
   # Prevent merge artifacts from getting committed
   class ConflictMarkers
-    attr_reader :errors, :warnings
+    attr_reader :errors
 
-    def initialize(label)
-      # Instance variables
-      @label = label
+    def initialize
+      @label = 'No merge artifacts'
       @errors = []
     end
 
-    def run
-      markers = `git diff-index --check --cached HEAD --`
-
-      check_markers(markers.chomp.strip)
-    end
-
-    def check_markers(markers)
-      check_label = 'No merge artifacts'
-
+    def run(markers)
+      # markers = `git diff-index --check --cached HEAD --`
       if markers == ''
-        Status.report(check_label, true)
+        Status.report(@label, true)
       else
-        Status.report(check_label, false)
+        Status.report(@label, false)
         @errors.push('Merge artifacts were found!' + "\n" + markers)
       end
     end

data/lib/renegade/handle_errors.rb

@@ -4,16 +4,16 @@ module Renegade
   class HandleErrors
     # Handle errors if they exist
     def self.handle_errors(errors)
-      if errors.size > 0
-        print_errors(errors)
-        exit 1
+      if errors.empty?
+        true
       else
-        exit 0
+        print_errors(errors)
+        false
       end
     end
 
     def self.handle_warnings(warnings)
-      print_warnings(warnings) if warnings.size > 0
+      print_warnings(warnings) unless warnings.empty?
     end
 
     def self.print_errors(errors)

data/lib/renegade/linters.rb

@@ -19,7 +19,7 @@ module Renegade
       append_file_count(files)
 
       # Only run check if there are relevant files being committed
-      if files.size == 0
+      if files.empty?
         Status.report(@label, true)
       else
         Status.report(@label, exec(files))
@@ -30,25 +30,21 @@ module Renegade
     def append_file_count(files)
       file_size = files.size
 
-      if file_size == 0 || file_size > 1
-        @label = "#{@label} (#{file_size} files)"
-      else
-        @label = "#{@label} (1 file)"
-      end
+      label_count =
+        (file_size == 0 || file_size > 1) ? "#{file_size} files" : '1 file'
+
+      @label = "#{@label} (#{label_count})"
     end
 
     def exec(files)
       # http://stackoverflow.com/questions/690151/getting-output-of-system-calls-in-ruby
-      _stdin, stdout, stderr,
-        wait_thread = Open3.popen3(@exec_command, files.join(' '))
+      stdin, stdout, stderr,
+        wait_thread = Open3.popen3(@exec_command + " #{files.join(' ')}")
 
-      if wait_thread.value.exitstatus == 1
-        @errors.push(stdout.read)
-      end
+      @errors.push(stdout.read) if wait_thread.value.exitstatus == 1
 
-      stdout.gets(nil)
+      stdin.close
       stdout.close
-      stderr.gets(nil)
       stderr.close
 
       wait_thread.value.exitstatus == 0
@@ -58,9 +54,7 @@ module Renegade
       filtered_files = []
 
       file_list.each do |file|
-        if File.extname(file) == @extension
-          filtered_files.push(file)
-        end
+        filtered_files.push(file) if File.extname(file) == @extension
       end
 
       filtered_files

data/lib/renegade/pre_commit.rb

@@ -3,34 +3,38 @@ require 'renegade/status'
 require 'renegade/linters'
 require 'renegade/branch_name'
 require 'renegade/conflict_markers'
+require 'renegade/protected_files'
 
 module Renegade
   # Run linters
   class PreCommit
     def initialize
       Renegade::Status.hook_start('pre-commit')
-      # @scss_lint = Renegade::Linters.new('SCSS Lint', '.scss', 'scss-lint')
-      # @eslint = Renegade::Linters.new('ESLint', '.js', 'eslint')
-      @branch_name = Renegade::BranchName.new('Branch Name')
-      @conflict_markers = Renegade::ConflictMarkers.new('Conflict Markers')
-      # @protected_files = Renegade::ProtectedFiles.new('Protected Files')
-
-      run
+      @scss_lint = Renegade::Linters.new('SCSS Lint', '.scss', 'scss-lint')
+      @eslint = Renegade::Linters.new('ESLint', '.js', 'eslint')
+      @branch_name = Renegade::BranchName.new
+      @conflict_markers = Renegade::ConflictMarkers.new
+      @protected_files = Renegade::ProtectedFiles.new
     end
 
-    def run
-      # @scss_lint.run
-      # @eslint.run
-      @branch_name.run
-      @conflict_markers.run
-      # @protected_files.run
+    def run(files, branch_name, markers)
+      unless files.empty?
+        files = files.split("\n")
+        @scss_lint.run(files)
+        @eslint.run(files)
+        @branch_name.run(branch_name)
+        @conflict_markers.run(markers)
+        @protected_files.run(files)
+      end
 
-      Renegade::HandleErrors.handle_warnings(@branch_name.warnings)
-      Renegade::HandleErrors.handle_errors(@conflict_markers.errors)
+      handle_errors
+    end
 
-      # Renegade::HandleErrors.handle_errors(
-      #   @scss_lint.errors + @eslint.errors +
-      #   @branch_name.errors + @protected_files.errors)
+    def handle_errors
+      Renegade::HandleErrors.handle_warnings(@branch_name.warnings +
+        @protected_files.warnings)
+      Renegade::HandleErrors.handle_errors(@scss_lint.errors +
+        @eslint.errors + @conflict_markers.errors)
     end
   end
 end

data/lib/renegade/prepare_commit_msg.rb

@@ -3,26 +3,23 @@ require 'renegade/status'
 require 'renegade/commit_message'
 
 module Renegade
-  # Run linters
+  # Run prepare commit message hooks
   class PrepareCommitMsg
-    def initialize
-      Renegade::Status.hook_start('prepare-commit-msg')
-      run
+    def initialize(args)
+      @message = args[1]
+      @message_file = args[0]
+
+      # Avoid checking merges
+      Renegade::Status.hook_start('prepare-commit-msg') if @message == 'message'
     end
 
     def run
-      message_type = ARGV[1]
-
-      commit_message = Renegade::CommitMessage.new('Commit Message')
+      if @message == 'message' # Avoid checking merges
+        commit_message = Renegade::CommitMessage.new
+        commit_message.run(File.read(@message_file))
 
-      # Avoid checking merges
-      if message_type == 'message'
-        message_file = ARGV[0]
-        message = File.read(message_file)
-        commit_message.run(message)
+        Renegade::HandleErrors.handle_errors(commit_message.errors)
       end
-
-      Renegade::HandleErrors.handle_errors(commit_message.errors)
     end
   end
 end

data/lib/renegade/protected_files.rb

@@ -0,0 +1,22 @@
+require 'renegade/status'
+
+module Renegade
+  # Check protected files
+  class ProtectedFiles
+    attr_reader :warnings, :protected_files
+
+    def initialize
+      # Instance variables
+      @warnings = []
+      @protected_files = ['app.config', 'web.config']
+    end
+
+    def run(files)
+      files.each do |file|
+        if @protected_files.include?(File.basename(file).downcase)
+          @warnings.push 'Warning! You are making changes to: ' + file.highlight
+        end
+      end
+    end
+  end
+end

data/lib/renegade/status.rb

@@ -1,15 +1,23 @@
 # Add color options
 class String
-  def red
-    "\e[31m#{self}\e[0m"
+  def highlight
+    "\e[36m#{self}\e[0m"
   end
 
-  def green
-    "\e[32m#{self}\e[0m"
+  def status
+    "\e[35m#{self}\e[0m"
   end
 
-  def yellow
-    "\e[1;33m#{self}\e[0m"
+  def success
+    "\e[32m  √ #{self}\e[0m"
+  end
+
+  def warning
+    "\e[33m  × #{self}\e[0m"
+  end
+
+  def error
+    "\e[31m  × #{self}\e[0m"
   end
 end
 
@@ -21,18 +29,16 @@ module Renegade
     # Report labels
     def self.report(label, passed, warning = nil)
       if passed
-        puts "  √ #{label}".green
+        puts label.success
+      elsif warning
+        puts label.warning
       else
-        if warning
-          puts "  × #{label}".yellow
-        else
-          puts "  × #{label}".red
-        end
+        puts label.error
       end
     end
 
     def self.hook_start(hook)
-      puts "\nRunning #{hook} hooks…"
+      puts "\n" + "Running #{hook} hooks…".status
     end
   end
 end

data/lib/renegade/version.rb

@@ -1,4 +1,4 @@
 # Renegade version
 module Renegade
-  VERSION = '0.1.33'
+  VERSION = '0.1.48'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renegade
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.48
 platform: ruby
 authors:
 - ratherblue
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +38,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.37.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.37.2
+- !ruby/object:Gem::Dependency
+  name: scss_lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 1.7.8
 description: Gem description
 email:
 - ratherblue@gmail.com
@@ -67,6 +109,7 @@ files:
 - lib/renegade/linters.rb
 - lib/renegade/pre_commit.rb
 - lib/renegade/prepare_commit_msg.rb
+- lib/renegade/protected_files.rb
 - lib/renegade/status.rb
 - lib/renegade/version.rb
 homepage: https://github.com/ratherblue/renegade