hocon 1.2.4 → 1.2.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDJiNDQ0ZDY5ZmZkYWI5NjgzYTUxMGE3NTVmZDBiOTI4ZjAwYjJkZQ==
-  data.tar.gz: !binary |-
-    NGQ4M2E2NGZlNjZhNDMzNTRhZmFlNTFiY2UzNzMxNWM2ZDY0NGQxMw==
+SHA1:
+  metadata.gz: 7095db4599e49bba826383bbef6a4794c47f5184
+  data.tar.gz: 7c7a561001db4d555533c3a5fbc7ade0e0ce6012
 SHA512:
-  metadata.gz: !binary |-
-    YWU5Yzg3M2IyMTVjZTIxNzQyZjdmODBkZDRhZTcyMzliMmEyZmJkNDU2MTlh
-    YTYxOTc5MTgxOGViYTJjYzI3MThlZTllZDNjNzg5MTU1NjMwOWU0ZTIwYzIx
-    N2I0OTVhMWNkYTVjYzU0NzNkNzZlZmZmODIwZWI3YTIzMzI1MDI=
-  data.tar.gz: !binary |-
-    N2ViYjQ1MTkyMGFkNzJhZTFkZWUwZWIwMzVlNmJmYTE0OGEzZmMyZWY1MzVj
-    MGE4OWU1MGVhMmUwMDMyOGJmNTEyMzFkZTZmYjgzNGViMzE5MDZhZGE3ZDhj
-    M2I3MWE2YzU1NjU2MTM0OTFhM2VjNjQ5M2QyYWRkODlmY2M3MWE=
+  metadata.gz: 43599721551ba020537e5ccfadac221f84ea3e85d8a5489bd7113e6874d91ffd109c4699675822c9b77b7c60c1960642e027f1fc89168025e2b3e2288376a664
+  data.tar.gz: 60ec87ed27f06f2c0fb6b10a667bf7989c77dfb1abcc993fb3c274cfb0a9b2bded126ffa4507cbe4970f7c9adc3585555b7d41c0302c252e0847a988b9597422

data/CHANGELOG.md

@@ -1,8 +1,16 @@
-## 1.2.0
+## 1.2.5
+This is a bugfix release
+
+* Fixed loading files with UTF-8 characters in their file paths
+
+## 1.2.4
 This is a feature release.
 
 * Added a cli tool called `hocon` for reading and manipulating hocon files
 
+Note that the version numbers 1.2.0-1.2.3 were not used because of bugs in our
+release pipeline we were working out
+
 ## 1.1.3
 This is a bugfix release.
 

data/HISTORY.md

@@ -1,6 +1,7 @@
 # enterprise_ruby-hocon_bump_and_tag_master - History
 ## Tags
-* [LATEST - 3 Nov, 2016 (67ff0795)](#LATEST)
+* [LATEST - 4 Apr, 2017 (b42a72f0)](#LATEST)
+* [1.2.4 - 3 Nov, 2016 (5157cc60)](#1.2.4)
 * [1.2.3 - 3 Nov, 2016 (cd9a5c8d)](#1.2.3)
 * [1.2.2 - 1 Nov, 2016 (4a29c034)](#1.2.2)
 * [1.2.1 - 27 Oct, 2016 (b6edea48)](#1.2.1)
@@ -22,7 +23,130 @@
 * [0.0.1 - 16 Mar, 2014 (f7dbca52)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 3 Nov, 2016 (67ff0795)
+### <a name = "LATEST">LATEST - 4 Apr, 2017 (b42a72f0)
+
+* (GEM) update hocon version to 1.2.5 (b42a72f0)
+
+* Merge pull request #108 from jpinsonault/maint-prepare-for-1.2.5 (50b0087b)
+
+
+```
+Merge pull request #108 from jpinsonault/maint-prepare-for-1.2.5
+
+(MAINT) Change version back 1.2.5.SNAPSHOT
+```
+* (MAINT) Change version back 1.2.5.SNAPSHOT (40d45c77)
+
+
+```
+(MAINT) Change version back 1.2.5.SNAPSHOT
+
+CI needs the current to be less than the next version to be released
+```
+* Merge pull request #107 from jpinsonault/PE-18165-support-for-utf8-file-paths (c65941f2)
+
+
+```
+Merge pull request #107 from jpinsonault/PE-18165-support-for-utf8-file-paths
+
+(PE-18165) Support for utf-8 file paths
+```
+* (MAINT) Prepare for 1.2.5 release (8edf0841)
+
+
+```
+(MAINT) Prepare for 1.2.5 release
+
+Update changelog and version
+```
+* (PE-18165) Support for utf-8 file paths (a54c93b5)
+
+
+```
+(PE-18165) Support for utf-8 file paths
+
+This commit removes the dependency on Addressable and adds some comments
+regarding some screwy areas in the code where we half heartedly tried to
+support loading of URIs
+
+It maintains utf-8 file support
+```
+* Merge pull request #105 from mwbutcher/maint/master/PE-18165_encode_file_URIs_in_order_to_handle_utf-8_chars (e2725955)
+
+
+```
+Merge pull request #105 from mwbutcher/maint/master/PE-18165_encode_file_URIs_in_order_to_handle_utf-8_chars
+
+(PE-18165) encode file URIs to handle utf8 chars
+```
+* (PE-18165) encode file URIs to handle utf8 chars (51525f43)
+
+
+```
+(PE-18165) encode file URIs to handle utf8 chars
+
+Prior to this change, the hocon parser would
+error when give file names like ᚠᛇᚻ.conf or
+/tmp/旗本/pe.conf.
+
+This commit URI encodes the filenames to
+avoid that issue.
+```
+* Merge pull request #104 from puppetlabs/rm_cprice404 (ddb4afb2)
+
+
+```
+Merge pull request #104 from puppetlabs/rm_cprice404
+
+remove cprice404
+```
+* remove cprice404 (f74fb2ca)
+
+* Merge pull request #98 from puppetlabs/theshanx-patch-1 (c532a69e)
+
+
+```
+Merge pull request #98 from puppetlabs/theshanx-patch-1
+
+(maint) Add internal_list key to MAINTAINERS
+```
+* Merge pull request #102 from jpinsonault/maint-fix-typo-in-readme (ecd2de47)
+
+
+```
+Merge pull request #102 from jpinsonault/maint-fix-typo-in-readme
+
+(MAINT) Fix typo in readme
+```
+* (MAINT) Fix typo in readme (10961a98)
+
+* Merge pull request #101 from jpinsonault/maint-update-changelog-after-1.2.4-release (c8d543ad)
+
+
+```
+Merge pull request #101 from jpinsonault/maint-update-changelog-after-1.2.4-release
+
+(MAINT) Update changelog for 1.2.4
+```
+* (MAINT) Update changelog for 1.2.4 (c7a5edf1)
+
+
+```
+(MAINT) Update changelog for 1.2.4
+
+And explain missing version numbers
+```
+* (maint) Add internal_list key to MAINTAINERS (e327d214)
+
+
+```
+(maint) Add internal_list key to MAINTAINERS
+
+This change adds a reference to the Google group the maintainers are associated with.
+```
+### <a name = "1.2.4">1.2.4 - 3 Nov, 2016 (5157cc60)
+
+* (HISTORY) update ruby-hocon history for gem release 1.2.4 (5157cc60)
 
 * (GEM) update hocon version to 1.2.4 (67ff0795)
 

data/README.md

@@ -116,7 +116,9 @@ $ cat settings.conf
 $ hocon -i settings.conf get foo
 bar
 
-$ hocon -i settings.conf set foo.baz
+$ hocon -i settings.conf set foo baz
+
+$ cat settings.conf
 {
   foo: baz
 }

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

@@ -1,5 +1,5 @@
 module Hocon
   module Version
-    STRING = '1.2.4'
+    STRING = '1.2.5'
   end
 end

data/spec/unit/typesafe/config/conf_parser_spec.rb

@@ -705,6 +705,11 @@ describe "Config Parser" do
     assert_comments_at_path([], conf8, "a")
   end
 
+  context "loading unicode file paths" do
+    it "should be able to parse files with unicode file paths" do
+      expect(Hocon.load("#{FIXTURE_DIR}/test_utils/resources/ᚠᛇᚻ.conf")).to eq({'ᚠᛇᚻ' => '᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢ'})
+    end
+  end
 
   it "includeFile" do
     conf = Hocon::ConfigFactory.parse_string("include file(" +
@@ -781,12 +786,6 @@ describe "Config Parser" do
   # Skipping 'includeURLHeuristically' because we don't support URLs
   # Skipping 'includeURLBasenameHeuristically' because we don't support URLs
 
-  it "shouldacceptUTF8FileNames" do
-    skip('UTF-8 filenames not currently supported') do
-      expect { Hocon::ConfigFactory.parse_file(TestUtils.resource_file("ᚠᛇᚻ.conf")) }.to raise_error
-    end
-  end
-
   it "acceptsUTF8FileContents" do
     # utf8.conf is UTF-8 with no BOM
     rune_utf8 = "\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Chris Price
@@ -19,32 +19,32 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-description: == A port of the Java {Typesafe Config}[https://github.com/typesafehub/config]
-  library to Ruby
+description: "== A port of the Java {Typesafe Config}[https://github.com/typesafehub/config]
+  library to Ruby"
 email: chris@puppetlabs.com
 executables:
 - hocon
@@ -200,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HOCON Config Library