inspec 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46086a8807d15265955db741c7bd40588230fea3
-  data.tar.gz: 7de696eaa0d504e06bf3721db82453cb98ab684f
+  metadata.gz: 22439c33205070f48e2e1f199f040ff3f4a50133
+  data.tar.gz: 12fb11787b0df75c7c3f275a5ee43bb19df94983
 SHA512:
-  metadata.gz: 62812a33d54e2ca96dd59d38e77bf8bba0df28aeb20a11d41524c5d2cc090f35a2ac5cc5afb0f498140c2d4d9a5446bac73678faa34ae89eb477c3531946fee3
-  data.tar.gz: bb685a5a79c4d562676431b3640c5870702a54a9d11815ceeec56252790c56d775135cc3f8f8410e349a10069d0247f90159359ce4bc15ac6033908e3453e2ef
+  metadata.gz: 1b8fc567acb8bf86a1b9fa4ec40dab1ac50f596874cf26ed30e240612c2a32ad772e3b2166767ed4f9676aa966530bf114fb004187b6aa71dd5a436449c4ef28
+  data.tar.gz: 1e17444082f76b7c02a9590783a93c350ac12f6e039492737a3af54cd5c6f91c2a9530db2422241f971b175cbdb194bfd1903d8694c6d13dbb05ca7a81afd119

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Change Log
 
-## [0.14.5](https://github.com/chef/inspec/tree/0.14.5) (2016-02-29)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.14.4...0.14.5)
+## [0.14.6](https://github.com/chef/inspec/tree/0.14.6) (2016-03-01)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.5...0.14.6)
+
+**Fixed bugs:**
+
+- add missing supermarket loader [\#506](https://github.com/chef/inspec/pull/506) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- Improve Supermarket CLI [\#508](https://github.com/chef/inspec/pull/508) ([alexpop](https://github.com/alexpop))
+
+## [v0.14.5](https://github.com/chef/inspec/tree/v0.14.5) (2016-02-29)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.4...v0.14.5)
 
 **Merged pull requests:**
 
+- 0.14.5 [\#505](https://github.com/chef/inspec/pull/505) ([chris-rock](https://github.com/chris-rock))
 - Fix license warning during gem build. [\#503](https://github.com/chef/inspec/pull/503) ([juliandunn](https://github.com/juliandunn))
 
 ## [v0.14.4](https://github.com/chef/inspec/tree/v0.14.4) (2016-02-26)

data/lib/bundles/inspec-supermarket.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+module Supermarket
+  autoload :Configuration, 'inspec-supermarket/configuration'
+  autoload :API, 'inspec-supermarket/api'
+end
+
+require 'inspec-supermarket/cli'
+require 'inspec-supermarket/target'

data/lib/bundles/inspec-supermarket/api.rb

@@ -18,7 +18,11 @@ module Supermarket
       _success, data = get(url, { q: 'compliance_profile' })
       if !data.nil?
         profiles = JSON.parse(data)
-        profiles['items']
+        profiles['items'].map { |x|
+          m = %r{^#{Supermarket::API.supermarket_url}/api/v1/tools/(?<slug>[\w-]+)(/)?$}.match(x['tool'])
+          x['slug'] = m[:slug]
+          x
+        }
       else
         []
       end
@@ -34,15 +38,12 @@ module Supermarket
     # displays profile infos
     def self.info(profile)
       _tool_owner, tool_name = profile_name("supermarket://#{profile}")
+      return if tool_name.nil? || tool_name.empty?
       url = "#{SUPERMARKET_URL}/api/v1/tools/#{tool_name}"
       _success, data = get(url, {})
-      if !data.nil?
-        JSON.parse(data)
-      else
-        {}
-      end
+      JSON.parse(data) if !data.nil?
     rescue JSON::ParserError
-      {}
+      nil
     end
 
     # compares a profile with the supermarket tool info

data/lib/bundles/inspec-supermarket/cli.rb

@@ -13,12 +13,11 @@ module Supermarket
 
       headline('Available profiles:')
       supermarket_profiles.each { |p|
-        m = %r{^#{Supermarket::API.supermarket_url}/api/v1/tools/(?<slug>[\w-]+)(/)?$}.match(p['tool'])
-        li("#{p['tool_owner']}/#{m[:slug]}")
+        li("#{p['tool_owner']}/#{p['slug']}")
       }
     end
 
-    desc 'exec PROFILE', 'executes a Supermarket profile'
+    desc 'exec PROFILE', 'execute a Supermarket profile'
     option :id, type: :string,
       desc: 'Attach a profile ID to all test results'
     target_options
@@ -32,10 +31,21 @@ module Supermarket
       run_tests(tests, opts)
     end
 
-    desc 'info profile', 'display profile details'
+    desc 'info PROFILE', 'display Supermarket profile details'
     def info(profile)
-      info = Supermarket::API.info(profile)
+      # check that the profile is available
+      supermarket_profiles = Supermarket::API.profiles
+      found = supermarket_profiles.select { |p|
+        "#{p['tool_owner']}/#{p['slug']}" == profile
+      }
 
+      if found.length == 0
+        puts "#{mark_text(profile)} is not available on Supermarket"
+        return
+      end
+
+      # load details for the specific profile
+      info = Supermarket::API.info(profile)
       puts "#{mark_text('name: ')}  #{info['slug']}"
       puts "#{mark_text('owner:')}  #{info['owner']}"
       puts "#{mark_text('url:  ')}  #{info['source_url']}"

data/lib/inspec/version.rb

@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.14.5'.freeze
+  VERSION = '0.14.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
@@ -221,6 +221,7 @@ files:
 - lib/bundles/inspec-init/templates/profile/controls/example.rb
 - lib/bundles/inspec-init/templates/profile/inspec.yml
 - lib/bundles/inspec-init/templates/profile/libraries/.gitkeep
+- lib/bundles/inspec-supermarket.rb
 - lib/bundles/inspec-supermarket/README.md
 - lib/bundles/inspec-supermarket/api.rb
 - lib/bundles/inspec-supermarket/cli.rb