knife-essentials 1.5.3 → 1.5.4

data/lib/chef/knife/raw_essentials.rb

@@ -48,7 +48,13 @@ class Chef
         end
         chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
         begin
-          output ::ChefFS::RawRequest.api_request(chef_rest, config[:method].to_sym, chef_rest.create_url(name_args[0]), {}, data)
+          method = config[:method].to_sym
+          url = chef_rest.create_url(name_args[0])
+          result = ::ChefFS::RawRequest.api_request(chef_rest, method, url, {}, data, :parse_json => config[:pretty])
+          if result.is_a?(Hash) || result.is_a?(Array)
+            result = Chef::JSONCompat.to_json_pretty(result)
+          end
+          output result
         rescue Timeout::Error => e
           ui.error "Server timeout"
           exit 1

data/lib/chef_fs/file_system.rb

@@ -288,7 +288,7 @@ module ChefFS
                 ui.output "Deleted extra entry #{dest_path} (purge is on)" if ui
               end
             else
-              Chef::Log.info("Not deleting extra entry #{dest_path} (purge is off)") if ui
+              ui.output ("Not deleting extra entry #{dest_path} (purge is off)") if ui
             end
           end
 
@@ -406,7 +406,7 @@ module ChefFS
       parent = entry.parent
       if parent && !parent.exists?
         parent_path = format_path.call(parent) if ui
-        parent_parent = get_or_create_parent(entry.parent, options, ui, format_path)
+        parent_parent = get_or_create_parent(parent, options, ui, format_path)
         if options[:dry_run]
           ui.output "Would create #{parent_path}" if ui
         else

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -53,7 +53,7 @@ module ChefFS
           Dir.mkdir(path)
         end
         child = make_child_entry(name)
-        @children << child
+        @children = nil
         child
       end
 

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -62,6 +62,7 @@ module ChefFS
       end
 
       def create_child_from(other, options = {})
+        @children = nil
         upload_cookbook_from(other, options)
       end
 

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -63,6 +63,7 @@ module ChefFS
             raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "HTTP error creating child '#{name}': #{e}"
           end
         end
+        @children = nil
         DataBagDir.new(name, self, true)
       end
     end

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -46,13 +46,14 @@ module ChefFS
       end
 
       def create_child(child_name, file_contents=nil)
-        result = FileSystemEntry.new(child_name, self)
+        child = FileSystemEntry.new(child_name, self)
         if file_contents
-          result.write(file_contents)
+          child.write(file_contents)
         else
-          Dir.mkdir(result.file_path)
+          Dir.mkdir(child.file_path)
         end
-        result
+        @children = nil
+        child
       end
 
       def dir?

data/lib/chef_fs/file_system/multiplexed_dir.rb

@@ -39,6 +39,7 @@ module ChefFS
       end
 
       def create_child(name, file_contents = nil)
+        @children = nil
         write_dir.create_child(name, file_contents)
       end
     end

data/lib/chef_fs/file_system/operation_failed_error.rb

@@ -26,6 +26,14 @@ module ChefFS
         @operation = operation
       end
 
+      def message
+        if cause && cause.is_a?(Net::HTTPExceptions) && cause.response.code == "400"
+          "#{super} cause: #{cause.response.body}"
+        else
+          super
+        end
+      end
+
       attr_reader :operation
     end
   end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -88,6 +88,8 @@ module ChefFS
           end
         end
 
+        @children = nil
+
         result
       end
 

data/lib/chef_fs/raw_request.rb

@@ -1,15 +1,15 @@
 module ChefFS
   module RawRequest
     def self.raw_json(chef_rest, api_path)
-      JSON.parse(raw_request(chef_rest, api_path), :create_additions => false)
+      api_request(chef_rest, :GET, chef_rest.create_url(api_path), {}, nil, :parse_json => true)
     end
 
     def self.raw_request(chef_rest, api_path)
-      api_request(chef_rest, :GET, chef_rest.create_url(api_path), {}, false)
+      api_request(chef_rest, :GET, chef_rest.create_url(api_path))
     end
 
-    def self.api_request(chef_rest, method, url, headers={}, data=false)
-      json_body = data
+    def self.api_request(chef_rest, method, url, headers={}, data=nil, options = {})
+      json_body = data || nil
       #        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
@@ -23,11 +23,15 @@ module ChefFS
         response_body = chef_rest.decompress_body(response)
 
         if response.kind_of?(Net::HTTPSuccess)
-          response_body
+          if options[:parse_json] && response['content-type'] =~ /json/
+            JSON.parse(response_body, :create_additions => false)
+          else
+            response_body
+          end
         elsif redirect_location = redirected_to(response)
           if [:GET, :HEAD].include?(method)
             chef_rest.follow_redirect do
-              api_request(chef_rest, method, chef_rest.create_url(redirect_location))
+              api_request(chef_rest, method, chef_rest.create_url(redirect_location), headers, nil, options)
             end
           else
             raise Exceptions::InvalidRedirect, "#{method} request was redirected from #{url} to #{redirect_location}. Only GET and HEAD support redirects."
@@ -62,11 +66,11 @@ module ChefFS
       response['location']
     end
 
-    def self.build_headers(chef_rest, method, url, headers={}, json_body=false, raw=false)
+    def self.build_headers(chef_rest, method, url, headers={}, json_body=nil, raw=nil)
       #        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-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?

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/chef_fs/file_system/operation_failed_error_spec.rb

@@ -0,0 +1,47 @@
+#
+# 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/operation_failed_error'
+
+describe ChefFS::FileSystem::OperationFailedError do
+  context 'message' do
+    let(:error_message) { 'HTTP error writing: 400 "Bad Request"' }
+
+    context 'has a cause attribute and HTTP result code is 400' do
+      it 'include error cause' do
+        allow_message_expectations_on_nil
+        response_body = '{"error":["Invalid key test in request body"]}'
+        @response.stub(:code).and_return("400")
+        @response.stub(:body).and_return(response_body)
+        exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+        proc {
+          raise ChefFS::FileSystem::OperationFailedError.new(:write, self, exception), error_message
+        }.should raise_error(ChefFS::FileSystem::OperationFailedError, "#{error_message} cause: #{response_body}")
+      end
+    end
+
+    context 'does not have a cause attribute' do
+      it 'does not include error cause' do
+        proc {
+          raise ChefFS::FileSystem::OperationFailedError.new(:write, self), error_message
+        }.should raise_error(ChefFS::FileSystem::OperationFailedError, error_message)
+      end
+    end
+  end
+end

data/spec/integration/download_spec.rb

@@ -239,6 +239,15 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed <<EOM
 D\t/data_bags/x/z.json
+EOM
+        end
+
+        it 'knife download /data_bags/x /data_bags/x/y.json downloads x once' do
+          knife('download /data_bags/x /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags
+Created /data_bags/x
+Created /data_bags/x/y.json
+Created /data_bags/x/z.json
 EOM
         end
       end

data/spec/integration/raw_spec.rb

@@ -142,6 +142,69 @@ EOM
   "name": "y",
   "description": "eek"
 }
+EOM
+      end
+    end
+
+    context 'When a server returns raw json' do
+      before :each do
+        @real_chef_server_url = Chef::Config.chef_server_url
+        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        app = lambda do |env|
+          [200, {'Content-Type' => 'application/json' }, ['{ "x": "y", "a": "b" }'] ]
+        end
+        @raw_server = Puma::Server.new(app, Puma::Events.new(STDERR, STDOUT))
+        @raw_server.add_tcp_listener("127.0.0.1", 9018)
+        @raw_server.run
+      end
+
+      after :each do
+        Chef::Config.chef_server_url = @real_chef_server_url
+        @raw_server.stop(true)
+      end
+
+      it 'knife raw /blah returns the prettified json', :pending => (RUBY_VERSION < "1.9") do
+        knife('raw /blah').should_succeed <<EOM
+{
+  "x": "y",
+  "a": "b"
+}
+EOM
+      end
+
+      it 'knife raw --no-pretty /blah returns the raw json' do
+        knife('raw --no-pretty /blah').should_succeed <<EOM
+{ "x": "y", "a": "b" }
+EOM
+      end
+    end
+
+    context 'When a server returns text' do
+      before :each do
+        @real_chef_server_url = Chef::Config.chef_server_url
+        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        app = lambda do |env|
+          [200, {'Content-Type' => 'text' }, ['{ "x": "y", "a": "b" }'] ]
+        end
+        @raw_server = Puma::Server.new(app, Puma::Events.new(STDERR, STDOUT))
+        @raw_server.add_tcp_listener("127.0.0.1", 9018)
+        @raw_server.run
+      end
+
+      after :each do
+        Chef::Config.chef_server_url = @real_chef_server_url
+        @raw_server.stop(true)
+      end
+
+      it 'knife raw /blah returns the raw text' do
+        knife('raw /blah').should_succeed <<EOM
+{ "x": "y", "a": "b" }
+EOM
+      end
+
+      it 'knife raw --no-pretty /blah returns the raw text' do
+        knife('raw --no-pretty /blah').should_succeed <<EOM
+{ "x": "y", "a": "b" }
 EOM
       end
     end

