berkshelf 2.0.18 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4c1cb4c285df553eb0ef7571a584ab308d35f278
-  data.tar.gz: 66452c03b102b78cdf440841f99a644307677a3f
-SHA512:
-  metadata.gz: 85bdfe1f3dd22b69af3343868ad5ae07ad17d457daf94cea5c267fa47dd3273f232efcd80ad358490b6bed94f6981f5453d459e7604121b1ef271aa4e12aaf91
-  data.tar.gz: 5525092c4221b4b32452cb214e50cbe7e6f0bc7e8b012a0403dbdf7875635797b707f99ea41f0d12e018f07b08d8b91d60698d71704bfe0565ada1e122e5df08

data/features/default_locations.feature

@@ -1,127 +0,0 @@
-Feature: Berksfile default locations
-  As a Berkshelf user
-  I want to be able to define default locations in my Berksfile
-  So I can set the precedence of where cookbook sources are downloaded from or define an alternate location for all
-  cookbook sources to attempt to retrieve from
-
-  @chef_server
-  Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is satisfied by the chef_api(1) location
-    Given I write to "Berksfile" with:
-      """
-      chef_api :config
-      site :opscode
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    And the Chef server has cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    When I successfully run `berks install`
-    Then the output should contain:
-      """
-      Installing berkshelf-cookbook-fixture (1.0.0) from chef_api:
-      """
-    And the cookbook store should have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    And the exit status should be 0
-
-  @chef_server
-  Scenario: with a default chef_api(1) and site(2) location with a cookbook source that is not satisfied by the chef_api(1) location
-    Given I write to "Berksfile" with:
-      """
-      chef_api :config
-      site :opscode
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    And the Chef server does not have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    When I successfully run `berks install`
-    Then the output should contain:
-      """
-      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      """
-    And the cookbook store should have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    And the exit status should be 0
-
-  @chef_server
-  Scenario: with a default site(1) and chef_api(2) location with a cookbook source that is satisfied by the site(1) location
-    Given I write to "Berksfile" with:
-      """
-      site :opscode
-      chef_api :config
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    And the Chef server has cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    When I run the install command
-    Then the output should contain:
-      """
-      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      """
-    And the cookbook store should have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    And the exit status should be 0
-
-  @chef_server
-  Scenario: with a default chef_api(1) location and a cookbook source that is satisfied by the chef_api(1) location but has an explicit location set
-    Given I write to "Berksfile" with:
-      """
-      chef_api :config
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      """
-    And the Chef server has cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    When I run the install command
-    Then the output should contain:
-      """
-      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      """
-    And the cookbook store should have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    And the exit status should be 0
-
-  @chef_server
-  Scenario: with a defualt chef_api(1) location and a cookbook source that is not satisfied by it
-    Given I write to "Berksfile" with:
-      """
-      chef_api :config
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    And the Chef server does not have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-    When I run the install command
-    Then the output should contain:
-      """
-      Cookbook 'berkshelf-cookbook-fixture' not found in any of the default locations
-      """
-    And the CLI should exit with the status code for error "CookbookNotFound"
-
-  Scenario: with two duplicate locations definitions
-    Given I write to "Berksfile" with:
-      """
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    When I run the install command
-    Then the output should contain:
-      """
-      A default 'site' location with the value 'http://cookbooks.opscode.com/api/v1/cookbooks' is already defined
-      """
-    And the CLI should exit with the status code for error "DuplicateLocationDefined"
-
-  Scenario: with two locations of the same type but different values
-    Given I write to "Berksfile" with:
-      """
-      site 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      site 'http://cookbooks.opscode.com/api/v2/cookbooks'
-
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    When I run the install command
-    Then the exit status should be 0

data/features/step_definitions/berksfile_steps.rb

@@ -1,8 +0,0 @@
-Given /^a Berksfile with path location sources to fixtures:$/ do |cookbooks|
-  lines = []
-  cookbooks.raw.each do |name, fixture|
-    fixture_path = fixtures_path.join("cookbooks", fixture)
-    lines << "cookbook '#{name}', path: '#{fixture_path}'"
-  end
-  write_file("Berksfile", lines.join("\n"))
-end

data/features/step_definitions/configure_cli_steps.rb

@@ -1,19 +0,0 @@
-Given /^I have a default Chef config$/ do
-  path = tmp_path.join('chef_config').to_s
-  generate_chef_config(path)
-  ENV['BERKSHELF_CHEF_CONFIG'] = path
-end
-
-Then /^a Berkshelf config file should exist and contain:$/ do |table|
-  config = Berkshelf::Config.from_file(Berkshelf::Config.path)
-  table.raw.each do |key, value|
-    expect(config.get_attribute(key)).to eq(value)
-  end
-end
-
-Then /^a Berkshelf config file should exist at "(.+)" and contain:$/ do |path, table|
-  config = Berkshelf::Config.from_file(File.expand_path("tmp/aruba/#{path}"))
-  table.raw.each do |key, value|
-    config.get_attribute(key).should eql(value)
-  end
-end

