berkshelf 1.0.0.rc2 → 1.0.0.rc3

data/Thorfile

@@ -38,25 +38,41 @@ class Default < Thor
 
     desc "all", "Run all tests"
     def all
-      invoke(:unit)
-      invoke(:acceptance)
+      unless run_unit && run_acceptance
+        exit 1
+      end
     end
 
     desc "ci", "Run all possible tests on Travis-CI"
     def ci
       ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-      run "rspec --tag ~chef_server --tag ~focus --color --format=documentation spec"
-      run "cucumber --format pretty --tags ~@chef_server"
+      unless run_unit("--tag ~chef_server") && run_acceptance("--tags ~@chef_server")
+        exit 1
+      end
     end
 
     desc "unit", "Run unit tests"
     def unit
-      run "rspec --color --format=documentation spec"
+      unless run_unit
+        exit 1
+      end
     end
 
     desc "acceptance", "Run acceptance tests"
     def acceptance
-      run "cucumber --color --format pretty --tags ~@no_run"
+      unless run_acceptance
+        exit 1
+      end
+    end
+
+    no_tasks do
+      def run_unit(*flags)
+        run "rspec --color --format=documentation #{flags.join(' ')} spec"
+      end
+
+      def run_acceptance(*flags)
+        run "cucumber --color --format pretty --tags ~@no_run #{flags.join(' ')}"
+      end
     end
   end
 

data/berkshelf.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
+  s.add_dependency 'yajl-ruby'
   s.add_dependency 'activesupport'
   s.add_dependency 'chef', '>= 10.12.0'
   s.add_dependency 'ridley', '>= 0.4.1'

data/features/update.feature

@@ -10,7 +10,7 @@ Feature: update
       """
     Given I write to "Berksfile.lock" with:
       """
-      cookbook 'artifact', :locked_version => '0.0.1'
+      cookbook 'artifact', :locked_version => '0.1.0'
       """
     When I run the update command
     Then the file "Berksfile.lock" should contain exactly:

data/generator_files/metadata.rb.erb

@@ -5,8 +5,8 @@ license          "<%= license_name %>"
 description      "Installs/Configures <%= name %>"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 <% if options[:scmversion] -%>
-version          IO.read(File.join(File.dirname(__FILE__), 'VERSION')) rescue "0.0.1"
+version          IO.read(File.join(File.dirname(__FILE__), 'VERSION')) rescue "0.1.0"
 <% else -%>
-version          "0.0.1"
+version          "0.1.0"
 <% end -%>
 

data/lib/berkshelf/berksfile.rb

@@ -384,7 +384,6 @@ module Berkshelf
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
     def upload(options = {})
-      options[:organization] ||= ChefAPILocation.extract_organization(Chef::Config[:chef_server_url])
       uploader = Uploader.new(options)
       solution = resolve(options)
 

data/lib/berkshelf/cli.rb

@@ -160,7 +160,7 @@ module Berkshelf
       desc: "Upload all cookbooks even if a frozen one exists on the target Chef Server"
     option :ssl_verify,
       type: :boolean,
-      default: true,
+      default: nil,
       desc: "Disable/Enable SSL verification when uploading cookbooks"
     desc "upload", "Upload the Cookbooks specified by a Berksfile or a Berksfile.lock to a Chef Server"
     def upload

data/lib/berkshelf/config.rb

@@ -6,17 +6,42 @@ module Berkshelf
   class Config < Chozo::Config::JSON
     FILENAME = "config.json".freeze
 
-    class << self
-      attr_writer :path
+    # List taken from: http://wiki.opscode.com/display/chef/Chef+Configuration+Settings
+    # Listed in order of preferred preference
+    KNIFE_LOCATIONS = [
+      './.chef/knife.rb',
+      '~/.chef/knife.rb',
+      '/etc/chef/solo.rb',
+      '/etc/chef/client.rb'
+    ].freeze
 
+    class << self
       # @return [String]
       def path
-        File.join(Berkshelf.berkshelf_path, FILENAME)
+        @path || File.join(Berkshelf.berkshelf_path, FILENAME)
       end
 
-      # @return [String]
+      # @param [String] new_path
+      def path=(new_path)
+        @path = File.expand_path(new_path)
+      end
+
+      # @return [String, nil]
       def chef_config_path
-        @chef_config_path ||= File.expand_path(ENV["BERKSHELF_CHEF_CONFIG"] || "~/.chef/knife.rb")
+        @chef_config_path ||= begin
+          possibles = KNIFE_LOCATIONS.dup
+
+          unless ENV['BERKSHELF_CHEF_CONFIG'].nil?
+            possibles.unshift(ENV['BERKSHELF_CHEF_CONFIG'])
+          end
+
+          location = possibles.find do |location|
+            File.exists?(File.expand_path(location))
+          end
+          location ||= "~/.chef/knife.rb"
+
+          File.expand_path(location)
+        end
       end
 
       # @param [String] value
@@ -86,7 +111,7 @@ module Berkshelf
       default: Hash.new
     attribute 'vagrant.vm.network.bridged',
       type: Boolean,
-      default: true
+      default: false
     attribute 'vagrant.vm.network.hostonly',
       type: String,
       default: '33.33.33.10'
@@ -95,6 +120,7 @@ module Berkshelf
       default: 'chef_solo'
     attribute 'ssl.verify',
       type: Boolean,
-      default: true
+      default: true,
+      required: true
   end
 end

data/lib/berkshelf/init_generator.rb

@@ -71,7 +71,7 @@ module Berkshelf
       end
 
       if options[:scmversion]
-        create_file target.join("VERSION"), "0.0.1"
+        create_file target.join("VERSION"), "0.1.0"
       end
 
       unless options[:no_bundler]

data/lib/berkshelf/locations/chef_api_location.rb

@@ -56,20 +56,6 @@ module Berkshelf
 
         true
       end
-
-      # Retrieves the organization of a Chef API URI. If the URI does not contain an
-      # organization then nil will be returned.
-      #
-      # @param [String] uri
-      #
-      # @raise [InvalidChefAPILocation]
-      #
-      # @return [String, nil]
-      def extract_organization(uri)
-        validate_uri!(uri)
-
-        URI(uri).path.split('organizations/')[1]
-      end
     end
 
     include Location

data/lib/berkshelf/vagrant/action/install.rb

@@ -34,6 +34,10 @@ module Berkshelf
 
           def configure_cookbooks_path(env)
             Berkshelf::Vagrant.provisioners(:chef_solo, env[:vm].config).each do |provisioner|
+              unless provisioner.config.cookbooks_path.is_a?(Array)
+                provisioner.config.cookbooks_path = Array(provisioner.config.cookbooks_path)
+              end
+
               provisioner.config.cookbooks_path.unshift(self.shelf)
             end
           end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/lib/berkshelf.rb

@@ -1,3 +1,4 @@
+require 'yajl'
 require 'chef/cookbook/metadata'
 require 'chef/cookbook_version'
 require 'chef/knife'

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ Spork.prefork do
   require 'webmock/rspec'
 
   APP_ROOT = File.expand_path('../../', __FILE__)
+  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
+  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "tmp", "knife.rb")
 
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 

data/spec/support/chef_api.rb

@@ -103,8 +103,7 @@ EOF
           @uploader ||= Berkshelf::Uploader.new(
             server_url: Chef::Config[:chef_server_url],
             client_name: Chef::Config[:node_name],
-            client_key: Chef::Config[:client_key],
-            organization: Berkshelf::ChefAPILocation.extract_organization(Chef::Config[:chef_server_url])
+            client_key: Chef::Config[:client_key]
           )
         end
     end

data/spec/unit/berkshelf/cookbook_store_spec.rb

@@ -61,7 +61,7 @@ module Berkshelf
 
       context "when there is no matching cookbook for the given name and constraint" do
         let(:version) { Solve::Version.new("1.0.0") }
-        let(:constraint) { Solve::Constraint.new("= 0.0.1") }
+        let(:constraint) { Solve::Constraint.new("= 0.1.0") }
 
         before(:each) do
           subject.stub(:cookbooks).and_return([ double('badcache', name: 'none', version: version) ])

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

@@ -66,16 +66,16 @@ module Berkshelf
         context "given the symbol :config for the value of chef_api:" do
           before(:each) { @loc = subject.new("nginx", constraint, chef_api: :config) }
 
-          it "uses the value of Chef::Config[:chef_server_url] for the uri attribute" do
-            @loc.uri.should eql(Chef::Config[:chef_server_url])
+          it "uses the value of Berkshelf::Chef.instance.chef.chef_server_url for the uri attribute" do
+            @loc.uri.should eql(Berkshelf::Config.instance.chef.chef_server_url)
           end
 
-          it "uses the value of Chef::Config[:node_name] for the node_name attribute" do
-            @loc.node_name.should eql(Chef::Config[:node_name])
+          it "uses the value of Berkshelf::Chef.instance.chef.node_name for the node_name attribute" do
+            @loc.node_name.should eql(Berkshelf::Config.instance.chef.node_name)
           end
 
-          it "uses the value of Chef::Config[:client_key] for the client_key attribute" do
-            @loc.client_key.should eql(Chef::Config[:client_key])
+          it "uses the value of Berkshelf::Chef.instance.chef.client_key for the client_key attribute" do
+            @loc.client_key.should eql(Berkshelf::Config.instance.chef.client_key)
           end
         end
       end
@@ -228,7 +228,7 @@ module Berkshelf
       end
 
       it "returns a string containing the location key and the Chef API URI" do
-        subject.to_s.should eql("chef_api: '#{Chef::Config[:chef_server_url]}'")
+        subject.to_s.should eql("chef_api: '#{Berkshelf::Config.instance.chef.chef_server_url}'")
       end
     end
   end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -1,34 +1,5 @@
 require 'spec_helper'
 
-module Berkshelf
-  describe Lockfile do
-    let(:downloader) { Downloader.new(Berkshelf.cookbook_store) }
-
-    describe "without a lockfile in place already" do
-      before(:all) do
-        @old_dir = Dir.pwd
-        Dir.chdir fixtures_path.join("lockfile_spec", "without_lock")
-      end
-
-      after(:all) do
-        FileUtils.rm(fixtures_path.join("lockfile_spec", "without_lock", "Berksfile.lock"))
-        Dir.chdir(@old_dir)
-      end
-
-      it "should be able to write a Berksfile.lock from a list of cookbooks" do
-        resolver = Resolver.new(downloader, sources: CookbookSource.new('nginx', constraint: '= 0.101.0'))
-        resolver.resolve
-
-        Lockfile.new(resolver.sources).write
-
-        File.read('Berksfile.lock').split(/\r?\n/).should =~ [
-          "cookbook 'bluepill', :locked_version => '1.1.0'",
-          "cookbook 'build-essential', :locked_version => '1.1.2'",
-          "cookbook 'nginx', :locked_version => '0.101.0'",
-          "cookbook 'ohai', :locked_version => '1.0.2'",
-          "cookbook 'runit', :locked_version => '0.15.0'"
-        ]
-      end
-    end
-  end
+describe Berkshelf::Lockfile do
+  pending
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,8 +12,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement