berkshelf 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100a6f3b421a94aa67bb5656af8f3bc689b0dc12
-  data.tar.gz: 7b6301d2dbedb6faf17db98f3d08767104e2ab2e
+  metadata.gz: cd1aa53a9867a0e5a5499885621fb883886c4d70
+  data.tar.gz: 4a730017be76868d1892a8e0f283415f4fcc922d
 SHA512:
-  metadata.gz: 05c22a423962555fc42d425121922a7a8a42bcc4e365903d55a9cc176d9a78f42b3e915c77b4a415454259e7a211df57343569a91e24dce725f3e516ad0f0b7d
-  data.tar.gz: b0c809c1113c592ee8bf1d7041369d13edad6433bb15d83c02eeaab8bf38ab37db5668def7681686c28cce890f3cc0b1a64eac56c8e29b391c5d54b9af1ad4ac
+  metadata.gz: 6e69b3084e8f50f45099b6978c339fbb39b602c3caf7724b7383697b0d4ac3beca4f77848ccc7b4f23a72ebc5bedecce0e709e3e2a996d72fb0c5fa3f5b7d22b
+  data.tar.gz: c07fe3c83904af0f9b0c45a1db8ac85e65ea07450328fa2fbbf7fa062f9bcd43a2666545b183b6e33b1710d9c6eafa09a6701d050d1e29f4c9f103f867caa929

data/features/apply_command.feature

@@ -17,8 +17,8 @@ Feature: Applying cookbook versions to a Chef Environment
     When I successfully run `berks apply berkshelf_lock_test`
     Then the version locks in "berkshelf_lock_test" should be:
       | cookbook   | version_lock |
-      | fake       | 1.0.0 |
-      | dependency | 2.0.0 |
+      | fake       | = 1.0.0 |
+      | dependency | = 2.0.0 |
     And the exit status should be 0
 
   @chef_server

data/features/upload_command.feature

@@ -316,3 +316,32 @@ Feature: Uploading cookbooks to a Chef Server
       Uploading fake (0.0.0)
       """
     And the exit status should be 0
+  Scenario: When the syntax check is skipped
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "recipes/default.rb" with:
+      """
+      Totally not valid Ruby syntax
+      """
+    And the cookbook "fake" has the file "templates/default/file.erb" with:
+      """
+      <% for %>
+      """
+    And the cookbook "fake" has the file "recipes/template.rb" with:
+      """
+      template "/tmp/wadus" do
+        source "file.erb"
+      end
+      """
+    And the cookbook "fake" has the file "Berksfile" with:
+      """
+      site :opscode
+
+      metadata
+      """
+    And I cd to "fake"
+    When I successfully run `berks upload --skip-syntax-check`
+    Then the output should contain:
+      """
+      Using fake (0.0.0) from metadata
+      Uploading fake (0.0.0) to: 'http://localhost:4000/'
+      """

data/lib/berkshelf/berksfile.rb

@@ -519,10 +519,10 @@ module Berkshelf
     #   if an attempt to upload a cookbook which has been frozen on the target server is made
     #   and the :halt_on_frozen option was true
     def upload(options = {})
-      options = options.reverse_merge(force: false, freeze: true, skip_dependencies: false, halt_on_frozen: false, update_lockfile: false)
+      options = options.reverse_merge(force: false, freeze: true, skip_dependencies: false, halt_on_frozen: false, update_lockfile: false, validate: true)
 
       cached_cookbooks = install(options)
-      upload_opts      = options.slice(:force, :freeze)
+      upload_opts      = options.slice(:force, :freeze, :validate)
       conn             = ridley_connection(options)
 
       cached_cookbooks.each do |cookbook|
@@ -572,7 +572,7 @@ module Berkshelf
         install
 
         environment.cookbook_versions = {}.tap do |cookbook_versions|
-          lockfile.sources.each { |source| cookbook_versions[source.name] = source.locked_version.to_s }
+          lockfile.sources.each { |source| cookbook_versions[source.name] = "= #{source.locked_version.to_s}" }
         end
 
         environment.save

data/lib/berkshelf/cli.rb

@@ -225,6 +225,7 @@ module Berkshelf
       upload_options             = Hash[options.except(:no_freeze, :berksfile)].symbolize_keys
       upload_options[:cookbooks] = cookbook_names
       upload_options[:freeze]    = false if options[:no_freeze]
+      upload_options[:validate]  = false if options[:skip_syntax_check]
 
       berksfile.upload(upload_options)
     end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -510,6 +510,37 @@ describe Berkshelf::Berksfile do
         upload
       end
     end
+
+    context 'when validate is passed' do
+      let(:options) do
+        {
+          force: false,
+          freeze: true,
+          validate: false,
+          name: "cookbook"
+        }
+      end
+      let(:ridley_options) do
+        default_ridley_options.merge(
+            { server_url: 'http://configured-chef-server/'})
+      end
+      let(:cookbook) { double('cookbook', cookbook_name: 'cookbook', path: 'path', version: '1.0.0') }
+      let(:installed_cookbooks) { [ cookbook ] }
+      let(:server_url)  { Berkshelf::RSpec::ChefServer.server_url }
+      let(:client_name) { 'reset' }
+      let(:client_key) { 'client-key' }
+      let(:ridley_connection)      { double('ridley-connection', server_url: server_url, client_name: client_name, client_key: client_key) }
+      let(:cookbook_resource) { double('cookbook') }
+
+      it 'uses the passed in :validate' do
+        Ridley.stub(:new).with(ridley_options).and_return(ridley_connection)
+        ridley_connection.stub(:alive?).and_return(true)
+        ridley_connection.stub(:terminate).and_return(true)
+        ridley_connection.should_receive(:cookbook).and_return(cookbook_resource)
+        cookbook_resource.should_receive(:upload).with('path', options )
+        upload
+      end
+    end
   end
 
   describe '#apply' do
@@ -548,8 +579,8 @@ describe Berkshelf::Berksfile do
 
         environment = ::JSON.parse(chef_server.data_store.get(['environments', 'berkshelf']))
         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')
+        expect(environment['cookbook_versions']['nginx']).to eq('= 1.2.3')
+        expect(environment['cookbook_versions']['artifact']).to eq('= 1.4.0')
       end
     end
 

data/spec/unit/berkshelf/cli_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Berkshelf::Cli do
+  let(:subject) { described_class.new }
+  let(:berksfile) { double('Berksfile') }
+  let(:cookbooks) { ['mysql'] }
+  describe '#upload' do
+    it 'calls to upload with params if passed in cli' do
+      Berkshelf::Berksfile.should_receive(:from_file).and_return(berksfile)
+      berksfile.should_receive(:upload).with(include(:skip_syntax_check => true, :freeze => false, :cookbooks => cookbooks))
+      subject.options[:skip_syntax_check] = true
+      subject.options[:no_freeze] = true
+      subject.upload('mysql')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -616,6 +616,7 @@ files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/chef/cookbook/chefignore_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
@@ -755,6 +756,7 @@ test_files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/chef/cookbook/chefignore_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