data/features/vendor_install.feature

@@ -1,19 +0,0 @@
-Feature: Vendoring cookbooks to a specific path
-  As a user of Berkshelf
-  I want to be able to install cookbooks to a specific directory
-  So I vendor my cookbooks and package them with my application
-
-  Scenario: With a path option
-    Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 |
-    Given I write to "Berksfile" with:
-      """
-      site :opscode
-      cookbook 'fake', '1.0.0'
-      """
-    When I run the install command with flags:
-      | --path vendor/cookbooks |
-    Then the following directories should exist:
-      | vendor/cookbooks          |
-      | vendor/cookbooks/fake |
-    And the exit status should be 0

data/lib/berkshelf/core_ext/openuri.rb

@@ -1,36 +0,0 @@
-#
-# Patch to allow open-uri to follow safe (http to https) and unsafe
-# redirections (https to http).
-#
-# Original gist URL:
-# https://gist.github.com/1271420
-#
-# Relevant issue:
-# http://redmine.ruby-lang.org/issues/3719
-#
-# Source here:
-# https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb
-#
-module OpenURI
-  class <<self
-    alias_method :open_uri_original, :open_uri
-
-    def redirectable_safe?(uri1, uri2)
-      uri1.scheme.downcase == uri2.scheme.downcase || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
-    end
-
-    def redirectable_all?(uri1, uri2)
-      redirectable_safe?(uri1, uri2) || (uri1.scheme.downcase == "https" && uri2.scheme.downcase == "http")
-    end
-  end
-
-  # Patches the original open_uri method to follow all redirects
-  def self.open_uri(name, *rest, &block)
-    class << self
-      remove_method :redirectable?
-      alias_method  :redirectable?, :redirectable_all?
-    end
-
-    self.open_uri_original(name, *rest, &block)
-  end
-end

data/lib/berkshelf/core_ext/rbzip2.rb

@@ -1,8 +0,0 @@
-class RBzip2::Decompressor
-  def pos ; end
-  def pos=(*args) ; end
-  
-  def eof?
-    @io.eof?
-  end
-end

data/lib/berkshelf/locations/chef_api_location.rb

