berkshelf 1.2.0.rc1 → 1.2.1

data/lib/berkshelf/mixin/shell_out.rb

@@ -1,23 +0,0 @@
-require 'mixlib/shellout'
-
-module Berkshelf::Mixin
-  # @author Jamie Winsor <reset@riotgames.com>
-  module ShellOut
-    # @return [Mixlib::ShellOut]
-    def shell_out(*command_args)
-      cmd = Mixlib::ShellOut.new(*command_args)
-      if STDOUT.tty?
-        cmd.live_stream = STDOUT
-      end
-      cmd.run_command
-      cmd
-    end
-
-    # @return [Mixlib::ShellOut]
-    def shell_out!(*command_args)
-      cmd = shell_out(*command_args)
-      cmd.error!
-      cmd
-    end
-  end
-end

data/lib/berkshelf/uploader.rb

@@ -1,80 +0,0 @@
-module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
-  class Uploader
-    class << self
-      def finalize
-        conn.terminate if conn.alive?
-      end
-    end
-
-    extend Forwardable
-
-    def_delegator :conn, :client_name
-    def_delegator :conn, :client_key
-    def_delegator :conn, :organization
-
-    # @option options [String] :server_url
-    #   URL to the Chef API
-    # @option options [String] :client_name
-    #   name of the client used to authenticate with the Chef API
-    # @option options [String] :client_key
-    #   filepath to the client's private key used to authenticate with
-    #   the Chef API
-    # @option options [String] :organization
-    #   the Organization to connect to. This is only used if you are connecting to
-    #   private Chef or hosted Chef
-    # @option options [Hash] :params
-    #   URI query unencoded key/value pairs
-    # @option options [Hash] :headers
-    #   unencoded HTTP header key/value pairs
-    # @option options [Hash] :request
-    #   request options
-    # @option options [Hash] :ssl
-    #   SSL options
-    # @option options [URI, String, Hash] :proxy
-    #   URI, String, or Hash of HTTP proxy options
-    def initialize(options = {})
-      @conn = Ridley.new(options)
-
-      ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc)
-    end
-
-    # Uploads a CachedCookbook from a CookbookStore to this instances Chef Server URL
-    #
-    # @param [CachedCookbook] cookbook
-    #   a cached cookbook to upload
-    #
-    # @option options [Boolean] :force
-    #   Upload the Cookbook even if the version already exists and is frozen on
-    #   the target Chef Server
-    # @option options [Boolean] :freeze
-    #   Freeze the uploaded Cookbook on the Chef Server so that it cannot be
-    #   overwritten
-    # @option options [Boolean] :skip_syntax_check
-    #   Skip syntax checking of the Cookbook to reduce the overall upload time 
-    #
-    # @raise [CookbookNotFound]
-    # @raise [CookbookSyntaxError]
-    #
-    # @return [Boolean]
-    def upload(cookbook, options = {})
-      cookbook.validate! unless options[:skip_syntax_check]
-      checksums = cookbook.checksums.dup
-      sandbox   = conn.sandbox.create(checksums.keys)
-
-      sandbox.upload(checksums)
-      sandbox.commit
-
-      conn.cookbook.save(
-        cookbook.cookbook_name,
-        cookbook.version,
-        cookbook.to_json,
-        options
-      )
-    end
-
-    private
-
-      attr_reader :conn
-  end
-end

data/spec/unit/berkshelf/uploader_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Berkshelf::Uploader, :chef_server do
-  let(:chef_config) { Berkshelf::Chef::Config }
-
-  subject do
-    Berkshelf::Uploader.new(
-      server_url: chef_config[:chef_server_url],
-      client_key: chef_config[:client_key],
-      client_name: chef_config[:node_name]
-    )
-  end
-
-  describe "#upload" do
-    let(:cookbook) { double('nginx', name: "nginx-0.101.2", cookbook_name: "nginx", version: "0.101.2") }
-
-    context "when cookbook is invalid" do
-      before(:each) { cookbook.should_receive(:validate!).and_raise(Berkshelf::CookbookSyntaxError) }
-
-      it "raises a CookbookSyntaxError error" do
-        lambda {
-          subject.upload(cookbook)
-        }.should raise_error(Berkshelf::CookbookSyntaxError)
-      end
-    end
-  end
-end

data/spec/unit/chef/cookbook/metadata_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Berkshelf::Chef::Cookbook::Metadata do
-  describe ""
-end

data/spec/unit/chef/digester_spec.rb

@@ -1,41 +0,0 @@
-# Borrowed and modified from: {https://github.com/opscode/chef/blob/11.4.0/spec/unit/digester_spec.rb}
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
-# 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 'spec_helper'
-
-describe Berkshelf::Chef::Digester do
-  before(:each) do
-    @cache = described_class.instance
-  end
-
-  describe "when computing checksums of cookbook files and templates" do
-    it "proxies the class method checksum_for_file to the instance" do
-      @cache.should_receive(:checksum_for_file).with("a_file_or_a_fail")
-      described_class.checksum_for_file("a_file_or_a_fail")
-    end
-
-    it "generates a checksum from a non-file IO object" do
-      io = StringIO.new("riseofthemachines\nriseofthechefs\n")
-      expected_md5 = '0e157ac1e2dd73191b76067fb6b4bceb'
-      @cache.generate_md5_checksum(io).should == expected_md5
-    end
-  end
-end