checker 0.0.4 → 0.0.4.1

data/checker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'checker'
-  s.version     = '0.0.4'
+  s.version     = '0.0.4.1'
   s.date        = '2012-07-09'
   s.summary     = "Syntax checker for various files"
   s.description = "A collection of modules which every is designed to check syntax for specific files."

data/lib/checker.rb

@@ -2,7 +2,7 @@ require 'colorize'
 
 require 'checker/core_ext'
 
-require "checker/modules/all"
+require "checker/modules/base"
 require "checker/modules/ruby"
 require "checker/modules/haml"
 require "checker/modules/pry"

data/lib/checker/cli.rb

@@ -1,11 +1,56 @@
 require 'checker'
-require 'checker/cli/execute'
 
 module Checker
-  module Modules; end
-
   class CLI
+    class << self
+      def execute
+        if ARGV.size == 0
+          modules = get_modules_to_check
+        else
+          modules = ARGV.map(&:downcase)
+        end
+
+        if modules.empty? || modules.include?('all')
+          modules = available_modules
+        end
+
+        check_module_availability(modules) do |result|
+          puts "Modules not available: #{result.join(", ")}.\n"
+          puts "Available: all, #{available_modules.join(", ")}\n"
+          puts "Check your git config checker.check\n"
+          exit 1
+        end
+
+        checked = []
+        files = modified_files
+        modules.each do |mod|
+          klass = "Checker::Modules::#{mod.downcase.capitalize}".constantize
+          checked << klass.new(files.dup).check
+        end
+        exit (checked.all_true? ? 0 : 1)
+      end
+
+      private
+      def available_modules
+        Checker::Modules.constants.map(&:to_s).map(&:downcase) - ['base']
+      end
+
+      def check_module_availability(modules)
+        result = modules - available_modules
+        unless result.empty?
+          if block_given?
+            yield(result)
+          end
+        end
+      end
+
+      def get_modules_to_check
+        `git config checker.check`.chomp.split(",").map(&:strip)
+      end
 
-    include Execute
+      def modified_files
+        @modified_files ||= `git status --porcelain | egrep "^(A |M |R ).*" | awk ' { if ($3 == "->") print $4; else print $2 } '`.split
+      end
+    end
   end
 end

data/lib/checker/core_ext.rb

@@ -1,5 +1,3 @@
-require 'checker/utils'
-
 class CoreExt
   def self.constantize(camel_cased_word)
     names = camel_cased_word.split('::')

data/lib/checker/modules/base.rb

@@ -0,0 +1,124 @@
+module Checker
+  module Modules
+    class Base < Struct.new(:files)
+      def check
+        print_module_header
+        prepare_check
+        check_executable or return true
+        select_proper_files
+        check_all_files
+        valid?
+      end
+
+      def valid?
+        @results.all_true?
+      end
+
+      private
+
+      def print_module_header
+        color "[ #{name} ]\n", :light_blue
+      end
+
+      def prepare_check
+        @files_to_check = []
+        @results = []
+      end
+
+      def check_executable
+        if check_for_executable
+          true
+        else
+          color "executable not found, skipping...\n", :magenta
+          false
+        end
+      end
+
+      def check_for_executable
+        true
+      end
+
+      def select_proper_files
+        @files_to_check = self.files.select { |f|
+          self.class.extensions.map { |ex| f.ends_with?(ex) }.any?
+        }
+      end
+
+      def check_all_files
+        @results = @files_to_check.map do |file|
+          color "Checking #{file}...", :yellow
+          check_one(file)
+        end
+      end
+
+      def self.extensions *args
+        @extensions ||= []
+        if args.empty?
+          @extensions
+        else
+          @extensions += args
+        end
+      end
+
+      def plain_command(cmd, options = {})
+        exitstatus = system(cmd)
+        show_output(exitstatus, options)
+        exitstatus
+      end
+
+      def command(cmd, options = {})
+        if options[:use_bundler] == true
+          if use_bundler?
+            cmd = "bundle exec #{cmd}"
+          end
+        end
+
+        cmd = rvm_command(cmd) if use_rvm?
+        cmd << " #{options[:append]}" if options[:append]
+        exitstatus = execute(cmd)
+        show_output(exitstatus, options)
+        exitstatus
+      end
+
+      def show_output(exitstatus, options)
+        unless options[:show_output] == false
+          if exitstatus
+            puts " [OK]".green
+          else
+            puts " [FAIL]".red
+          end
+        end
+      end
+
+
+      def execute(cmd)
+        system(cmd)
+      end
+
+      def color(str, color)
+        print str.colorize(color) 
+      end
+
+      def name
+        self.class.to_s.split('::').last.upcase
+      end
+
+      def use_bundler?
+        File.exists?("Gemfile.lock") 
+      end
+
+      def use_rvm?
+        File.exists?(".rvmrc") && File.exists?(rvm_shell)
+      end
+
+      def rvm_shell
+        File.join(ENV.fetch('rvm_path', ''), 'bin/rvm-shell')
+      end
+
+      def rvm_command(command)
+        rvm_version = `echo $rvm_ruby_string`.chomp
+        "#{rvm_shell} '#{rvm_version}' -c '#{command}'"
+      end
+    end
+  end
+end

