knife-essentials 0.7.6 → 0.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
@@ -22,14 +22,14 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/chef/knife/delete.rb
-- lib/chef/knife/diff.rb
-- lib/chef/knife/download.rb
-- lib/chef/knife/list.rb
-- lib/chef/knife/raw.rb
-- lib/chef/knife/show.rb
-- lib/chef/knife/upload.rb
-- lib/chef/sandbox_uploader.rb
+- lib/chef/knife/delete_essentials.rb
+- lib/chef/knife/dependencies_essentials.rb
+- lib/chef/knife/diff_essentials.rb
+- lib/chef/knife/download_essentials.rb
+- lib/chef/knife/list_essentials.rb
+- lib/chef/knife/raw_essentials.rb
+- lib/chef/knife/show_essentials.rb
+- lib/chef/knife/upload_essentials.rb
 - lib/chef_fs/command_line.rb
 - lib/chef_fs/file_pattern.rb
 - lib/chef_fs/file_system/base_fs_dir.rb
@@ -47,6 +47,7 @@ files:
 - lib/chef_fs/file_system/file_system_entry.rb
 - lib/chef_fs/file_system/file_system_error.rb
 - lib/chef_fs/file_system/file_system_root_dir.rb
+- lib/chef_fs/file_system/multiplexed_dir.rb
 - lib/chef_fs/file_system/must_delete_recursively_error.rb
 - lib/chef_fs/file_system/nodes_dir.rb
 - lib/chef_fs/file_system/nonexistent_fs_object.rb
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Universal knife verbs that work with your Chef repository

data/lib/chef/sandbox_uploader.rb

@@ -1,208 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2009 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.
-#
-
-
-class Chef
-  #
-  # Represents a sandbox uploading session.  You pass in a set of files with
-  #
-  # Much of this is shamelessly stolen from Chef::CookbookUploader, placed at
-  # the sandbox level to allow any set of files to be uploaded and to allow
-  # uploading to plug in to the host's threading model (if any).
-  #
-  # A single-threaded caller will want to:
-  #
-  #     uploader = SandboxUploader.new(checksum_files, rest)
-  #     while uploader.upload_next_file do
-  #     end
-  #     uploader.commit
-  #
-  # A multithreaded caller will want to keep doing this:
-  #
-  #     if !uploader.upload_next_file
-  #       uploader.commit
-  class SandboxUploader
-    # Create a new SandboxUploader.
-    #
-    # ==== Attributes
-    #
-    # * +checksums+ - a list of checksums of files you plan to upload
-    # * +rest+ - the rest client to use
-    #
-    # ==== Throws
-    #
-    # This method will throw an HTTP exception if the sandbox creation fails.
-    def initialize(checksum, rest)
-      # Grab the list of URLs we need to upload to
-      checksums_hash = checksums.inject({}) { |hash,checksum| hash[checksum] = nil; hash }
-      response = rest.post_rest("sandboxes", { :checksums => checksums_hash })
-      @sandbox_url = response['uri']
-      @to_upload = []
-      response['checksums'].each do |checksum, info|
-        if info['needs_upload'] == true
-          @to_upload << {
-            :checksum => checksum,
-            :url => info['url']
-          }
-        else
-          Chef::Log.debug("#{checksum_files[checksum]} has not changed")
-        end
-      end
-      @uploading = 0
-    end
-
-    # Picks a file off the list and uploads it.
-    #
-    # ==== Parameters
-    #
-    # * +&block+ - if there is a file to upload, +block.call(checksum)+ will be
-    #   invoked, and this should return the file contents for the given
-    #   checksum.
-    #
-    # ==== Throws
-    #
-    # An HTTP error is thrown if the upload fails.
-    #
-    # ==== Returns
-    #
-    # +{ :checksum => checksum, :url => url }+ if a file was uploaded.  +nil+ if
-    # there was no file left to upload.
-    def upload_next_file(&block)
-      @uploading += 1
-      begin
-        file = @to_upload.pop
-        return nil if !file
-
-        begin
-          return upload_file(block.call(file[:checksum]), file[:checksum], file[:url])
-        rescue
-          # Stick the work on top so we work on other things first
-          @to_upload.unshift(file)
-          raise
-        end
-      ensure
-        @uploading -= 1
-      end
-    end
-
-    # Commits the sandbox to Chef.
-    #
-    # ==== Throws
-    #
-    # * An HTTP error if the commit fails.
-    # * "Attempt to commit "
-    #
-    # ==== Returns
-    #
-    # +true+ if a commit occurred.  +false+ if commit
-    # has already been called.
-    def commit
-      return false if !@sandbox_url
-      raise "Attempt to commit before uploads are complete!" if !uploads_complete?
-      # nil out sandbox url to avoid race conditions where multiple
-      # callers try to commit
-      sandbox_url = @sandbox_url
-      @sandbox_url = nil
-      @to_upload = nil
-
-      Chef::Log.debug("Committing sandbox")
-      # Retry if S3 is claims a checksum doesn't exist (the eventual
-      # in eventual consistency)
-      retries = 0
-      begin
-        rest.put_rest(sandbox_url, {:is_completed => true})
-      rescue Net::HTTPServerException => e
-        if e.message =~ /^400/ && (retries += 1) <= 5
-          sleep 2
-          retry
-        else
-          raise
-        end
-      end
-      true
-    end
-
-    def cancel
-      # Yeah, so uh, delete doesn't work.  But we'd like to imagine it will.
-      sandbox_url = @sandbox_url
-      @sandbox_url = nil
-      @to_upload = nil
-      rest.delete_rest(sandbox_url)
-    end
-
-    # Tells whether uploads are all complete.
-    def uploads_complete?
-      @to_upload.length == 0 && @uploading == 0
-    end
-
-    private
-
-    def upload_file(file_contents, checksum, url)
-      # Checksum is the hexadecimal representation of the md5,
-      # but we need the base64 encoding for the content-md5
-      # header
-      checksum64 = Base64.encode64([checksum].pack("H*")).strip
-      timestamp = Time.now.utc.iso8601
-      # TODO - 5/28/2010, cw: make signing and sending the request streaming
-      sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
-                                                                         :http_method => :put,
-                                                                         :path        => URI.parse(url).path,
-                                                                         :body        => file_contents,
-                                                                         :timestamp   => timestamp,
-                                                                         :user_id     => rest.client_name
-                                                                         )
-      headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, :accept => 'application/json' }
-      headers.merge!(sign_obj.sign(OpenSSL::PKey::RSA.new(rest.signing_key)))
-
-      begin
-        RestClient::Resource.new(url, :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
-      rescue RestClient::Exception => e
-        Chef::Knife.ui.error("Failed to upload #@cookbook : #{e.message}\n#{e.response.body}")
-        raise
-      end
-    end
-
-    # For CookbookDir
-
-      private
-
-      def upload(entries, force, freeze)
-        # knife cookbook upload: Validate environment
-        # knife cookbook upload: Warn about cookbook shadowing
-        # knife cookbook upload: Check for broken links
-        # knife cookbook upload: Check for dependencies
-        # CookbookUploader: Validate cookbook syntax, ruby files and templates
-        # SandboxUploader!
-        entries_by_checksum = entries.inject({}) do |hash,entry|
-          if entry.respond_to?(:checksum)
-            checksum = entry.checksum
-          else
-            checksum = ChefFS::Diff.calc_checksum(entry.read)
-          end
-          hash[checksum] = entry
-        end
-
-        uploader = SandboxUploader.new(entries_by_checksum.keys, rest)
-        while uploader.upload_next_file { |checksum| entries_by_checksum[checksum].read }
-        end
-        uploader.commit
-        # CookbookUploader: PUT the manifest to either the force_save_url or save_url for the cookbook
-        # knife cookbook upload: update version constraints for environment
-      end
-  end
-end