inspec 2.0.32 → 2.0.45

data/lib/inspec/dependencies/requirement.rb

@@ -1,123 +1,123 @@
-# encoding: utf-8
-require 'inspec/cached_fetcher'
-require 'inspec/dependencies/dependency_set'
-require 'semverse'
-
-module Inspec
-  #
-  # Inspec::Requirement represents a given profile dependency, where
-  # appropriate we delegate to Inspec::Profile directly.
-  #
-  class Requirement
-    def self.from_metadata(dep, cache, opts)
-      raise 'Cannot load empty dependency.' if dep.nil? || dep.empty?
-
-      req_path = opts[:cwd]
-
-      if dep[:path]
-        req_path = File.expand_path(dep[:path], req_path)
-      end
-
-      new(dep[:name],
-          dep[:version],
-          cache,
-          req_path,
-          opts.merge(dep))
-    end
-
-    def self.from_lock_entry(entry, cwd, cache, backend, opts = {})
-      req = new(entry[:name],
-                entry[:version_constraints],
-                cache,
-                cwd,
-                entry[:resolved_source].merge(backend: backend).merge(opts))
-
-      locked_deps = []
-      Array(entry[:dependencies]).each do |dep_entry|
-        locked_deps << Inspec::Requirement.from_lock_entry(dep_entry, cwd, cache, backend, opts)
-      end
-      req.lock_deps(locked_deps)
-      req
-    end
-
-    attr_reader :cwd, :opts, :version_constraints
-    def initialize(name, version_constraints, cache, cwd, opts)
-      @name = name
-      @version_constraints = Array(version_constraints)
-      @cache = cache
-      @backend = opts[:backend]
-      @opts = opts
-      @cwd = cwd
-    end
-
-    #
-    # A dependency can be renamed in inspec.yml/inspec.lock.  Prefer
-    # the name the user gave this dependency over the profile name.
-    #
-    def name
-      @name || profile.name
-    end
-
-    def source_version
-      profile.version
-    end
-
-    def source_satisfies_spec?
-      return true if version_constraints.empty?
-
-      # Semverse::Constraint.satisfy_all returns a list of versions that match all of the
-      # supplied constraints. Since we're only matching against a single version, the return
-      # of satisfy_all will be non-empty if the profile version we have satisfies the constraints.
-      constraints = @version_constraints.map { |x| Semverse::Constraint.new(x) }
-      !Semverse::Constraint.satisfy_all(constraints, Semverse::Version.new(profile.version)).empty?
-    end
-
-    def resolved_source
-      @resolved_source ||= fetcher.resolved_source
-    end
-
-    def to_hash
-      h = {
-        'name' => name,
-        'resolved_source' => resolved_source,
-        'version_constraints' => version_constraints.to_s,
-      }
-
-      if !dependencies.empty?
-        h['dependencies'] = dependencies.map(&:to_hash)
-      end
-
-      h
-    end
-
-    def lock_deps(dep_array)
-      @dependencies = dep_array
-    end
-
-    def fetcher
-      @fetcher ||= Inspec::CachedFetcher.new(opts, @cache)
-    end
-
-    # load dependencies of the dependency
-    def dependencies
-      @dependencies ||= profile.metadata.dependencies.map do |r|
-        Inspec::Requirement.from_metadata(r, @cache, cwd: @cwd, backend: @backend)
-      end
-    end
-
-    def to_s
-      name
-    end
-
-    # load the profile for the requirement
-    def profile
-      return @profile unless @profile.nil?
-      opts = @opts.dup
-      opts[:backend] = @backend
-      if !@dependencies.nil?
-        opts[:dependencies] = Inspec::DependencySet.from_array(@dependencies, @cwd, @cache, @backend)
-      end
-      @profile = Inspec::Profile.for_fetcher(fetcher, opts)
-    end
-  end
-end
+# encoding: utf-8
+require 'inspec/cached_fetcher'
+require 'inspec/dependencies/dependency_set'
+require 'semverse'
+
+module Inspec
+  #
+  # Inspec::Requirement represents a given profile dependency, where
+  # appropriate we delegate to Inspec::Profile directly.
+  #
+  class Requirement
+    def self.from_metadata(dep, cache, opts)
+      raise 'Cannot load empty dependency.' if dep.nil? || dep.empty?
+
+      req_path = opts[:cwd]
+
+      if dep[:path]
+        req_path = File.expand_path(dep[:path], req_path)
+      end
+
+      new(dep[:name],
+          dep[:version],
+          cache,
+          req_path,
+          opts.merge(dep))
+    end
+
+    def self.from_lock_entry(entry, cwd, cache, backend, opts = {})
+      req = new(entry[:name],
+                entry[:version_constraints],
+                cache,
+                cwd,
+                entry[:resolved_source].merge(backend: backend).merge(opts))
+
+      locked_deps = []
+      Array(entry[:dependencies]).each do |dep_entry|
+        locked_deps << Inspec::Requirement.from_lock_entry(dep_entry, cwd, cache, backend, opts)
+      end
+      req.lock_deps(locked_deps)
+      req
+    end
+
+    attr_reader :cwd, :opts, :version_constraints
+    def initialize(name, version_constraints, cache, cwd, opts)
+      @name = name
+      @version_constraints = Array(version_constraints)
+      @cache = cache
+      @backend = opts[:backend]
+      @opts = opts
+      @cwd = cwd
+    end
+
+    #
+    # A dependency can be renamed in inspec.yml/inspec.lock.  Prefer
+    # the name the user gave this dependency over the profile name.
+    #
+    def name
+      @name || profile.name
+    end
+
+    def source_version
+      profile.version
+    end
+
+    def source_satisfies_spec?
+      return true if version_constraints.empty?
+
+      # Semverse::Constraint.satisfy_all returns a list of versions that match all of the
+      # supplied constraints. Since we're only matching against a single version, the return
+      # of satisfy_all will be non-empty if the profile version we have satisfies the constraints.
+      constraints = @version_constraints.map { |x| Semverse::Constraint.new(x) }
+      !Semverse::Constraint.satisfy_all(constraints, Semverse::Version.new(profile.version)).empty?
+    end
+
+    def resolved_source
+      @resolved_source ||= fetcher.resolved_source
+    end
+
+    def to_hash
+      h = {
+        'name' => name,
+        'resolved_source' => resolved_source,
+        'version_constraints' => version_constraints.to_s,
+      }
+
+      if !dependencies.empty?
+        h['dependencies'] = dependencies.map(&:to_hash)
+      end
+
+      h
+    end
+
+    def lock_deps(dep_array)
+      @dependencies = dep_array
+    end
+
+    def fetcher
+      @fetcher ||= Inspec::CachedFetcher.new(opts, @cache)
+    end
+
+    # load dependencies of the dependency
+    def dependencies
+      @dependencies ||= profile.metadata.dependencies.map do |r|
+        Inspec::Requirement.from_metadata(r, @cache, cwd: @cwd, backend: @backend)
+      end
+    end
+
+    def to_s
+      name
+    end
+
+    # load the profile for the requirement
+    def profile
+      return @profile unless @profile.nil?
+      opts = @opts.dup
+      opts[:backend] = @backend
+      if !@dependencies.nil?
+        opts[:dependencies] = Inspec::DependencySet.from_array(@dependencies, @cwd, @cache, @backend)
+      end
+      @profile = Inspec::Profile.for_fetcher(fetcher, opts)
+    end
+  end
+end

