codeqa 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c958a6611a0a955d10a405401ee880c160110143
-  data.tar.gz: 16f4f0891d4d30e803949670068762f5771a8dc6
+  metadata.gz: e9b19bbc570eb76e3e5a6254ead39215713a363d
+  data.tar.gz: 061d9968aaacf02778dda744ac40a3003b59bb86
 SHA512:
-  metadata.gz: 0089efc75482dca33f4da9fd752be74647d1e1b19f5a299a70e2cd31b48dfe317bb82fb0fe95453ac14af77aa94928184f9896dd16c147d6b87d4bc8763f5b26
-  data.tar.gz: adc7c3549c7d1dbd44d210924388a3923a819256eaacb9c91c6564e5c198b801efdbe55737386927a173ff4287cf5177637a256cf2d0e6d0ca2465628e5959e4
+  metadata.gz: 465e4bba1c98ac836288de4b6e5d88dacfb972268a0088cc959e365d3bf108c7b464ca1c36831becbf54d1db53f3c2a511c095b38b50395d161c97c599d6d619
+  data.tar.gz: 2f0daf5c332a5fe9b18b9bbb31eb735960a56f63898ff8ab0e16f3d0e386e4adc20ad26c85d7731b02a86f34d653fbefa449bbde991cec35ec18ce7ae047d14a

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.5.0
+  * INCOMPATIBLE CHANGE: new config layout (now config has to be in .codeqa/config.rb)
+  * multiple hooks in any language is allowed (create scripts in .codeqa/hooks)
 0.2.1
   * fixing missing ERB error
 0.2.0

data/README.md

@@ -33,9 +33,9 @@ Since Version 0.3 codeqa uses ruby for configuration, therefore the config file
 is now named `.codeqa.rb`. The loading of configuration files is still the same,
 meaning we have to following load order:
 
-1. Initialize with default settings (see `config/default..rb`)
-2. load `.codeqa.rb` from your home directory and merge it with the defaults.
-3. load `.codeqa.rb` placed in the project root, which is determined by finding
+1. Initialize with default settings (see `config/default.rb`)
+2. load `.codeqa/config.rb` from your home directory and merge it with the defaults.
+3. load `.codeqa/config.rb` placed in the project root, which is determined by finding
   the closest `.git` folder.
 
 Both the config in your home directory and the project config file are optional
@@ -90,6 +90,10 @@ end
   - CheckYard (checks YARD for warnings)
 - CheckRubySyntax (runs file though `ruby -c`, use RubocopLint if possible)
 
+## Hooks
+Since version 0.5 it's possible to run any scripts which are placed at .codeqa/hooks . If they exit with code <> 0
+the commit is not allowed. The scripts have to be executable.
+
 ## Contributing
 
 1. Fork it

data/bin/codeqa

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.join(File.dirname(__FILE__), '../lib') if ENV['CODEQA_DEV']
+$: << File.join(File.dirname(__FILE__), '../lib') unless $PROGRAM_NAME == 'codeqa'
 require 'rubygems'
 require 'codeqa'
 

data/lib/codeqa.rb

@@ -8,25 +8,8 @@ module Codeqa
     end
 
     def install(root='.')
-      require 'fileutils'
-      git_root = Pathname.new "#{root}/.git"
-      if File.exist?(git_root)
-        pre_commit_path = git_root.join 'hooks', 'pre-commit'
-        if File.exist?(pre_commit_path)
-          # $stdout.puts 'moving away the old pre-commit hook -> pre-commit.bkp'
-          FileUtils.mv(pre_commit_path,
-                       git_root.join('hooks', 'pre-commit.bkp'),
-                       :force => true)
-        end
-        pre_commit_template_path = Codeqa.root.join('lib', 'templates', 'pre-commit')
-        # $stdout.puts 'placing new pre-commit hook'
-        FileUtils.cp(pre_commit_template_path, pre_commit_path)
-        FileUtils.chmod('+x', pre_commit_path)
-        true
-      else
-        # $stderr.puts "#{root} is not in a git root"
-        false
-      end
+      require 'codeqa/installer'
+      Codeqa::Installer.call(root)
     end
 
     def check(filename, options={})

data/lib/codeqa/configuration.rb

@@ -47,7 +47,7 @@ module Codeqa
 
   private
 
-    DOTFILE = '.codeqa.rb'
+    DOTFILE = '.codeqa/config.rb'
 
     def home_dir
       @home_dir ||= Dir.home

