knife-essentials 0.9.4 → 0.9.5

data/lib/chef_fs/knife.rb

@@ -27,7 +27,7 @@ module ChefFS
     def self.common_options
       option :repo_mode,
         :long => '--repo-mode MODE',
-        :description => "Specifies the local repository layout.  Values: default or everything"
+        :description => "Specifies the local repository layout.  Values: default, everything, hosted_everything"
 
       option :chef_repo_path,
         :long => '--chef-repo-path PATH',
@@ -39,7 +39,7 @@ module ChefFS
       Chef::Config[:repo_mode] = config[:repo_mode] if config[:repo_mode]
 
       # --chef-repo-path overrides all other paths
-      path_variables = %w(client_path cookbook_path data_bag_path environment_path node_path role_path user_path)
+      path_variables = %w(acl_path client_path cookbook_path container_path data_bag_path environment_path group_path node_path role_path user_path)
       if config[:chef_repo_path]
         Chef::Config[:chef_repo_path] = config[:chef_repo_path]
         path_variables.each do |variable_name|
@@ -79,7 +79,7 @@ module ChefFS
     end
 
     def chef_fs
-      @chef_fs ||= ChefFS::FileSystem::ChefServerRootDir.new("remote", Chef::Config, Chef::Config[:repo_mode])
+      @chef_fs ||= ChefFS::FileSystem::ChefServerRootDir.new("remote", Chef::Config)
     end
 
     def object_paths
@@ -90,8 +90,11 @@ module ChefFS
         end
 
         result = {}
-        if Chef::Config[:repo_mode] == 'everything'
+        case Chef::Config[:repo_mode]
+        when 'everything'
           object_names = %w(clients cookbooks data_bags environments nodes roles users)
+        when 'hosted_everything'
+          object_names = %w(acls clients cookbooks containers data_bags environments groups nodes roles)
         else
           object_names = %w(cookbooks data_bags environments roles)
         end

data/lib/chef_fs/raw_request.rb

@@ -0,0 +1,73 @@
+module ChefFS
+  module RawRequest
+    def self.raw_json(chef_rest, api_path)
+      JSON.parse(raw_request(chef_rest, api_path), :create_additions => false)
+    end
+
+    def self.raw_request(chef_rest, api_path)
+      api_request(chef_rest, :GET, chef_rest.create_url(api_path), {}, false)
+    end
+
+    def self.api_request(chef_rest, method, url, headers={}, data=false)
+      json_body = data
+      #        json_body = data ? Chef::JSONCompat.to_json(data) : nil
+      # Force encoding to binary to fix SSL related EOFErrors
+      # cf. http://tickets.opscode.com/browse/CHEF-2363
+      # http://redmine.ruby-lang.org/issues/5233
+      #        json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
+      headers = build_headers(chef_rest, method, url, headers, json_body)
+
+      chef_rest.retriable_rest_request(method, url, json_body, headers) do |rest_request|
+        response = rest_request.call {|r| r.read_body}
+
+        response_body = chef_rest.decompress_body(response)
+
+        if response.kind_of?(Net::HTTPSuccess)
+            response_body
+        elsif redirect_location = redirected_to(response)
+          raise "Redirected to #{create_url(redirect_location)}"
+          follow_redirect {api_request(:GET, create_url(redirect_location))}
+        else
+          # have to decompress the body before making an exception for it. But the body could be nil.
+          response.body.replace(chef_rest.decompress_body(response)) if response.body.respond_to?(:replace)
+
+          if response['content-type'] =~ /json/
+            exception = response_body
+            msg = "HTTP Request Returned #{response.code} #{response.message}: "
+            msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
+            Chef::Log.info(msg)
+          end
+          response.error!
+        end
+      end
+    end
+
+    private
+
+    # Copied so that it does not automatically inflate an object
+    # This is also used by knife raw_essentials
+
+    ACCEPT_ENCODING = "Accept-Encoding".freeze
+    ENCODING_GZIP_DEFLATE = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3".freeze
+
+    def self.redirected_to(response)
+      return nil  unless response.kind_of?(Net::HTTPRedirection)
+      # Net::HTTPNotModified is undesired subclass of Net::HTTPRedirection so test for this
+      return nil  if response.kind_of?(Net::HTTPNotModified)
+      response['location']
+    end
+
+
+    def self.build_headers(chef_rest, method, url, headers={}, json_body=false, raw=false)
+      #        headers                 = @default_headers.merge(headers)
+      #headers['Accept']       = "application/json" unless raw
+      headers['Accept']       = "application/json" unless raw
+      headers["Content-Type"] = 'application/json' if json_body
+      headers['Content-Length'] = json_body.bytesize.to_s if json_body
+      headers[Chef::REST::RESTRequest::ACCEPT_ENCODING] = Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE
+      headers.merge!(chef_rest.authentication_headers(method, url, json_body)) if chef_rest.sign_requests?
+      headers.merge!(Chef::Config[:custom_http_headers]) if Chef::Config[:custom_http_headers]
+      headers
+    end
+  end
+end

