cookbook-omnifetch 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e4ca89bc3c10a6c4bf4e224bb39f5657d1cd12
-  data.tar.gz: c16cfaa9e0b3c9eb655faa3d12a293b6ec166931
+  metadata.gz: 43c39456987fef3b32d9b037565804e5293bd8ed
+  data.tar.gz: 776b3865d04123606bdafb1f4f7c7412b993724b
 SHA512:
-  metadata.gz: 8e3354f49b0ed00fd5ab23f6de8dd8994419bb8e15c1d32b5dc85f960c46c1d20af45b8f2ca4cbb0e96a812a57e9a8bc04bba1907a319c13e9a6a323eda673be
-  data.tar.gz: f7841d6c9081275526ba60ece1fd3f349b24d812d9c2bba66110a3c1da6800d0e35e2da1a304f7601e4fda6849e9f78f49c8a127f3c3fcaf4f33dc1f919db3dd
+  metadata.gz: 1dea15259b08c5de8a97f111c103f9f8a54d6ad6499806c4659b9870f6b73fb587a57b1297d1fb52faa146904b643e698f18572c393f7fd2c334b3f71484d9b2
+  data.tar.gz: 1005b451253f385241b319c7601f7bb2594502c712d7583f0c92761836acdda45dde4a027aafd303d6a730fa344ece4fb8276bcad1fbec58d6b2d07bda6d5e14

data/lib/cookbook-omnifetch.rb

@@ -124,6 +124,10 @@ module CookbookOmnifetch
     integration.chef_server_download_concurrency
   end
 
+  def self.default_chef_server_http_client
+    integration.default_chef_server_http_client
+  end
+
   # Returns true or false if the given path contains a Chef Cookbook
   #
   # @param [#to_s] path

data/lib/cookbook-omnifetch/chef_server.rb

@@ -10,7 +10,7 @@ module CookbookOmnifetch
     def initialize(dependency, options = {})
       super
       @cookbook_version = options[:version]
-      @http_client = options[:http_client]
+      @http_client = options[:http_client] || default_chef_server_http_client
       @uri ||= options[:chef_server]
     end
 
@@ -57,5 +57,16 @@ module CookbookOmnifetch
       "#{dependency.name}-#{cookbook_version}"
     end
 
+    # @see BaseLocation#cached_cookbook
+    def cached_cookbook
+      @cached_cookbook ||= CookbookOmnifetch.cached_cookbook_class.from_path(install_path)
+    end
+
+    private
+
+    def default_chef_server_http_client
+      CookbookOmnifetch.default_chef_server_http_client
+    end
+
   end
 end

data/lib/cookbook-omnifetch/chef_server_artifact.rb

@@ -17,7 +17,7 @@ module CookbookOmnifetch
     def initialize(dependency, options = {})
       super
       @cookbook_identifier = options[:identifier]
-      @http_client = options[:http_client]
+      @http_client = options[:http_client] || default_chef_server_http_client
       @uri ||= options[:chef_server_artifact]
     end
 
@@ -61,12 +61,23 @@ module CookbookOmnifetch
     end
 
     def lock_data
-      { "chef_server" => uri, "server_identifier" => cookbook_identifier }
+      { "chef_server_artifact" => uri, "identifier" => cookbook_identifier }
     end
 
     def cache_key
       "#{dependency.name}-#{cookbook_identifier}"
     end
 
+    # @see BaseLocation#cached_cookbook
+    def cached_cookbook
+      @cached_cookbook ||= CookbookOmnifetch.cached_cookbook_class.from_path(install_path)
+    end
+
+    private
+
+    def default_chef_server_http_client
+      CookbookOmnifetch.default_chef_server_http_client
+    end
+
   end
 end

data/lib/cookbook-omnifetch/integration.rb

@@ -39,6 +39,11 @@ module CookbookOmnifetch
     # commentary in cookbook_omnifetch.rb
     configurable :chef_server_download_concurrency
 
+    # HTTP client object that will be used for source option `http_client` by
+    # `ChefServerLocation` and `ChefServerArtifactLocation` if not explicitly
+    # passed
+    configurable :default_chef_server_http_client
+
     def initialize
       self.class.configurables.each do |configurable|
         instance_variable_set("@#{configurable}".to_sym, NullValue.new)

data/lib/cookbook-omnifetch/version.rb

@@ -1,3 +1,3 @@
 module CookbookOmnifetch
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/unit/chef_server_artifact_spec.rb

@@ -21,6 +21,8 @@ RSpec.describe CookbookOmnifetch::ChefServerArtifactLocation do
 
   let(:expected_cache_key) { "example-467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
 
+  let(:expected_install_path) { File.join(storage_path, expected_cache_key) }
+
   subject(:chef_server_artifact_location) { described_class.new(dependency, options) }
 
   before do
@@ -40,7 +42,7 @@ RSpec.describe CookbookOmnifetch::ChefServerArtifactLocation do
     expect(installer).to be_a(CookbookOmnifetch::MetadataBasedInstaller)
     expect(installer.http_client).to eq(http_client)
     expect(installer.url_path).to eq("/cookbook_artifacts/example/467dc855408ce8b74f991c5dc2fd72a6aa369b60")
-    expect(installer.install_path.to_s).to eq(File.join(storage_path, expected_cache_key))
+    expect(installer.install_path.to_s).to eq(expected_install_path)
   end
 
   it "has a cache key containing the site URI and version" do
@@ -53,12 +55,46 @@ RSpec.describe CookbookOmnifetch::ChefServerArtifactLocation do
 
   it "provides lock data as a Hash" do
     expected_data = {
-      "chef_server" => url,
-      "server_identifier" => cookbook_identifier,
+      "chef_server_artifact" => url,
+      "identifier" => cookbook_identifier,
     }
     expect(chef_server_artifact_location.lock_data).to eq(expected_data)
   end
 
+  it "returns a cached cookbook object" do
+    expect(MockCachedCookbook).to receive(:from_path).with(Pathname.new(expected_install_path))
+    chef_server_artifact_location.cached_cookbook
+  end
+
+  context "when using the default chef server HTTP client" do
+
+    let(:options) { { chef_server_artifact: url, identifier: cookbook_identifier } }
+
+    let(:default_http_client) { double("Http Client") }
+
+    before do
+      CookbookOmnifetch.integration.default_chef_server_http_client = default_http_client
+    end
+
+    after do
+      CookbookOmnifetch.integration.default_chef_server_http_client = nil
+    end
+
+    it "uses the default http client for requests" do
+      expect(chef_server_artifact_location.http_client).to eq(default_http_client)
+    end
+
+    context "and an http client is explicitly passed" do
+
+      let(:options) { { chef_server: url, identifier: cookbook_identifier, http_client: http_client } }
+
+      it "uses the explicitly passed client instead of the default" do
+        expect(chef_server_artifact_location.http_client).to eq(http_client)
+      end
+
+    end
+  end
+
   describe "when installing" do
 
     let(:installer) { instance_double("CookbookOmnifetch::MetadataBasedInstaller") }

data/spec/unit/chef_server_spec.rb

@@ -19,6 +19,8 @@ RSpec.describe CookbookOmnifetch::ChefServerLocation do
 
   let(:options) { { chef_server: url, version: cookbook_version, http_client: http_client } }
 
+  let(:expected_install_path) { File.join(storage_path, "example-0.5.0") }
+
   subject(:chef_server_location) { described_class.new(dependency, options) }
 
   before do
@@ -38,7 +40,7 @@ RSpec.describe CookbookOmnifetch::ChefServerLocation do
     expect(installer).to be_a(CookbookOmnifetch::MetadataBasedInstaller)
     expect(installer.http_client).to eq(http_client)
     expect(installer.url_path).to eq("/cookbooks/example/0.5.0")
-    expect(installer.install_path.to_s).to eq(File.join(storage_path, "example-0.5.0"))
+    expect(installer.install_path.to_s).to eq(expected_install_path)
   end
 
   it "has a cache key containing the site URI and version" do
@@ -57,6 +59,40 @@ RSpec.describe CookbookOmnifetch::ChefServerLocation do
     expect(chef_server_location.lock_data).to eq(expected_data)
   end
 
+  it "returns a cached cookbook object" do
+    expect(MockCachedCookbook).to receive(:from_path).with(Pathname.new(expected_install_path))
+    chef_server_location.cached_cookbook
+  end
+
+  context "when using the default chef server HTTP client" do
+
+    let(:options) { { chef_server_artifact: url, version: cookbook_version } }
+
+    let(:default_http_client) { double("Http Client") }
+
+    before do
+      CookbookOmnifetch.integration.default_chef_server_http_client = default_http_client
+    end
+
+    after do
+      CookbookOmnifetch.integration.default_chef_server_http_client = nil
+    end
+
+    it "uses the default http client for requests" do
+      expect(chef_server_location.http_client).to eq(default_http_client)
+    end
+
+    context "and an http client is explicitly passed" do
+
+      let(:options) { { chef_server: url, version: cookbook_version, http_client: http_client } }
+
+      it "uses the explicitly passed client instead of the default" do
+        expect(chef_server_location.http_client).to eq(http_client)
+      end
+
+    end
+  end
+
   describe "when installing" do
 
     let(:installer) { instance_double("CookbookOmnifetch::MetadataBasedInstaller") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-archive