structurebutcher 0.8.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db853d50c1ba07f0bc5a4e4d990c4586b4ba17d5
-  data.tar.gz: 337b870faf1fad12a15767be0b246958286442da
+SHA256:
+  metadata.gz: 8c41f74f3eb3fd798e6f50858de0dbaa8ec5945614a760b4bde3d7a3841a13df
+  data.tar.gz: faad2ff531b90159b5e9f7b02a48763eeaab96b9ade42970cbb16eab4f5c4b3e
 SHA512:
-  metadata.gz: b694dce96c8783c94d473fdb581f56b504c4d181985e0bfcf7061cb7b7f5eb5eaad9f1c6f0a627c2a3d9a1f7d09c11647a35c5a1de8a07d43262bcb93af3ee0e
-  data.tar.gz: 592094360fa418d177bc3e7dbede2832978d16cfa8a17cbfdd07f740e62e472b611d9b5b8a45852125fc2a249814408224178b44d0ca1c043f25957dd2d256b7
+  metadata.gz: c06bae11fe8749678f9098205287b8309a89b58a877235b3ecaf499695c83f9a6333628f626e5db21e9f4a6452fec9cdc7cec4207aeaae2e7cdcad584e6b4b34
+  data.tar.gz: 977527c33cb82b2a09515ea41304b3ed4f8f1e9cd367056714397f13ca50f7eee6a5e798a50ba0846e1e69e21a7cea355245fd2af43e26dd963702d0f10f3244

data/lib/structurebutcher.rb

@@ -10,18 +10,6 @@ require 'base64'
 #amputovat, implantovat
 #amputate, implantate
 
-class Hash
-  def sort_by_key(recursive = false, &block)
-    self.keys.sort(&block).reduce({}) do |seed, key|
-      seed[key] = self[key]
-      if recursive && seed[key].is_a?(Hash)
-        seed[key] = seed[key].sort_by_key(true, &block)
-      end
-      seed
-    end
-  end
-end
-
 class StructureButcher
     def split_escape(str)
         output = []
@@ -85,7 +73,7 @@ class StructureButcher
 
         storer = StructureButcher::Storer.new
 
-        storer.save_structure(body.sort_by_key(true), body_file, "yaml")
+        storer.save_structure(body, body_file, "yaml")
     end
 
     def implantate_struct_into_file(body_file, slot, part_struct)
@@ -102,7 +90,7 @@ class StructureButcher
         butcher.implantate(body, slot, part_struct)
 
         storer = StructureButcher::Storer.new
-        storer.save_structure(body.sort_by_key(true), body_file, "yaml")
+        storer.save_structure(body, body_file, "yaml")
     end
 end
 
@@ -165,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
@@ -176,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
@@ -184,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
@@ -216,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.8.0
+  version: 1.0.1
 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.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.3'
 - !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.6.8
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Config saver/restorer
 test_files: []