codeclimate-yaml 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae155d660630ed6c713004789de2769e17b3b945
-  data.tar.gz: 608a2c96b26ba25431cdd1af2494e456a0e05511
+  metadata.gz: d688aa913be9902d9b855c6f770a55128c220989
+  data.tar.gz: 1006cb799006206bbc404fd20e872a590368b1ad
 SHA512:
-  metadata.gz: 1b8867df04a24d83ca590a9cce5ab200d3eae130a56f29e5629e102bfa133e94135d37be004eb86416f940e2d54285100bf0259ad293a1273f13be11c1d234d8
-  data.tar.gz: ff48f6a029744d085a9caaffc29847facef02316327cd66d81da69faf1595919f387cf84a4080a4121208253ee5bfcdf9a6448889fa33712d076032efae9795f
+  metadata.gz: 318e6a4f8496e5335e80441679813abff30ddb8f0eb4aeff4e35179aeb25f7c060ede8e4f072dd1638167d2736014e56428533888cf6266f839e5288700fdcc9
+  data.tar.gz: e828e0c1119b3d5f13990f84a9a2806c88f21d49bcbdca8ecb49e79dc3f1ec98c24312e2f2fd2095b9c2c5180d9ce0759367e13a6d056fcc2fe8ef54001e2ff1

data/lib/cc/yaml/nodes/mapping.rb

@@ -1,7 +1,7 @@
 module CC::Yaml
   module Nodes
     class Mapping < Node
-      INCOMPATIBLE_KEYS_WARNING = "Analysis settings for Languages and Engines are both valid but mutually exclusive. Note: command line analysis requires an Engines configuration.".freeze
+      INCOMPATIBLE_KEYS_WARNING = "Use either a Languages key or an Engines key, but not both. They are mutually exclusive.".freeze
 
       def self.mapping
         @mapping ||= superclass.respond_to?(:mapping) ? superclass.mapping.dup : {}
@@ -187,19 +187,7 @@ module CC::Yaml
 
       def check_incompatibility(key)
         if creates_incompatibility?(key)
-          warning(incompatibility_message(key), key)
-        end
-      end
-
-      def incompatibility_message(key)
-        "#{extant_engines_or_languages_key} key already found, dropping key: #{key}. #{INCOMPATIBLE_KEYS_WARNING}"
-      end
-
-      def extant_engines_or_languages_key
-        if self["engines"]
-          "engines"
-        elsif self["languages"]
-          "languages"
+          warning(INCOMPATIBLE_KEYS_WARNING, key)
         end
       end
 

data/lib/cc/yaml/parser/psych.rb

@@ -4,6 +4,8 @@ require 'delegate'
 module CC::Yaml
   module Parser
     class Psych
+      WARNING_NO_ANALYSIS_KEY_FOUND = "No languages or engines key found. Must have analysis key.".freeze
+
       class SetNode < DelegateClass(::Psych::Nodes::Mapping)
         def children
           super.select.with_index { |_,i| i.even? }
@@ -79,12 +81,18 @@ module CC::Yaml
         parsed   = @value if @value.is_a? ::Psych::Nodes::Node
         parsed ||= ::Psych.parse(@value)
         accept(root, parsed)
+        check_for_analysis_key(root)
         root
       rescue ::Psych::SyntaxError => error
         root.verify
         root.warnings.clear
         root.error("syntax error: %s", error.message)
-        root
+      end
+
+      def check_for_analysis_key(root)
+        unless root.engines? || root.languages?
+          root.warnings << WARNING_NO_ANALYSIS_KEY_FOUND
+        end
       end
 
       def accept(node, value)

data/lib/cc/yaml/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Yaml
-    VERSION = "0.0.7".freeze
+    VERSION = "0.0.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: secure_string