knife-essentials 1.3 → 1.3.2

data/lib/chef/knife/serve_essentials.rb

@@ -22,11 +22,6 @@ EOM
         require 'chef_fs/chef_fs_data_store'
       end
 
-      option :remote,
-        :long => '--remote',
-        :boolean => true,
-        :description => "Proxy the remote server instead of the local filesystem"
-
       option :host,
         :short => '-H',
         :long => '--host=HOST',
@@ -44,7 +39,7 @@ EOM
 
       def run
         server_options = {}
-        server_options[:data_store] = ChefFS::ChefFSDataStore.new(proc { config[:remote] ? create_chef_fs : create_local_fs })
+        server_options[:data_store] = ChefFS::ChefFSDataStore.new(local_fs)
         server_options[:log_level] = Chef::Log.level
         server_options[:host] = config[:host] if config[:host]
         server_options[:port] = config[:port] ? config[:port].to_i : 4000

data/lib/chef_fs/chef_fs_data_store.rb

@@ -35,11 +35,7 @@ module ChefFS
       "Reading and writing data to #{chef_fs.fs_description}"
     end
 
-    def chef_fs
-      @chef_fs.call
-    end
-
-    MEMORY_PATHS = %w(sandboxes file_store)
+    attr_reader :chef_fs
 
     def create_dir(path, name, *options)
       if use_memory_store?(path)

data/lib/chef_fs/data_handler/acl_data_handler.rb

@@ -5,7 +5,7 @@ module ChefFS
     class AclDataHandler < DataHandlerBase
       def normalize(node, entry)
         # Normalize the order of the keys for easier reading
