berkshelf 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fa6835af52a54149248c29a9e110b26bb8c5d479aec8095cca8ab252d3a3cd
-  data.tar.gz: c75eee318205302ff8c69b2c70afffe6d665bd40f7306c44965e45163b26cd3b
+  metadata.gz: a1e2e961ef268a5163cfb0c489645bda19ad19f48d0f49654ca73f8a99a8046e
+  data.tar.gz: d09b8fa457809fb644500d4d5084f95003c8056789281e4fd7aae86f931d841c
 SHA512:
-  metadata.gz: 31044607572e40f4d07e803fe86221f7fef2bc65beceba38bf082f6e3328072d983c6cac3734f28647b3a55f8aa29c3775ff9e7ca96aab34e5135d0c1b9c06a6
-  data.tar.gz: ac687fc8c1f793260768542c6b9f00100051fd10d2306848598babf593b058a53aef91f0365849ff32e83e3bbb6e939f16894fa4a868f37a6879f6b75c22cd4c
+  metadata.gz: 22b933cdb39e71477f6159fd452c29b58042d5b2f6885f3d858767a5e7ef885eb12243a503c52e12e3253c93f8883a1335fd2ea7cd3eb87f00744b241e5bb643
+  data.tar.gz: 0c0261b36f52abdbee539f814c4491dab3246f509e9fe02f599272a50ed45788a92629feb6c2d1241459e5693635b41e42c6dc41e42ae4032e3b94e9f2ca5ae2

data/Gemfile.lock

@@ -1,15 +1,16 @@
 GIT
   remote: https://github.com/chef/chef
-  revision: 5ef14cc77226fe16b734ec90aead1de5d49ca7fb
+  revision: 39ff59de987a11efa8d4c9f803c79343b27c4b4a
   branch: master
   specs:
-    chef (14.0.210)
+    chef (14.0.215)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.0.210)
+      chef-config (= 14.0.215)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi (< 1.9.22)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
@@ -33,7 +34,7 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.0.210)
+    chef-config (14.0.215)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -43,7 +44,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (7.0.0)
+    berkshelf (7.0.1)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -120,7 +121,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.23)
+    ffi (1.9.21)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuubar (2.3.1)
@@ -156,7 +157,7 @@ GEM
     libyajl2 (1.2.0)
     minitar (0.6.1)
     minitest (5.11.3)
-    mixlib-archive (0.4.1)
+    mixlib-archive (0.4.2)
       mixlib-log
     mixlib-authentication (2.0.0)
     mixlib-cli (1.7.0)

data/features/commands/vendor.feature

@@ -150,3 +150,5 @@ Feature: Vendoring cookbooks to a directory
     Then the directory "vendor/bacon" should contain version "1.0.0" of the "bacon" cookbook
     And a file named "vendor/bacon/metadata.json" should exist
     And a file named "vendor/bacon/metadata.rb" should exist
+    And a file named "bacon/metadata.rb" should exist
+    And a file named "bacon/metadata.json" should not exist

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -1,28 +1,30 @@
 require "berkshelf/ridley_compat"
 
-module Berkshelf::APIClient
-  require_relative "errors"
+module Berkshelf
+  module APIClient
+    require_relative "errors"
 
-  class ChefServerConnection
-    attr_reader :client
+    class ChefServerConnection
+      attr_reader :client
 
-    def initialize(*args)
-      @client = Berkshelf::RidleyCompat.new(*args)
-      @url = args[0][:server_url]
-    end
+      def initialize(*args)
+        @client = Berkshelf::RidleyCompat.new(*args)
+        @url = args[0][:server_url]
+      end
 
-    def universe
-      response = client.get("universe")
+      def universe
+        response = client.get("universe")
 
-      [].tap do |cookbooks|
-        response.each do |name, versions|
-          versions.each do |version, attributes|
-            attributes[:location_path] = @url
-            cookbooks << RemoteCookbook.new(name, version, attributes) end
+        [].tap do |cookbooks|
+          response.each do |name, versions|
+            versions.each do |version, attributes|
+              attributes[:location_path] = @url
+              cookbooks << RemoteCookbook.new(name, version, attributes) end
+          end
         end
+      rescue Ridley::Errors::HTTPNotFound
+        raise ServiceNotFound, "service not found at: #{@url}"
       end
-    rescue Ridley::Errors::HTTPNotFound
-      raise ServiceNotFound, "service not found at: #{@url}"
     end
   end
 end

data/lib/berkshelf/api_client/connection.rb

@@ -1,53 +1,55 @@
 require "berkshelf/ridley_compat"
 
-module Berkshelf::APIClient
-  require_relative "errors"
-
-  class Connection
-    # @return [String]
-    attr_reader :url
-
-    # @return [Integer]
-    #   how many retries to attempt on HTTP requests
-    attr_reader :retries
-
-    # @return [Float]
-    #   time to wait between retries
-    attr_reader :retry_interval
-
-    # @param [String, Addressable::URI] url
-    #
-    # @option options [Integer] :open_timeout (3)
-    #   how long to wait (in seconds) for connection open to the API server
-    # @option options [Integer] :timeout (30)
-    #   how long to wait (in seconds) before getting a response from the API server
-    # @option options [Integer] :retries (3)
-    #   how many retries to perform before giving up
-    # @option options [Float] :retry_interval (0.5)
-    #   how long to wait (in seconds) between each retry
-    def initialize(url, options = {})
-      # it looks like Faraday mutates the URI argument it is given, when we ripped Faraday out of this
-      # API it stopped doing that.  this may or may not be a breaking change (it broke some fairly
-      # brittle berkshelf tests).  if it causes too much berkshelf chaos we could revert by uncommenting
-      # the next line.  as it is removing this behavior feels more like fixing a bug.
-      #@url = url.normalize! if url.is_a?(Addressable::URI)
-      options = { retries: 3, retry_interval: 0.5, open_timeout: 30, timeout: 30 }.merge(options)
-      options[:server_url] = url
-
-      @client = Berkshelf::RidleyCompatJSON.new(**options)
-    end
+module Berkshelf
+  module APIClient
+    require_relative "errors"
+
+    class Connection
+      # @return [String]
+      attr_reader :url
+
+      # @return [Integer]
+      #   how many retries to attempt on HTTP requests
+      attr_reader :retries
+
+      # @return [Float]
+      #   time to wait between retries
+      attr_reader :retry_interval
+
+      # @param [String, Addressable::URI] url
+      #
+      # @option options [Integer] :open_timeout (3)
+      #   how long to wait (in seconds) for connection open to the API server
+      # @option options [Integer] :timeout (30)
+      #   how long to wait (in seconds) before getting a response from the API server
+      # @option options [Integer] :retries (3)
+      #   how many retries to perform before giving up
+      # @option options [Float] :retry_interval (0.5)
+      #   how long to wait (in seconds) between each retry
+      def initialize(url, options = {})
+        # it looks like Faraday mutates the URI argument it is given, when we ripped Faraday out of this
+        # API it stopped doing that.  this may or may not be a breaking change (it broke some fairly
+        # brittle berkshelf tests).  if it causes too much berkshelf chaos we could revert by uncommenting
+        # the next line.  as it is removing this behavior feels more like fixing a bug.
+        #@url = url.normalize! if url.is_a?(Addressable::URI)
+        options = { retries: 3, retry_interval: 0.5, open_timeout: 30, timeout: 30 }.merge(options)
+        options[:server_url] = url
+
+        @client = Berkshelf::RidleyCompatJSON.new(**options)
+      end
 
-    # Retrieves the entire universe of known cookbooks from the API source
-    #
-    # @raise [APIClient::TimeoutError]
-    #
-    # @return [Array<APIClient::RemoteCookbook>]
-    def universe
-      response = @client.get("universe")
-
-      [].tap do |cookbooks|
-        response.each do |name, versions|
-          versions.each { |version, attributes| cookbooks << RemoteCookbook.new(name, version, attributes) }
+      # Retrieves the entire universe of known cookbooks from the API source
+      #
+      # @raise [APIClient::TimeoutError]
+      #
+      # @return [Array<APIClient::RemoteCookbook>]
+      def universe
+        response = @client.get("universe")
+
+        [].tap do |cookbooks|
+          response.each do |name, versions|
+            versions.each { |version, attributes| cookbooks << RemoteCookbook.new(name, version, attributes) }
+          end
         end
       end
     end

data/lib/berkshelf/api_client/remote_cookbook.rb

@@ -1,54 +1,56 @@
 require "json"
 require "chef/mash"
 
-module Berkshelf::APIClient
-  # A representation of cookbook metadata indexed by a Berkshelf API Server. Returned
-  # by sending messages to a {Berkshelf::APIClient} and used to download cookbooks
-  # indexed by the Berkshelf API Server.
-  class RemoteCookbook
-    # @return [String]
-    attr_reader :name
-    # @return [String]
-    attr_reader :version
-
-    # @param [String] name
-    # @param [String] version
-    # @param [Hash] attributes
-    def initialize(name, version, attributes = {})
-      @name       = name
-      @version    = version
-      @attributes = ::Mash.new(attributes)
-    end
-
-    # @return [Hash]
-    def dependencies
-      @attributes[:dependencies]
-    end
-
-    # @return [Hash]
-    def platforms
-      @attributes[:platforms]
-    end
-
-    # @return [Symbol]
-    def location_type
-      @attributes[:location_type].to_sym
-    end
-
-    # @return [String]
-    def location_path
-      @attributes[:location_path]
-    end
-
-    def to_hash
-      {
-        name: name,
-        version: version,
-      }
-    end
-
-    def to_json(options = {})
-      ::JSON.pretty_generate(to_hash, options)
+module Berkshelf
+  module APIClient
+    # A representation of cookbook metadata indexed by a Berkshelf API Server. Returned
+    # by sending messages to a {Berkshelf::APIClient} and used to download cookbooks
+    # indexed by the Berkshelf API Server.
+    class RemoteCookbook
+      # @return [String]
+      attr_reader :name
+      # @return [String]
+      attr_reader :version
+
+      # @param [String] name
+      # @param [String] version
+      # @param [Hash] attributes
+      def initialize(name, version, attributes = {})
+        @name       = name
+        @version    = version
+        @attributes = ::Mash.new(attributes)
+      end
+
+      # @return [Hash]
+      def dependencies
+        @attributes[:dependencies]
+      end
+
+      # @return [Hash]
+      def platforms
+        @attributes[:platforms]
+      end
+
+      # @return [Symbol]
+      def location_type
+        @attributes[:location_type].to_sym
+      end
+
+      # @return [String]
+      def location_path
+        @attributes[:location_path]
+      end
+
+      def to_hash
+        {
+          name: name,
+          version: version,
+        }
+      end
+
+      def to_json(options = {})
+        ::JSON.pretty_generate(to_hash, options)
+      end
     end
   end
 end

data/lib/berkshelf/berksfile.rb

@@ -636,10 +636,6 @@ module Berkshelf
         cached_cookbooks.each do |cookbook|
           Berkshelf.formatter.vendor(cookbook, destination)
 
-          # compile the metadata early before we do the file list
-          cookbook.compile_metadata
-          cookbook.reload
-
           cookbook_destination = File.join(scratch, cookbook.cookbook_name)
           FileUtils.mkdir_p(cookbook_destination)
 
@@ -666,6 +662,8 @@ module Berkshelf
             FileUtils.mkdir_p( File.join(cookbook_destination, File.dirname(rpath)) )
             FileUtils.cp( File.join(cookbook.path.to_s, rpath), File.join(cookbook_destination, rpath) )
           end
+
+          cookbook.compile_metadata(cookbook_destination)
         end
 
         # Don't vendor the raw metadata (metadata.rb). The raw metadata is

data/lib/berkshelf/cached_cookbook.rb

@@ -162,7 +162,7 @@ module Berkshelf
       true
     end
 
-    def compile_metadata
+    def compile_metadata(path = self.path)
       json_file = "#{path}/metadata.json"
       rb_file = "#{path}/metadata.rb"
       return nil if File.exist?(json_file)

data/lib/berkshelf/config.rb

@@ -40,23 +40,12 @@ module Berkshelf
         @instance = nil
       end
 
-      # @return [String, nil]
-      #   the contents of the file
-      def file
-        File.read(path) if File.exist?(path)
-      end
-
       # Instantiate and return or just return the currently instantiated Berkshelf
       # configuration
       #
       # @return [Config]
       def instance
-        @instance ||=
-          if file
-            from_json file
-          else
-            new
-          end
+        @instance ||= new(path)
         coerce_ssl
       end
 
@@ -82,14 +71,6 @@ module Berkshelf
       def from_file(path)
         new(path)
       end
-
-      def from_json(json)
-        new.from_json(json)
-      end
-
-      def from_hash(hash)
-        new.from_hash(hash)
-      end
     end
 
     attr_accessor :path

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.0"
+  VERSION = "7.0.1"
 end

data/spec/support/chef_server.rb

@@ -1,99 +1,101 @@
 require "chef_zero/server"
 require "json"
 
-module Berkshelf::RSpec
-  module ChefServer
-    PORT = 4000
+module Berkshelf
+  module RSpec
+    module ChefServer
+      PORT = 4000
 
-    class << self
-      attr_reader :server
+      class << self
+        attr_reader :server
 
-      def clear_request_log
-        @request_log = Array.new
-      end
+        def clear_request_log
+          @request_log = Array.new
+        end
 
-      def request_log
-        @request_log ||= Array.new
-      end
+        def request_log
+          @request_log ||= Array.new
+        end
 
-      def server_url
-        @server && @server.url
-      end
+        def server_url
+          @server && @server.url
+        end
 
-      def start(options = {})
-        return @server if @server
+        def start(options = {})
+          return @server if @server
 
-        options = { port: PORT }.merge(options)
-        options[:generate_real_keys] = false
+          options = { port: PORT }.merge(options)
+          options[:generate_real_keys] = false
 
