cookbook-omnifetch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a7a092cd5020fd96e0c0dc5c15816adf03e49fa
-  data.tar.gz: f3f1e9a7fac7872f6295f97ea486410573036b33
+  metadata.gz: 0ae1460747cd8d56df8edb96f910ab7aedc7884d
+  data.tar.gz: dfe8988c3227ccb3660a8e591b803596ebf0a4e9
 SHA512:
-  metadata.gz: fb5a529f659a4c6212c6fa8e0e72f1b9a6be40084b04fb0857628de11bb59dab8214a7612f4b96632d2da679ca110bfc419793586c4f87482c26c47206ed1dda
-  data.tar.gz: e1bb5b80e291e8f28db54c1be484e386b5fd409ed81a7e6b3886b322846d2b26314eb7fdcf771d9f2f4d920955432a9dc75cf0dffdd6628d4287e01b104ceaca
+  metadata.gz: 0da7ef63902761a5a0d8574d4fcfcd189845a3b9fe3968f4c60e68ce9556f4f9a2f19123001a2e89e5f87a4438bad8f8614c6da9d2bd9c57913add7943ed47ff
+  data.tar.gz: 5f9d292cae9cf0ed321c1a288cfa6677b6223e90e6def07a86025cb52999ac72c7934f4421dffc6d375b2fd7ba4e1b0559f15b6415bb88c97ffb89d85cc450c0

data/lib/cookbook-omnifetch/artifactserver.rb

@@ -88,6 +88,13 @@ module CookbookOmnifetch
         "#cached_cookbook must be implemented on #{self.class.name}!"
     end
 
+    def lock_data
+      out = {}
+      out["artifactserver"] = uri
+      out["version"] = cookbook_version
+      out
+    end
+
     # The lockfile representation of this location.
     #
     # @return [string]

data/lib/cookbook-omnifetch/base.rb

@@ -35,6 +35,14 @@ module CookbookOmnifetch
         "#cached_cookbook must be implemented on #{self.class.name}!"
     end
 
+    # A representation of this location suitable for a lockfile, given as a Hash
+    #
+    # @return [Hash]
+    def lock_data
+      raise AbstractFunction,
+        "#to_lock must be implemented on #{self.class.name}!"
+    end
+
     # The lockfile representation of this location.
     #
     # @return [string]

data/lib/cookbook-omnifetch/git.rb

@@ -108,6 +108,17 @@ module CookbookOmnifetch
       end
     end
 
+    def lock_data
+      out = {}
+      out["git"] = uri
+      out["revision"] = revision
+      out["ref"] = shortref if shortref
+      out["branch"] = branch if branch
+      out["tag"] = tag if tag
+      out["rel"] = rel if rel
+      out
+    end
+
     def to_lock
       out =  "    git: #{uri}\n"
       out << "    revision: #{revision}\n"

data/lib/cookbook-omnifetch/path.rb

@@ -69,6 +69,13 @@ module CookbookOmnifetch
       other.relative_path == relative_path
     end
 
+    def lock_data
+      out = {}
+      out["path"] = relative_path.to_s
+      out["metadata"] = true if metadata?
+      out
+    end
+
     def to_lock
       out =  "    path: #{relative_path}\n"
       out << "    metadata: true\n" if metadata?

data/lib/cookbook-omnifetch/version.rb

@@ -1,3 +1,3 @@
 module CookbookOmnifetch
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/unit/artifactserver_spec.rb

@@ -12,16 +12,18 @@ module CookbookOmnifetch
 
     let(:dependency) { double("Dependency", name: cookbook_name, constraint: constraint) }
 
-    let(:options) { {artifactserver: "https://cookbooks.opscode.com/api/v1", version: cookbook_version } }
+    let(:url) { "https://supermarket.getchef.com/api/v1/cookbooks/nginx/versions/1.5.23/download" }
+
+    let(:options) { {artifactserver: url, version: cookbook_version } }
 
     subject(:public_repo_location) { ArtifactserverLocation.new(dependency, options) }
 
     it "has a URI" do