data/lib/checker/modules/coffeescript.rb

@@ -1,33 +1,14 @@
 module Checker
   module Modules
-    class Coffeescript
-      def self.check
-        Utils.color("> Coffeescript syntax <\n", :light_blue)
-
-        unless Coffeescript.check_for_executable
-          Utils.color("coffee executable NOT FOUND, OMITTING...\n", :yellow)
-          return true
-        end
-
-        files = Utils.files_modified
-        files.delete_if {|f| !f.ends_with?(".coffee")}
-
-        files.map! do |f|
-          Utils.color("Checking #{f}...", :yellow)
-          Coffeescript.check_one(f)
-        end
-
-        files.all_true?
-      end
-
-      def self.check_one(file)
-        Utils.plain_command("cat #{file} | egrep -v '^//=' | coffee -sc > /dev/null")
+    class Coffeescript < Base
+      extensions 'coffee'
+      private
+      def check_one(file)
+        plain_command("cat #{file} | egrep -v '^//=' | coffee -sc > /dev/null")
       end
 
-      def self.check_for_executable
-        cmd = "coffee -v"
-        system(cmd)
-        $?.exitstatus == 0
+      def check_for_executable
+        command('coffee -v', :show_output => false, :append => ">> /dev/null 2>&1")
       end
     end
   end

data/lib/checker/modules/haml.rb

@@ -1,22 +1,10 @@
 module Checker
   module Modules
-    class Haml
-      def self.check
-        Utils.color("> HAML syntax <\n", :light_blue)
-
-        files = Utils.files_modified
-        files.delete_if {|f| !f.ends_with?(".haml")}
-
-        files.map! do |f|
-          Utils.color("Checking #{f}...", :yellow)
-          Haml.check_one(f)
-        end
-
-        files.all_true?
-      end
-
-      def self.check_one(file)
-        Utils.plain_command("haml #{file} > /dev/null")
+    class Haml < Base
+      extensions 'haml'
+      private
+      def check_one(file)
+        plain_command("haml --check #{file} >> /dev/null")
       end
     end
   end

data/lib/checker/modules/pry.rb

@@ -1,21 +1,15 @@
 module Checker
   module Modules
-    class Pry
-      def self.check
-        Utils.color("> binding.pry occurence <\n", :light_blue)
+    class Pry < Base
+      extensions 'rb'
 
-        files = Utils.files_modified
-
-        files.map! do |f|
-          Utils.color("Checking #{f}...", :yellow)
-          [Pry.check_for_binding_pry(f), Pry.check_for_binding_remote_pry(f)].all_true?
-        end
-
-        files.all_true?
+      private
+      def check_one file
+        [check_for_binding_pry(file), check_for_binding_remote_pry(file)].all_true?
       end
 
