hocon 1.1.3 → 1.3.1

data/lib/hocon/impl/config_node_object.rb

@@ -206,7 +206,6 @@ class Hocon::Impl::ConfigNodeObject
     new_nodes = []
     new_nodes += indentation
     new_nodes.push(desired_path.first)
-    new_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_ignored_whitespace(nil, ' ')))
     new_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens::COLON))
     new_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_ignored_whitespace(nil, ' ')))
 
@@ -281,4 +280,4 @@ class Hocon::Impl::ConfigNodeObject
     path = Hocon::Impl::PathParser.parse_path_node(desired_path, flavor).value
     change_value_on_path(path, nil, flavor)
   end
-end
+end

data/lib/hocon/impl/config_node_root.rb

@@ -57,4 +57,4 @@ class Hocon::Impl::ConfigNodeRoot
     end
     raise Hocon::ConfigError::ConfigBugOrBrokenError, "ConfigNodeRoot did not contain a value"
   end
-end
+end

data/lib/hocon/impl/parseable.rb

@@ -35,10 +35,11 @@ class Hocon::Impl::Parseable
     end
   end
 
-  # Changed this to a class variable because the upstream library seems to use it
-  # as a global way of keeping track of how many files have been included, to
-  # avoid cycles
-  @@parse_stack= []
+  # The upstream library seems to use this as a global way of keeping track of
+  # how many files have been included, to avoid cycles
+  def self.parse_stack
+    Thread.current[:hocon_parse_stack] ||= []
+  end
 
   MAX_INCLUDE_DEPTH = 50
 
@@ -134,7 +135,7 @@ class Hocon::Impl::Parseable
     if (base_options.nil?)
       base_options = options
     end
-    stack = @@parse_stack
+    stack = self.class.parse_stack
     if stack.length >= MAX_INCLUDE_DEPTH
       raise Hocon::ConfigError::ConfigParseError.new(@initial_origin,
             "include statements nested more than #{MAX_INCLUDE_DEPTH} times, " +

data/lib/hocon/impl/simple_config_document.rb

@@ -48,4 +48,4 @@ class Hocon::Impl::SimpleConfigDocument
   def hash
     render.hash
   end
-end
+end

data/lib/hocon/impl/simple_config_origin.rb

@@ -23,6 +23,9 @@ class Hocon::Impl::SimpleConfigOrigin
     @line_number = line_number
     @end_line_number = end_line_number
     @origin_type = origin_type
+
+    # TODO: Currently ruby hocon does not support URLs, and so this variable
+    # is not actually a URL/URI, but a string
     @url_or_nil = url_or_nil
     @resource_or_nil = resource_or_nil
     @comments_or_nil = comments_or_nil
@@ -39,10 +42,9 @@ class Hocon::Impl::SimpleConfigOrigin
   end
 
   def self.new_file(file_path)
-    url = URI.join('file:///', file_path)
     self.new(file_path, -1, -1,
              OriginType::FILE,
-             url, nil, nil)
+             file_path, nil, nil)
   end
 
   # NOTE: not porting `new_url` because we're not going to support URLs for now
@@ -153,6 +155,10 @@ class Hocon::Impl::SimpleConfigOrigin
   end
 
   def filename
+    # TODO because we don't support URLs, this function's URL handling
+    # is completely pointless. It will only return _description (a string that
+    # is the file path) or nil.
+    # It should be cleaned up
     if origin_type == OriginType::FILE
       _description
     elsif ! url_or_nil.nil?

data/lib/hocon/version.rb

@@ -0,0 +1,5 @@
+module Hocon
+  module Version
+    STRING = '1.3.1'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Price
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,14 +46,18 @@ dependencies:
 description: "== A port of the Java {Typesafe Config}[https://github.com/typesafehub/config]
   library to Ruby"
 email: chris@puppetlabs.com
-executables: []
+executables:
+- hocon
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- HISTORY.md
 - LICENSE
 - README.md
