inspec 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f2f0ca8fb9fe310ac9454e39082d733023a191
-  data.tar.gz: 84f5a81f485171d490766e9a19dba7ec7c198ea9
+  metadata.gz: 8af69e7763f2f41cea47b857805512d1987e8565
+  data.tar.gz: 74e15150e9b1f2b6ad90040f3f7e1d07da788e3a
 SHA512:
-  metadata.gz: 54b3fb1e15eb187ab7b18f665a7eb15d8faa2f4490862881833899f766a67583152b7c7619e91429dcf71e0ac8273724bbf58567d03c53fe6c387f1f40ed0eeb
-  data.tar.gz: 08748270838169829e643dcefd85a3a10b0b30a8e2a8f30d5bc188ea7928d141bfdd4fb93d4b7c477c22b26328d8948c01775a11f4e7718e8d60ed685fc35798
+  metadata.gz: 615bfc38930bc317de961e0d8d48a4f4f0e7143a010417d8fd3af9db2d62ee0ade358d1e5d182e5d1dcc73c142ec46d14c9bcc4588c4ffde81a98b878418fca6
+  data.tar.gz: e40becad8f8b2277293c1bea194863a97b425d2c757f64394a542b264d8ea82cd33a091209d48792202767a0f2c67318b535c760cbfdc0d48ecc9d36e9f183de

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [1.7.1](https://github.com/chef/inspec/tree/1.7.1) (2016-12-03)
-[Full Changelog](https://github.com/chef/inspec/compare/v1.7.0...1.7.1)
+## [1.7.2](https://github.com/chef/inspec/tree/1.7.2) (2016-12-08)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.7.1...1.7.2)
+
+**Fixed bugs:**
+
+- use cached profile for compliance dependencies if vendored [\#1348](https://github.com/chef/inspec/pull/1348) ([chris-rock](https://github.com/chris-rock))
+
+## [v1.7.1](https://github.com/chef/inspec/tree/v1.7.1) (2016-12-03)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.7.0...v1.7.1)
 
 **Implemented enhancements:**
 

data/lib/bundles/inspec-compliance/target.rb

@@ -13,7 +13,7 @@ module Compliance
   class Fetcher < Fetchers::Url
     name 'compliance'
     priority 500
-    def self.resolve(target) # rubocop:disable PerceivedComplexity
+    def self.resolve(target) # rubocop:disable PerceivedComplexity, Metrics/CyclomaticComplexity
       uri = if target.is_a?(String) && URI(target).scheme == 'compliance'
               URI(target)
             elsif target.respond_to?(:key?) && target.key?(:compliance)
@@ -22,17 +22,22 @@ module Compliance
 
       return nil if uri.nil?
 
-      # check if we have a compliance token
-      config = Compliance::Configuration.new
-      if config['token'].nil?
-        if config['server_type'] == 'automate'
-          server = 'automate'
-          msg = 'inspec compliance login_automate https://your_automate_server --user USER --ent ENT --dctoken DCTOKEN or --usertoken USERTOKEN'
-        else
-          server = 'compliance'
-          msg = "inspec compliance login https://your_compliance_server --user admin --insecure --token 'PASTE TOKEN HERE' "
-        end
-        fail Inspec::FetcherFailure, <<EOF
+      # we have detailed information available in our lockfile, no need to ask the server
+      if target.respond_to?(:key?) && target.key?(:url)
+        profile_fetch_url = target[:url]
+        config = {}
+      else
+        # check if we have a compliance token
+        config = Compliance::Configuration.new
+        if config['token'].nil?
+          if config['server_type'] == 'automate'
+            server = 'automate'
+            msg = 'inspec compliance login_automate https://your_automate_server --user USER --ent ENT --dctoken DCTOKEN or --usertoken USERTOKEN'
+          else
+            server = 'compliance'
+            msg = "inspec compliance login https://your_compliance_server --user admin --insecure --token 'PASTE TOKEN HERE' "
+          end
+          fail Inspec::FetcherFailure, <<EOF
 
 Cannot fetch #{uri} because your #{server} token has not been
 configured.
@@ -41,14 +46,16 @@ Please login using
 
     #{msg}
 EOF
-      end
+        end
 
-      # verifies that the target e.g base/ssh exists
-      profile = uri.host + uri.path
-      if !Compliance::API.exist?(config, profile)
-        fail Inspec::FetcherFailure, "The compliance profile #{profile} was not found on the configured compliance server"
+        # verifies that the target e.g base/ssh exists
+        profile = uri.host + uri.path
+        if !Compliance::API.exist?(config, profile)
+          fail Inspec::FetcherFailure, "The compliance profile #{profile} was not found on the configured compliance server"
+        end
+        profile_fetch_url = target_url(profile, config)
       end
-      new(target_url(profile, config), config)
+      new(profile_fetch_url, config)
     rescue URI::Error => _e
       nil
     end
@@ -63,12 +70,14 @@ EOF
       target
     end
 
-    #
     # We want to save compliance: in the lockfile rather than url: to
-    # make sure we go back through the ComplianceAPI handling.
-    #
+    # make sure we go back through the Compliance API handling.
     def resolved_source
-      { compliance: supermarket_profile_name }
+      @resolved_source ||= {
+        compliance: compliance_profile_name,
+        url: @target,
+        sha256: sha256,
+      }
     end
 
     def to_s
@@ -77,7 +86,7 @@ EOF
 
     private
 
-    def supermarket_profile_name
+    def compliance_profile_name
       m = %r{^#{@config['server']}/owners/(?<owner>[^/]+)/compliance/(?<id>[^/]+)/tar$}.match(@target)
       "#{m[:owner]}/#{m[:id]}"
     end

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train