-      def self.check_for_binding_pry(file)
-        result = `grep -n "binding.pry" #{file}`.chomp
+      def check_for_binding_pry(file)
+        result = `grep -n "binding\\.pry" #{file}`.chomp
 
         unless result.empty?
           puts " pry -> FAIL, ".red
@@ -27,8 +21,8 @@ module Checker
         result.empty?
       end
 
-      def self.check_for_binding_remote_pry(file)
-        result = `grep -n "binding.remote_pry" #{file}`.chomp
+      def check_for_binding_remote_pry(file)
+        result = `grep -n "binding\\.remote_pry" #{file}`.chomp
 
         unless result.empty?
           puts " remote_pry -> FAIL".red

data/lib/checker/modules/ruby.rb

@@ -1,22 +1,10 @@
 module Checker
   module Modules
-    class Ruby
-      def self.check
-        Utils.color("> Ruby syntax <\n", :light_blue)
-        
-        files = Utils.files_modified
-        files.delete_if {|f| !f.ends_with?(".rb")}
-
-        files.map! do |f|
-          Utils.color("Checking #{f}...", :yellow)
-          Ruby.check_one(f)
-        end
-
-        files.all_true?
-      end
-
-      def self.check_one(file)
-        Utils.command("ruby -c #{file}", :append => ">> /dev/null")
+    class Ruby < Base
+      extensions 'rb'
+      private
+      def check_one(file)
+        command("ruby -c #{file}", :append => ">> /dev/null")
       end
     end
   end

data/lib/checker/modules/sass.rb

@@ -1,35 +1,14 @@
 module Checker
   module Modules
-    class Sass
-      def self.check
-        Utils.color("> Sass syntax <\n", :light_blue)
-
-        unless Sass.check_for_executable
-          Utils.color("sass executable NOT FOUND, OMITTING...\n", :magenta)
-          return true
-        end
-
-        files = Utils.files_modified
-        files.delete_if {|f| !f.ends_with?(".scss") and !f.ends_with?(".sass")}
-
-        files.map! do |f|
-          Utils.color("Checking #{f}...", :yellow)
-          Sass.check_one(f)
-        end
-
-        files.all_true?
-      end
-
-      def self.check_one(file)
-        cmd = "sass #{file}"
-        Utils.command(cmd, :use_bundler => true, :append => ">> /dev/null")
+    class Sass < Base
+      extensions 'scss', 'sass'
+      private
+      def check_one(file)
+        command("sass #{file}", :use_bundler => true, :append => ">> /dev/null")
       end
 
-      def self.check_for_executable
-        return @exitstatus unless @exitstatus.nil?
-        cmd = "sass -v"
-        Utils.command(cmd, :use_bundler => true, :show_output => false, :append => ">> /dev/null")
-        @exitstatus = ($?.exitstatus == 0)
+      def check_for_executable
+        command("sass -v", :use_bundler => true, :show_output => false, :append => ">> /dev/null 2>&1")
       end
     end
   end

metadata

@@ -1,35 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: checker
-version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  - 1
+  version: 0.0.4.1
 platform: ruby
-authors:
+authors: 
 - Jacek Jakubik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-09 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: colorize
-  requirement: &70118335122520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 8
         version: 0.5.8
   type: :runtime
-  prerelease: false
-  version_requirements: *70118335122520
-description: A collection of modules which every is designed to check syntax for specific
-  files.
+  version_requirements: *id001
+description: A collection of modules which every is designed to check syntax for specific files.
 email: jacek.jakubik@netguru.pl
-executables:
+executables: 
 - checker
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG
 - README.md
@@ -37,37 +48,42 @@ files:
 - checker.gemspec
 - lib/checker.rb
 - lib/checker/cli.rb
-- lib/checker/cli/execute.rb
 - lib/checker/core_ext.rb
-- lib/checker/modules/all.rb
+- lib/checker/modules/base.rb
 - lib/checker/modules/coffeescript.rb
 - lib/checker/modules/haml.rb
 - lib/checker/modules/pry.rb
 - lib/checker/modules/ruby.rb
 - lib/checker/modules/sass.rb
-- lib/checker/utils.rb
+has_rdoc: true
 homepage: http://github.com/netguru/checker
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Syntax checker for various files
 test_files: []
+

data/lib/checker/cli/execute.rb

@@ -1,42 +0,0 @@
-module Checker
-  class CLI
-    module Execute
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def execute
-          if ARGV.size == 0
-            modules = Utils.get_modules_to_check
-          else
-            modules = ARGV.map(&:downcase)
-          end
-          ## by default lets check all
-          if modules.empty?
-            modules = ["all"]
-          end
-
-          ## check all the modules
-          if modules.include?("all")
-            exit (Checker::Modules::All.check ? 0 : 1)
-          else
-            Utils.check_module_availability(modules) do |result|
-              puts "Modules not available: #{result.join(", ")}.\n"
-              puts "Available: #{Utils.available_modules.join(", ")}\n"
-              puts "Check your git config checker.check\n"
-              exit 1
-            end
-
-            checked = []
-            modules.each do |mod|
-              klass = "Checker::Modules::#{mod.downcase.capitalize}".constantize
-              checked << klass.check
-            end
-            exit (checked.all_true? ? 0 : 1)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/checker/modules/all.rb

@@ -1,16 +0,0 @@
-module Checker
-  module Modules
-    ## simple wrapper, to call every module
-    class All
-      def self.check
-        checked = []
-        constants = Utils.available_modules - ["all"]
-        constants.each do |const|
-          klass = "Checker::Modules::#{const.capitalize}".constantize
-          checked << klass.check
-        end
-        checked.all_true?
-      end
-    end
-  end
-end

data/lib/checker/utils.rb

@@ -1,83 +0,0 @@
-class Utils
-  def self.files_modified
-    @files_modified ||= `git status --porcelain | egrep "^(A |M |R ).*" | awk ' { if ($3 == "->") print $4; else print $2 } '`.split
-    @files_modified.dup
-  end
-
-  def self.use_bundler?
-    File.exists?("Gemfile.lock")
-  end
-
-  def self.use_rvm?
-    File.exists?(".rvmrc") && File.exists?(rvm_shell)
-  end
-
-  def self.rvm_command(command)
-    rvm_version = `echo $rvm_ruby_string`.chomp
-    # puts "Using '#{rvm_version}' version"
-    cmd = "#{rvm_shell} '#{rvm_version}' -c '#{command}'"
-    cmd
-  end
-
-  def self.rvm_shell
-    File.join(ENV.fetch('rvm_path', ''), 'bin/rvm-shell')
-  end
-
-  def self.show_output(exitstatus, options)
-    unless options[:show_output] == false
-      if exitstatus
-        puts " [OK]".green
-      else
-        puts " [FAIL]".red
-      end
-    end
-  end
-
-  def self.plain_command(cmd, options = {})
-    exitstatus = system(cmd)
-    Utils.show_output(exitstatus, options)
-    exitstatus
-  end
-
-  def self.command(cmd, options = {})
-    if options[:use_bundler] == true
-      if Utils.use_bundler?
-        cmd = "bundle exec #{cmd}"
-      end
-    end
-
-    cmd = Utils.rvm_command(cmd) if Utils.use_rvm?
-    cmd << " #{options[:append]}" if options[:append]
-    exitstatus = Utils.execute(cmd)
-    Utils.show_output(exitstatus, options)
-    exitstatus
-  end
-
-  def self.execute(cmd)
-    # system("echo #{cmd}")
-    system(cmd)
-  end
-
-  def self.available_modules
-    Checker::Modules.constants.map(&:to_s).map(&:downcase)
-  end
-
-  def self.check_module_availability(modules)
-    constants = self.available_modules
-    result = modules - (constants & modules)
-    unless result.empty?
-      if block_given?
-        yield(result)
-      end
-    end
-  end
-
-  def self.get_modules_to_check
-    `git config checker.check`.chomp.split(",").map(&:strip)
-  end
-
-  def self.color(str, color)
-    print str.colorize(color)
-  end
-end
-