@@ -1,228 +0,0 @@
-module Berkshelf
-  class ChefAPILocation
-    class << self
-      # @return [Proc]
-      def finalizer
-        proc { conn.terminate if defined?(conn) && conn.alive? }
-      end
-
-      # @param [String] node_name
-      #
-      # @return [Boolean]
-      def validate_node_name(node_name)
-        node_name.is_a?(String) && !node_name.empty?
-      end
-
-      # @raise [InvalidChefAPILocation]
-      #
-      # @see validate_node_name
-      def validate_node_name!(node_name)
-        unless validate_node_name(node_name)
-          raise InvalidChefAPILocation
-        end
-
-        true
-      end
-
-      # @param [String] client_key
-      #
-      # @return [Boolean]
-      def validate_client_key(client_key)
-        File.exists?(client_key)
-      end
-
-      # @raise [InvalidChefAPILocation]
-      #
-      # @see validate_client_key
-      def validate_client_key!(client_key)
-        unless validate_client_key(client_key)
-          raise InvalidChefAPILocation
-        end
-
-        true
-      end
-
-      # @param [String] uri
-      #
-      # @return [Boolean]
-      def validate_uri(uri)
-        uri =~ URI.regexp(['http', 'https'])
-      end
-
-      # @raise [InvalidChefAPILocation] if the given object is not a String containing a
-      #   valid Chef API URI
-      #
-      # @see validate_uri
-      def validate_uri!(uri)
-        unless validate_uri(uri)
-          raise InvalidChefAPILocation, "'#{uri}' is not a valid Chef API URI."
-        end
-
-        true
-      end
-    end
-
-    include Location
-
-    set_location_key :chef_api
-    set_valid_options :node_name, :client_key
-
-    attr_reader :uri
-    attr_reader :node_name
-    attr_reader :client_key
-
-    # @param [#to_s] name
-    # @param [Solve::Constraint] version_constraint
-    # @param [Hash] options
-    #
-    # @option options [String, Symbol] :chef_api
-    #   a URL to a Chef API. Alternatively the symbol :config can be provided
-    #   which will instantiate this location with the values found in your
-    #   Berkshelf configuration.
-    # @option options [String] :node_name (Berkshelf::Config.instance.chef.node_name)
-    #   the name of the client to use to communicate with the Chef API.
-    # @option options [String] :client_key (Berkshelf::Config.instance.chef.client_key)
-    #   the filepath to the authentication key for the client
-    # @option options [Boolean] :verify_ssl (Berkshelf::Config.instance.chef.ssl.verify)
-    #
-    # @raise [ClientKeyFileNotFound] if the value for :client_key does not contain a filepath
-    #   pointing to a readable file containing a Chef client key.
-    #
-    #   If the :chef_api option is given the symbol :config and your Berkshelf config does not
-    #   have a value for chef.client_key which points to a readable file containing a Chef
-    #   client key.
-    def initialize(name, version_constraint, options = {})
-      options = options.reverse_merge(
-        client_key: Berkshelf::Config.instance.chef.client_key,
-        node_name: Berkshelf::Config.instance.chef.node_name,
-        verify_ssl: Berkshelf::Config.instance.ssl.verify
-      )
-
-      @name               = name
-      @version_constraint = version_constraint
-      @downloaded_status  = false
-
-      if options[:chef_api] == :knife
-        Berkshelf.formatter.deprecation "specifying 'chef_api :knife' is deprecated. Please use 'chef_api :config'."
-        options[:chef_api] = :config
-      end
-
-      validate_options!(options)
-
-      if options[:chef_api] == :config
-        unless Berkshelf::Config.instance.chef.node_name.present? &&
-          Berkshelf::Config.instance.chef.client_key.present? &&
-          Berkshelf::Config.instance.chef.chef_server_url.present?
-
-          msg = "A Berkshelf configuration is required with a 'chef.client_key', 'chef.chef_server_Url',"
-          msg << " and 'chef.node_name' setting to install or upload cookbooks using 'chef_api :config'."
-
-          raise Berkshelf::ConfigurationError, msg
-        end
-        @node_name  = Berkshelf::Config.instance.chef.node_name
-        @client_key = Berkshelf::Config.instance.chef.client_key
-        @uri        = Berkshelf::Config.instance.chef.chef_server_url
-      else
-        @node_name  = options[:node_name]
-        @client_key = options[:client_key]
-        @uri        = options[:chef_api]
-      end
-
-      @conn = Ridley.new(
-        server_url: uri,
-        client_name: node_name,
-        client_key: client_key,
-        ssl: {
-          verify: options[:verify_ssl]
-        }
-      )
-
-      # Why do we use a class function for defining our finalizer?
-      # http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
-      ObjectSpace.define_finalizer(self, self.class.finalizer)
-    rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid => ex
-      raise ClientKeyFileNotFound, ex
-    end
-
-    # @param [#to_s] destination
-    #
-    # @return [Berkshelf::CachedCookbook]
-    def download(destination)
-      berks_path = File.join(destination, "#{name}-#{target_cookbook.version}")
-
-      temp_path = target_cookbook.download
-      FileUtils.mv(temp_path, berks_path)
-
-      cached = CachedCookbook.from_store_path(berks_path)
-      validate_cached(cached)
-
-      cached
-    end
-
-    # Returns a Ridley::CookbookResource representing the cookbook that should be downloaded
-    # for this location
-    #
-    # @return [Ridley::CookbookResource]
-    def target_cookbook
-      return @target_cookbook unless @target_cookbook.nil?
-
-      begin
-        @target_cookbook = if version_constraint
-          conn.cookbook.satisfy(name, version_constraint)
-        else
-          conn.cookbook.latest_version(name)
-        end
-      rescue Ridley::Errors::HTTPNotFound,
-             Ridley::Errors::ResourceNotFound
-        @target_cookbook = nil
-      end
-
-      if @target_cookbook.nil?
-        msg = "Cookbook '#{name}' found at #{self}"
-        msg << " that would satisfy constraint (#{version_constraint})" if version_constraint
-        raise CookbookNotFound, msg
-      end
-
-      @target_cookbook
-    end
-
-    def to_hash
-      super.merge(value: self.uri)
-    end
-
-    def to_s
-      "#{self.class.location_key}: '#{uri}'"
-    end
-
-    private
-
-      # @return [Ridley::Client]
-      attr_reader :conn
-
-      # Validates the options hash given to the constructor.
-      #
-      # @param [Hash] options
-      #
-      # @raise [InvalidChefAPILocation] if any of the options are missing or their values do not
-      #   pass validation
-      def validate_options!(options)
-        if options[:chef_api] == :config
-          return true
-        end
-
-        missing_options = [:node_name, :client_key] - options.keys
-
-        unless missing_options.empty?
-          missing_options.collect! { |opt| "'#{opt}'" }
-          msg = "Source '#{name}' is a 'chef_api' location with a URL for it's value"
-          msg << " but is missing options: #{missing_options.join(', ')}."
-
-          raise Berkshelf::InvalidChefAPILocation, msg
-        end
-
-        self.class.validate_node_name!(options[:node_name])
-        self.class.validate_client_key!(options[:client_key])
-        self.class.validate_uri!(options[:chef_api])
-      end
-  end
-end