structurebutcher 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c19a6f6222074c12a8b3449d3c43b234cbeda1d
-  data.tar.gz: eb32ced9e89b7004c0b12ca47623eef4c53b91c3
+  metadata.gz: 8de11b61a4cff11073f600d70e13e1166df5ce85
+  data.tar.gz: 41461e5a17c76349926ce05accae503b16cc6415
 SHA512:
-  metadata.gz: 2061451fbf84041e4015890e9ace3ed7be0b8ad7f5bcf5c847e0eabca74261fe652f6ee2110c1ba9a069c195b34fd6e9675b6f6361bf452a780b4182891a711a
-  data.tar.gz: 4465801209874f072243b3d72372588561736d73afcb8df97851da224eb621ebec9dd83dd8ef721a2aebd5c9234eefd80c10b826d26818a6d57842a5ae21f3f8
+  metadata.gz: bc1b1156c46e0ffcd9cfe568682f830aa3e5959f2b7cea466f7f3f9baf4b35cd02ad779ef39a568a879629630bc9514efd930f5debc272c51ead24d7fbfe4189
+  data.tar.gz: 16e70c42509b4c928433ac61afb873429d8d28236cd07bc7a27615330e97fdce4727bbdb6a0f0c27a0504760a652183238cac8ccde1c548cfb65e75a2e51c93c

data/lib/structurebutcher.rb

@@ -64,9 +64,9 @@ class StructureButcher
 
         # make sure we work with hash
         # it does not make sense to work with anything else
-	if not body.is_a?(Hash)
-	    body = Hash.new
-	end
+        if not body.is_a?(Hash)
+            body = Hash.new
+        end
 
         butcher = StructureButcher.new
         part = butcher.implantate(body, slot, part)
@@ -81,9 +81,9 @@ class StructureButcher
 
         # make sure we work with hash
         # it does not make sense to work with anything else
-	if not body.is_a?(Hash)
-	    body = Hash.new
-	end
+        if not body.is_a?(Hash)
+            body = Hash.new
+        end
 
         butcher = StructureButcher.new
         butcher.implantate(body, slot, part_struct)
@@ -95,21 +95,25 @@ end
 
 class StructureButcher::Parser
     def load_structure(filename, format)
-        case format
-        when "json"
-            return load_json(filename)
-        when "yaml"
-            return load_yaml(filename)
-        when "properties"
-            return load_properties(filename)
-        when "javaprops"
-            return load_properties(filename)
-        when "hocon"
-            return load_hocon(filename)
-        when "base64"
-            return load_base64(filename)
-        else
-            throw "Not implemented"
+        begin
+            case format
+            when "json"
+                return load_json(filename)
+            when "yaml"
+                return load_yaml(filename)
+            when "properties"
+                return load_properties(filename)
+            when "javaprops"
+                return load_properties(filename)
+            when "hocon"
+                return load_hocon(filename)
+            when "base64"
+                return load_base64(filename)
+            else
+                raise "Not implemented"
+            end
+        rescue Exception => e
+            abort(e.message)
         end
     end
 
@@ -132,19 +136,47 @@ class StructureButcher::Parser
 
     def load_json(filename)
         file = File.read(filename)
-        return recursive_stringify_keys(JSON.parse(file))
+        result = nil
+        begin
+            result = recursive_stringify_keys(JSON.parse(file))
+        rescue
+            msg = "Error parsing '" + filename + "': " + $!.message
+            raise ArgumentError.new(msg)
+        end
+        return result
     end
 
     def load_yaml(filename)
-        return recursive_stringify_keys(YAML.load_file(filename))
+        result = nil
+        begin
+            result = recursive_stringify_keys(YAML.load_file(filename))
+        rescue
+            msg = "Error parsing '" + filename + "': " + $!.message
+            raise AbortException.new(msg)
+        end
+        return result
     end
 
     def load_properties(filename)
-        return recursive_stringify_keys(JavaProperties.load(filename))
+        result = nil
+        begin
+            result = recursive_stringify_keys(JavaProperties.load(filename))
+        rescue
+            msg = "Error parsing '" + filename + "': " + $!.message
+            raise AbortException.new(msg)
+        end
+        return result
     end
 
     def load_hocon(filename)
-        return recursive_stringify_keys(Hocon.load(filename))
+        result = nil
+        begin
+            result =  recursive_stringify_keys(Hocon.load(filename))
+        rescue
+            msg = "Error parsing '" + filename + "': " + $!.message
+            raise AbortException.new(msg)
+        end
+        return result
     end
 
     def load_base64(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structurebutcher
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Miroslav Tynovsky
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Config saver/restorer