data/spec/integration/upload_spec.rb

@@ -41,10 +41,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)
@@ -59,7 +59,7 @@ 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
@@ -222,6 +222,13 @@ EOM
 EOM
           JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
         end
+
+        it 'knife upload /data_bags/x /data_bags/x/y.json uploads x once' do
+          knife('upload /data_bags/x /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags/x
+Created /data_bags/x/y.json
+EOM
+        end
       end
 
       when_the_repository 'has a data bag item with keys chef_type and data_bag' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -192,12 +192,12 @@ files:
 - lib/chef_fs.rb
 - spec/chef_fs/diff_spec.rb
 - spec/chef_fs/file_pattern_spec.rb
+- spec/chef_fs/file_system/operation_failed_error_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
-- spec/integration/converge_spec.rb
 - spec/integration/delete_spec.rb
 - spec/integration/deps_spec.rb
 - spec/integration/diff_spec.rb

data/spec/integration/converge_spec.rb

@@ -1,75 +0,0 @@
-require 'support/integration_helper'
-require 'chef/knife/converge_essentials'
-
-describe 'knife converge' do
-  let(:sample_cookbook) do
-    return 
-  end
-
-  when_the_repository 'has a cookbook' do
-    file 'cookbooks/x/recipes/default.rb', <<EOM
-file #{path_to('x.txt')} do
-  content 'x::default'
-end
-EOM
-    file 'cookbooks/x/recipes/y.rb', <<EOM
-file #{path_to('x.txt')} do
-  content 'x::y'
-end
-EOM
-    file 'cookbooks/x/recipes/fromrole.rb', <<EOM
-file #{path_to('x.txt')} do
-  content 'x::fromrole'
-end
-EOM
-    file 'roles/r.json', { 'run_list' => [ 'recipe[x::r]' ] }
-
-    context 'and current directory is at the top of the repository' do
-      cwd '.'
-      it 'knife converge creates .chef/knife.rb' do
-      end
-    end
-
-    it 'knife converge /cookbooks/x converges x::default' do
-    end
-
-    it 'knife converge recipe[x] converges x::default' do
-    end
-
-    it 'knife converge /cookbooks/x/recipes/y.rb converges x::y' do
-    end
-
-    it 'knife converge recipe[x::y] converges x::y' do
-    end
-
-    it 'knife converge /roles/ converges x::fromrole' do
-    end
-
-    it 'knife converge role[r] converges x::fromrole' do
-    end
-
-    context 'and current directory is cookbooks/x/default' do
-      cwd 'cookbooks/x/default'
-
-      it 'knife converge creates .chef/knife.rb' do
-      end
-      it 'knife converge y.rb converges x::y' do
-      end
-    end
-
-    context 'and a .chef/knife.rb' do
-      it 'knife converge converges' do
-      end
-    end
-  end
-
-  when_the_repository 'has a cookbook' do
-    it 'knife converge with no arguments runs the node\'s run list' do
-    end
-  end
-
-  when_the_chef_server 'has cookbooks' do
-    it 'knife converge converges them' do
-    end
-  end
-end