psych 2.0.17-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5c4d910a52947718fe9c4e935a30110d1eef1f
-  data.tar.gz: 52a1a614265c7dbc09f1170fa6d8d4f9d67dd27b
+  metadata.gz: e9dc0b94275e4a1293ff5f5d00f6a81d6f5a39c1
+  data.tar.gz: 680468b64f8d7b1b9b703f0adbd5249c2f9cd48b
 SHA512:
-  metadata.gz: da729662069374b214233bd5074a06168791e4a8582f9c3e1752b5dc887415d2d095364cd171e781b30bd330f27181f18a50bf75329e753b087ecd6c3ffbadc4
-  data.tar.gz: d332a0d3ab7924544ce6309156eff265843b1c795593b4ad8b48c0a65b688a4d3ba0d70de66534f40957824aec4a4eac92c65f5f3d834405c2eb7e9e996b3fa4
+  metadata.gz: 7cd7a891073f8c4469729780b92f90a7fe08277ae74b859b8d0c8a76180a016f223c4ed63908925cdd9accbdb29d277d2152ead31d2486008cfef338f88cb9a8
+  data.tar.gz: 3ac6acb3cdcc50b90870e2e0f5870470c8353725f06b75a9baa800beefd5dfc084ca9c43359f6c47c513dc320e1d38be2598ed778d45f15b748adfecbfb5888d

data/.travis.yml

@@ -1,14 +1,7 @@
 rvm:
   - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.1
+  - 2.2
+  - 2.3.0
   - ruby-head
-  - rbx-2
-before_script:
-  - gem install hoe
-  - gem install rake-compiler
-  - gem install minitest -v '~> 5.0'
-script: rake test
-matrix:
-  allow_failures:
-    - rvm: rbx-2
+before_install: gem install bundler --no-document

data/Rakefile

@@ -1,123 +1,31 @@
-# -*- ruby -*-
-
-require 'psych'
-require 'rubygems'
-require 'hoe'
-
-def java?
-  RUBY_PLATFORM =~ /java/
-end
-
-class Hoe
-  remove_const :RUBY_FLAGS
-  flags = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
-  flags = "--1.9 " + flags if java?
-  RUBY_FLAGS = flags
-end
-
-gem 'rake-compiler', '>= 0.4.1'
-gem 'minitest', '~> 5.0'
-require "rake/extensiontask"
-
-Hoe.plugin :doofus, :git, :gemspec
-
-$hoe = Hoe.spec 'psych' do
-  license   'MIT'
-  developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
-
-  self.extra_rdoc_files  = Dir['*.rdoc']
-  self.history_file      = 'CHANGELOG.rdoc'
-  self.readme_file       = 'README.rdoc'
-  self.testlib           = :minitest
-
-  extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-  extra_dev_deps << ['minitest', '~> 5.0']
-
-  self.spec_extras = {
-    :required_ruby_version => '>= 1.9.2'
-  }
-
-  if java?
-    require './lib/psych/versions.rb'
-    extra_deps << ['jar-dependencies', '>= 0.1.7']
-
-    # the jar declaration for jar-dependencies
-    self.spec_extras[ 'requirements' ] = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
-    self.spec_extras[ 'platform' ] = 'java'
-    # TODO: clean this section up.
-    require "rake/javaextensiontask"
-    Rake::JavaExtensionTask.new("psych", spec) do |ext|
-      require 'maven/ruby/maven'
-      # uses Mavenfile to write classpath into pkg/classpath
-      # and tell maven via system properties the snakeyaml version
-      # this is basically the same as running from the commandline:
-      # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
-      Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' )
-      ext.source_version = '1.7'
-      ext.target_version = '1.7'
-      ext.classpath = File.read('pkg/classpath')
-      ext.ext_dir = 'ext/java'
-    end
-  else
-    self.spec_extras[:extensions] = ["ext/psych/extconf.rb"]
-    Rake::ExtensionTask.new "psych", spec do |ext|
-      ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-    end
-  end
-end
-
-def gem_build_path
-  File.join 'pkg', $hoe.spec.full_name
-end
-
-def add_file_to_gem relative_path
-  target_path = File.join gem_build_path, relative_path
-  target_dir = File.dirname(target_path)
-  mkdir_p target_dir unless File.directory?(target_dir)
-  rm_f target_path
-  safe_ln relative_path, target_path
-  $hoe.spec.files.concat [relative_path]
-end
-
-if java?
-  task gem_build_path => [:compile] do
-    add_file_to_gem 'lib/psych.jar'
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/test_*.rb']
+end
+
+if RUBY_PLATFORM =~ /java/
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new("psych") do |ext|
+    require 'maven/ruby/maven'
+    # uses Mavenfile to write classpath into pkg/classpath
+    # and tell maven via system properties the snakeyaml version
+    # this is basically the same as running from the commandline:
+    # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
+    Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' )
+    ext.source_version = '1.7'
+    ext.target_version = '1.7'
+    ext.classpath = File.read('pkg/classpath')
+    ext.ext_dir = 'ext/java'
   end
-end
-
-Hoe.add_include_dirs('.:lib/psych')
-
-task :test => :compile
-
-task :hack_spec do
-  $hoe.spec.extra_rdoc_files.clear
-end
-task 'core:spec' => [:hack_spec, 'gem:spec']
-
-desc "merge psych in to ruby trunk"
-namespace :merge do
-  basedir = File.expand_path File.dirname __FILE__
-  rubydir = File.join ENV['HOME'], 'git', 'ruby'
-  mergedirs = {
-    # From                          # To
-    [basedir, 'ext', 'psych/']  => [rubydir, 'ext', 'psych/'],
-    [basedir, 'lib/']           => [rubydir, 'ext', 'psych', 'lib/'],
-    [basedir, 'test', 'psych/'] => [rubydir, 'test', 'psych/'],
-  }
-
-  rsync = 'rsync -av --exclude lib --exclude ".*" --exclude "*.o" --exclude Makefile --exclude mkmf.log --delete'
-
-  task :to_ruby do
-    mergedirs.each do |from, to|
-      sh "#{rsync} #{File.join(*from)} #{File.join(*to)}"
-    end
-  end
-
-  task :from_ruby do
-    mergedirs.each do |from, to|
-      sh "#{rsync} #{File.join(*to)} #{File.join(*from)}"
-    end
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new("psych") do |ext|
+    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
   end
 end
 
-# vim: syntax=ruby
+task :default => [:compile, :test]

data/ext/psych/extconf.rb

@@ -1,4 +1,5 @@
 # -*- coding: us-ascii -*-
+# frozen_string_literal: false
 require 'mkmf'
 require 'fileutils'
 

data/ext/psych/yaml/loader.c

@@ -239,8 +239,8 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
             return yaml_parser_set_composer_error_context(parser,
-                    "found duplicate anchor; first occurence",
-                    alias_data->mark, "second occurence", data.mark);
+                    "found duplicate anchor; first occurrence",
+                    alias_data->mark, "second occurrence", data.mark);
         }
     }
 

data/ext/psych/yaml/scanner.c

@@ -1251,7 +1251,7 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
 
 /*
  * Pop indentation levels from the indents stack until the current level
- * becomes less or equal to the column.  For each intendation level, append
+ * becomes less or equal to the column.  For each indentation level, append
  * the BLOCK-END token.
  */
 
@@ -1266,7 +1266,7 @@ yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
     if (parser->flow_level)
         return 1;
 
-    /* Loop through the intendation levels in the stack. */
+    /* Loop through the indentation levels in the stack. */
 
     while (parser->indent > column)
     {
@@ -2775,15 +2775,15 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (IS_DIGIT(parser->buffer))
         {
-            /* Check that the intendation is greater than 0. */
+            /* Check that the indentation is greater than 0. */
 
             if (CHECK(parser->buffer, '0')) {
                 yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                        start_mark, "found an intendation indicator equal to 0");
+                        start_mark, "found an indentation indicator equal to 0");
                 goto error;
             }
 
-            /* Get the intendation level and eat the indicator. */
+            /* Get the indentation level and eat the indicator. */
 
             increment = AS_DIGIT(parser->buffer);
 
@@ -2797,7 +2797,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
     {
         if (CHECK(parser->buffer, '0')) {
             yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found an intendation indicator equal to 0");
+                    start_mark, "found an indentation indicator equal to 0");
             goto error;
         }
 
@@ -2847,7 +2847,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     end_mark = parser->mark;
 
-    /* Set the intendation level if it was specified. */
+    /* Set the indentation level if it was specified. */
 
     if (increment) {
         indent = parser->indent >= 0 ? parser->indent+increment : increment;
@@ -2913,7 +2913,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (!READ_LINE(parser, leading_break)) goto error;
 
-        /* Eat the following intendation spaces and line breaks. */
+        /* Eat the following indentation spaces and line breaks. */
 
         if (!yaml_parser_scan_block_scalar_breaks(parser,
                     &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
@@ -2948,8 +2948,8 @@ error:
 }
 
 /*
- * Scan intendation spaces and line breaks for a block scalar.  Determine the
- * intendation level if needed.
+ * Scan indentation spaces and line breaks for a block scalar.  Determine the
+ * indentation level if needed.
  */
 
 static int
@@ -2961,11 +2961,11 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
 
     *end_mark = parser->mark;
 
-    /* Eat the intendation spaces and line breaks. */
+    /* Eat the indentation spaces and line breaks. */
 
     while (1)
     {
-        /* Eat the intendation spaces. */
+        /* Eat the indentation spaces. */
 
         if (!CACHE(parser, 1)) return 0;
 
@@ -2978,12 +2978,12 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
         if ((int)parser->mark.column > max_indent)
             max_indent = (int)parser->mark.column;
 
-        /* Check for a tab character messing the intendation. */
+        /* Check for a tab character messing the indentation. */
 
         if ((!*indent || (int)parser->mark.column < *indent)
                 && IS_TAB(parser->buffer)) {
             return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found a tab character where an intendation space is expected");
+                    start_mark, "found a tab character where an indentation space is expected");
         }
 
         /* Have we found a non-empty line? */
@@ -3504,12 +3504,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse intendation. */
+                /* Check for tab character that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate intendation");
+                            start_mark, "found a tab character that violate indentation");
                     goto error;
                 }
 
@@ -3542,7 +3542,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
             if (!CACHE(parser, 1)) goto error;
         }
 
-        /* Check intendation level. */
+        /* Check indentation level. */
 
         if (!parser->flow_level && (int)parser->mark.column < indent)
             break;

data/lib/psych.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 case RUBY_ENGINE
 when 'jruby'
   require 'psych_jars'
@@ -223,11 +224,13 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.17'
+  VERSION         = '2.1.0'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
 
+  FALLBACK        = Struct.new :to_ruby # :nodoc:
+
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
@@ -247,8 +250,8 @@ module Psych
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil
-    result = parse(yaml, filename)
+  def self.load yaml, filename = nil, fallback = false
+    result = parse(yaml, filename, fallback)
     result ? result.to_ruby : result
   end
 
@@ -320,11 +323,11 @@ module Psych
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, filename = nil
+  def self.parse yaml, filename = nil, fallback = false
     parse_stream(yaml, filename) do |node|
       return node
     end
-    false
+    fallback
   end
 
   ###
@@ -465,9 +468,12 @@ module Psych
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a Ruby object
-  def self.load_file filename
-    File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified default return value, which defaults to an empty Hash 
+  def self.load_file filename, fallback = false
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.load f, filename, FALLBACK.new(fallback)
+    }
   end
 
   # :stopdoc:

data/lib/psych/class_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/omap'
 require 'psych/set'
 

data/lib/psych/coder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # If an object defines +encode_with+, then an instance of Psych::Coder will

data/lib/psych/core_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)

data/lib/psych/deprecated.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'date'
 
 module Psych

data/lib/psych/exception.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   class Exception < RuntimeError
   end

data/lib/psych/handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used

data/lib/psych/handlers/document_stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/tree_builder'
 
 module Psych

data/lib/psych/handlers/recorder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych

data/lib/psych/json/ruby_events.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module JSON
     module RubyEvents # :nodoc:

data/lib/psych/json/stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 

data/lib/psych/json/tree_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/json/yaml_events'
 
 module Psych