cookbook-omnifetch 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a282e1e19a46033174edabb28146d168618a1ec
-  data.tar.gz: c811e57b03d592fc1e91c51596a14a14fb090120
+  metadata.gz: 3c87b779ed374b94c79ed6d60c92d4acdacca050
+  data.tar.gz: c5f55d263dd9c5ccc81b96be560664d6d4ac882a
 SHA512:
-  metadata.gz: 76e5d5008c709dfa9302d34955242c4349338ec91610079fef984e678e5fdc3cef7b60d252c32745220cf311a94ba29fb0a35b537dd6c8d97980396be4ef1812
-  data.tar.gz: d44ae39c76394b6a89614418bfb43a5c27dd044708929111f21c3620ed65a2b6d20b4a7b387fd27289187b8c61e0728f8c4128c305336db920dd9f4f9e8c45a1
+  metadata.gz: 948bbab575f6693876e197978b3866b9489dc24c64b3860b94fee60cb5187d96fc3101559067aa163d0b44911aa90c10bc20f1a33de6d14e626cd41198337519
+  data.tar.gz: 1ad1cac27d2b6a6c84f01c8155a7dcf11f14f5af56c45dd842c50e6e86ff35369e501f81a9914646c07bfa60e9c47cb463506ce5d1b4ef5c23bc885bde277d5c

data/.travis.yml

@@ -4,8 +4,8 @@ branches:
 
 language: ruby
 rvm:
-  - 2.1
   - 2.2
-  - 2.3.1
-before_install: gem install bundler -v 1.11.2
+  - 2.3.3
+  - 2.4.1
+before_install: gem install bundler -v 1.14.6
 script: bundle exec rake ci

data/cookbook-omnifetch.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mixlib-archive", "~> 0.4"
 
-  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 
 end

data/lib/cookbook-omnifetch.rb

@@ -6,6 +6,7 @@ require "cookbook-omnifetch/git"
 require "cookbook-omnifetch/github"
 require "cookbook-omnifetch/path"
 require "cookbook-omnifetch/artifactserver"
+require "cookbook-omnifetch/artifactory"
 require "cookbook-omnifetch/chef_server"
 
 module CookbookOmnifetch

data/lib/cookbook-omnifetch/artifactory.rb

@@ -0,0 +1,127 @@
+require "cookbook-omnifetch/base"
+
+require "mixlib/archive"
+require "tmpdir"
+
+module CookbookOmnifetch
+
+  class ArtifactoryLocation < BaseLocation
+
+    attr_reader :uri
+    attr_reader :cookbook_version
+    attr_reader :http_client
+
+    def initialize(dependency, options = {})
+      super
+      @uri ||= options[:artifactory]
+      @cookbook_version = options[:version]
+      @http_client = options[:http_client]
+    end
+
+    def repo_host
+      @host ||= URI.parse(uri).host
+    end
+
+    def cookbook_name
+      dependency.name
+    end
+
+    # Determine if this revision is installed.
+    #
+    # @return [Boolean]
+    def installed?
+      install_path.exist?
+    end
+
+    # Install the given cookbook. Subclasses that implement this method should
+    # perform all the installation and validation steps required.
+    #
+    # @return [void]
+    def install
+      FileUtils.mkdir_p(cache_root) unless cache_root.exist?
+
+      http_client.streaming_request(nil) do |tempfile|
+        tempfile.close
+        FileUtils.mv(tempfile.path, cache_path)
+      end
+
+      FileUtils.mkdir_p(staging_root) unless staging_root.exist?
+      Dir.mktmpdir(nil, staging_root) do |staging_dir|
+        Mixlib::Archive.new(cache_path).extract(staging_dir, perms: false)
+        staged_cookbook_path = File.join(staging_dir, cookbook_name)
+        validate_cached!(staged_cookbook_path)
+        FileUtils.mv(staged_cookbook_path, install_path)
+      end
+    end
+
+    def sanitized_version
+      cookbook_version
+    end
+
+    # The path where this cookbook would live in the store, if it were
+    # installed.
+    #
+    # @return [Pathname, nil]
+    def install_path
+      @install_path ||= CookbookOmnifetch.storage_path.join(cache_key)
+    end
+
+    def cache_key
+      "#{dependency.name}-#{cookbook_version}-#{repo_host}"
+    end
+
+    # The cached cookbook for this location.
+    #
+    # @return [CachedCookbook]
+    def cached_cookbook
+      raise AbstractFunction,
+        "#cached_cookbook must be implemented on #{self.class.name}!"
+    end
+
+    def lock_data
+      out = {}
+      out["artifactory"] = uri
+      out["version"] = cookbook_version
+      out
+    end
+
+    # The lockfile representation of this location.
+    #
+    # @return [string]
+    def to_lock
+      raise AbstractFunction,
+        "#to_lock must be implemented on #{self.class.name}!"
+    end
+
+    # The path where all pristine tarballs from an artifactserver are held.
+    # Tarballs are moved/swapped into this location once they have been staged
+    # in a co-located staging directory.
+    #
+    # @return [Pathname]
+    def cache_root
+      Pathname.new(CookbookOmnifetch.cache_path).join(".cache", "artifactserver")
+    end
+
+    # The path where tarballs are downloaded to and unzipped.  On certain platforms
+    # you have a better chance of getting an atomic move if your temporary working
+    # directory is on the same device/volume as the  destination.  To support this,
+    # we use a staging directory located under the cache path under the rather mild
+    # assumption that everything under the cache path is going to be on one device.
+    #
+    # Do not create anything under this directory that isn't randomly named and
+    # remember to release your files once you are done.
+    #
+    # @return [Pathname]
+    def staging_root
+      Pathname.new(CookbookOmnifetch.cache_path).join(".cache_tmp", "artifactserver")
+    end
+
+    # The path where the pristine tarball is cached
+    #
+    # @return [Pathname]
+    def cache_path
+      cache_root.join("#{cache_key}.tgz")
+    end
+
+  end
+end

data/lib/cookbook-omnifetch/version.rb

@@ -1,3 +1,3 @@
 module CookbookOmnifetch
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/unit/artifactory_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+require "cookbook-omnifetch/artifactory"
+require "zlib"
+require "archive/tar/minitar"
+
+module CookbookOmnifetch
+  describe ArtifactoryLocation do
+
+    let(:cookbook_name) { "nginx" }
+
+    let(:cookbook_version) { "1.5.23" }
+
+    let(:http_client) { double("Chef::HTTP::Simple") }
+
+    let(:constraint) { double("Constraint") }
+
+    let(:dependency) { double("Dependency", name: cookbook_name, constraint: constraint) }
+
+    let(:url) { "https://artifactory.example.com/api/v1/cookbooks/nginx/versions/1.5.23/download" }
+
+    let(:options) { { artifactory: url, version: cookbook_version, http_client: http_client } }
+
+    subject(:public_repo_location) { described_class.new(dependency, options) }
+
+    it "has a URI" do
+      expect(public_repo_location.uri).to eq(url)
+    end
+
+    it "has a repo host" do
+      expect(public_repo_location.repo_host).to eq("artifactory.example.com")
+    end
+
+    it "has an exact version" do
+      expect(public_repo_location.cookbook_version).to eq("1.5.23")
+    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-artifactory.example.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-artifactory.example.com")
+      expect(public_repo_location.install_path).to eq(expected_install_path)
+    end
+
+    it "considers the cookbook installed if it exists in the main cache" do
+      expect(public_repo_location.install_path).to receive(:exist?).and_return(true)
+      expect(public_repo_location.installed?).to be true
+    end
+
+    it "considers the cookbook not installed if it doesn't exist in the main cache" do
+      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 = {
+        "artifactory" => url,
+        "version" => "1.5.23",
+      }
+      expect(public_repo_location.lock_data).to eq(expected_data)
+    end
+  end
+end

data/spec/unit/chef_server_spec.rb

@@ -45,7 +45,7 @@ module CookbookOmnifetch
     let(:remote_path) { File.join(test_root, "remote") }
     let(:options) { { chef_server: url, version: cookbook_version, http_client: http_client } }
 
-    let(:cookbook_files) { %w{. ..  metadata.rb recipes} }
+    let(:cookbook_files) { %w{. .. metadata.rb recipes} }
     subject(:chef_server_location) { described_class.new(dependency, options) }
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-archive
@@ -33,16 +33,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - cookbook-omnifetch.gemspec
 - lib/cookbook-omnifetch.rb
+- lib/cookbook-omnifetch/artifactory.rb
 - lib/cookbook-omnifetch/artifactserver.rb
 - lib/cookbook-omnifetch/base.rb
 - lib/cookbook-omnifetch/chef_server.rb
@@ -98,6 +99,7 @@ files:
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
 - spec/spec_helper.rb
+- spec/unit/artifactory_spec.rb
 - spec/unit/artifactserver_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/chef_server_spec.rb
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library code to fetch Chef cookbooks from a variety of sources to a local
@@ -141,6 +143,7 @@ test_files:
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
 - spec/spec_helper.rb
+- spec/unit/artifactory_spec.rb
 - spec/unit/artifactserver_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/chef_server_spec.rb