data/lib/codeqa/installer.rb

@@ -0,0 +1,54 @@
+require 'fileutils'
+
+module Codeqa
+  class Installer
+    def self.call(app_root)
+      new(app_root).call
+    end
+
+    def initialize(app_root)
+      @app_root=Pathname.new(File.expand_path(app_root))
+    end
+
+    def call
+      generate_dot_codeqa
+      install_codeqa_git_hook
+    end
+
+    private
+    def dot_path(*args)
+      app_path('.codeqa').join(*args)
+    end
+
+    def app_path(*args)
+      @app_root.join(*args)
+    end
+
+    private
+    def template_path(*args)
+      Codeqa.root.join('lib', 'templates').join(*args)
+    end
+
+    def install_codeqa_git_hook
+      git_root = app_path.join(".git")
+      pre_commit_path = git_root.join 'hooks', 'pre-commit'
+
+      return false unless File.exist?(git_root)
+      return false if File.exist?(pre_commit_path)
+
+      FileUtils.mv(pre_commit_path,
+                   git_root.join('hooks', 'pre-commit.bkp'),
+                   :force => true)
+      pre_commit_path.make_symlink('../../.codeqa/git_hook.rb') #relative path!
+      true
+    end
+
+    def generate_dot_codeqa
+      dot_path.mkdir unless dot_path.exist?
+      dot_path("hooks").mkdir unless dot_path("hooks").exist?
+      FileUtils.cp(template_path('base_hook.rb'), dot_path("hooks","base.rb")) unless dot_path("hooks","base.rb").exist?
+      FileUtils.cp(template_path('git_hook.rb'), dot_path("git_hook.rb")) unless  dot_path("git_hook.rb").exist?
+      dot_path("git_hook.rb").chmod(0775)
+    end
+  end
+end

data/lib/codeqa/version.rb

@@ -1,3 +1,3 @@
 module Codeqa
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/templates/{pre-commit → base_hook.rb}

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# running codeqa checks on changes files
+
 def staged_files
   @staged_files ||= begin
     files = `git diff --cached --name-only --diff-filter=ACM`.split

data/lib/templates/git_hook.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+APP_ROOT=Pathname.new(File.expand_path(File.join(File.dirname(__FILE__),'..','..')))
+HOOKS_PATH=APP_ROOT.join('.codeqa','hooks')
+
+
+#run each hook if one gives an error then commit will fail
+
+HOOKS_PATH.children(false).sort.each do |filename|
+  exe=HOOKS_PATH.join(filename)
+  ok=system(%{#{exe} APP_ROOT="#{APP_ROOT}"})
+  exit 1 unless ok
+end
+
+exit 0

data/spec/lib/codeqa_spec.rb

@@ -42,11 +42,11 @@ describe Codeqa do
     end
 
     it 'should copy pre-commit hook into project git folder' do
-      template_location = Codeqa.root.join('lib', 'templates', 'pre-commit')
-      hook_location = project_dir.join('.git', 'hooks', 'pre-commit')
-      expect(FileUtils).to receive(:cp).with(template_location, hook_location)
-      allow(FileUtils).to receive(:chmod)
       Codeqa.install project_dir.to_s
+      expect(project_dir.join('.codeqa')).to be_exist
+      expect(project_dir.join('.codeqa','hooks')).to be_exist
+      expect(project_dir.join('.codeqa','hooks','base.rb')).to be_exist
+      expect(project_dir.join('.codeqa','git_hook.rb')).to be_exist
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeqa
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Peter Schrammel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -108,7 +108,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - ".vimrc"
 - CHANGELOG
@@ -138,13 +137,15 @@ files:
 - lib/codeqa/checkers/rubocop_full.rb
 - lib/codeqa/checkers/rubocop_lint.rb
 - lib/codeqa/configuration.rb
+- lib/codeqa/installer.rb
 - lib/codeqa/runner.rb
 - lib/codeqa/runner_decorator.rb
 - lib/codeqa/sourcefile.rb
 - lib/codeqa/utils/check_errors.rb
 - lib/codeqa/utils/erb_sanitizer.rb
 - lib/codeqa/version.rb
-- lib/templates/pre-commit
+- lib/templates/base_hook.rb
+- lib/templates/git_hook.rb
 - spec/fixtures/erb_example.html
 - spec/fixtures/erb_example.html.erb
 - spec/fixtures/html_error.html.erb

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.2