etcd-tools 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjJmMWFjMTQ0ZTg4YTU1ZWYzODEyNzFkMTcxMzlkNzljYjM0ZTMyMw==
+    YmEwMGYxNmZmNzUyYWViMTE4OWUzNWM1OGFjNjA4Y2YzOWY1NTNjMg==
   data.tar.gz: !binary |-
-    NTY4ZDgzNWM2MWNhNDhmZTc4MzYzOGZjNWQ4YTNiZWMwMzU0NmE2OA==
+    NDAzYWY3NjgxOGY0MWYwMzNmYjM4ZDM0NTA3NGJhNTY2NTE0OTA3OQ==
 SHA512:
   metadata.gz: !binary |-
-    M2NkMGYxZjRlYTNkMDM3MGIxZjk4ZmQ5ZTBmMzA4NjhmZGZkNGJjMjFiMGM0
-    YjFjNTc3MDdjMTk5MmQ5ZTUyNjcyMjQ3NTQyMTRlNmI0ZDcwN2Y3NWZjZmJm
-    NmY5ODkzMTA5NTdjOTkzNTQ4OTE1MTJiZDNkOGI0ZmY1ZmZmM2U=
+    MWViNzVkNGI1ODA5MmEzMjhhMTUxOWUxNjNhOTNhZjc1YmQwYzRmNjM3ZmQ0
+    NWEwM2ZjN2M1MjQwOTJkZTJkOTljNmY4NzlmZTg3NTY2Mjk0ZmI4YTIwOGEy
+    NGI4ZTAwNzFlMzI3NzdiMmZhNjliOGI1YzExYmYyZWRlNmMwZTI=
   data.tar.gz: !binary |-
-    ZjU0OWE3ODM1MTM1MDM1Njk3MmYzYWZlNTZmMDk1NGU0MTQ5NzdhY2EzZWI1
-    OTEyNDlmZmExYzJlZWQzNThjMGE4ZjAxM2JjOTJjOWQyOGRmZDJkYWNkNGEy
-    Mjk0NTY4MDllMzRjNjk2YTc1Yzk0ZGU1NDExOWJiMjdlNzE3ZTA=
+    OTA0Y2M4ZWNkNDQyNTg0ZjMzZGVlMWJmNjIzYzI0ZWZhNGQyYjUxYTYwOGNm
+    NDZhY2JjMjk5NzRkYjFhYzEwYWM5OWExN2EyNmUzMjdlYWUxYmY3ZjRmOTU0
+    NjZjNTM5OWIwOWM3NmJkZWI4NDI1NzRlMTNkY2FiNDliMmEzYjA=

data/lib/etcd-tools/cli/etcd2yaml.rb

@@ -49,7 +49,7 @@ module EtcdTools
 
         begin
           hash = etcd2hash @etcd, @options[:root_path]
-          puts hash.to_yaml
+          puts YAML.dump hash
         rescue Exception => e
           $stderr.puts "Import failed"
           $stderr.puts e.message

data/lib/etcd-tools/etcd.rb

@@ -18,8 +18,7 @@ module EtcdTools
       begin
         hash.each do |key, value|
           etcd_key = path + "/" + key.to_s
-          case value
-          when Hash
+          if value === Hash
             hash2etcd(value, etcd_key)
           else
             etcd.set(etcd_key, value: value)
@@ -32,19 +31,18 @@ module EtcdTools
 
     def etcd2hash (etcd, path="")
       begin
-        hash = Hash.new
+        h = {}
         etcd.get(path).children.each do |child|
           if etcd.get(child.key).directory?
-            hash[child.key.split('/').last.to_sym] = etcd2hash etcd, child.key
+            h[child.key.split('/').last.to_s] = etcd2hash etcd, child.key
           else
-            hash[child.key.split('/').last.to_sym] = child.value
+            h[child.key.split('/').last.to_s] = child.value
           end
         end
-      rescue
+        return Hash[h.sort]
+      rescue Exception => e
         return nil
       end
-      return hash.sort.to_h
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etcd-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='