data/lib/chef_fs/version.rb

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

data/spec/support/integration_helper.rb

@@ -28,7 +28,18 @@ require 'support/spec_helper'
 module IntegrationSupport
   include ChefZero::RSpec
 
-  # Integration DSL
+  def self.extended(base)
+    base.before :each do
+      @old_repo_mode = nil
+      @old_versioned_cookbooks = nil
+      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
+    end
+  end
 
   def when_the_repository(description, *args, &block)
     context "When the local repository #{description}", *args do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -63,15 +63,21 @@ files:
 - lib/chef/knife/show_essentials.rb
 - lib/chef/knife/upload_essentials.rb
 - lib/chef_fs/command_line.rb
+- lib/chef_fs/data_handler/acl_data_handler.rb
 - lib/chef_fs/data_handler/client_data_handler.rb
+- lib/chef_fs/data_handler/container_data_handler.rb
 - lib/chef_fs/data_handler/cookbook_data_handler.rb
 - lib/chef_fs/data_handler/data_bag_item_data_handler.rb
 - lib/chef_fs/data_handler/data_handler_base.rb
 - lib/chef_fs/data_handler/environment_data_handler.rb
+- lib/chef_fs/data_handler/group_data_handler.rb
 - lib/chef_fs/data_handler/node_data_handler.rb
 - lib/chef_fs/data_handler/role_data_handler.rb
 - lib/chef_fs/data_handler/user_data_handler.rb
 - lib/chef_fs/file_pattern.rb
+- lib/chef_fs/file_system/acl_dir.rb
+- lib/chef_fs/file_system/acl_entry.rb
+- lib/chef_fs/file_system/acls_dir.rb
 - lib/chef_fs/file_system/base_fs_dir.rb
 - lib/chef_fs/file_system/base_fs_object.rb
 - lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb
@@ -82,6 +88,7 @@ files:
 - lib/chef_fs/file_system/cookbook_dir.rb
 - lib/chef_fs/file_system/cookbook_file.rb
 - lib/chef_fs/file_system/cookbook_subdir.rb
+- lib/chef_fs/file_system/cookbooks_acl_dir.rb
 - lib/chef_fs/file_system/cookbooks_dir.rb
 - lib/chef_fs/file_system/data_bag_dir.rb
 - lib/chef_fs/file_system/data_bag_item.rb
@@ -103,14 +110,11 @@ files:
 - lib/chef_fs/file_system.rb
 - lib/chef_fs/knife.rb
 - lib/chef_fs/path_utils.rb
+- lib/chef_fs/raw_request.rb
 - lib/chef_fs/version.rb
 - lib/chef_fs.rb
 - spec/chef_fs/diff_spec.rb
 - spec/chef_fs/file_pattern_spec.rb
-- spec/chef_fs/file_system/chef_server_root_dir_spec.rb
-- spec/chef_fs/file_system/cookbook_dir_spec.rb
-- spec/chef_fs/file_system/cookbooks_dir_spec.rb
-- spec/chef_fs/file_system/data_bags_dir_spec.rb
 - spec/chef_fs/file_system_spec.rb
 - spec/integration/chef_repo_path_spec.rb
 - spec/integration/chef_repository_file_system_spec.rb

