codeclimate-yaml 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d782fa25bad738efd94fcc20f94902ac73d485
-  data.tar.gz: c22fdb5275b93887fefd1f6cb11a925089fd4a30
+  metadata.gz: a7245f6f455befe3f6b8ca5a7d5db3c0cc90f94d
+  data.tar.gz: 5919951b30ab401f965b8b75041be0b5e23494e9
 SHA512:
-  metadata.gz: e876bb9daf725313ac2ded6d0ded54464b4bfe57e38e4dff07aaf371d2daa51dd646dd19fd3bdc4202f3a4c05c80f1f55ede032e8cad96c6a388a4f23b01c7b3
-  data.tar.gz: bc1ff4e054002bb4b3c100805100de89adee6fd9438538860134d3a2d3c61865299f43004f69f74b53044bfc72cab9d7f2965c1d14ace12df4181acf2a4f0a83
+  metadata.gz: c5007979ccd4e0a85e85fc306ba9c6ba95a191442efb4ddab20cc6e60283f82a97c7b1ab87ade729f167904fa24842923f742cee4ed9c92b6a8bbad0183cab20
+  data.tar.gz: 0bf4693e9accf963178411d706f0629e1439c8d15fd2173f2e11e504e54bbeb0b567bb525d8fe6e578df8c993a8db754cc313682e25585bb4430a0967dc2a915

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

@@ -2,7 +2,30 @@ module CC
   module Yaml
     module Nodes
       class EngineList < OpenMapping
+        GENERIC_ERROR_MESSAGE = "The engines key should be a mapping from engine name to engine config.".freeze
+        EMPTY_ERROR_MESSAGE = "The engines key cannot be empty.".freeze
+
         default_type Engine
+
+        def verify
+          super
+          verify_not_empty
+        end
+
+        def visit_unexpected(_visitor, _value, message = nil)
+          if message
+            message = message << ". #{GENERIC_ERROR_MESSAGE}"
+          else
+            message = GENERIC_ERROR_MESSAGE
+          end
+          error(message)
+        end
+
+        private
+
+        def verify_not_empty
+          error(EMPTY_ERROR_MESSAGE) if mapping.keys.empty? && errors.empty?
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module CC::Yaml
   module Nodes
     class Mapping < Node
-      INCOMPATIBLE_KEYS_WARNING = "Use either a Languages key or an Engines key, but not both. They are mutually exclusive.".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 : {}
@@ -24,7 +24,7 @@ module CC::Yaml
           when Symbol then aliases[key.to_s] = options[:to].to_s
           when Module then mapping[key.to_s] = options[:to]
           when nil    then mapping[key.to_s] = Nodes[key]
-          else raise ArgumentError, 'unexpected value for to: %p' % options[:to]
+          else raise ArgumentError, "unexpected value for to: %p" % options[:to]
           end
         end
       end
@@ -153,7 +153,7 @@ module CC::Yaml
       def verify_errors
         @mapping.delete_if do |key, value|
           if value.errors?
-            warning "dropping %p section: %s", key, value.errors.join(', ')
+            error "invalid %p section: %s", key, value.errors.join(", ")
             true
           end
         end

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

@@ -65,23 +65,23 @@ module CC
         end
 
         def visit_mapping(visitor, value)
-          error("unexpected mapping")
+          visit_unexpected(visitor, value, "unexpected mapping")
         end
 
         def visit_pair(visitor, key, value)
-          error("unexpected pair")
+          visit_unexpected(visitor, value, "unexpected pair")
         end
 
         def visit_scalar(visitor, type, value, implicit = true)
-          error("unexpected scalar") unless type == :null
+          visit_unexpected(visitor, value, "unexpected scalar") unless type == :null
         end
 
         def visit_sequence(visitor, value)
-          error("unexpected sequence")
+          visit_unexpected(visitor, value, "unexpected sequence")
         end
 
         def visit_child(visitor, value)
-          error("unexpected child")
+          visit_unexpected(visitor, value, "unexpected child")
         end
 
         def respond_to_missing?(method, include_private = false)

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

@@ -10,8 +10,12 @@ module CC
         map :languages, to: LanguageList
         map :ratings, to: Ratings
 
+        attr_accessor :parseable
+        alias_method :parseable?, :parseable
+
         def initialize
           super(nil)
+          @parseable = true
         end
 
         def nested_warnings(*)

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

@@ -1,5 +1,5 @@
-require 'psych'
-require 'delegate'
+require "psych"
+require "delegate"
 
 module CC::Yaml
   module Parser
@@ -37,14 +37,14 @@ module CC::Yaml
       TRUE      = /\A(?:y|Y|yes|Yes|YES|true|True|TRUE|on|On|ON)\z/
       FALSE     = /\A(?:n|N|no|No|NO|false|False|FALSE|off|Off|OFF)\z/
       REGEXP    = /\A!(?:ruby\/)?regexp\z/
-      REG_FLAGS = { 'i' => Regexp::IGNORECASE, 'm' => Regexp::MULTILINE, 'x' => Regexp::EXTENDED }
+      REG_FLAGS = { "i" => Regexp::IGNORECASE, "m" => Regexp::MULTILINE, "x" => Regexp::EXTENDED }
       FORMATS   = {
-        '!bool'      => Regexp.union(TRUE, FALSE),
-        '!float'     => ::Psych::ScalarScanner::FLOAT,
-        '!null'      => /\A(:?~|null|Null|NULL|)\z/,
-        '!timestamp' => ::Psych::ScalarScanner::TIME,
-        '!int'       => ::Psych::ScalarScanner::INTEGER,
-        '!regexp'    => /\A\/(.*)\/([imx]*)\z/
+        "!bool"      => Regexp.union(TRUE, FALSE),
+        "!float"     => ::Psych::ScalarScanner::FLOAT,
+        "!null"      => /\A(:?~|null|Null|NULL|)\z/,
+        "!timestamp" => ::Psych::ScalarScanner::TIME,
+        "!int"       => ::Psych::ScalarScanner::INTEGER,
+        "!regexp"    => /\A\/(.*)\/([imx]*)\z/,
       }
 
       if defined? ::Psych::ClassLoader
@@ -87,11 +87,12 @@ module CC::Yaml
         root.verify
         root.warnings.clear
         root.error("syntax error: %s", error.message)
+        root.parseable = false
         root
       end
 
       def check_for_analysis_key(root)
-        unless root.engines? || root.languages?
+        unless root.engines? || root.languages? || root.errors.any?
           root.error NO_ANALYSIS_KEY_FOUND_ERROR
         end
       end
@@ -127,10 +128,10 @@ module CC::Yaml
         when SET              then node.visit_sequence self, SetNode.new(value)
         when SEQ              then node.visit_sequence self, value
         when nil
-          if value.children.size == 2 and value.children.first.value == 'secure'
+          if value.children.size == 2 and value.children.first.value == "secure"
             secret_value = value.children.last
             if secret_value.is_a? ::Psych::Nodes::Scalar
-              secret_value.tag ||= '!secure'
+              secret_value.tag ||= "!secure"
               node.visit_scalar(self, :secure, secret_value, false)
             else
               node.visit_unexpected(self, value, "secret value needs to be a string")
@@ -179,16 +180,16 @@ module CC::Yaml
 
       def scalar_tag(value)
         return value.tag if value.tag
-        return '!str' if value.quoted
+        return "!str" if value.quoted
         FORMATS.each do |tag, format|
           return tag if value.value =~ format
         end
-        '!str'
+        "!str"
       end
 
       def regexp(pattern)
         return pattern if pattern.is_a? Regexp
-        return Regexp.new(pattern) unless pattern =~ FORMATS['!regexp']
+        return Regexp.new(pattern) unless pattern =~ FORMATS["!regexp"]
         flag = $2.chars.inject(0) { |f,c| f | REG_FLAGS.fetch(c, 0) }
         Regexp.new($1, flag)
       rescue RegexpError => error
@@ -198,15 +199,15 @@ module CC::Yaml
       def cast(type, value)
         case type
         when :str    then value.value
-        when :binary then value.value.unpack('m').first
+        when :binary then value.value.unpack("m").first
         when :bool   then value.value !~ FALSE
         when :float  then Float   @scanner.tokenize(value.value)
         when :int    then Integer @scanner.tokenize(value.value)
         when :time   then @scanner.parse_time(value.value)