-        result = super(node, {
+        result = normalize_hash(node, {
           'create' => {},
           'read' => {},
           'update' => {},
@@ -13,7 +13,7 @@ module ChefFS
           'grant' => {}
           })
         result.keys.each do |key|
-          result[key] = super(result[key], { 'actors' => [], 'groups' => [] })
+          result[key] = normalize_hash(result[key], { 'actors' => [], 'groups' => [] })
           result[key]['actors'] = result[key]['actors'].sort
           result[key]['groups'] = result[key]['groups'].sort
         end

data/lib/chef_fs/data_handler/client_data_handler.rb

@@ -16,7 +16,7 @@ module ChefFS
         if entry.org
           defaults['orgname'] = entry.org
         end
-        result = super(client, defaults)
+        result = normalize_hash(client, defaults)
         # You can NOT send json_class, or it will fail
         result.delete('json_class')
         result

data/lib/chef_fs/data_handler/container_data_handler.rb

@@ -4,7 +4,7 @@ module ChefFS
   module DataHandler
     class ContainerDataHandler < DataHandlerBase
       def normalize(container, entry)
-        super(container, {
+        normalize_hash(container, {
           'containername' => remove_dot_json(entry.name),
           'containerpath' => remove_dot_json(entry.name)
         })

data/lib/chef_fs/data_handler/cookbook_data_handler.rb

@@ -7,7 +7,7 @@ module ChefFS
       def normalize(cookbook, entry)
         version = entry.name
         name = entry.parent.name
-        result = super(cookbook, {
+        result = normalize_hash(cookbook, {
           'name' => "#{name}-#{version}",
           'version' => version,
           'cookbook_name' => name,
@@ -16,7 +16,7 @@ module ChefFS
           'frozen?' => false,
           'metadata' => {}
         })
-        result['metadata'] = super(result['metadata'], {
+        result['metadata'] = normalize_hash(result['metadata'], {
           'version' => version,
           'name' => name
         })

data/lib/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -9,16 +9,17 @@ module ChefFS
         if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
           data_bag_item = data_bag_item['raw_data']
         end
-        # chef_type and data_bag only come back from PUT and POST, but we'll
-        # normalize them in in case someone is comparing with those results.
-        super(data_bag_item, {
-          'chef_type' => 'data_bag_item',
-          'data_bag' => entry.parent.name,
+        # chef_type and data_bag come back in PUT and POST results, but we don't
+        # use those in knife-essentials.
+        normalize_hash(data_bag_item, {
           'id' => remove_dot_json(entry.name)
         })
       end
 
       def normalize_for_post(data_bag_item, entry)
+        if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
+          data_bag_item = data_bag_item['raw_data']
+        end
         {
           "name" => "data_bag_item_#{entry.parent.name}_#{remove_dot_json(entry.name)}",
           "json_class" => "Chef::DataBagItem",

data/lib/chef_fs/data_handler/data_handler_base.rb

@@ -26,7 +26,7 @@ module ChefFS
         normalize({}, entry)
       end
 
-      def normalize(object, defaults)
+      def normalize_hash(object, defaults)
         # Make a normalized result in the specified order for diffing
         result = {}
         defaults.each_pair do |key, default|

data/lib/chef_fs/data_handler/environment_data_handler.rb

@@ -5,7 +5,7 @@ module ChefFS
   module DataHandler
     class EnvironmentDataHandler < DataHandlerBase
       def normalize(environment, entry)
-        super(environment, {
+        normalize_hash(environment, {
           'name' => remove_dot_json(entry.name),
           'description' => '',
           'cookbook_versions' => {},

data/lib/chef_fs/data_handler/group_data_handler.rb

@@ -15,7 +15,7 @@ module ChefFS
         if entry.org
           defaults['orgname'] = entry.org
         end
-        result = super(group, defaults)
+        result = normalize_hash(group, defaults)
         if result['actors'] && result['actors'].sort.uniq == (result['users'] + result['clients']).sort.uniq
           result.delete('actors')
         end

data/lib/chef_fs/data_handler/node_data_handler.rb

@@ -5,7 +5,7 @@ module ChefFS
   module DataHandler
     class NodeDataHandler < DataHandlerBase
       def normalize(node, entry)
-        result = super(node, {
+        result = normalize_hash(node, {
           'name' => remove_dot_json(entry.name),
           'json_class' => 'Chef::Node',
           'chef_type' => 'node',

data/lib/chef_fs/data_handler/role_data_handler.rb

@@ -5,7 +5,7 @@ module ChefFS
   module DataHandler
     class RoleDataHandler < DataHandlerBase
       def normalize(role, entry)
-        result = super(role, {
+        result = normalize_hash(role, {
           'name' => remove_dot_json(entry.name),
           'description' => '',
           'json_class' => 'Chef::Role',

data/lib/chef_fs/data_handler/user_data_handler.rb

@@ -4,7 +4,7 @@ module ChefFS
   module DataHandler
     class UserDataHandler < DataHandlerBase
       def normalize(user, entry)
-        super(user, {
+        normalize_hash(user, {
           'name' => remove_dot_json(entry.name),
           'admin' => false,
           'json_class' => 'Chef::WebUIUser',

data/lib/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -81,11 +81,10 @@ module ChefFS
       end
 
       def children
-        @children ||=
-          Dir.entries(file_path).sort.
-              select { |entry| entry != '.' && entry != '..' }.
-              map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }.
-              select { |entry| !ignored?(entry) }
+        Dir.entries(file_path).sort.
+            select { |entry| entry != '.' && entry != '..' }.
+            map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }.
+            select { |entry| !ignored?(entry) }
       end
 
       private

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -39,7 +39,7 @@ module ChefFS
 
       def children
         begin
-          @children ||= Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
+          Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
         rescue Errno::ENOENT
           raise ChefFS::FileSystem::NotFoundError.new(self, $!)
         end

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.3"
+  VERSION = "1.3.2"
 end

data/spec/data/null_config.rb

@@ -0,0 +1 @@
+$__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"

data/spec/integration/redirection_spec.rb

@@ -1,4 +1,4 @@
-require 'thin'
+require 'puma'
 require 'support/integration_helper'
 require 'chef/knife/list_essentials'
 
@@ -16,18 +16,11 @@ describe 'redirection' do
         app = lambda do |env|
           [302, {'Content-Type' => 'text','Location' => "#{@real_chef_server_url}#{env['PATH_INFO']}" }, ['302 found'] ]
         end
-        Thin::Logging.silent = true
-        @redirector_server = Thin::Server.new('127.0.0.1', 9018, app, { :signals => false })
-        @redirector_thread = Thread.new do
-          begin
-            @redirector_server.start
-          rescue
-            @server_error = $!
-            Chef::Log.error("#{$!.message}\n#{$!.backtrace.join("\n")}")
-          end
-        end
+        @redirector_server = Puma::Server.new(app, Puma::Events.new(STDERR, STDOUT))
+        @redirector_server.add_tcp_listener("127.0.0.1", 9018)
+        @redirector_server.run
         Timeout::timeout(5) do
-          until @redirector_server.running? || @server_error
+          until @redirector_server.running
             sleep(0.01)
           end
           raise @server_error if @server_error
@@ -36,10 +29,7 @@ describe 'redirection' do
 
       after :each do
         Chef::Config.chef_server_url = @real_chef_server_url
-        @redirector_thread.kill
-        @redirector_thread.join(nil)
-        @redirector_thread = nil
-        @redirector_server = nil
+        @redirector_server.stop(true)
       end
 
       it 'knife list /roles returns the role' do

data/spec/integration/upload_spec.rb

@@ -1,6 +1,7 @@
 require 'support/integration_helper'
 require 'chef/knife/upload_essentials'
 require 'chef/knife/diff_essentials'
+require 'chef/knife/raw_essentials'
 
 describe 'knife upload' do
   extend IntegrationSupport
@@ -209,8 +210,36 @@ EOM
       end
     end
 
-    # Test upload of an item when the other end doesn't even have the container
     when_the_chef_server 'is empty' do
+      when_the_repository 'has a data bag item' do
+        file 'data_bags/x/y.json', { 'foo' => 'bar' }
+        it 'knife upload of the data bag uploads only the values in the data bag item and no other' do
+          knife('upload /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags/x
+Created /data_bags/x/y.json
+EOM
+          knife('diff --name-status /data_bags').should_succeed <<EOM
+EOM
+          JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
+        end
+      end
+
+      when_the_repository 'has a data bag item with keys chef_type and data_bag' do
+        file 'data_bags/x/y.json', { 'chef_type' => 'aaa', 'data_bag' => 'bbb' }
+        it 'upload preserves chef_type and data_bag' do
+          knife('upload /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags/x
+Created /data_bags/x/y.json
+EOM
+          knife('diff --name-status /data_bags').should_succeed ''
+          result = JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false)
+          result.keys.sort.should == [ 'chef_type', 'data_bag', 'id' ]
+          result['chef_type'].should == 'aaa'
+          result['data_bag'].should == 'bbb'
+        end
+      end
+
+      # Test upload of an item when the other end doesn't even have the container
       when_the_repository 'has two data bag items' do
         file 'data_bags/x/y.json', {}
         file 'data_bags/x/z.json', {}
@@ -566,10 +595,10 @@ D\t/roles/x.json
 D\t/users/admin.json
 D\t/users/x.json
 EOM
-      end
+        end
 
-      it 'knife upload --purge deletes everything' do
-        knife('upload --purge /').should_succeed(<<EOM, :stderr => "WARNING: /environments/_default.json cannot be deleted (default environment cannot be modified).\n")
+        it 'knife upload --purge deletes everything' do
+          knife('upload --purge /').should_succeed(<<EOM, :stderr => "WARNING: /environments/_default.json cannot be deleted (default environment cannot be modified).\n")
 Deleted extra entry /clients/chef-validator.json (purge is on)
 Deleted extra entry /clients/chef-webui.json (purge is on)
 Deleted extra entry /clients/x.json (purge is on)
@@ -581,10 +610,10 @@ Deleted extra entry /roles/x.json (purge is on)
 Deleted extra entry /users/admin.json (purge is on)
 Deleted extra entry /users/x.json (purge is on)
 EOM
-        knife('diff --name-status /').should_succeed <<EOM
+          knife('diff --name-status /').should_succeed <<EOM
 D\t/environments/_default.json
 EOM
-      end
+        end
       end
 
       when_the_repository 'has an identical copy of each thing' do

data/spec/support/integration_helper.rb

@@ -30,14 +30,14 @@ module IntegrationSupport
 
   def self.extended(base)
     base.before :each do
-      @old_repo_mode = nil
-      @old_versioned_cookbooks = nil
+      # We mess with Chef::Config a lot.  Save and restore it.
+      @old_chef_config = Chef::Config.configuration
+      Chef::Config.configuration = Chef::Config.configuration.dup
       Chef::Config.repo_mode = nil
       Chef::Config.versioned_cookbooks = nil
     end
     base.after :each do
-      Chef::Config.repo_mode = @old_repo_mode
-      Chef::Config.versioned_cookbooks = @old_versioned_cookbooks
+      Chef::Config.configuration = @old_chef_config
     end
   end
 

data/spec/support/knife_support.rb

@@ -45,7 +45,20 @@ module KnifeSupport
 
         # Don't print stuff
         Chef::Config[:verbosity] = ( DEBUG ? 2 : 0 )
+        instance.config[:config_file] = File.join(CHEF_SPEC_DATA, "null_config.rb")
+
+        # Configure chef with a (mostly) blank knife.rb
+        # We set a global and then mutate it in our stub knife.rb so we can be
+        # extra sure that we're not loading someone's real knife.rb and then
+        # running test scenarios against a real chef server. If things don't
+        # smell right, abort.
+
+        $__KNIFE_INTEGRATION_FAILSAFE_CHECK = "ole"
         instance.configure_chef
+
+        unless $__KNIFE_INTEGRATION_FAILSAFE_CHECK == "ole ole"
+          raise Exception, "Potential misconfiguration of integration tests detected. Aborting test."
+        end
         logger = Logger.new(stderr)
         logger.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
         Chef::Log.use_log_devices([logger])

data/spec/support/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'support/file_system_support'
 
+CHEF_SPEC_DATA = File.join(File.dirname(File.dirname(__FILE__)), 'data')
+
 RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -92,21 +92,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
 executables: []
@@ -190,6 +190,7 @@ files:
 - spec/chef_fs/diff_spec.rb
 - spec/chef_fs/file_pattern_spec.rb
 - spec/chef_fs/file_system_spec.rb
+- spec/data/null_config.rb
 - spec/integration/chef_repo_path_spec.rb
 - spec/integration/chef_repository_file_system_spec.rb
 - spec/integration/chefignore_spec.rb