data/spec/chef_fs/file_system/chef_server_root_dir_spec.rb

@@ -1,252 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'support/spec_helper'
-require 'chef_fs/file_system/chef_server_root_dir'
-
-describe ChefFS::FileSystem::ChefServerRootDir do
-
-  let(:should_receive_children) { endpoint.should_receive(:chef_collection).once.and_return(chef_collection) }
-  let(:should_receive_read) { endpoint_leaf.should_receive(:chef_hash).once.and_return(chef_hash) }
-  let(:should_throw_404) do
-    nonexistent_child.should_receive(:raw_request).
-      with("#{endpoint_name}/blah").
-      once.and_raise(Net::HTTPServerException.new(nil,Net::HTTPResponse.new(nil,'404',nil)))
-  end
-
-  let(:chef_collection) do
-    {
-      "achild" => "http://opscode.com/achild",
-      "bchild" => "http://opscode.com/bchild"
-    }
-  end
-
-  let(:chef_hash) { { 'a' => 'b' } }
-
-  shared_examples 'a json endpoint dir leaf' do
-    it 'parent is endpoint' do
-      endpoint_leaf.parent.should == endpoint
-    end
-    it 'name is correct' do
-      endpoint_leaf.name.should == "#{endpoint_leaf_name}.json"
-    end
-    it 'path is correct' do
-      endpoint_leaf.path.should == "/#{endpoint_name}/#{endpoint_leaf_name}.json"
-    end
-    it 'path_for_printing is correct' do
-      endpoint_leaf.path_for_printing.should == "remote/#{endpoint_name}/#{endpoint_leaf_name}.json"
-    end
-    it 'is not a directory' do
-      endpoint_leaf.dir?.should be_false
-    end
-    it 'exists' do
-      should_receive_children
-      endpoint_leaf.exists?.should be_true
-    end
-    it 'read returns content' do
-      should_receive_read
-      endpoint_leaf.read.should == '{
-  "name": "achild",
-  "a": "b"
-}'
-    end
-  end
-
-
-  shared_examples 'a json rest endpoint dir' do
-    it 'parent is root' do
-      endpoint.parent.should == root_dir
-    end
-    it 'has correct name' do
-      endpoint.name.should == endpoint_name
-    end
-    it 'has correct path' do
-      endpoint.path.should == "/#{endpoint_name}"
-    end
-    it 'has correct path_for_printing' do
-      endpoint.path_for_printing.should == "remote/#{endpoint_name}"
-    end
-    it 'is a directory' do
-      endpoint.dir?.should be_true
-    end
-    it 'exists' do
-      endpoint.exists?.should be_true
-    end
-    it 'can have json files as children' do
-      endpoint.can_have_child?('blah.json', false).should be_true
-    end
-    it 'cannot have non-json files as children' do
-      endpoint.can_have_child?('blah', false).should be_false
-    end
-    it 'cannot have directories as children' do
-      endpoint.can_have_child?('blah', true).should be_false
-      endpoint.can_have_child?('blah.json', true).should be_false
-    end
-
-
-    it 'has correct children' do
-      should_receive_children
-      endpoint.children.map { |child| child.name }.should =~ %w(achild.json bchild.json)
-    end
-
-    context 'achild in endpoint.children' do
-      let(:endpoint_leaf_name) { 'achild' }
-      let(:endpoint_leaf) do
-        should_receive_children
-        endpoint.children.select { |child| child.name == 'achild.json' }.first
-      end
-      it_behaves_like 'a json endpoint dir leaf'
-    end
-    context 'endpoint.child(achild)' do
-      let(:endpoint_leaf_name) { 'achild' }
-      let(:endpoint_leaf) { endpoint.child('achild.json') }
-      it_behaves_like 'a json endpoint dir leaf'
-    end
-    context 'nonexistent child()' do
-      let(:nonexistent_child) { endpoint.child('blah.json') }
-      it 'has correct parent, name, path and path_for_printing' do
-        nonexistent_child.parent.should == endpoint
-        nonexistent_child.name.should == "blah.json"
-        nonexistent_child.path.should == "#{endpoint.path}/blah.json"
-        nonexistent_child.path_for_printing.should == "#{endpoint.path_for_printing}/blah.json"
-      end
-      it 'does not exist' do
-        should_receive_children
-        nonexistent_child.exists?.should be_false
-      end
-      it 'is not a directory' do
-        nonexistent_child.dir?.should be_false
-      end
-      it 'read returns NotFoundError' do
-        should_throw_404
-        expect { nonexistent_child.read }.to raise_error(ChefFS::FileSystem::NotFoundError)
-      end
-    end
-  end
-
-  let(:root_dir) {
-    ChefFS::FileSystem::ChefServerRootDir.new('remote',
-    {
-      :chef_server_url => 'url',
-      :node_name => 'username',
-      :client_key => 'key'
-    }, 'everything')
-  }
-
-  before(:each) do
-    @rest = double("rest")
-    Chef::REST.stub(:new).with('url','username','key') { @rest }
-  end
-
-  context 'the root directory' do
-    it 'has no parent' do
-      root_dir.parent.should == nil
-    end
-    it 'is a directory' do
-      root_dir.dir?.should be_true
-    end
-    it 'exists' do
-      root_dir.exists?.should be_true
-    end
-    it 'has name ""' do
-      root_dir.name.should == ""
-    end
-    it 'has path /' do
-      root_dir.path.should == '/'
-    end
-    it 'has path_for_printing remote/' do
-      root_dir.path_for_printing.should == 'remote/'
-    end
-    it 'has correct children' do
-      root_dir.children.map { |child| child.name }.should =~ %w(clients cookbooks data_bags environments nodes roles users)
-    end
-    it 'can have children with the known names' do
-      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.can_have_child?(child, true).should be_true }
-    end
-    it 'cannot have files as children' do
-      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.can_have_child?(child, false).should be_false }
-      root_dir.can_have_child?('blah', false).should be_false
-    end
-    it 'cannot have other child directories than the known names' do
-      root_dir.can_have_child?('blah', true).should be_false
-    end
-    it 'child() responds to children' do
-      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.child(child).exists?.should be_true }
-    end
-    context 'nonexistent child()' do
-      let(:nonexistent_child) { root_dir.child('blah') }
-      it 'has correct parent, name, path and path_for_printing' do
-        nonexistent_child.parent.should == root_dir
-        nonexistent_child.name.should == "blah"
-        nonexistent_child.path.should == "/blah"
-        nonexistent_child.path_for_printing.should == "remote/blah"
-      end
-      it 'does not exist' do
-        nonexistent_child.exists?.should be_false
-      end
-      it 'is not a directory' do
-        nonexistent_child.dir?.should be_false
-      end
-      it 'read returns NotFoundError' do
-        expect { nonexistent_child.read }.to raise_error(ChefFS::FileSystem::NotFoundError)
-      end
-    end
-  end
-
-  context 'clients in children' do
-    let(:endpoint_name) { 'clients' }
-    let(:endpoint) { root_dir.children.select { |child| child.name == 'clients' }.first }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-
-  context 'root.child(clients)' do
-    let(:endpoint_name) { 'clients' }
-    let(:endpoint) { root_dir.child('clients') }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-
-  context 'root.child(environments)' do
-    let(:endpoint_name) { 'environments' }
-    let(:endpoint) { root_dir.child('environments') }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-
-  context 'root.child(nodes)' do
-    let(:endpoint_name) { 'nodes' }
-    let(:endpoint) { root_dir.child('nodes') }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-
-  context 'root.child(roles)' do
-    let(:endpoint_name) { 'roles' }
-    let(:endpoint) { root_dir.child('roles') }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-
-  context 'root.child(users)' do
-    let(:endpoint_name) { 'users' }
-    let(:endpoint) { root_dir.child('users') }
-
-    it_behaves_like 'a json rest endpoint dir'
-  end
-end