+- bin/hocon
 - lib/hocon.rb
+- lib/hocon/cli.rb
 - lib/hocon/config.rb
 - lib/hocon/config_error.rb
 - lib/hocon/config_factory.rb
@@ -139,51 +143,7 @@ files:
 - lib/hocon/parser/config_document.rb
 - lib/hocon/parser/config_document_factory.rb
 - lib/hocon/parser/config_node.rb
-- spec/fixtures/hocon/by_extension/cat.conf
-- spec/fixtures/hocon/by_extension/cat.test
-- spec/fixtures/hocon/by_extension/cat.test-json
-- spec/fixtures/hocon/with_substitution/subst.conf
-- spec/fixtures/parse_render/example1/input.conf
-- spec/fixtures/parse_render/example1/output.conf
-- spec/fixtures/parse_render/example1/output_nocomments.conf
-- spec/fixtures/parse_render/example2/input.conf
-- spec/fixtures/parse_render/example2/output.conf
-- spec/fixtures/parse_render/example2/output_nocomments.conf
-- spec/fixtures/parse_render/example3/input.conf
-- spec/fixtures/parse_render/example3/output.conf
-- spec/fixtures/parse_render/example4/input.json
-- spec/fixtures/parse_render/example4/output.conf
-- spec/fixtures/test_utils/resources/bom.conf
-- spec/fixtures/test_utils/resources/cycle.conf
-- spec/fixtures/test_utils/resources/file-include.conf
-- spec/fixtures/test_utils/resources/include-from-list.conf
-- spec/fixtures/test_utils/resources/subdir/bar.conf
-- spec/fixtures/test_utils/resources/subdir/baz.conf
-- spec/fixtures/test_utils/resources/subdir/foo.conf
-- spec/fixtures/test_utils/resources/test01.conf
-- spec/fixtures/test_utils/resources/test01.json
-- spec/fixtures/test_utils/resources/test03.conf
-- spec/fixtures/test_utils/resources/utf16.conf
-- spec/fixtures/test_utils/resources/utf8.conf
-- spec/fixtures/test_utils/resources/ᚠᛇᚻ.conf
-- spec/spec_helper.rb
-- spec/test_utils.rb
-- spec/unit/hocon/README.md
-- spec/unit/hocon/hocon_spec.rb
-- spec/unit/typesafe/config/README.md
-- spec/unit/typesafe/config/concatenation_spec.rb
-- spec/unit/typesafe/config/conf_parser_spec.rb
-- spec/unit/typesafe/config/config_document_parser_spec.rb
-- spec/unit/typesafe/config/config_document_spec.rb
-- spec/unit/typesafe/config/config_factory_spec.rb
-- spec/unit/typesafe/config/config_node_spec.rb
-- spec/unit/typesafe/config/config_value_factory_spec.rb
-- spec/unit/typesafe/config/config_value_spec.rb
-- spec/unit/typesafe/config/path_spec.rb
-- spec/unit/typesafe/config/public_api_spec.rb
-- spec/unit/typesafe/config/simple_config_spec.rb
-- spec/unit/typesafe/config/token_spec.rb
-- spec/unit/typesafe/config/tokenizer_spec.rb
+- lib/hocon/version.rb
 homepage: https://github.com/puppetlabs/ruby-hocon
 licenses:
 - Apache License, v2
@@ -203,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: HOCON Config Library

data/spec/fixtures/hocon/by_extension/cat.conf

@@ -1,4 +0,0 @@
-# Comment
-{
-  "meow": "cats"
-}

data/spec/fixtures/hocon/by_extension/cat.test

@@ -1,4 +0,0 @@
-# Comment
-{
-  "meow": "cats"
-}

data/spec/fixtures/hocon/by_extension/cat.test-json

@@ -1,3 +0,0 @@
-{
-  "meow": "cats"
-}

data/spec/fixtures/hocon/with_substitution/subst.conf

@@ -1,2 +0,0 @@
-a: true
-b: ${a}

data/spec/fixtures/parse_render/example1/input.conf

@@ -1,21 +0,0 @@
-# These are some opening comments
-# These are some additional opening comments
-foo.bar {
-  // the baz is is blah blah
-  baz = 42
-  boom = [1, 2, {derp : duh }, 4]
-  empty = []
-
-  # abracadabra setting
-  abracadabra = "hi"
-}
-
-// as for the yippee
-# it entails some things
-foo.bar.yahoo = "yippee"
-
-# truthy
-foo.bar.truthy = true
-
-# falsy
-foo.bar.falsy  = false

data/spec/fixtures/parse_render/example1/output.conf

@@ -1,26 +0,0 @@
-foo {
-    # These are some opening comments
-    # These are some additional opening comments
-    bar {
-        # falsy
-        falsy=false
-        # truthy
-        truthy=true
-        # as for the yippee
-        # it entails some things
-        yahoo=yippee
-        # the baz is is blah blah
-        baz=42
-        boom=[
-            1,
-            2,
-            {
-                derp=duh
-            },
-            4
-        ]
-        empty=[]
-        # abracadabra setting
-        abracadabra=hi
-    }
-}

data/spec/fixtures/parse_render/example1/output_nocomments.conf

@@ -1,17 +0,0 @@
-foo {
-    bar {
-        falsy=false
-        truthy=true
-        yahoo=yippee
-        baz=42
-        boom=[
-            1,
-            2,
-            {
-                derp=duh
-            },
-            4
-        ]
-        abracadabra=hi
-    }
-}

data/spec/fixtures/parse_render/example2/input.conf

@@ -1,10 +0,0 @@
-jruby-puppet: {
-    jruby-pools: [{environment: production}]
-    load-path: [/usr/lib/ruby/site_ruby/1.8, /usr/lib/ruby/site_ruby/1.8]
-    master-conf-dir: /etc/puppet
-    master-var-dir: /var/lib/puppet
-}
-
-webserver: {
-  host: 1.2.3.4
-}

data/spec/fixtures/parse_render/example2/output.conf

@@ -1,17 +0,0 @@
-jruby-puppet {
-    jruby-pools=[
-        {
-            environment=production
-        }
-    ]
-    load-path=[
-        "/usr/lib/ruby/site_ruby/1.8",
-        "/usr/lib/ruby/site_ruby/1.8"
-    ]
-    master-conf-dir="/etc/puppet"
-    master-var-dir="/var/lib/puppet"
-}
-
-webserver {
-  host="1.2.3.4"
-}

data/spec/fixtures/parse_render/example2/output_nocomments.conf

@@ -1,17 +0,0 @@
-jruby-puppet {
-    jruby-pools=[
-        {
-            environment=production
-        }
-    ]
-    load-path=[
-        "/usr/lib/ruby/site_ruby/1.8",
-        "/usr/lib/ruby/site_ruby/1.8"
-    ]
-    master-conf-dir="/etc/puppet"
-    master-var-dir="/var/lib/puppet"
-}
-
-webserver {
-  host="1.2.3.4"
-}

data/spec/fixtures/parse_render/example3/input.conf

@@ -1,2 +0,0 @@
-a: true
-b: ${a}

data/spec/fixtures/parse_render/example3/output.conf

@@ -1,2 +0,0 @@
-a=true
-b=true

data/spec/fixtures/parse_render/example4/input.json

@@ -1,6 +0,0 @@
-{
-    "kermit": "frog",
-    "miss": "piggy",
-    "bert": "ernie",
-    "janice": "guitar"
-}

data/spec/fixtures/parse_render/example4/output.conf

@@ -1,6 +0,0 @@
-{
-    "kermit"="frog",
-    "miss"="piggy",
-    "bert"="ernie",
-    "janice"="guitar"
-}

data/spec/fixtures/test_utils/resources/bom.conf

@@ -1,2 +0,0 @@
-#
-foo = bar

