Merge branch 'master' into features/csslint

Conflicts:
	test/unit/pre-commit/cli_test.rb

Author: mpapis

.travis.yml

@@ -10,8 +10,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx
 matrix:
-  allow_failures:
-    - rvm: rbx
   fast_finish: true

Gemfile

@@ -11,11 +11,4 @@ group :development do
   gem "redcarpet", :platforms => [:mri_20]
   gem "simplecov", :platforms => [:mri_20]
   gem "coveralls", :platforms => [:mri_20]
-
-  # rubinius support
-  gem "rubysl-json",      :platforms => [:rbx]
-  gem "rubysl-mutex_m",   :platforms => [:rbx]
-  gem "rubysl-open3",     :platforms => [:rbx]
-  gem "rubysl-singleton", :platforms => [:rbx]
-  gem "rubysl-stringio",  :platforms => [:rbx]
 end

lib/plugins/pre_commit/configuration/providers/git_old.rb

@@ -0,0 +1,28 @@
+require 'plugins/pre_commit/configuration/providers/git'
+
+module PreCommit
+  class Configuration
+    class Providers
+
+      class GitOld < Git
+
+        def self.priority
+          11
+        end
+
+        def [](name)
+          value = super(name)
+          if
+            name == :checks && value && ! value.kind_of?(Array)
+          then
+            value = value.chomp.split(/,\s*/).map(&:to_sym) || []
+            update(name, value) unless value.empty?
+          end
+          value
+        end
+
+      end
+
+    end
+  end
+end

test/unit/plugins/pre_commit/configuration/providers/git_old_test.rb

@@ -0,0 +1,37 @@
+require 'minitest_helper'
+require 'plugins/pre_commit/configuration/providers/git_old'
+
+describe PreCommit::Configuration::Providers::GitOld do
+  subject do
+    PreCommit::Configuration::Providers::GitOld
+  end
+
+  it "has priority" do
+    subject.priority.must_equal(11)
+  end
+
+  describe :filesystem do
+    before do
+      create_temp_dir
+      start_git
+      sh "git config pre-commit.checks jshint,local"
+      sh "git config pre-commit.other jshint,local"
+    end
+    after(&:destroy_temp_dir)
+
+    it "reads values" do
+      example = subject.new
+      example[:test1].must_equal(nil)
+      example[:checks].must_equal([:jshint, :local])
+      example[:other].must_equal("jshint,local")
+    end
+
+    it "saves values" do
+      example = subject.new
+      example[:checks]
+      example[:other]
+      sh("git config pre-commit.checks").strip.must_equal("[:jshint, :local]")
+      sh("git config pre-commit.other").strip.must_equal("jshint,local")
+    end
+  end
+end

test/unit/pre-commit/cli_test.rb

@@ -45,7 +45,7 @@
     cli.execute.must_equal(true)
     $stderr.string.must_equal('')
     $stdout.string.gsub(/\s+\n/,"\n").must_equal(<<-EXPECTED)
-Available providers: default(0) git(10) yaml(20)
+Available providers: default(0) git(10) git_old(11) yaml(20)
 Available checks   : before_all ci closure coffeelint console_log csslint debugger gemfile_path jshint jslint local merge_conflict migration nb_space php pry rspec_focus rubocop ruby_symbol_hashrockets tabs whitespace
 Default   checks   : white_space console_log debugger pry tabs jshint migrations merge_conflict local nb_space
 Enabled   checks   : white_space console_log debugger pry tabs jshint migrations merge_conflict local nb_space
@@ -74,7 +74,7 @@
     cli.execute.must_equal(true)
     $stderr.string.must_equal('')
     $stdout.string.gsub(/\s+\n/,"\n").must_equal(<<-EXPECTED)
-Available providers: default(0) git(10) yaml(20)
+Available providers: default(0) git(10) git_old(11) yaml(20)
 Available checks   : before_all ci closure coffeelint console_log csslint debugger gemfile_path jshint jslint local merge_conflict migration nb_space php pry rspec_focus rubocop ruby_symbol_hashrockets tabs whitespace
 Default   checks   : white_space console_log debugger pry tabs jshint migrations merge_conflict local nb_space
 Enabled   checks   : console_log debugger pry tabs jshint migrations merge_conflict local nb_space
@@ -94,7 +94,7 @@
     cli.execute.must_equal(true)
     $stderr.string.must_equal('')
     $stdout.string.gsub(/\s+\n/,"\n").must_equal(<<-EXPECTED)
-Available providers: default(0) git(10) yaml(20)
+Available providers: default(0) git(10) git_old(11) yaml(20)
 Available checks   : before_all ci closure coffeelint console_log csslint debugger gemfile_path jshint jslint local merge_conflict migration nb_space php pry rspec_focus rubocop ruby_symbol_hashrockets tabs whitespace
 Default   checks   : white_space console_log debugger pry tabs jshint migrations merge_conflict local nb_space
 Enabled   checks   : white_space console_log debugger pry tabs jshint migrations merge_conflict local nb_space