travis-lint 1.0.0 → 1.1.0

data/.gitignore

@@ -1,6 +1,8 @@
-.DS_Store
 #~
-*~
-Gemfile.lock
 *.gem
-.rvmrc
+*.swp
+*~
+.DS_Store
+/.rvmrc
+/Gemfile.lock
+/TAGS

data/Gemfile

@@ -2,6 +2,3 @@ source "http://rubygems.org"
 
 gemspec
 
-group :test do
-  gem "rake", ">= 0.9.2.2"
-end

data/README.md

@@ -7,11 +7,12 @@
 
 ## Installation
 
-TBD: we need to do initial gem release first
+    gem install travis-lint
 
 
 ## Usage
 
+    travis-lint # inside a dir with .travis.yml
     travis-lint ./.travis.yml
     travis-lint ~/your/project/.travis.yml
 

data/lib/travis/lint/dsl.rb

@@ -3,6 +3,12 @@ require "travis/lint/validator"
 module Travis
   module Lint
     module DSL
+      def blank? object
+        # This implementation is based on rails' activesupport.  It is used
+        # under the MIT license.
+        object.respond_to?(:empty?) ? object.empty? : !object
+      end
+
       @@validators = []
 
       def validator_for(language, key, message, &validator)

data/lib/travis/lint/linter.rb

@@ -1,6 +1,7 @@
-require "active_support/core_ext/object/blank"
 require "travis/lint/dsl"
 
+require "hashr"
+
 module Travis
   module Lint
     class Linter
@@ -17,6 +18,8 @@ module Travis
       #
 
       def self.validate(hsh)
+        hsh = Hashr.new hsh
+
         issues = find_validators_for(hsh[:language]).inject([]) do |acc, val|
           acc << val.call(hsh)
           acc
@@ -32,8 +35,8 @@ module Travis
       # General
       #
 
-      validator_for :all, :language, "Language: key is mandatory" do |hsh|
-        hsh[:language].blank?
+      validator_for :all, :language, "The \"language\" key is mandatory" do |hsh|
+        blank? hsh[:language]
       end
 
 
@@ -41,8 +44,8 @@ module Travis
       # Erlang
       #
 
-      validator_for :erlang, :otp_release, "Specify OTP releases you want to test against using the :otp_release key" do |hsh|
-        hsh[:language].to_s.downcase == "erlang" && hsh[:otp_release].blank?
+      validator_for :erlang, :otp_release, "Specify OTP releases you want to test against using the \"otp_release\" key" do |hsh|
+        hsh[:language].to_s.downcase == "erlang" && blank?(hsh[:otp_release])
       end
 
 
@@ -50,8 +53,8 @@ module Travis
       # Ruby
       #
 
-      validator_for :ruby, :rvm, "Specify Ruby versions/implementations you want to test against using the :rvm key" do |hsh|
-        hsh[:language].to_s.downcase == "ruby" && hsh[:rvm].blank?
+      validator_for :ruby, :rvm, "Specify Ruby versions/implementations you want to test against using the \"rvm\" key" do |hsh|
+        hsh[:language].to_s.downcase == "ruby" && blank?(hsh[:rvm])
       end
 
       validator_for :ruby, :rvm, "Prefer jruby-18mode RVM alias to jruby" do |hsh|
@@ -81,7 +84,7 @@ module Travis
 
 
       validator_for :ruby, :language, "Language is set to Ruby but node_js key is present. Ruby builder will ignore node_js key." do |hsh|
-        hsh[:language].to_s.downcase == "ruby" && hsh[:node_js].present?
+        hsh[:language].to_s.downcase == "ruby" && ! blank?(hsh[:node_js])
       end
     end
   end

data/lib/travis/lint/runner.rb

@@ -1,8 +1,6 @@
 require "pathname"
 require "yaml"
 
-require "hashr"
-
 require "travis/lint/linter"
 
 module Travis
@@ -55,7 +53,7 @@ module Travis
       end
 
       def parsed_travis_yml
-        Hashr.new(YAML.load_file(@travis_file_path))
+        YAML.load_file(@travis_file_path)
       end
 
       def show_help

data/lib/travis/lint/version.rb

@@ -1,6 +1,6 @@
 module Travis
   module Lint
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
     Version = VERSION
   end
 end

data/spec/travis_lint_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 
 describe "A .travis.yml" do
   let(:language_key_is_mandatory) do
-    { :key => :language, :issue => "Language: key is mandatory" }
+    { :key => :language, :issue => "The \"language\" key is mandatory" }
   end
 
   let(:rvm_key_is_recommended) do
-    { :key => :rvm, :issue => "Specify Ruby versions/implementations you want to test against using the :rvm key" }
+    { :key => :rvm, :issue => "Specify Ruby versions/implementations you want to test against using the \"rvm\" key" }
   end
 
   let(:prefer_jruby18mode_over_jruby) do
@@ -25,14 +25,17 @@ describe "A .travis.yml" do
     { :key => :rvm, :issue => "rbx-2.0.0pre RVM alias is no longer provided. Please use rbx-18mode or rbx-19mode instead." }
   end
 
+  let(:otp_release_key_is_required) do
+    { :key => :otp_release, :issue => "Specify OTP releases you want to test against using the \"otp_release\" key" }
+  end
+
 
   def content_of_sample_file(name)
     path = Pathname.new(File.join("spec", "files", name)).expand_path
 
-    Hashr.new(YAML.load_file(path.to_s))
+    YAML.load_file(path.to_s)
   end
 
-
   context "that is blank" do
     it "is invalid" do
       Travis::Lint::Linter.validate({}).should include(language_key_is_mandatory)
@@ -41,8 +44,14 @@ describe "A .travis.yml" do
     end
   end
 
+  context "using String keys" do
+    it "is validates as with Symbol keys" do
+      Travis::Lint::Linter.validate({ "language" => "ruby" }).should include(rvm_key_is_recommended)
+    end
+  end
+
   context "that has language set to Ruby" do
-    context "but has no :rvm key" do
+    context "but has no \"rvm\" key" do
       it "is invalid" do
         Travis::Lint::Linter.validate({ :language => "ruby" }).should include(rvm_key_is_recommended)
         Travis::Lint::Linter.valid?(content_of_sample_file("no_rvm_key.yml")).should be_false
@@ -106,4 +115,13 @@ describe "A .travis.yml" do
       end
     end
   end
+
+  context "that has language set to erlang" do
+    context "but has no \"otp_release\" key" do
+      it "is invalid" do
+        Travis::Lint::Linter.validate({ :language => "erlang" }).should include(otp_release_key_is_required)
+        Travis::Lint::Linter.valid?({ :language => "erlang" }).should be_false
+      end
+    end
+  end
 end

data/travis-lint.gemspec

@@ -16,10 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("activesupport", ["~> 3.2.0"])
-  # activesupport 3.1 and 3.2 have a bug in HashWithIndifferentAccess that
-  # causes an undefined method exception when hash values are arrays, so we
-  # retreat to Hashr. MK.
   s.add_runtime_dependency("hashr", [">= 0.0.19"])
 
   s.add_development_dependency("rspec", ["~> 2.8.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travis-lint
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael S. Klishin
@@ -16,28 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
-        version: 3.2.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hashr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +33,11 @@ dependencies:
         - 19
         version: 0.0.19
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,7 +49,7 @@ dependencies:
         - 0
         version: 2.8.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: travis-lint is a tool that check your .travis.yml for possible issues, deprecations and so on. Recommended for all travis-ci.org users.
 email: 
 - michaelklishin@me.com
@@ -127,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Checks your .travis.yml for possible issues, deprecations and so on