cookbook-omnifetch 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed71a5a2de183598b020865f4c09f5442e15ee13
-  data.tar.gz: 05911931abea5ef8742300be91f55bdffff9bd73
+  metadata.gz: cbe64ce071a948e6ca39a7108ddcda0f4553468d
+  data.tar.gz: 95cd67b5df43e5455b2043fb3580729536f0657b
 SHA512:
-  metadata.gz: ae1de192ff0125bfd70e08addaf18e14fe081e92cc85e13a0c07b6e3c9f0cc4aa25b390c3bececf72177a74dc4076a8b0d145c07c15cf8716f7ae156b875e02d
-  data.tar.gz: 8624065514fa015f4d2e292ebea63215715848a1c188e8dd00e46291cbd4bb68e0e512430575b8844a65cd26fb9d9ecde5a189bee6219eeb439a5808365dd0b2
+  metadata.gz: 7566665f88a9b007bdfe46cfddca79c5180020940653ce3876f1a1307c6dcb27a39d4afddd78eee0e71178d7572e6b941466c7b72430226967c9f5be3e3dece8
+  data.tar.gz: 2219631bec691166948b54add95c5b52164e1f1c6d8b974ab9dae9586616385f7fa420d49300cdbac8100e96582b49fb20531b533d82a83b01176c7bf1cf1f7c

data/lib/cookbook-omnifetch.rb

@@ -124,7 +124,7 @@ module CookbookOmnifetch
     # @return [Class, nil]
     def klass_from_options(options)
       options.each do |key, _|
-        id = key.to_s.capitalize
+        id = key.to_s.split("_").map(&:capitalize).join
 
         begin
           return CookbookOmnifetch.const_get("#{id}Location")

data/lib/cookbook-omnifetch/chef_server.rb

@@ -30,15 +30,16 @@ module CookbookOmnifetch
     end
   end
 
-  class ChefserverLocation < BaseLocation
+  class ChefServerLocation < BaseLocation
 
     attr_reader :cookbook_version
+    attr_reader :uri
 
     def initialize(dependency, options = {})
       super
       @cookbook_version = options[:version]
       @http_client = options[:http_client]
-      @uri ||= options[:artifactserver]
+      @uri ||= options[:chef_server]
     end
 
     def repo_host
@@ -83,6 +84,10 @@ module CookbookOmnifetch
       @install_path ||= CookbookOmnifetch.storage_path.join(cache_key)
     end
 
+    def lock_data
+      { "chef_server" => uri, "version" => cookbook_version }
+    end
+
     def cache_key
       "#{dependency.name}-#{cookbook_version}"
     end

data/lib/cookbook-omnifetch/version.rb

@@ -1,3 +1,3 @@
 module CookbookOmnifetch
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/unit/chef_server_spec.rb

@@ -19,7 +19,7 @@ module CookbookOmnifetch
     end
   end
 
-  describe ChefserverLocation do
+  describe ChefServerLocation do
 
     let(:http_client) { double("Http Client") }
 
@@ -38,10 +38,12 @@ module CookbookOmnifetch
     let(:cookbook_name) { "example" }
     let(:cookbook_version) { "0.5.0" }
 
+    let(:url) { "https://chef.example.com/organizations/example" }
+
     let(:cookbook_fixture_path) { fixtures_path.join("cookbooks/example_cookbook") }
 
     let(:remote_path) { File.join(test_root, "remote") }
-    let(:options) { { version: cookbook_version, http_client: http_client } }
+    let(:options) { { chef_server: url, version: cookbook_version, http_client: http_client } }
 
     let(:cookbook_files) { %w{. ..  metadata.rb recipes} }
     subject(:chef_server_location) { described_class.new(dependency, options) }
@@ -58,6 +60,18 @@ module CookbookOmnifetch
       FileUtils.rm_r(test_root)
     end
 
+    it "has a URI" do
+      expect(chef_server_location.uri).to eq(url)
+    end
+
+    it "has a cache key containing the site URI and version" do
+      expect(chef_server_location.cache_key).to eq("example-0.5.0")
+    end
+
+    it "has an exact version" do
+      expect(chef_server_location.cookbook_version).to eq("0.5.0")
+    end
+
     it "installs the cookbook to the desired install path" do
       expect(http_client).to receive(:get).with("/cookbooks/example/0.5.0").and_return(METADATA)
       expect(http_client).to receive(:streaming_request).twice do |url, &block|
@@ -71,5 +85,14 @@ module CookbookOmnifetch
       expect(Dir).to exist(chef_server_location.install_path)
       expect(Dir.entries(chef_server_location.install_path)).to match_array(cookbook_files)
     end
+
+    it "provides lock data as a Hash" do
+      expected_data = {
+        "chef_server" => url,
+        "version" => "0.5.0",
+      }
+      expect(chef_server_location.lock_data).to eq(expected_data)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-archive