data/spec/fixtures/test_utils/resources/cycle.conf

@@ -1 +0,0 @@
-include "cycle.conf"

data/spec/fixtures/test_utils/resources/file-include.conf

@@ -1,5 +0,0 @@
-base=41
-# included without file() in a subdir
-include "subdir/foo.conf"
-# included using file() in a subdir
-include file("subdir/baz.conf")

data/spec/fixtures/test_utils/resources/include-from-list.conf

@@ -1,4 +0,0 @@
-// The {} inside the [] is needed because
-// just [ include ] means an array with the
-// string "include" in it.
-a = [ { include "test01.conf" } ]

data/spec/fixtures/test_utils/resources/subdir/bar.conf

@@ -1 +0,0 @@
-bar=43

data/spec/fixtures/test_utils/resources/subdir/baz.conf

@@ -1 +0,0 @@
-baz=45

data/spec/fixtures/test_utils/resources/subdir/foo.conf

@@ -1,5 +0,0 @@
-foo=42
-# included without file()
-include "bar.conf"
-# included using file()
-include file("bar-file.conf")

data/spec/fixtures/test_utils/resources/test01.conf

@@ -1,80 +0,0 @@
-{
-    "ints" : {
-        "fortyTwo" : 42,
-        "fortyTwoAgain" : ${ints.fortyTwo}
-    },
-
-    "floats" : {
-        "fortyTwoPointOne" : 42.1,
-        "fortyTwoPointOneAgain" : ${floats.fortyTwoPointOne}
-    },
-
-    "strings" : {
-        "abcd" : "abcd",
-        "abcdAgain" : ${strings.a}${strings.b}${strings.c}${strings.d},
-        "a" : "a",
-        "b" : "b",
-        "c" : "c",
-        "d" : "d",
-        "concatenated" : null bar 42 baz true 3.14 hi,
-        "double" : "3.14",
-        "number" : "57",
-        "null" : "null",
-        "true" : "true",
-        "yes" : "yes",
-        "false" : "false",
-        "no" : "no"
-    },
-
-    "arrays" : {
-        "empty" : [],
-        "ofInt" : [1, 2, 3],
-        "ofString" : [ ${strings.a}, ${strings.b}, ${strings.c} ],
-        "ofDouble" : [3.14, 4.14, 5.14],
-        "ofNull" : [null, null, null],
-        "ofBoolean" : [true, false],
-        "ofArray" : [${arrays.ofString}, ${arrays.ofString}, ${arrays.ofString}],
-        "ofObject" : [${ints}, ${booleans}, ${strings}],
-        "firstElementNotASubst" : [ "a", ${strings.b} ]
-    },
-
-    "booleans" : {
-        "true" : true,
-        "trueAgain" : ${booleans.true},
-        "false" : false,
-        "falseAgain" : ${booleans.false}
-    },
-
-    "nulls" : {
-        "null" : null,
-        "nullAgain" : ${nulls.null}
-    },
-
-    "durations" : {
-        "second" : 1s,
-        "secondsList" : [1s,2seconds,3 s, 4000],
-        "secondAsNumber" : 1000,
-        "halfSecond" : 0.5s,
-        "millis" : 1 milli,
-        "micros" : 2000 micros
-    },
-
-    "memsizes" : {
-        "meg" : 1M,
-        "megsList" : [1M, 1024K, 1048576],
-        "megAsNumber" : 1048576,
-        "halfMeg" : 0.5M
-    },
-
-    "system" : {
-        "javaversion" : ${?java.version},
-        "userhome" : ${?user.home},
-        "home" : ${?HOME},
-        "pwd" : ${?PWD},
-        "shell" : ${?SHELL},
-        "lang" : ${?LANG},
-        "path" : ${?PATH},
-        "not_here" : ${?NOT_HERE},
-        "concatenated" : Your Java version is ${?system.javaversion} and your user.home is ${?system.userhome}
-    }
-}