fashion-police 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69aee17571a54c11ff77280b89e8406a81254482
-  data.tar.gz: 949fe6bfe3a0300b8fdf642cbfb5a46f466019d3
+  metadata.gz: 5dab0f8dfe39ff4db5209debc8a2e5daee7ecdf7
+  data.tar.gz: 5e3da2c1c5bce760ef1ecaa55399707362557484
 SHA512:
-  metadata.gz: 027c4f5c35d091e8fb644aa1b4e03b0176205f21fadaeedd1386e859668b35e89b4cbe6f9c6b8d26c6084b50d5bddfab3c78496d9d60a1965fa146a2c3d462de
-  data.tar.gz: f45d73029cb1e62e62f76793dc799cca48afe49a203b1658aff24d7d72fb1f34ae633ec0b34f4c66d3a0cf21e91b0ee3ce84d1a767d64002e4c91ee1f553480b
+  metadata.gz: 3049903809914697e748d797e5de6a07f9cecd202d8517abddb1a2e31aa68b2b2842d4ec550efb631bedc0092b0379f0805d20e8a284bf0f96c24b59fd56a3dd
+  data.tar.gz: 4edfd9436aeba99c84d627cb39ba5e2b797fa4aee9f1d5fdd0ff0963020fb4b90c4ea7bcbace0d495c6a3e88128fc45cab9ddac459310fd27f6835f9234a0560

data/bin/fashion-police

@@ -4,8 +4,11 @@ require 'rubygems'
 require 'rainbow'
 require 'fashion-police'
 
+no_color = ARGV[0] == '--no-color' ? true : false
+
 @fashion_police = FashionPolice.new
-errors = []
+
+everything_copasetic = true
 
 unstaged = `git diff --name-only`.split("\n")
 staged = `git diff --name-only --cached`.split("\n")
@@ -13,20 +16,38 @@ staged = `git diff --name-only --cached`.split("\n")
 files = unstaged + staged
 
 files.each do |filename|
+  next unless filename.match(/\.js$/)
   begin
     @fashion_police.investigate(File.read(filename))
   rescue FashionPolice::BadCode
-    errors << filename.background(:red)
-    errors << @fashion_police.errors.collect {|element| element.to_s.foreground(:red) }
+    # FIXME: it's fairly obvious the clunkiness of this block
+    #        means I should clean up the design
+    if no_color
+      puts filename
+    else
+      puts filename.color("ff7400")
+    end
+    @fashion_police.errors.each do |element|
+      element.each do |key, value|
+        if no_color
+          puts key.to_s + " " + value
+        else
+          puts key.to_s.color("bf3030") + " " + value.color("ff0000")
+        end
+      end
+    end
+    @fashion_police.errors = []
+    everything_copasetic = false
   end
 end
 
-if errors.empty?
+if everything_copasetic
   exit(0)
 else
-  puts "JavaScript style errors!".foreground(:red)
-  errors.each do |error|
-    puts error
+  if no_color
+    puts "Commit aborted due to JavaScript style errors."
+  else
+    puts "Commit aborted due to JavaScript style errors.".color("ff9640")
   end
   exit(1)
 end

data/lib/fashion-police.rb

@@ -1,6 +1,5 @@
 class FashionPolice
-  attr_reader :errors
-  attr_accessor :rules
+  attr_accessor :errors, :rules
 
   class SpacesNotTabs
     def test(string)
@@ -69,6 +68,7 @@ class FashionPolice
   class SpacesAroundArgumentsInForLoops
     def test(string)
       return false if string.match(/for\(\S+\s+[^\)]+\)/)
+      return false if string.match(/for \(\S+\s+/)
       return true
     end
 

data/spec/fashion_police_spec.rb

@@ -266,6 +266,7 @@ describe FashionPolice do
       it "(negative case)" do
         @rule = FashionPolice::SpacesAroundArgumentsInForLoops.new
         @rule.test("for(var i=0;i<100;i++) {").should be_false
+        @rule.test("for (i = 0; i < 100; i++) {").should be_false
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fashion-police
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Giles Bowkett