-        @server = ChefZero::Server.new(options)
-        @server.start_background
-        @server.on_response do |request, response|
-          request_log << [ request, response ]
+          @server = ChefZero::Server.new(options)
+          @server.start_background
+          @server.on_response do |request, response|
+            request_log << [ request, response ]
+          end
+          clear_request_log
+
+          @server
         end
-        clear_request_log
 
-        @server
-      end
+        def stop
+          @server.stop if running?
+        end
 
-      def stop
-        @server.stop if running?
-      end
+        def running?
+          @server && @server.running?
+        end
 
-      def running?
-        @server && @server.running?
+        def reset!
+          @server && @server.clear_data
+        end
       end
 
-      def reset!
-        @server && @server.clear_data
+      def chef_server
+        ChefServer.server
       end
-    end
-
-    def chef_server
-      ChefServer.server
-    end
 
-    def chef_client(name, hash = {})
-      load_data(:clients, name, hash)
-    end
+      def chef_client(name, hash = {})
+        load_data(:clients, name, hash)
+      end
 
-    def chef_cookbook(name, hash = {})
-      chef_server.load_data({ "cookbooks" => { name => hash } })
-    end
+      def chef_cookbook(name, hash = {})
+        chef_server.load_data({ "cookbooks" => { name => hash } })
+      end
 
-    def chef_cookbooks
-      chef_server.data_store.list(%w{organizations chef cookbooks}).inject({}) do |hash, name|
-        hash[name] = chef_server.data_store.list(["organizations", "chef", "cookbooks", name])
-        hash
+      def chef_cookbooks
+        chef_server.data_store.list(%w{organizations chef cookbooks}).inject({}) do |hash, name|
+          hash[name] = chef_server.data_store.list(["organizations", "chef", "cookbooks", name])
+          hash
+        end
       end
-    end
 
-    def chef_data_bag(name, hash = {})
-      chef_server.load_data({ "data" => { name => hash } })
-    end
+      def chef_data_bag(name, hash = {})
+        chef_server.load_data({ "data" => { name => hash } })
+      end
 
-    def chef_environment(name, hash = {})
-      load_data(:environments, name, hash)
-    end
+      def chef_environment(name, hash = {})
+        load_data(:environments, name, hash)
+      end
 
-    def chef_environment_locks(name)
-      JSON.parse(chef_server.data_store.get(["organizations", "chef", "environments", name]))["cookbook_versions"]
-    rescue ChefZero::DataStore::DataNotFoundError
-      {}
-    end
+      def chef_environment_locks(name)
+        JSON.parse(chef_server.data_store.get(["organizations", "chef", "environments", name]))["cookbook_versions"]
+      rescue ChefZero::DataStore::DataNotFoundError
+        {}
+      end
 
-    def chef_node(name, hash = {})
-      load_data(:nodes, name, hash)
-    end
+      def chef_node(name, hash = {})
+        load_data(:nodes, name, hash)
+      end
 
-    def chef_role(name, hash = {})
-      load_data(:roles, name, hash)
-    end
+      def chef_role(name, hash = {})
+        load_data(:roles, name, hash)
+      end
 
-    private
+      private
 
-    def load_data(key, name, hash)
-      chef_server.load_data({ key.to_s => { name => JSON.generate(hash) } })
+      def load_data(key, name, hash)
+        chef_server.load_data({ key.to_s => { name => JSON.generate(hash) } })
+      end
     end
   end
 end

data/spec/unit/berkshelf/config_spec.rb

@@ -1,16 +1,6 @@
 require "spec_helper"
 
 describe Berkshelf::Config do
-  describe "::file" do
-    context "when the file does not exist" do
-      before { allow(File).to receive(:exist?).and_return(false) }
-
-      it "is nil" do
-        expect(Berkshelf::Config.file).to be_nil
-      end
-    end
-  end
-
   describe "::instance" do
     it "should be a Berkshelf::Config" do
       expect(Berkshelf::Config.instance).to be_an_instance_of(Berkshelf::Config)
@@ -74,10 +64,6 @@ describe Berkshelf::Config do
       expect(Berkshelf::Config.path).to be_a(String)
     end
 
-    before do
-      allow(File).to receive(:exist?).and_return(false)
-    end
-
     after do
       Berkshelf::Config.instance_variable_set(:@path, nil)
     end
@@ -92,6 +78,16 @@ describe Berkshelf::Config do
         expect(Berkshelf::Config.path).to match(%r{/tmp/config.json})
       end
     end
+
+    it "reads json from a path" do
+      Tempfile.open(["berkstest", ".json"]) do |t|
+        t.write JSON.generate({ "ssl" => { "verify" => false } })
+        t.close
+        expect(Berkshelf::Config).to receive(:local_location).at_least(:once).and_return(t.path)
+        Berkshelf::Config.reload
+        expect( Berkshelf::Config.instance[:ssl][:verify] ).to be false
+      end
+    end
   end
 
   describe "::set_path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout