codeclimate-yaml 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b83201137eff338b53df17bcd0c40dc6c4080d
-  data.tar.gz: 765030581dbb359be2b1a64cbfb3c8afb32b7f1a
+  metadata.gz: 09ba5979113592bfe69c17ea1ea515883bf8b236
+  data.tar.gz: b8d0034a571105f3e3f29807fc9edce39e459c8e
 SHA512:
-  metadata.gz: bdcc647a18fdd90f1641ba26e9f495f8d9f1d21a2fddafb88a372e616615e9d0e749fe0dc0093e2d33886403e1abdc61a7b1df2c0c8a319a33f7cb18652774c7
-  data.tar.gz: b255602577aeffcf93a4f642b21e5b69c60143203655fedd2e9aa4d1eb8a6b16f547ed478edf90b6406a4a26087a6813ff942079d0b941ce94b4250209d18b71
+  metadata.gz: b1aad8e2a33fa800765cd2f1997524dbb4604911b454695410ae0b02e3fad04a3f24046301fc568bcb982e029b231cb074d6d7f2ad28092c22286ebc889e7cdd
+  data.tar.gz: ebb9b13db51c9ed988e66c009dd31ee4d08cff6d18c56bb7b4936e66ab5bba2d2305e97479cdbcecab53b257ccaebb6f798eca7bc8b8520a6cfccd527adf633c

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

@@ -0,0 +1,32 @@
+module CC
+  module Yaml
+    module Nodes
+      class Language < Scalar
+        LANGUAGES = %w[Ruby JavaScript Python PHP].freeze
+
+        def valid?
+          LANGUAGES.include?(name)
+        end
+
+        def name
+          to_s
+        end
+
+        def appears_to_be_mispelled_version_of?
+          if !valid? && downcased_language_map.has_key?(name.downcase)
+            downcased_language_map[self]
+          else
+            false
+          end
+        end
+
+        def downcased_language_map
+          @downcased_language_map ||=
+          LANGUAGES.each_with_object({}) do |language, obj|
+            obj[language.downcase] = language
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module CC
+  module Yaml
+    module Nodes
+      class LanguageList < Sequence
+        type Language
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 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
+
       def self.mapping
         @mapping ||= superclass.respond_to?(:mapping) ? superclass.mapping.dup : {}
       end
@@ -65,17 +67,12 @@ module CC::Yaml
       def set_warnings(key)
         if subnode_for(key)
           check_duplicates(key)
-        elsif key == "languages"
-          warning("analysis by language not available via CLI. Use engines configuration instead.")
+          check_incompatibility(key)
         else
           warning("unexpected key %p, dropping", key)
         end
       end
 
-      def check_duplicates(key)
-        warning("has multiple %p entries, keeping last entry", key) if self[key]
-      end
-
       def []=(key, value)
         if mapped_key = mapped_key(key)
           unless value.is_a? Node
@@ -178,11 +175,37 @@ module CC::Yaml
 
       protected
 
-        def dup_values
-          duped_mapping = @mapping.map { |key, value| [key.dup, value.dup] }
-          @mapping      = Hash[duped_mapping]
-          self
+      def dup_values
+        duped_mapping = @mapping.map { |key, value| [key.dup, value.dup] }
+        @mapping      = Hash[duped_mapping]
+        self
+      end
+
+      def check_duplicates(key)
+        warning("has multiple %p entries, keeping last entry", key) if self[key]
+      end
+
+      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"
+        end
+      end
+
+      def creates_incompatibility?(key)
+        (key == "engines" && self["languages"]) || (key == "languages" && self["engines"])
+      end
     end
   end
 end

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

@@ -7,6 +7,7 @@ module CC
       class Root < Mapping
         map :engines, to: EngineList
         map :exclude_paths, to: GlobList
+        map :languages, to: LanguageList
         map :ratings, to: Ratings
 
         def initialize

data/lib/cc/yaml/nodes.rb

@@ -5,6 +5,8 @@ module CC
       autoload :EngineList, "cc/yaml/nodes/engine_list"
       autoload :Glob, "cc/yaml/nodes/glob"
       autoload :GlobList, "cc/yaml/nodes/glob_list"
+      autoload :Language, "cc/yaml/nodes/language"
+      autoload :LanguageList, "cc/yaml/nodes/language_list"
       autoload :Mapping, "cc/yaml/nodes/mapping"
       autoload :Node, "cc/yaml/nodes/node"
       autoload :OpenMapping, "cc/yaml/nodes/open_mapping"

data/lib/cc/yaml/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Yaml
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: secure_string
@@ -50,6 +50,8 @@ files:
 - lib/cc/yaml/nodes/engine_list.rb
 - lib/cc/yaml/nodes/glob.rb
 - lib/cc/yaml/nodes/glob_list.rb
+- lib/cc/yaml/nodes/language.rb
+- lib/cc/yaml/nodes/language_list.rb
 - lib/cc/yaml/nodes/mapping.rb
 - lib/cc/yaml/nodes/node.rb
 - lib/cc/yaml/nodes/open_mapping.rb