data/lib/inspec/dependencies/resolver.rb

@@ -1,86 +1,86 @@
-# encoding: utf-8
-# author: Steven Danna <steve@chef.io>
-require 'inspec/log'
-require 'inspec/errors'
-
-module Inspec
-  #
-  # Inspec::Resolver is a simple dependency resolver. Unlike Bundler
-  # or Berkshelf, it does not attempt to resolve each named dependency
-  # to a single version. Rather, it traverses down the dependency tree
-  # and:
-  #
-  # - Fetches the dependency from the source
-  # - Checks the presence of cycles, and
-  # - Checks that the specified dependency source satisfies the
-  #   specified version constraint
-  #
-  # The full dependency tree is then available for the loader, which
-  # will provide the isolation necessary to support multiple versions
-  # of the same profile being used at runtime.
-  #
-  # Currently the fetching happens somewhat lazily depending on the
-  # implementation of the fetcher being used.
-  #
-  class Resolver
-    def self.resolve(dependencies, cache, working_dir, backend)
-      reqs = dependencies.map do |dep|
-        req = Inspec::Requirement.from_metadata(dep, cache, cwd: working_dir, backend: backend)
-        req || raise("Cannot initialize dependency: #{req}")
-      end
-      new.resolve(reqs)
-    end
-
-    def detect_duplicates(deps, top_level, path_string)
-      seen_items_local = []
-      deps.each do |dep|
-        if seen_items_local.include?(dep.name)
-          problem_cookbook = if top_level
-                               'the inspec.yml for this profile.'
-                             else
-                               "the dependency information for #{path_string.split(' ').last}"
-                             end
-          raise Inspec::DuplicateDep, "The dependency #{dep.name} is listed twice in #{problem_cookbook}"
-        else
-          seen_items_local << dep.name
-        end
-      end
-    end
-
-    def resolve(deps, top_level = true, seen_items = {}, path_string = '') # rubocop:disable Metrics/AbcSize
-      graph = {}
-      if top_level
-        Inspec::Log.debug("Starting traversal of dependencies #{deps.map(&:to_s)}")
-      else
-        Inspec::Log.debug("Traversing dependency tree of transitive dependency #{deps.map(&:name)}")
-      end
-
-      detect_duplicates(deps, top_level, path_string)
-      deps.each do |dep|
-        new_seen_items = seen_items.dup
-        new_path_string = if path_string.empty?
-                            dep.name
-                          else
-                            path_string + " -> #{dep.name}"
-                          end
-
-        raise Inspec::CyclicDependencyError, "Dependency #{dep} would cause a dependency cycle (#{new_path_string})" if new_seen_items.key?(dep.resolved_source)
-
-        new_seen_items[dep.resolved_source] = true
-
-        if !dep.source_satisfies_spec?
-          raise Inspec::UnsatisfiedVersionSpecification, "The profile #{dep.name} from #{dep.resolved_source} has a version #{dep.source_version} which doesn't match #{dep.version_constraints}"
-        end
-
-        Inspec::Log.debug("Adding dependency #{dep.name} (#{dep.resolved_source})")
-        graph[dep.name] = dep
-        if !dep.dependencies.empty?
-          resolve(dep.dependencies, false, new_seen_items.dup, new_path_string)
-        end
-      end
-
-      Inspec::Log.debug('Dependency traversal complete.') if top_level
-      graph
-    end
-  end
-end
+# encoding: utf-8
+# author: Steven Danna <steve@chef.io>
+require 'inspec/log'
+require 'inspec/errors'
+
+module Inspec
+  #
+  # Inspec::Resolver is a simple dependency resolver. Unlike Bundler
+  # or Berkshelf, it does not attempt to resolve each named dependency
+  # to a single version. Rather, it traverses down the dependency tree
+  # and:
+  #
+  # - Fetches the dependency from the source
+  # - Checks the presence of cycles, and
+  # - Checks that the specified dependency source satisfies the
+  #   specified version constraint
+  #
+  # The full dependency tree is then available for the loader, which
+  # will provide the isolation necessary to support multiple versions
+  # of the same profile being used at runtime.
+  #
+  # Currently the fetching happens somewhat lazily depending on the
+  # implementation of the fetcher being used.
+  #
+  class Resolver
+    def self.resolve(dependencies, cache, working_dir, backend)
+      reqs = dependencies.map do |dep|
+        req = Inspec::Requirement.from_metadata(dep, cache, cwd: working_dir, backend: backend)
+        req || raise("Cannot initialize dependency: #{req}")
+      end
+      new.resolve(reqs)
+    end
+
+    def detect_duplicates(deps, top_level, path_string)
+      seen_items_local = []
+      deps.each do |dep|
+        if seen_items_local.include?(dep.name)
+          problem_cookbook = if top_level
+                               'the inspec.yml for this profile.'
+                             else
+                               "the dependency information for #{path_string.split(' ').last}"
+                             end
+          raise Inspec::DuplicateDep, "The dependency #{dep.name} is listed twice in #{problem_cookbook}"
+        else
+          seen_items_local << dep.name
+        end
+      end
+    end
+
+    def resolve(deps, top_level = true, seen_items = {}, path_string = '') # rubocop:disable Metrics/AbcSize
+      graph = {}
+      if top_level
+        Inspec::Log.debug("Starting traversal of dependencies #{deps.map(&:to_s)}")
+      else
+        Inspec::Log.debug("Traversing dependency tree of transitive dependency #{deps.map(&:name)}")
+      end
+
+      detect_duplicates(deps, top_level, path_string)
+      deps.each do |dep|
+        new_seen_items = seen_items.dup
+        new_path_string = if path_string.empty?
+                            dep.name
+                          else
+                            path_string + " -> #{dep.name}"
+                          end
+
+        raise Inspec::CyclicDependencyError, "Dependency #{dep} would cause a dependency cycle (#{new_path_string})" if new_seen_items.key?(dep.resolved_source)
+
+        new_seen_items[dep.resolved_source] = true
+
+        if !dep.source_satisfies_spec?
+          raise Inspec::UnsatisfiedVersionSpecification, "The profile #{dep.name} from #{dep.resolved_source} has a version #{dep.source_version} which doesn't match #{dep.version_constraints}"
+        end
+
+        Inspec::Log.debug("Adding dependency #{dep.name} (#{dep.resolved_source})")
+        graph[dep.name] = dep
+        if !dep.dependencies.empty?
+          resolve(dep.dependencies, false, new_seen_items.dup, new_path_string)
+        end
+      end
+
+      Inspec::Log.debug('Dependency traversal complete.') if top_level
+      graph
+    end
+  end
+end

data/lib/inspec/describe.rb

@@ -1,27 +1,27 @@
-# encoding: utf-8
-# author: Dominik Richter
-# author: Christoph Hartmann
-
-module Inspec
-  class DescribeBase
-    def initialize(action)
-      @action = action
-      @checks = []
-    end
-
-    # Evaluate the given block and collect all checks. These will be registered
-    # with the callback function under the 'describe.one' name.
-    #
-    # @param [Proc] ruby block containing checks (e.g. via describe)
-    # @return [nil]
-    def one(&block)
-      return unless block_given?
-      instance_eval(&block)
-      @action.call('describe.one', @checks, nil)
-    end
-
-    def describe(*args, &block)
-      @checks.push(['describe', args, block])
-    end
-  end
-end
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+module Inspec
+  class DescribeBase
+    def initialize(action)
+      @action = action
+      @checks = []
+    end
+
+    # Evaluate the given block and collect all checks. These will be registered
+    # with the callback function under the 'describe.one' name.
+    #
+    # @param [Proc] ruby block containing checks (e.g. via describe)
+    # @return [nil]
+    def one(&block)
+      return unless block_given?
+      instance_eval(&block)
+      @action.call('describe.one', @checks, nil)
+    end
+
+    def describe(*args, &block)
+      @checks.push(['describe', args, block])
+    end
+  end
+end