berkshelf 0.6.0.beta4 → 1.0.0.rc1

data/spec/unit/berkshelf/locations/chef_api_location_spec.rb

@@ -77,12 +77,6 @@ module Berkshelf
           it "uses the value of Chef::Config[:client_key] for the client_key attribute" do
             @loc.client_key.should eql(Chef::Config[:client_key])
           end
-
-          it "attempts to load the config file with no arguments" do
-            Berkshelf.should_receive(:load_config).with(no_args)
-
-            subject.new("nginx", constraint, chef_api: :knife)
-          end
         end
       end
 

data/spec/unit/berkshelf_spec.rb

@@ -26,26 +26,6 @@ describe Berkshelf do
       end
     end
 
-    describe "::config_path" do
-      it "returns a default value if nothing is specified" do
-        subject.config_path.should eql(Berkshelf::DEFAULT_CONFIG)
-      end
-
-      it "returns the value assigned if specified" do
-        subject.config_path = value = "/Users/reset/.chef/knife.rb"
-
-        subject.config_path.should eql(value)
-      end
-    end
-
-    describe "::load_config" do
-      it "loads the path specified by config_path if no parameter given" do
-        Chef::Config.should_receive(:from_file).with(Berkshelf.config_path)
-
-        subject.load_config
-      end
-    end
-
     describe "::formatter" do
       context "with default formatter" do
         it "should be human readable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta4
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ files:
 - berkshelf.gemspec
 - bin/berks
 - features/config.feature
-- features/config_command.feature
+- features/configure_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
@@ -223,6 +223,7 @@ files:
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
+- features/step_definitions/configure_cli_steps.rb
 - features/step_definitions/filesystem_steps.rb
 - features/step_definitions/json_steps.rb
 - features/support/env.rb
@@ -235,7 +236,6 @@ files:
 - generator_files/Thorfile.erb
 - generator_files/Vagrantfile.erb
 - generator_files/chefignore
-- generator_files/config.json
 - generator_files/default_recipe.erb
 - generator_files/gitignore.erb
 - generator_files/licenses/apachev2.erb
@@ -250,8 +250,6 @@ files:
 - lib/berkshelf/cached_cookbook.rb
 - lib/berkshelf/cli.rb
 - lib/berkshelf/config.rb
-- lib/berkshelf/config_generator.rb
-- lib/berkshelf/config_validator.rb
 - lib/berkshelf/cookbook_generator.rb
 - lib/berkshelf/cookbook_source.rb
 - lib/berkshelf/cookbook_store.rb
@@ -323,7 +321,6 @@ files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/config_spec.rb
-- spec/unit/berkshelf/config_validator_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
@@ -367,7 +364,7 @@ specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/config.feature
-- features/config_command.feature
+- features/configure_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
@@ -378,6 +375,7 @@ test_files:
 - features/step_definitions/berksfile_steps.rb
 - features/step_definitions/chef_server_steps.rb
 - features/step_definitions/cli_steps.rb
+- features/step_definitions/configure_cli_steps.rb
 - features/step_definitions/filesystem_steps.rb
 - features/step_definitions/json_steps.rb
 - features/support/env.rb
@@ -419,7 +417,6 @@ test_files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/config_spec.rb
-- spec/unit/berkshelf/config_validator_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb

data/features/config_command.feature

@@ -1,10 +0,0 @@
-Feature: config command
-  As a Cookbook author  
-  I want to quickly generate a Berkshelf config
-  So I can easily tell which options are available to me
-
-  Scenario: creating a new config
-    Given I do not have a Berkshelf config file
-    When I run the config command
-    Then I should have a Berkshelf config file
-    And the exit status should be 0

data/generator_files/config.json

@@ -1,22 +0,0 @@
-{
-  "vagrant": {
-    "chef": {
-      "chef_server_url": "https://api.opscode.com/organizations/ORGNAME",
-        "validation_client_name": "ORGNAME-validator",
-        "validation_key_path": "~/validation.pem"
-    },
-    "vm": {
-      "box": "base",
-      "box_url": "http://files.vagrantup.com/lucid64.box",
-      "forward_port": {
-        "80": "8080"
-      },
-      "host_name": "berkshelf-cookbook",
-      "network": {
-        "bridged": true,
-        "hostonly": "192.168.33.10"
-      },
-      "provision": "chef_solo"
-    }
-  }
-}

data/lib/berkshelf/config_generator.rb

@@ -1,8 +0,0 @@
-module Berkshelf
-  # @author Justin Campbell <justin@justincampbell.me>
-  class ConfigGenerator < BaseGenerator
-    def generate
-      template "config.json", Config.path
-    end
-  end
-end

data/lib/berkshelf/config_validator.rb

@@ -1,78 +0,0 @@
-module Berkshelf
-  # @author Justin Campbell <justin@justincampbell.me>
-  class ConfigValidator < ActiveModel::Validator
-    DEFAULT_STRUCTURE = {
-      vagrant: {
-        chef: {
-          chef_server_url: String,
-          validation_client_name: String,
-          validation_key_path: String
-        },
-        vm: {
-          box: String,
-          box_url: String,
-          forward_port: Hash,
-          host_name: String,
-          network: {
-            bridged: Object,
-            hostonly: String
-          },
-          provision: String
-        }
-      }
-    }
-
-    # Recursively validate the structure of a hash with another hash. If
-    # invalid, the actual_hash will have errors added to it.
-    #
-    # @param [Hash] actual_hash
-    #   The hash to validate
-    #
-    # @param [Hash] expected_hash
-    #   The expected structure of actual_hash
-    #
-    # @param [Config] config
-    #   The config object to add errors to. This is only used recursively.
-    #
-    # @return [Boolean]
-    def assert_in_structure(actual_hash, expected_hash, config = nil)
-      config ||= actual_hash
-
-      actual_hash.keys.each do |key|
-        unless expected_hash.keys.include? key.to_sym
-          config.errors.add key, "is not a valid key"
-          return
-        end
-
-        actual = actual_hash[key]
-        expected = expected_hash[key.to_sym]
-
-        if actual.is_a?(Hash) && expected.is_a?(Hash)
-          return unless assert_in_structure actual, expected, config
-        else
-          unless actual.is_a? expected
-            config.errors.add key, "should be an instance of #{expected}"
-            return
-          end
-        end
-      end
-
-      true
-    end
-
-    # @see DEFAULT_STRUCTURE
-    # @return [Hash]
-    def structure
-      @structure ||= DEFAULT_STRUCTURE
-    end
-
-    # @param [Config] config
-    #   The config to validate
-    #
-    # @return [Boolean]
-    def validate(config)
-      assert_in_structure config, structure
-    end
-  end
-end
-

data/spec/unit/berkshelf/config_validator_spec.rb

@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-describe Berkshelf::ConfigValidator do
-  let(:config) { Berkshelf::Config.from_json json }
-  let(:config_validator) { klass.new Hash.new }
-  let(:json) { '{}' }
-  let(:klass) { described_class }
-  let(:structure) { Hash.new }
-
-  before :each do
-    klass.any_instance.stub structure: structure
-  end
-
-  describe "#validate" do
-    subject { config_validator.validate config }
-
-    it { should be_true }
-    it { config.should be_valid }
-
-    context "with a top-level key" do
-      let(:json) { '{ "a": 1 }' }
-      let(:structure) { { a: Object } }
-
-      it { should be_true }
-      it { config.should be_valid }
-    end
-
-    context "with a nested key" do
-      let(:json) { '{ "a": { "b": 1 } }' }
-      let(:structure) { { a: { b: Object } } }
-
-      it { should be_true }
-      it { config.should be_valid }
-    end
-
-    context "with a top-level nonsense key" do
-      let(:json) { '{ "nonsense": null }' }
-      let(:structure) { { a: Object } }
-
-      it { should be_false }
-      it { config.should_not be_valid }
-    end
-
-    context "with a nested nonsense key" do
-      let(:json) { '{ "a": { "nonsense": 1 } }' }
-      let(:structure) { { a: { b: Object } } }
-
-      it { should be_false }
-      it { config.should_not be_valid }
-    end
-
-    context "with a top-level key that doesn't match the expected type" do
-      let(:json) { '{ "a": 1 }' }
-      let(:structure) { { a: String } }
-
-      it { should be_false }
-      it { config.should_not be_valid }
-    end
-
-    context "with a nested key that doesn't match the expected type" do
-      let(:json) { '{ "a": { "b": 1 } }' }
-      let(:structure) { { a: { b: String } } }
-
-      it { should be_false }
-      it { config.should_not be_valid }
-    end
-  end
-end