-        when :secure then SecureString.new(value.value, value.tag != '!decrypted')
+        when :secure then SecureString.new(value.value, value.tag != "!decrypted")
         when :regexp then regexp(value.value)
         when :null   then nil
-        else raise ArgumentError, 'unknown scalar type %p' % type
+        else raise ArgumentError, "unknown scalar type %p" % type
         end
       end
 

data/lib/cc/yaml/serializer/generic.rb

@@ -1,4 +1,4 @@
-require 'secure_string'
+require "secure_string"
 
 module CC::Yaml
   module Serializer
@@ -23,7 +23,7 @@ module CC::Yaml
         when Nodes::Scalar   then serialize_scalar(node)
         when Nodes::Mapping  then serialize_mapping(node)
         when Nodes::Sequence then serialize_sequence(node)
-        else raise NotSupportedError, 'do not know how to serialize %p' % node.class
+        else raise NotSupportedError, "do not know how to serialize %p" % node.class
         end
       end
 
@@ -57,13 +57,13 @@ module CC::Yaml
       def serialize_secure(value)
         case options[:secure]
         when :decrypted
-          raise ArgumentError, 'secure option is set decrypted, but a secure value is not decrypted' unless value.decrypted?
+          raise ArgumentError, "secure option is set decrypted, but a secure value is not decrypted" unless value.decrypted?
           serialize_decrypted(value)
         when :encrypted
-          raise ArgumentError, 'secure option is set encrypted, but a secure value is not encrypted' unless value.encrypted?
+          raise ArgumentError, "secure option is set encrypted, but a secure value is not encrypted" unless value.encrypted?
           serialize_encrypted(value)
         else
-          raise ArgumentError, 'unexpected value for secure option: %p' % options[:secure] if options[:secure]
+          raise ArgumentError, "unexpected value for secure option: %p" % options[:secure] if options[:secure]
           value.encrypted? ? serialize_encrypted(value) : serialize_decrypted(value)
         end
       end
@@ -93,7 +93,7 @@ module CC::Yaml
       end
 
       def serialize_value(node)
-        raise NotSupportedError, 'cannot serialize %p with %p' % [node.class, self.class]
+        raise NotSupportedError, "cannot serialize %p with %p" % [node.class, self.class]
       end
 
       def serialize_root(node)

data/lib/cc/yaml/serializer/json.rb

@@ -16,7 +16,7 @@ module CC
       end
 
       def serialize_float(value)
-        raise NotSupportedError, 'cannot serialize infinity as JSON' if value.infinite?
+        raise NotSupportedError, "cannot serialize infinity as JSON" if value.infinite?
         "#{value}"
       end
 
@@ -29,15 +29,15 @@ module CC
       end
 
       def serialize_str(value)
-        string = value.encode('utf-8')
-        string.force_encoding('binary')
+        string = value.encode("utf-8")
+        string.force_encoding("binary")
         string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
-        string.force_encoding('utf-8')
+        string.force_encoding("utf-8")
         "\"#{string}\""
       end
 
       def serialize_binary(value)
-        raise NotSupportedError, 'cannot serialize binary data as JSON'
+        raise NotSupportedError, "cannot serialize binary data as JSON"
       end
 
       def serialize_bool(value)
@@ -45,11 +45,11 @@ module CC
       end
 
       def serialize_mapping(node)
-        lines('{%s}', super.map { |key, value| key_value(key, value) })
+        lines("{%s}", super.map { |key, value| key_value(key, value) })
       end
 
       def serialize_sequence(node)
-        lines('[%s]', super)
+        lines("[%s]", super)
       end
 
       def key_value(key, value, wrapper = "%s")
@@ -58,7 +58,7 @@ module CC
       end
 
       def lines(wrapper, lines)
-        return wrapper % lines.join(',') unless pretty?
+        return wrapper % lines.join(",") unless pretty?
         return wrapper % "" if lines.empty?
         return wrapper % " #{lines.first} " unless lines.size > 1 or  lines.first.include?("\n") or lines.first.size > 50
         lines = "\n  " + lines.join(",\n").strip.gsub("\n", "\n  ") + "\n"

data/lib/cc/yaml/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Yaml
-    VERSION = "0.3.0".freeze
+    VERSION = "0.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-yaml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: secure_string