berkshelf-api 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971e1180855e205e466cb354e752fe0c0c94c2dc
-  data.tar.gz: 5bbc0b19b1cb8b57e86014010a3b1d2690c87ded
+  metadata.gz: cfca2d0b27a4de920ab8ebebc1696e54215d99c8
+  data.tar.gz: e1eb91c9fb7aee0533c880ee52ba383c1c5bcca4
 SHA512:
-  metadata.gz: 6a3a6d8aa8afae5b117264e45752abfbbf835461d5db735c4e4a47a66b08d317b6dbb6bc6ef6ad6b8d2c7ffcff5cafa0fdd9ed62bfbef9d9671bae8278eebadc
-  data.tar.gz: 2f3961d35ffa57970fe463174631d414d0b9fa706ea789f8907a43eeefcf29338e16706599a224d4544811124772ef12095bdbced01b4e3e824a99f0983cede5
+  metadata.gz: 266934ce6f48ec6e47eaa3ac3f666bf697c35e971f663bd5344a71b4d1e872334f4c74c7b2cbf69a2e24519efc3a81ba67d7272e959d2ab7060c4c9fccebda1a
+  data.tar.gz: 9bb4b00e20252fefc1e88c8b7c2d3477736b1e31428568b4281d47bd5ed142741bd106ab3a1855ba84e4bade823e949733ef483e15cb3d1cb794d30899534636

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

@@ -52,7 +52,7 @@ module Berkshelf::API
 
                     if cookbook_metadata.version.to_s == match[:version].to_s
                       cookbook_versions << RemoteCookbook.new(cookbook_metadata.name, cookbook_metadata.version,
-                        self.class.worker_type, repo.html_url, priority)
+                        self.class.worker_type, repo.html_url, priority, {:repo_name => repo.name} )
                     else
                       log.warn "Version found in metadata for #{repo.name} (#{tag.name}) does not " +
                         "match the tag. Got #{cookbook_metadata.version}."
@@ -77,7 +77,7 @@ module Berkshelf::API
         #
         # @return [Ridley::Chef::Cookbook::Metadata, nil]
         def metadata(remote)
-          load_metadata(remote.name, "v#{remote.version}")
+          load_metadata(remote.info[:repo_name], "v#{remote.version}")
         end
 
         private

data/lib/berkshelf/api/version.rb

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

data/spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb

@@ -31,8 +31,16 @@ describe Berkshelf::API::CacheBuilder::Worker::Github do
     )
   end
 
+  let(:repo_mismached) do
+    double('repo',
+      name: 'enterprise',
+      full_name: 'opscode-cookbooks/enterprise-chef-common',
+      html_url: 'https://github.com/opscode-cookbooks/enterprise-chef-common',
+    )
+  end
+
   let(:repos) do
-    [repo]
+    [repo, repo_mismached]
   end
 
   subject do
@@ -43,15 +51,18 @@ describe Berkshelf::API::CacheBuilder::Worker::Github do
   it_behaves_like "a human-readable string"
 
   describe "#cookbooks" do
+
     before do
       expect(connection).to receive(:organization_repositories) { repos }
-      expect(connection).to receive(:tags) { [good_tag, bad_tag] }
-      expect(connection).to receive(:contents).with("opscode-cookbooks/apt",
-        { path: "metadata.rb", ref: "v1.0.0"}) { contents }
+      repos.each do |repo|
+        expect(connection).to receive(:tags) { [good_tag, bad_tag] }
+        expect(connection).to receive(:contents).with("opscode-cookbooks/" + repo.name,
+          { path: "metadata.rb", ref: "v1.0.0"}) { contents }
+      end
     end
 
     it "returns an array containing an item for each valid cookbook on the server" do
-      expect(subject.cookbooks.size).to eq(1)
+      expect(subject.cookbooks.size).to eq(2)
     end
 
     it "returns an array of RemoteCookbooks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: 2.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: 2.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: archive
   requirement: !ruby/object:Gem::Requirement
@@ -147,16 +147,22 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +177,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: varia_model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Berkshelf dependency API server
 email:
 - jamie@vialstudios.com
@@ -257,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A server which indexes cookbooks from various sources and hosts it over a