berkshelf-api 2.1.0 → 2.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 971e1180855e205e466cb354e752fe0c0c94c2dc
+  data.tar.gz: 5bbc0b19b1cb8b57e86014010a3b1d2690c87ded
+SHA512:
+  metadata.gz: 6a3a6d8aa8afae5b117264e45752abfbbf835461d5db735c4e4a47a66b08d317b6dbb6bc6ef6ad6b8d2c7ffcff5cafa0fdd9ed62bfbef9d9671bae8278eebadc
+  data.tar.gz: 2f3961d35ffa57970fe463174631d414d0b9fa706ea789f8907a43eeefcf29338e16706599a224d4544811124772ef12095bdbced01b4e3e824a99f0983cede5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.1.1
+
+* Bug Fixes
+  * Calling berks_dependency/2 rspec support function no longer results in a runtime crash
+  * Failures when calling Supermarket.universe/0 will now return a hash instead of a boolean
+  * Cookbook name, not repo name, will be used when caching Github cookbooks
+  * Group/User will be created in proper order during cookbook converge
+
 # 2.1.0
 
 * Enhancements

data/README.md

@@ -26,7 +26,7 @@ Create an environment
 
 Bootstrap a server into that environment
 
-    $ knife ec2 server create -I ami-22e08b12 -f t1.micro -E berks-api-production -r "recipe[organization-base::default]" -G ssh-admin,http-https --ssh-user ubuntu
+    $ knife ec2 server create -I ami-23f78e13 -f t1.micro -E berks-api-production -r "recipe[organization-base::default]" -G ssh-admin,http-https --ssh-user ubuntu
 
 Install the cookbooks into your environment
 

data/lib/berkshelf/api/cache_builder/worker/github.rb

@@ -51,7 +51,7 @@ module Berkshelf::API
                     next unless cookbook_metadata = load_metadata(repo.name, tag.name)
 
                     if cookbook_metadata.version.to_s == match[:version].to_s
-                      cookbook_versions << RemoteCookbook.new(repo.name, cookbook_metadata.version,
+                      cookbook_versions << RemoteCookbook.new(cookbook_metadata.name, cookbook_metadata.version,
                         self.class.worker_type, repo.html_url, priority)
                     else
                       log.warn "Version found in metadata for #{repo.name} (#{tag.name}) does not " +

data/lib/berkshelf/api/remote_cookbook.rb

@@ -8,12 +8,12 @@ module Berkshelf::API
     attr_accessor :info
 
     def initialize(name, version, location_type, location_path, priority, info = {})
-      @name = name
-      @version = version
+      @name          = name
+      @version       = version
       @location_type = location_type
       @location_path = location_path
-      @priority = priority
-      @info = info
+      @priority      = priority
+      @info          = info
     end
 
     def hash

data/lib/berkshelf/api/rspec.rb

@@ -10,7 +10,7 @@ module Berkshelf::API
       options[:platforms] ||= Hash.new
       options[:dependencies] ||= Hash.new
       cookbook = RemoteCookbook.new(name, version,
-        CacheBuilder::Worker::Supermarket.worker_type, SiteConnector::Supermarket::V1_API)
+        CacheBuilder::Worker::Supermarket.worker_type, SiteConnector::Supermarket::V1_API, 0)
       metadata = Ridley::Chef::Cookbook::Metadata.new
       options[:platforms].each { |name, version| metadata.supports(name, version) }
       options[:dependencies].each { |name, constraint| metadata.depends(name, constraint) }

data/lib/berkshelf/api/site_connector/supermarket.rb

@@ -1,5 +1,4 @@
 require 'open-uri'
-require 'retryable'
 require 'archive'
 require 'tempfile'
 
@@ -32,6 +31,8 @@ module Berkshelf::API
       # The timeout for the HTTP request
       TIMEOUT = 15
 
+      EMPTY_UNIVERSE = {}.freeze
+
       # @return [String]
       attr_reader :api_url
 
@@ -53,14 +54,17 @@ module Berkshelf::API
         end
       rescue JSON::ParserError => e
         log.error "Failed to parse JSON: #{e}"
+        EMPTY_UNIVERSE
       rescue Timeout::Error
         log.error "Failed to get `#{universe_url}' in #{TIMEOUT} seconds!"
+        EMPTY_UNIVERSE
       rescue SocketError,
              Errno::ECONNREFUSED,
              Errno::ECONNRESET,
              Errno::ENETUNREACH,
              OpenURI::HTTPError => e
         log.error "Failed to get `#{universe_url}': #{e}"
+        EMPTY_UNIVERSE
       end
     end
   end

data/lib/berkshelf/api/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,146 +9,115 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: grape-msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: retryable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: archive
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -157,7 +125,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -165,49 +132,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Berkshelf dependency API server
@@ -220,39 +181,40 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- README.md
 - LICENSE
+- README.md
+- bin/berks-api
+- lib/berkshelf-api.rb
+- lib/berkshelf/api.rb
 - lib/berkshelf/api/application.rb
+- lib/berkshelf/api/cache_builder.rb
+- lib/berkshelf/api/cache_builder/worker.rb
 - lib/berkshelf/api/cache_builder/worker/chef_server.rb
 - lib/berkshelf/api/cache_builder/worker/file_store.rb
 - lib/berkshelf/api/cache_builder/worker/github.rb
 - lib/berkshelf/api/cache_builder/worker/supermarket.rb
-- lib/berkshelf/api/cache_builder/worker.rb
-- lib/berkshelf/api/cache_builder.rb
 - lib/berkshelf/api/cache_manager.rb
 - lib/berkshelf/api/config.rb
-- lib/berkshelf/api/core_ext/pathname.rb
 - lib/berkshelf/api/core_ext.rb
+- lib/berkshelf/api/core_ext/pathname.rb
 - lib/berkshelf/api/cucumber.rb
 - lib/berkshelf/api/dependency_cache.rb
-- lib/berkshelf/api/endpoint/v1.rb
 - lib/berkshelf/api/endpoint.rb
+- lib/berkshelf/api/endpoint/v1.rb
 - lib/berkshelf/api/errors.rb
 - lib/berkshelf/api/generic_server.rb
 - lib/berkshelf/api/logging.rb
-- lib/berkshelf/api/mixin/services.rb
 - lib/berkshelf/api/mixin.rb
+- lib/berkshelf/api/mixin/services.rb
 - lib/berkshelf/api/rack_app.rb
 - lib/berkshelf/api/remote_cookbook.rb
 - lib/berkshelf/api/rest_gateway.rb
-- lib/berkshelf/api/rspec/server.rb
 - lib/berkshelf/api/rspec.rb
-- lib/berkshelf/api/site_connector/supermarket.rb
+- lib/berkshelf/api/rspec/server.rb
 - lib/berkshelf/api/site_connector.rb
+- lib/berkshelf/api/site_connector/supermarket.rb
 - lib/berkshelf/api/srv_ctl.rb
 - lib/berkshelf/api/version.rb
-- lib/berkshelf/api.rb
-- lib/berkshelf-api.rb
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
@@ -275,34 +237,29 @@ files:
 - spec/unit/berkshelf/api/rest_gateway_spec.rb
 - spec/unit/berkshelf/api/site_connector/supermarket_spec.rb
 - spec/unit/berkshelf/api/srv_ctl_spec.rb
-- bin/berks-api
 homepage: https://github.com/berkshelf/berkshelf-api
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 186690400328134402
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A server which indexes cookbooks from various sources and hosts it over a
   REST API
 test_files: