berkshelf 3.0.0.beta3 → 3.0.0.beta4

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

@@ -81,7 +81,7 @@ describe Berkshelf::GitLocation do
       it 'raises a CookbookNotFound error' do
         subject.stub(:clone).and_return {
           FileUtils.mkdir_p(fake_remote)
-          Dir.chdir(fake_remote) { |dir| `git init; echo hi > README; git add README; git commit README -m 'README'`; dir }
+          Dir.chdir(fake_remote) { |dir| `git init && echo hi > README && git add README && git commit README -m 'README'`; dir }
         }
 
         expect { subject.download }.to raise_error(Berkshelf::CookbookNotFound)

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -11,7 +11,7 @@ describe Berkshelf::Lockfile do
   describe '.initialize' do
     it 'does not throw an exception' do
       expect {
-        Berkshelf::Lockfile.new(berksfile)
+        Berkshelf::Lockfile.from_berksfile(berksfile)
       }.to_not raise_error
     end
 
@@ -21,7 +21,86 @@ describe Berkshelf::Lockfile do
     end
   end
 
-  subject { Berkshelf::Lockfile.new(berksfile) }
+  subject { Berkshelf::Lockfile.from_berksfile(berksfile) }
+
+  describe "#apply" do
+    let(:env_name)    { 'berkshelf-test' }
+    let(:server_url)  { Berkshelf::RSpec::ChefServer.server_url }
+    let(:client_name) { 'berkshelf' }
+    let(:client_key)  {
+      "-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAs3u5qfmdEWtzYHvXpbQRyefhUjeTG7nwhn/LaYY6ou19xxW0
+I5MKSBqCxUCHqODRc7ox8zSF37x3jMBHbSczOcfbWsSe/qGnmvZZQhHmXCje2zkW
+ByaRHmmatzkz1aAqAmZm/wdSuVLXytsbrPXuaj/MiHa6QH3e/ZFaYME7rMkouqfC
+pUlSa2tZ9Ko1ZCCwjkiifuP4yQFsS6/G6b8c7F8wdq4byfJ9o6FN34lJHrzfG0ZV
+hwS47Bdn6FDBQ6PVxrBsvQNE2n7QlNLfXWi4Tb8OpmQif01FjxleAr5kamx3GD+s
+jC7fKHE9bZ0apZ1MVmkz9PhFmOigV5jl9Att+QIDAQABAoIBAQCCG6qXgQ9PVWkq
+BBxrToGmr6UzCH5nlv65QWKfeGKBQU/wRdd0Al9trWomu4Sb831iOxOCjgyOB/1R
+1wDwK36C4FIvFmF7jIwHVZWWw4sOO8JxgIxrWpXQShWRxLHCpnxNiRYYwaJCHb+4
+meUSGKVf+Ce4tPiHT7eacQfnI6yyr1hWusKu0I8w7NsfeNc+/Rpne6mifLfaB/9u
+b9kgfD15HGEsuUaMLZ/y1HFWvw2G2Og1cDrIpBIVtUAhA+DnjjLe/YoETeSmQAxH
+ioQpJJ/gSqtTczIoyPXXiwaF5wUTQrsn5zZhTs9mAQy7hcSR92IH2xBSmK3+wlz0
+vHZIq9rRAoGBAOeRUTRDgj+f+BlH1qFqf4EfkBN5quVM2808LYBGZWfA5/6o9jSN
+AM84VXq3S8Wy5V6UMcSv4mOqEr3tEUYE8or9r/RxzpGahSdi8Ttju9vvpJH5I3xr
+xx2ZK/vlrAfr6JHlE4bqqc5unCslUt2/liCWpERQ3cFcPydQb7Imrm+DAoGBAMZr
+mcxBeMyQHG6Kcpc7EQXZ5i7a8T6ksPu7FbAZ70Meb9UMtVIYpVBalutCXKhl7D4K
+qrCmV2gQryBz+S7AecFZSKvXdb7ueYzf8EcI/v+loNu9v9/4m4YV3bPBkMhW5kcK
+xFnVIsYqUlR+dsS8JfjSCpk4lePVSSt7B26eIFfTAoGBAJHPDKSuBWtunNe+RkUp
+O9PgPeYlbBgqBxT52WS17tAfxXSyiySXzHSuchRtKgb4GDkvcw73+MLsqhRxG7lN
+EDO4fXyb1IgWFdWxFVhh+j4IbUWE7HVBoAThF7Lq8SGjx7Nl3J/NTtKvDyKTw9Pg
++PTYJeLmUFuabCGjIlG4zYllAoGBAIwe5oB4597GEl35xUyI+M+B/myuTtknIpjS
+mFFBL1bdwqnYjJ+KKgwhvRwsRBTjzT5O+BVBks45ogKwA5OBdzoUXB6GTG9mJ05V
+wm/XqYRNqdgkGsEG5oV9IZBUrHLd80bOErVBr4nzzyo+GI98MvCRG8zySd+X+lEL
+U8dJQZvjAoGAWorll+fomfie6t5XbkpwMo8rn60yFUiRE7HWxA2qDj3IpoE6SfNE
+eOpsf1Zzx30r8answ9lPnd753ACdgNzE66ScWD+cQeB6OlMZMaW5tVSjddZ7854L
+00znt8b1OLkVY33xfsa89wKH343304BhVHABPMxm5Leua/H21/BqSK0=
+-----END RSA PRIVATE KEY-----
+"
+    }
+    let(:ridley) { Ridley.new(server_url: server_url, client_name: client_name, client_key: client_key) }
+
+    before do
+      Berkshelf.stub(:ridley_connection).and_yield(ridley)
+      berksfile.add_dependency('nginx', '>= 0.1.2')
+    end
+
+    context "when the chef environment exists" do
+      let(:dependencies) do
+        [
+          double(name: 'nginx', locked_version: '1.2.3'),
+          double(name: 'artifact', locked_version: '1.4.0')
+        ]
+      end
+
+      before do
+        chef_environment(env_name)
+        subject.stub(:dependencies).and_return(dependencies)
+      end
+
+      # it "test", focus: true do
+      #   p client_key
+      #   p File.read(client_key)
+      #   # p ridley.environment.find(env_name)
+      # end
+
+      it "applys the locked_versions of the Lockfile dependencies to the given Chef environment" do
+        subject.apply(env_name)
+
+        environment = ::JSON.parse(chef_server.data_store.get(['environments', env_name]))
+        expect(environment['cookbook_versions']).to have(2).items
+        expect(environment['cookbook_versions']['nginx']).to eq('= 1.2.3')
+        expect(environment['cookbook_versions']['artifact']).to eq('= 1.4.0')
+      end
+    end
+
+    context "when the environment does not exist" do
+      it "raises an EnvironmentNotFound error" do
+        expect {
+          subject.apply("not-there")
+        }.to raise_error(Berkshelf::EnvironmentNotFound)
+      end
+    end
+  end
 
   describe '#dependencies' do
     it 'returns an array' do

data/spec/unit/berkshelf/resolver/graph_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Berkshelf::Resolver::Graph do
+describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
   subject { described_class.new }
 
   describe "#populate" do

data/spec/unit/berkshelf/ui_spec.rb

@@ -29,7 +29,7 @@ describe Thor::Base.shell do
         subject.stub(:quiet?).and_return(true)
       end
 
-      it 'does not output anything' do
+      it 'does not output anything', :not_supported_on_windows do
         stdout.should_not_receive(:puts)
         subject.say 'message'
       end
@@ -66,7 +66,7 @@ describe Thor::Base.shell do
       end
 
       it 'prints to stdout' do
-        stdout.should_receive(:puts).with("\e[1m\e[32m           5\e[0m  message")
+        stdout.should_receive(:puts).with(windows? ? "           5  message" : "\e[1m\e[32m           5\e[0m  message")
         stdout.should_receive(:flush).with(no_args())
         subject.say_status 5, 'message'
       end
@@ -112,7 +112,7 @@ describe Thor::Base.shell do
         subject.stub(:quiet?).and_return(true)
       end
 
-      it 'does not output anything' do
+      it 'does not output anything', :not_supported_on_windows do
         stdout.should_not_receive(:puts)
         subject.error 'error!'
       end
@@ -124,7 +124,7 @@ describe Thor::Base.shell do
       end
 
       it 'prints to stderr' do
-        stderr.should_receive(:puts).with("\e[31merror!\e[0m")
+        stderr.should_receive(:puts).with(windows? ? "error!" : "\e[31merror!\e[0m")
         subject.error 'error!'
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +322,6 @@ files:
 - bin/berks
 - features/berksfile.feature
 - features/commands/apply.feature
-- features/commands/configure.feature
 - features/commands/contingent.feature
 - features/commands/cookbook.feature
 - features/commands/init.feature
@@ -450,6 +449,7 @@ files:
 - spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cli_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
@@ -498,14 +498,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/berksfile.feature
 - features/commands/apply.feature
-- features/commands/configure.feature
 - features/commands/contingent.feature
 - features/commands/cookbook.feature
 - features/commands/init.feature
@@ -568,6 +567,7 @@ test_files:
 - spec/unit/berkshelf/api_client_spec.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cli_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb

data/features/commands/configure.feature

@@ -1,89 +0,0 @@
-@spawn
-Feature: berks configure
-  Background:
-    * I do not have a Berkshelf config
-
-  Scenario: Using custom values
-    When I run `berks configure` interactively
-    And I type "https://api.opscode.com/organizations/vialstudios"
-    And I type "node_name"
-    And I type "client_key"
-    And I type "reset"
-    And I type "/Users/reset/.chef/reset.pem"
-    And I type "Berkshelf-minimal"
-    And I type "https://dl.dropbox.com/Berkshelf.box"
-    Then the output should contain:
-      """
-      Config written to:
-      """
-    And a Berkshelf config file should exist and contain:
-      | chef.chef_server_url        | https://api.opscode.com/organizations/vialstudios |
-      | chef.validation_client_name | reset                                             |
-      | chef.node_name              | node_name                                         |
-      | chef.client_key             | client_key                                        |
-      | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
-      | vagrant.vm.box              | Berkshelf-minimal                                 |
-      | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
-
-
-  Scenario: Accepting the default values
-    Given I do not have a Chef config
-    When I run `berks configure` interactively
-    And I type ""
-    And I type ""
-    And I type ""
-    And I type ""
-    And I type ""
-    And I type ""
-    And I type ""
-    Then the output should contain:
-      """
-      Config written to:
-      """
-    And a Berkshelf config file should exist and contain:
-      | chef.chef_server_url        | http://localhost:4000               |
-      | chef.validation_client_name | chef-validator                      |
-      | chef.client_key             | /etc/chef/client.pem                |
-      | chef.validation_key_path    | /etc/chef/validation.pem            |
-      | vagrant.vm.box              | opscode_ubuntu-12.04_provisionerless |
-      | vagrant.vm.box_url          | https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box |
-      | vagrant.omnibus.enabled     | BOOLEAN[true] |
-      | vagrant.omnibus.version     | latest |
-
-
-  Scenario: Creating a Berkshelf configuration file when one already exists
-    Given I already have a Berkshelf config file
-    When I run `berks configure`
-    Then the output should contain:
-      """
-      A configuration file already exists. Re-run with the --force flag if you wish to overwrite it.
-      """
-    And the exit status should be "ConfigExists"
-
-
-  Scenario Outline: Using the --path option
-    When I run `berks configure --path <path>` interactively
-    And I type "https://api.opscode.com/organizations/vialstudios"
-    And I type "node_name"
-    And I type "client_key"
-    And I type "reset"
-    And I type "/Users/reset/.chef/reset.pem"
-    And I type "Berkshelf-minimal"
-    And I type "https://dl.dropbox.com/Berkshelf.box"
-    Then the output should contain:
-      """
-      Config written to:
-      """
-    And a Berkshelf config file should exist at "<path>" and contain:
-      | chef.chef_server_url        | https://api.opscode.com/organizations/vialstudios |
-      | chef.validation_client_name | reset                                             |
-      | chef.node_name              | node_name                                         |
-      | chef.client_key             | client_key                                        |
-      | chef.validation_key_path    | /Users/reset/.chef/reset.pem                      |
-      | vagrant.vm.box              | Berkshelf-minimal                                 |
-      | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
-
-    Examples:
-      | path                   |
-      | .berkshelf/config.json |
-      | berkshelf/config.json  |