berkshelf 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ffa4862aad42150a8e4a7386f48a3495f0f7ef
-  data.tar.gz: 215b5e4128bc085893ee1740e8d02d73a6fdbd90
+  metadata.gz: 1a8c63c90d30c802ffb17a2789a8cbe9587419bc
+  data.tar.gz: d47fcfb52f9ac8c1013775d16ed3e7cff157f578
 SHA512:
-  metadata.gz: 5725f1b7ca2b51b17cbfdad97727f06548ae6445b90646f2c85293fcec6f5f160eaf36c0a7ccef26efc6333902e6d3885190a6a1b4033d0c8e87fd7ae8eb4d14
-  data.tar.gz: 814b494a2a9f5c92df52effecc0208938ff6829a22d5c21ee1f6a00526826df3c978f87cf2b9ff2dab9905ae854d438be00b20263c67cd1b011a2b24b31286c0
+  metadata.gz: 1ea86f4683a43f628c45451fc8dedded9da3958bd44a8f2d670e7c0f2b3659ab82db4199f5e96ab46c040b1e956d74792bb3f2956dd450764240a7480f9e10b4
+  data.tar.gz: 2830ea0960dfc0219cecc3af858c1fe420ad4402a1415cdcbdf7027dcc4c2dcb2c757a3e193b1ec138048826a044b1611eeab9a7489b331e6cd6c87feb7a2749

data/Gemfile

@@ -31,5 +31,5 @@ group :guard do
 end
 
 group :test do
-  gem 'berkshelf-api', github: "berkshelf/berkshelf-api"
+  gem 'berkshelf-api', "~> 1.2"
 end

data/README.md

@@ -11,34 +11,6 @@ Manage a Cookbook or an Application's Cookbook dependencies
 
 **WARNING:** It is advised at this time that you [use Berkshelf 3](https://github.com/berkshelf/berkshelf/wiki/Howto:-Use-the-bleeding-edge). Berkshelf 2 is no longer being actively developed and has a number of significant issues related to dependency resolution that Berkshelf 3 fixes.
 
-### Manually install Gecode (temporary)
-
-The current release candidate of Vagrant Berkshelf requires you to have Gecode installed on your machine. In the future this process will be provided in an easy and automated fashion.
-
-#### OSX
-
-    $ cd $( brew --prefix )
-    $ git checkout 3c5ca25 Library/Formula/gecode.rb
-    $ brew install gecode
-
-#### Debian and Ubuntu
-
-    $ sudo apt-get install libgecode-dev
-
-##### Source
-
-    $ curl -O http://www.gecode.org/download/gecode-3.7.3.tar.gz
-    $ tar zxvf gecode-3.7.3.tar.gz
-    $ ./configure --disable-doc-dot \
-        --disable-doc-search \
-        --disable-doc-tagfile \
-        --disable-doc-chm \
-        --disable-doc-docset \
-        --disable-qt \
-        --disable-examples
-    $ make
-    $ (sudo) make install
-
 ### Gem Installation
 
 Add Berkshelf to your repository's `Gemfile`:
@@ -126,11 +98,7 @@ If you need to disable SSL, you can in `~/.berkshelf/config.json` like so:
 
 ## Authors
 
-- Jamie Winsor (<jamie@vialstudios.com>)
-- Josiah Kiehl (<jkiehl@riotgames.com>)
-- Michael Ivey (<michael.ivey@riotgames.com>)
-- Justin Campbell (<justin@justincampbell.me>)
-- Seth Vargo (<sethvargo@gmail.com>)
+[The Berkshelf Core Team](https://github.com/berkshelf/berkshelf/wiki/Core-Team)
 
 Thank you to all of our [Contributors](https://github.com/berkshelf/berkshelf/graphs/contributors), testers, and users.
 

data/berkshelf.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.8.0'
 
   s.add_dependency 'addressable',          '~> 2.3.4'
-  s.add_dependency 'berkshelf-api-client', '~> 1.2.0.rc2'
+  s.add_dependency 'berkshelf-api-client', '~> 1.2'
   s.add_dependency 'buff-config',          '~> 0.2'
   s.add_dependency 'buff-extensions',      '~> 0.4'
   s.add_dependency 'buff-shell_out',       '~> 0.1'
@@ -39,9 +39,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
   s.add_dependency 'ridley',               '~> 3.0'
-  s.add_dependency 'solve',                '~> 1.0.0.rc3'
+  s.add_dependency 'solve',                '~> 1.1'
   s.add_dependency 'thor',                 '~> 0.18'
   s.add_dependency 'octokit',              '~> 2.6'
+  s.add_dependency 'celluloid',            '~> 0.16.0.pre'
+  s.add_dependency 'celluloid-io',         '~> 0.16.0.pre'
 
   s.add_development_dependency 'aruba',         '~> 0.5'
   s.add_development_dependency 'chef-zero',     '~> 1.5.0'

data/features/lifecycle.feature

@@ -250,7 +250,7 @@ Feature: Lifecycle commands
       """
       DEPENDENCIES
         fake
-          path: ./fake
+          path: fake
         transitive
           path: .
           metadata: true
@@ -369,7 +369,7 @@ Feature: Lifecycle commands
       """
       DEPENDENCIES
         fake
-          path: ./fake
+          path: fake
 
       GRAPH
         fake (2.0.0)

data/features/lockfile.feature

@@ -268,7 +268,7 @@ Feature: Creating and reading the Berkshelf lockfile
       """
       DEPENDENCIES
         fake
-          path: ./fake
+          path: fake
 
       GRAPH
         fake (0.0.0)

data/lib/berkshelf.rb

@@ -9,6 +9,7 @@ require 'solve'
 require 'thor'
 require 'tmpdir'
 require 'uri'
+require 'celluloid'
 
 JSON.create_id = nil
 
@@ -217,5 +218,6 @@ require_relative 'berkshelf/source'
 require_relative 'berkshelf/source_uri'
 require_relative 'berkshelf/ui'
 
-Ridley.logger = Berkshelf.logger
+Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN
+Celluloid.logger.level = Logger::ERROR

data/lib/berkshelf/berksfile.rb

@@ -8,6 +8,7 @@ module Berkshelf
       #
       # @param (see Berksfile#initialize)
       def from_options(options = {})
+        options[:berksfile] ||= File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
         from_file(options[:berksfile], options.slice(:except, :only))
       end
 
@@ -56,7 +57,7 @@ module Berkshelf
     #   Group(s) to include which will cause any dependencies marked as a member of the
     #   group to be installed and all others to be ignored
     def initialize(path, options = {})
-      @filepath         = path
+      @filepath         = File.expand_path(path)
       @dependencies     = Hash.new
       @sources          = Hash.new
 
@@ -159,14 +160,11 @@ module Berkshelf
     # @option options [String] :path
     #   path to the metadata file
     def metadata(options = {})
-      path = options[:path] || File.dirname(filepath)
-
+      path          = options[:path] || File.dirname(filepath)
       metadata_path = File.expand_path(File.join(path, 'metadata.rb'))
-      metadata = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
-
-      name = metadata.name.presence || File.basename(File.expand_path(path))
+      metadata      = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
 
-      add_dependency(name, nil, path: path, metadata: true)
+      add_dependency(metadata.name, nil, path: path, metadata: true)
     end
 
     # Add a Berkshelf API source to use when building the index of known cookbooks. The indexes will be

data/lib/berkshelf/cli.rb

@@ -122,7 +122,7 @@ module Berkshelf
       aliases: '-o'
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -145,7 +145,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -165,7 +165,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -232,7 +232,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -283,7 +283,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -303,7 +303,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: "Path to a Berksfile to operate off of.",
       aliases: "-b",
       banner: "PATH"
@@ -316,7 +316,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -337,7 +337,7 @@ module Berkshelf
 
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'
@@ -371,7 +371,7 @@ module Berkshelf
       aliases: '-o'
     method_option :berksfile,
       type: :string,
-      default: Berkshelf::DEFAULT_FILENAME,
+      default: nil,
       desc: 'Path to a Berksfile to operate off of.',
       aliases: '-b',
       banner: 'PATH'

data/lib/berkshelf/community_rest.rb

@@ -86,14 +86,27 @@ module Berkshelf
       super(api_uri, options)
     end
 
+    # Download and extract target cookbook archive to the local file system,
+    # returning its filepath.
+    #
     # @param [String] name
+    #   the name of the cookbook
     # @param [String] version
+    #   the targeted version of the cookbook
     #
-    # @return [String]
+    # @return [String, nil]
+    #   cookbook filepath, or nil if archive does not contain a cookbook
     def download(name, version)
       archive   = stream(find(name, version)[:file])
       extracted = self.class.unpack(archive.path)
-      Dir.glob(File.join(extracted, "*")).first
+
+      if File.cookbook?(extracted)
+        extracted
+      else
+        Dir.glob(File.join(extracted, '*')).find do |dir|
+          File.cookbook?(dir)
+        end
+      end
     ensure
       archive.unlink unless archive.nil?
     end

data/lib/berkshelf/installer.rb

@@ -10,7 +10,7 @@ module Berkshelf
     def initialize(berksfile)
       @berksfile  = berksfile
       @lockfile   = berksfile.lockfile
-      @downloader = Downloader.new(berksfile)
+      @worker     = Worker.pool(size: [(Celluloid.cores - 1), 1].max, args: [berksfile])
     end
 
     def build_universe
@@ -34,10 +34,10 @@ module Berkshelf
       Berkshelf.formatter.msg('Resolving cookbook dependencies...')
 
       dependencies, cookbooks = if lockfile.trusted?
-                                  install_from_lockfile
-                                else
-                                  install_from_universe
-                                end
+        install_from_lockfile
+      else
+        install_from_universe
+      end
 
       Berkshelf.log.debug "  Finished resolving, calculating locks"
 
@@ -59,34 +59,48 @@ module Berkshelf
 
     private
 
-      # Install a specific dependency.
-      #
-      # @param [Dependency]
-      #   the dependency to install
-      # @return [CachedCookbook]
-      #   the installed cookbook
-      def install(dependency)
-        Berkshelf.log.info "Installing #{dependency}"
+      attr_reader :worker
+
+      class Worker
+        include Celluloid
+
+        attr_reader :berksfile
+        attr_reader :downloader
+
+        def initialize(berksfile)
+          @berksfile  = berksfile
+          @downloader = Downloader.new(berksfile)
+        end
+
+        # Install a specific dependency.
+        #
+        # @param [Dependency]
+        #   the dependency to install
+        # @return [CachedCookbook]
+        #   the installed cookbook
+        def install(dependency)
+          Berkshelf.log.info "Installing #{dependency}"
 
-        if dependency.installed?
-          Berkshelf.log.debug "  Already installed - skipping install"
+          if dependency.installed?
+            Berkshelf.log.debug "  Already installed - skipping install"
 
-          Berkshelf.formatter.use(dependency)
-          dependency.cached_cookbook
-        else
-          name, version = dependency.name, dependency.locked_version.to_s
-          source = berksfile.source_for(name, version)
+            Berkshelf.formatter.use(dependency)
+            dependency.cached_cookbook
+          else
+            name, version = dependency.name, dependency.locked_version.to_s
+            source = berksfile.source_for(name, version)
 
-          Berkshelf.log.debug "  Downloading #{dependency.name} (#{dependency.locked_version}) from #{source}"
+            Berkshelf.log.debug "  Downloading #{dependency.name} (#{dependency.locked_version}) from #{source}"
 
-          cookbook = source.cookbook(name, version)
+            cookbook = source.cookbook(name, version)
 
-          Berkshelf.log.debug "    => #{cookbook.inspect}"
+            Berkshelf.log.debug "    => #{cookbook.inspect}"
 
-          Berkshelf.formatter.install(source, cookbook)
+            Berkshelf.formatter.install(source, cookbook)
 
-          stash = downloader.download(name, version)
-          CookbookStore.import(name, version, stash)
+            stash = downloader.download(name, version)
+            CookbookStore.import(name, version, stash)
+          end
         end
       end
 
@@ -112,9 +126,7 @@ module Berkshelf
           build_universe
         end
 
-        cookbooks = dependencies.sort.collect do |dependency|
-          install(dependency)
-        end
+        cookbooks = dependencies.sort.map { |dependency| worker.future.install(dependency) }.map(&:value)
 
         [dependencies, cookbooks]
       end
@@ -155,9 +167,7 @@ module Berkshelf
 
         Berkshelf.log.debug "  Starting resolution..."
 
-        cookbooks = resolver.resolve.sort.collect do |dependency|
-          install(dependency)
-        end
+        cookbooks = resolver.resolve.sort.map { |dependency| worker.future.install(dependency) }.map(&:value)
 
         [dependencies, cookbooks]
       end

data/lib/berkshelf/locations/path.rb

@@ -33,26 +33,18 @@ module Berkshelf
     # is actually the path reative to the associated Berksfile's parent
     # directory.
     #
-    # @return [String]
+    # @return [Pathname]
     #   the relative path relative to the target
     def relative_path
-      my_path     = Pathname.new(options[:path]).expand_path
-      target_path = Pathname.new(dependency.berksfile.filepath).expand_path
-      target_path = target_path.dirname if target_path.file?
-
-      new_path = my_path.relative_path_from(target_path).to_s
-
-      return new_path if new_path.index('.') == 0
-      "./#{new_path}"
+      @relative_path ||= expanded_path.relative_path_from(Pathname.new(File.dirname(dependency.berksfile.filepath)))
     end
 
     # The fully expanded path of this cookbook on disk, relative to the
     # Berksfile.
     #
-    # @return [String]
+    # @return [Pathname]
     def expanded_path
-      parent = File.expand_path(File.dirname(dependency.berksfile.filepath))
-      File.expand_path(relative_path, parent)
+      @expanded_path ||= Pathname.new File.expand_path(options[:path], File.dirname(dependency.berksfile.filepath))
     end
 
     def ==(other)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '3.0.0.rc1'
+  VERSION = '3.0.0'
 end

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

@@ -11,8 +11,8 @@ module Berkshelf
         berksfile: berksfile,
       )
     end
-    let(:path) { fixtures_path.join('cookbooks', 'example_cookbook').to_s }
-    let(:relative_path) { '../../../fixtures/cookbooks/example_cookbook' }
+    let(:path) { fixtures_path.join('cookbooks', 'example_cookbook') }
+    let(:relative_path) { Pathname.new('../../../fixtures/cookbooks/example_cookbook') }
 
     subject { described_class.new(dependency, path: path) }
 
@@ -44,7 +44,7 @@ module Berkshelf
 
     describe '#expanded_path' do
       it 'returns the expanded path, relative to the Berksfile' do
-        absolute_path = File.expand_path(relative_path, File.dirname(berksfile.filepath))
+        absolute_path = Pathname.new(File.expand_path(relative_path, File.dirname(berksfile.filepath)))
         expect(subject.expanded_path).to eq(absolute_path)
       end
     end
@@ -92,7 +92,7 @@ module Berkshelf
     end
 
     describe '#to_s' do
-      it 'uses the expanded path' do
+      it 'uses the relative path' do
         expect(subject.to_s).to eq("source at #{relative_path}")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0.pre
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement