knife-undev 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ccb6e7f71681b5e3e49b7286f6729d5c8ee2f5
-  data.tar.gz: db8802d7842b2e8f680ac46ce6510506ee1eb100
+  metadata.gz: be0a0d743a484ec9a8693fd64610ccd847fb1f4c
+  data.tar.gz: ba5ea1dfbeb9b2b17023ae42f7573e931ab5aa95
 SHA512:
-  metadata.gz: 1e7ee83e8c6bae0314940dcdbe584016e5171af96de2e9625a4ded52f5cfc3b1fe9d889ee54719fb849352869fdbb37ae7fff4c2f1322cbce8e52a7b13e4c575
-  data.tar.gz: 713083287a2c317f36fe5e8940d77d0bc038f2ccc79a35ccd87e3c1b04c5c0e05b3a538150bf9453f72a79ade7fec823da87c321a9aa9353e18ac290bb1fa0ef
+  metadata.gz: c895a81c0bd2ca4f11e982d6f8711772d7acb77ad64ed576ba901f97e06b06efb2dbeba6d2f709cc64a8eb1d8452ae8ab526de7de616a36b44833ef61b6865b3
+  data.tar.gz: 2b4cd515fc25a65e96d59594d114c692ccbc90a7b9274d278fbb90cc0ae65259a9f0f7e5aafdece38d0b8dabc7c40325a405a32db43a16efa7152664216cf3cd

data/knife-undev.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "chef"
   spec.add_dependency "trollop"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/knife/undev/converter.rb

@@ -5,13 +5,19 @@ require 'chef/environment'
 module Knife
   module Undev
     class Converter
-      
+
       def initialize(filename, klass = 'role')
         @filename = filename
         @klass = klass
         @comment_counter = 0
       end
 
+      def stringify_keys(obj)
+        return obj.inject({}){|memo,(k,v)| memo[k.to_s] =  stringify_keys(v); memo} if obj.is_a? Hash
+        return obj.inject([]){|memo,v    | memo           << stringify_keys(v); memo} if obj.is_a? Array
+        obj
+      end
+
       def to_yml
         case @klass
         when 'env'
@@ -32,7 +38,7 @@ module Knife
       def role_to_yml
         r = Chef::Role.new
         r.from_file(@filename)
-        hash = r.to_hash.dup
+        hash = stringify_keys(r.to_hash)
         result_hash = Hash.new
         hash.delete('chef_type')
         hash.delete('json_class')
@@ -46,7 +52,7 @@ module Knife
         result_hash.merge(hash).to_yaml.each_line do |line|
           puts '' if line.match /#comment_\d+/
           next if line.match /#comment_\d+/
-          next if line == '---'
+          next if line.match '^---'
           puts line
         end
       end
@@ -54,7 +60,7 @@ module Knife
       def env_to_yml
         r = Chef::Environment.new
         r.from_file(@filename)
-        hash = r.to_hash.dup
+        hash = stringify_keys(r.to_hash)
         hash.delete('chef_type')
         hash.delete('json_class')
         safe_delete(hash, 'override_attributes')
@@ -62,11 +68,11 @@ module Knife
         safe_delete(hash, 'cookbook_versions')
         safe_delete(hash, 'description')
         hash.to_yaml.each_line do |line|
-          next if line == '---' 
+          next if line.match '^---'
           puts line
         end
       end
-      
+
     end
   end
 end

data/lib/knife/undev/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Undev
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-undev
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement