knife-essentials 0.9.5 → 0.9.6

data/lib/chef_fs/data_handler/client_data_handler.rb

@@ -5,13 +5,21 @@ module ChefFS
   module DataHandler
     class ClientDataHandler < DataHandlerBase
       def normalize(client, entry)
-        super(client, {
+        defaults = {
           'name' => remove_dot_json(entry.name),
+          'clientname' => remove_dot_json(entry.name),
+          'orgname' => entry.org,
           'admin' => false,
           'validator' => false,
-          'json_class' => 'Chef::ApiClient',
           'chef_type' => 'client'
-        })
+        }
+        if entry.org
+          defaults['orgname'] = entry.org
+        end
+        result = super(client, defaults)
+        # You can NOT send json_class, or it will fail
+        result.delete('json_class')
+        result
       end
 
       def preserve_key(key)

data/lib/chef_fs/data_handler/data_handler_base.rb

@@ -38,6 +38,10 @@ module ChefFS
         result
       end
 
+      def normalize_for_put(object, entry)
+        normalize(object, entry)
+      end
+
       def normalize_run_list(run_list)
         run_list.map{|item|
           case item.to_s

data/lib/chef_fs/data_handler/group_data_handler.rb

@@ -9,14 +9,30 @@ module ChefFS
           'name' => remove_dot_json(entry.name),
           'groupname' => remove_dot_json(entry.name),
           'users' => [],
-          'actors' => [],
           'clients' => [],
           'groups' => [],
         }
         if entry.org
           defaults['orgname'] = entry.org
         end
-        super(group, defaults)
+        result = super(group, defaults)
+        if result['actors'] && result['actors'].sort.uniq == (result['users'] + result['clients']).sort.uniq
+          result.delete('actors')
+        end
+        result
+      end
+
+      def normalize_for_put(group, entry)
+        result = super(group, entry)
+        result['actors'] = {
+          'users' => result['users'],
+          'clients' => result['clients'],
+          'groups' => result['groups']
+        }
+        result.delete('users')
+        result.delete('clients')
+        result.delete('groups')
+        result
       end
 
       def preserve_key(key)

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -148,7 +148,7 @@ module ChefFS
         end
 
         if data_handler
-          object = data_handler.normalize(object, self)
+          object = data_handler.normalize_for_put(object, self)
         end
 
         base_name = name[0,name.length-5]

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero