phpcop 0.4.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3d4d38c484bea2b33984349716824b4d6539d4
-  data.tar.gz: ded7b85d0f430d9834361f8e959c89165ada3f72
+  metadata.gz: 21740e8e63f9fa63630ee1580dbe6cf00f586ff3
+  data.tar.gz: d6848133f0c897e3345092a37581af74f167eca4
 SHA512:
-  metadata.gz: ce4756471d9fd32b1e5d002dd6f211700131bf047c6e88b8e248466a2ec38eeaf91401940c2a7441a776f670c86023c7d9b7edefe197bb75b5ca0b7fb49e9d1a
-  data.tar.gz: 562fad8df27cf6d9236f7443586c15c46fb26ebe8e4518a612e63798f76a616622dd2158de0d91aea519aa0f726e53eb69ae52845749a7ac5e943cbb09bc35f2
+  metadata.gz: 03f7d41acbff8f04b9fa195984f53f25b8e95db12c46a4b0f61d2f2faf05a96f7205e8680b33f951cc707e5dc25e0c9b2c59d5be82ea4333ca970044531372c5
+  data.tar.gz: 9fd4a1bdbb2d10655fb82f15c10e52e179ba00137763b2ef872c512945cda728b6378db3c948c081719414083224a7a6406ab110fbd110ef13e90661b61fd5d8

data/config/default.yml

@@ -1,13 +1,3 @@
-# Configuration for application
-php:
-  # Precise PHP version
-  version: 7
-  # Precise convention used
-  rules:
-    - PSR-2
-  # Precise framework used
-  framework: zf-2
-
 AllCops:
   # Exclude:
   #    - '**/'

data/lib/phpcop/cli.rb

@@ -7,7 +7,7 @@ module PhpCop
   class CLI
     attr_reader :config_store
 
-    MSG_END = '%s fichier traité. %s erreurs.'
+    MSG_END = '%s fichiers traités. %s erreurs.'
 
     def initialize
       @config_store = ConfigStore.new
@@ -16,7 +16,27 @@ module PhpCop
     # Run all files
     def run(_args = ARGV)
       runner = PhpCop::Runner.new(@config_store)
-      puts format(MSG_END, runner.count_files, runner.count_errors)
+      puts format(MSG_END,
+                  format_count(runner.count_files),
+                  format_count(runner.count_errors))
+    end
+
+    private
+
+    def format_count(count)
+      i = 0
+      f = []
+      count.to_s.reverse.split('').each do |letter|
+        i += 1
+        f.push(letter)
+        i = add_space(f) if i == 3
+      end
+      f.join.to_s.reverse
+    end
+
+    def add_space(f)
+      f.push(' ')
+      0
     end
   end
 end

data/lib/phpcop/configloader.rb

@@ -18,13 +18,17 @@ module PhpCop
 
     def initialize
       @options = load_configuration(DEFAULT_CONF)
-      @options ||= load_configuration(CUSTOMIZE_CONF)
+      override_configuration(File.join(Dir.pwd, CUSTOMIZE_CONF))
     end
 
     private
 
     def load_configuration(file)
-      File.exist?(file) ? YAML.load(File.read(file)) : false
+      YAML.load(File.read(file))
+    end
+
+    def override_configuration(file)
+      @options = load_configuration(file) if File.exist?(file)
     end
   end
 end

data/lib/phpcop/cop/ccpm/constants.rb

@@ -29,14 +29,6 @@ module PhpCop
             return_an_error(@file, @line_number, 0) unless n_constant.eql? name
           end
         end
-
-        def return_an_error(file, line, column)
-          @errors += 1
-          line += 1
-          puts format(MSG_ALERT_FILE, file, line, column)
-          puts MSG_ALERT_DESCRIB
-          puts ''
-        end
       end
     end
   end

data/lib/phpcop/cop/ccpm/methods.rb

@@ -30,14 +30,6 @@ module PhpCop
             return_an_error(@file, @line_number, 0) unless name_camel.eql? name
           end
         end
-
-        def return_an_error(file, line, column)
-          @errors += 1
-          line += 1
-          puts format(MSG_ALERT_FILE, file, line, column)
-          puts MSG_ALERT_DESCRIB
-          puts ''
-        end
       end
     end
   end

data/lib/phpcop/cop/cop.rb

@@ -8,6 +8,7 @@ module PhpCop
       attr_reader :errors
       # Display an error 'fichier.ext:line:column'
       MSG_ALERT_FILE = '%s:%s:%s'
+      MSG_ALERT_DESCRIB = ''
 
       def initialize(file, line, line_number)
         @count_open = 0
@@ -24,6 +25,8 @@ module PhpCop
         @errors += 1
         line += 1
         puts format(MSG_ALERT_FILE, file, line, column)
+        puts MSG_ALERT_DESCRIB
+        puts ''
       end
     end
   end

data/lib/phpcop/cop/files/phpencoding.rb

@@ -28,14 +28,6 @@ module PhpCop
           array = @line.split(/./)
           array.each_with_index { |c, index| index unless c.ascii_only? }
         end
-
-        def return_an_error(file, line, column)
-          @errors += 1
-          line += 1
-          puts format(MSG_ALERT_FILE, file, line, column)
-          puts MSG_ALERT_DESCRIB
-          puts ''
-        end
       end
     end
   end

data/lib/phpcop/cop/files/phptags.rb

@@ -53,14 +53,6 @@ module PhpCop
                                               invalid: :replace,
                                               replace: '?').encode('UTF-8')
         end
-
-        def return_an_error(file, line, column)
-          @errors += 1
-          line += 1
-          puts format(MSG_ALERT_FILE, file, line, column)
-          puts MSG_ALERT_DESCRIB
-          puts ''
-        end
       end
     end
   end

data/lib/phpcop/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Phpcop
-  VERSION = '0.4.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phpcop
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jeremy VAILLANT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport