structurebutcher 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8de11b61a4cff11073f600d70e13e1166df5ce85
-  data.tar.gz: 41461e5a17c76349926ce05accae503b16cc6415
+SHA256:
+  metadata.gz: 5cd127b65de2a507451e7af172bef194d52a62c41d1a64e27aaf2173851a953e
+  data.tar.gz: b44a6e8b17192d2d4ef6a707dd290d70ccdbab0f8b83517273306d3a5444411c
 SHA512:
-  metadata.gz: bc1b1156c46e0ffcd9cfe568682f830aa3e5959f2b7cea466f7f3f9baf4b35cd02ad779ef39a568a879629630bc9514efd930f5debc272c51ead24d7fbfe4189
-  data.tar.gz: 16e70c42509b4c928433ac61afb873429d8d28236cd07bc7a27615330e97fdce4727bbdb6a0f0c27a0504760a652183238cac8ccde1c548cfb65e75a2e51c93c
+  metadata.gz: 15b0a3deb76002fa0cc81529a1b0e1ad3f5d6fbab62d164b0fcfd8a990598f2e28f59bbdbcf472dfded28974e4f1b3796eaec407694ec95486e68712c7ca3b6f
+  data.tar.gz: e49657755c9539a44ab6d8f17d53a008f342b6e1e2d98b41a919acf37bf30118274126f7b90bbea43329d466860f56b671a44e7e909a7b90285e04b1207cf085

data/lib/structurebutcher.rb

@@ -72,6 +72,7 @@ class StructureButcher
         part = butcher.implantate(body, slot, part)
 
         storer = StructureButcher::Storer.new
+
         storer.save_structure(body, body_file, "yaml")
     end
 
@@ -152,7 +153,7 @@ class StructureButcher::Parser
             result = recursive_stringify_keys(YAML.load_file(filename))
         rescue
             msg = "Error parsing '" + filename + "': " + $!.message
-            raise AbortException.new(msg)
+            raise Exception.new(msg)
         end
         return result
     end
@@ -163,7 +164,7 @@ class StructureButcher::Parser
             result = recursive_stringify_keys(JavaProperties.load(filename))
         rescue
             msg = "Error parsing '" + filename + "': " + $!.message
-            raise AbortException.new(msg)
+            raise Exception.new(msg)
         end
         return result
     end
@@ -171,10 +172,10 @@ class StructureButcher::Parser
     def load_hocon(filename)
         result = nil
         begin
-            result =  recursive_stringify_keys(Hocon.load(filename))
+            result =  recursive_stringify_keys(Hocon.load(filename, {:syntax => Hocon::ConfigSyntax::HOCON}))
         rescue
             msg = "Error parsing '" + filename + "': " + $!.message
-            raise AbortException.new(msg)
+            raise Exception.new(msg)
         end
         return result
     end
@@ -203,6 +204,15 @@ class StructureButcher::Storer
     end
 
     def save_structure(structure, filename, format)
-        File.write(filename, structure_in_format(structure, format))
+        sorted_structure = {}
+        structure.keys.each do |key|
+            value = structure[key]
+            if value.is_a?(Hash)
+                sorted_structure[key] = Hash[value.sort]
+            else
+                sorted_structure[key] = value
+            end
+        end
+        File.write(filename, structure_in_format(Hash[sorted_structure.sort], format))
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: structurebutcher
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Miroslav Tynovsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: java-properties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.1'
 description: Read a config file and write it to a YAML file under specific key
 email: tynovsky@avast.com
 executables: []
@@ -63,7 +63,7 @@ homepage: https://github.com/avast/structurebutcher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,9 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Config saver/restorer
 test_files: []