-      expect(public_repo_location.uri).to eq("https://cookbooks.opscode.com/api/v1")
+      expect(public_repo_location.uri).to eq(url)
     end
 
     it "has a repo host" do
-      expect(public_repo_location.repo_host).to eq("cookbooks.opscode.com")
+      expect(public_repo_location.repo_host).to eq("supermarket.getchef.com")
     end
 
     it "has an exact version" do
@@ -29,11 +31,11 @@ module CookbookOmnifetch
     end
 
     it "has a cache key containing the site URI and version" do
-      expect(public_repo_location.cache_key).to eq("nginx-1.5.23-cookbooks.opscode.com")
+      expect(public_repo_location.cache_key).to eq("nginx-1.5.23-supermarket.getchef.com")
     end
 
     it "sets the install location as the cache path plus cache key" do
-      expected_install_path = Pathname.new('~/.berkshelf/cookbooks').expand_path.join("nginx-1.5.23-cookbooks.opscode.com")
+      expected_install_path = Pathname.new('~/.berkshelf/cookbooks').expand_path.join("nginx-1.5.23-supermarket.getchef.com")
       expect(public_repo_location.install_path).to eq(expected_install_path)
     end
 
@@ -46,6 +48,14 @@ module CookbookOmnifetch
       expect(public_repo_location.install_path).to receive(:exist?).and_return(false)
       expect(public_repo_location.installed?).to be false
     end
+
+    it "provides lock data as a Hash" do
+      expected_data = {
+        "artifactserver" => url,
+        "version" => "1.5.23"
+      }
+      expect(public_repo_location.lock_data).to eq(expected_data)
+    end
   end
 end
 

data/spec/unit/base_spec.rb

@@ -32,6 +32,12 @@ module CookbookOmnifetch
       end
     end
 
+    describe '#lock_data' do
+      it 'is an abstract function' do
+        expect { subject.lock_data }.to raise_error(AbstractFunction)
+      end
+    end
+
     describe '#validate_cached!' do
       context 'when the path is not a cookbook' do
         before { CookbookOmnifetch.stub(:cookbook?).and_return(false) }

data/spec/unit/git_spec.rb

@@ -240,6 +240,39 @@ module CookbookOmnifetch
       end
     end
 
+    describe '#lock_data' do
+      let(:full_lock_data) do
+        {
+          "git" => "https://repo.com",
+          "revision" => "defjkl123456",
+          "ref" => "abc123",
+          "branch" => "ham",
+          "tag" => "v1.2.3",
+          "rel" => "hi"
+        }
+      end
+
+      it 'includes all the information' do
+        expect(subject.lock_data).to eq(full_lock_data)
+      end
+
+      it 'does not include the branch if missing' do
+        subject.stub(:branch).and_return(nil)
+        expect(subject.lock_data).to_not have_key('branch')
+      end
+
+      it 'does not include the tag if missing' do
+        subject.stub(:tag).and_return(nil)
+        expect(subject.lock_data).to_not have_key('tag')
+      end
+
+      it 'does not include the rel if missing' do
+        subject.stub(:rel).and_return(nil)
+        expect(subject.lock_data).to_not have_key('rel')
+      end
+    end
+
+
     describe '#git' do
       before { described_class.send(:public, :git) }
 

data/spec/unit/path_spec.rb

@@ -92,6 +92,17 @@ module CookbookOmnifetch
       end
     end
 
+    describe '#lock_data' do
+      it 'includes the path relative to the Berksfile' do
+        expect(subject.lock_data).to eq({ "path" => relative_path.to_s })
+      end
+
+      it 'includes the metadata attribute' do
+        subject.stub(:metadata?).and_return(true)
+        expect(subject.lock_data).to eq({ "path" => relative_path.to_s, "metadata" => true })
+      end
+    end
+
     describe '#to_s' do
       it 'uses the relative path' do
         expect(subject.to_s).to eq("source at #{relative_path}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar