inspec-core 3.0.61 → 3.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d789972e56d9edede66194f64a2539d91ceb4d5df71067d22d0f3a8a3a772d95
-  data.tar.gz: b0d96149a8d311b9e6926286f7369da1b944eb47d915a33a06fc0dad2aa046ac
+  metadata.gz: 51b87fd12aaccae196f61c1fe4066fd1b207b9f68139f510a92bf4a5c8ae700b
+  data.tar.gz: 6450a4e5b0e50e14988a6fccfa00fb220ebb179e7d532839d87fcf1e772cfcb3
 SHA512:
-  metadata.gz: aa9bc42927433d0ba2d7e30f03bce48bf2b79031706e8ab72659d509d78ac7342402d59c3782596e01b86b0ef71c4d227856b85b52d06025ea3295eb829677e6
-  data.tar.gz: d66ac71b3d480127c66ae14999c6e66f5b680a5b87e0e8beda105f1c08edb198df987a827553676c30dd3d2289517aa20d92499fed599993920a28349e434d42
+  metadata.gz: 0e00c26b123e61c4104f57ae4ef87c6909ea8070a325b9ebb5c29c9e2969d9ea46ebae07938f6004b1056e5582bcc985e9c8ce0caa0057721910155b01f48bac
+  data.tar.gz: cd7ab8068c6f18ff97f0d3b798bee1da0bad4bc268fff6a994cb5a607ec73cbf0ee92c025ae12d92d24dbb47b452f24027a03f2c39ced82a427feb32b1fa1578

data/CHANGELOG.md

@@ -1,34 +1,42 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 3.0.61 -->
-## [v3.0.61](https://github.com/inspec/inspec/tree/v3.0.61) (2018-11-29)
+<!-- latest_release 3.0.64 -->
+## [v3.0.64](https://github.com/inspec/inspec/tree/v3.0.64) (2018-12-06)
 
-#### New Features
-- Plugin Type: DSLs [#3557](https://github.com/inspec/inspec/pull/3557) ([clintoncwolfe](https://github.com/clintoncwolfe))
+#### Enhancements
+- Update Habitat plugin [#3646](https://github.com/inspec/inspec/pull/3646) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 <!-- latest_release -->
 
-<!-- release_rollup since=3.0.52 -->
-### Changes since 3.0.52 release
+<!-- release_rollup since=3.0.61 -->
+### Changes since 3.0.61 release
 
-#### New Features
-- Plugin Type: DSLs [#3557](https://github.com/inspec/inspec/pull/3557) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.61 -->
+#### Enhancements
+- Update Habitat plugin [#3646](https://github.com/inspec/inspec/pull/3646) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 3.0.64 -->
+- Remove Habitat package run time dependencies from Habitat plan [#3645](https://github.com/inspec/inspec/pull/3645) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 3.0.63 -->
+- Further slim the files we ship in the gem artifact [#3647](https://github.com/inspec/inspec/pull/3647) ([tas50](https://github.com/tas50)) <!-- 3.0.62 -->
+<!-- release_rollup -->
 
-#### Bug Fixes
-- package: fix package detection on windows [#3607](https://github.com/inspec/inspec/pull/3607) ([mhackethal](https://github.com/mhackethal)) <!-- 3.0.58 -->
-- www: remove jquery sticky on the sidebar [#3623](https://github.com/inspec/inspec/pull/3623) ([arlimus](https://github.com/arlimus)) <!-- 3.0.57 -->
+<!-- latest_stable_release -->
+## [v3.0.61](https://github.com/inspec/inspec/tree/v3.0.61) (2018-11-29)
+
+#### New Features
+- Plugin Type: DSLs [#3557](https://github.com/inspec/inspec/pull/3557) ([clintoncwolfe](https://github.com/clintoncwolfe))
 
 #### Enhancements
-- filesystem: improve Windows support [#3606](https://github.com/inspec/inspec/pull/3606) ([mhackethal](https://github.com/mhackethal)) <!-- 3.0.56 -->
+- filesystem: improve Windows support [#3606](https://github.com/inspec/inspec/pull/3606) ([mhackethal](https://github.com/mhackethal))
 
-#### Merged Pull Requests
-- Add SQLcl to Oracledb_session Doc [#3632](https://github.com/inspec/inspec/pull/3632) ([ibsavage](https://github.com/ibsavage)) <!-- 3.0.60 -->
-- lc/add-aws-platform-template [#3622](https://github.com/inspec/inspec/pull/3622) ([Caprowni](https://github.com/Caprowni)) <!-- 3.0.59 -->
-- Revert setting RSpec expectation syntax to &#39;should&#39; mode [#3620](https://github.com/inspec/inspec/pull/3620) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.55 -->
-- Improvements to the functional helper run_inspec_process [#3603](https://github.com/inspec/inspec/pull/3603) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.54 -->
-- Create a class to handle the plugins.json file [#3575](https://github.com/inspec/inspec/pull/3575) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.53 -->
-<!-- release_rollup -->
+#### Bug Fixes
+- www: remove jquery sticky on the sidebar [#3623](https://github.com/inspec/inspec/pull/3623) ([arlimus](https://github.com/arlimus))
+- package: fix package detection on windows [#3607](https://github.com/inspec/inspec/pull/3607) ([mhackethal](https://github.com/mhackethal))
 
+#### Merged Pull Requests
+- Create a class to handle the plugins.json file [#3575](https://github.com/inspec/inspec/pull/3575) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Improvements to the functional helper run_inspec_process [#3603](https://github.com/inspec/inspec/pull/3603) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Revert setting RSpec expectation syntax to &#39;should&#39; mode [#3620](https://github.com/inspec/inspec/pull/3620) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- lc/add-aws-platform-template [#3622](https://github.com/inspec/inspec/pull/3622) ([Caprowni](https://github.com/Caprowni))
+- Add SQLcl to Oracledb_session Doc [#3632](https://github.com/inspec/inspec/pull/3632) ([ibsavage](https://github.com/ibsavage))
 <!-- latest_stable_release -->
+
 ## [v3.0.52](https://github.com/inspec/inspec/tree/v3.0.52) (2018-11-15)
 
 #### Enhancements
@@ -40,7 +48,6 @@
 
 #### Merged Pull Requests
 - Load the compliance plugin when the fetcher is needed [#3609](https://github.com/inspec/inspec/pull/3609) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
-<!-- latest_stable_release -->
 
 ## [v3.0.46](https://github.com/inspec/inspec/tree/v3.0.46) (2018-11-08)
 

data/Gemfile

@@ -2,11 +2,6 @@
 source 'https://rubygems.org'
 gemspec name: 'inspec'
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
-  gem 'json', '~> 1.8'
-  gem 'rack', '< 2.0'
-end
-
 gem 'ffi', '>= 1.9.14'
 gem 'aws-sdk', '~> 2'
 

data/README.md

@@ -140,8 +140,7 @@ Currently, this method of installation only supports Linux. See the [Habitat sit
 Download the `hab` binary from the [Habitat](https://www.habitat.sh/docs/get-habitat/) site.
 
 ```bash
-hab pkg install chef/inspec
-export PATH="$(hab pkg path core/ruby)/bin:$(hab pkg path chef/inspec)/bin:$PATH"
+hab pkg install chef/inspec --binlink
 
 inspec
 ```
@@ -452,4 +451,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License. 
+limitations under the License.

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.0.61'
+  VERSION = '3.0.64'
 end

data/lib/plugins/inspec-habitat/lib/inspec-habitat/profile.rb

@@ -51,7 +51,6 @@ module InspecPlugins
         create_habitat_directories(work_dir)
         create_plan(work_dir)
         create_run_hook(work_dir)
-        create_settings_file(work_dir)
         create_default_config(work_dir)
 
         # returns the path to the .hart file in the work directory
@@ -96,7 +95,6 @@ module InspecPlugins
         create_habitat_directories(path)
         create_plan(path)
         create_run_hook(path)
-        create_settings_file(path)
         create_default_config(path)
       end
 
@@ -173,7 +171,6 @@ module InspecPlugins
       def create_habitat_directories(parent_directory)
         [
           File.join(parent_directory, 'habitat'),
-          File.join(parent_directory, 'habitat', 'config'),
           File.join(parent_directory, 'habitat', 'hooks'),
         ].each do |dir|
           Dir.mkdir(dir) unless Dir.exist?(dir)
@@ -207,12 +204,6 @@ module InspecPlugins
         File.write(run_hook_file, run_hook_contents)
       end
 
-      def create_settings_file(directory)
-        settings_file = File.join(directory, 'habitat', 'config', 'settings.sh')
-        @log.info("Generating a settings file at #{settings_file}...")
-        File.write(settings_file, "SLEEP_TIME={{cfg.sleep_time}}\n")
-      end
-
       def create_default_config(directory)
         default_toml = File.join(directory, 'habitat', 'default.toml')
         @log.info("Generating Habitat's default.toml configuration...")
@@ -319,30 +310,37 @@ module InspecPlugins
           pkg_name=#{package_name}
           pkg_version=#{profile.version}
           pkg_origin=#{habitat_origin}
-          pkg_deps=(chef/inspec core/ruby core/hab)
-          pkg_svc_user=root
+          pkg_deps=(chef/inspec)
         EOL
 
         plan += "pkg_license='#{profile.metadata.params[:license]}'\n\n" if profile.metadata.params[:license]
 
         plan += <<~EOL
+          do_setup_environment() {
+            ARCHIVE_PATH="$HAB_CACHE_SRC_PATH/$pkg_dirname/$pkg_name-$pkg_version.tar.gz"
+          }
 
           do_build() {
-            cp -vr $PLAN_CONTEXT/../* $HAB_CACHE_SRC_PATH/$pkg_dirname
-          }
+            if [ ! -f $PLAN_CONTEXT/../inspec.yml ]; then
+              exit_with 'Cannot find inspec.yml. Please build from profile root.' 1
+            fi
 
-          do_install() {
-            local profile_contents
-            local excludes
-            profile_contents=($(ls))
-            excludes=(habitat results *.hart)
+            local profile_files=($(ls $PLAN_CONTEXT/../ -I habitat -I results))
+            local profile_location="$HAB_CACHE_SRC_PATH/$pkg_dirname/build"
+            mkdir -p $profile_location
+
+            build_line "Copying profile files to $profile_location"
+            cp -R ${profile_files[@]} $profile_location
 
-            for item in ${excludes[@]}; do
-              profile_contents=(${profile_contents[@]/$item/})
-            done
+            build_line "Archiving $ARCHIVE_PATH"
+            inspec archive "$HAB_CACHE_SRC_PATH/$pkg_dirname/build" \
+                           -o $ARCHIVE_PATH \
+                           --overwrite
+          }
 
-            mkdir ${pkg_prefix}/dist
-            cp -r ${profile_contents[@]} ${pkg_prefix}/dist/
+          do_install() {
+            mkdir -p $pkg_prefix/profiles
+            cp $ARCHIVE_PATH $pkg_prefix/profiles
           }
         EOL
 
@@ -351,41 +349,41 @@ module InspecPlugins
 
       def run_hook_contents
         <<~EOL
-          #!/bin/sh
+          #!{{pkgPathFor "core/bash"}}/bin/bash
 
-          # redirect stderr to stdout
-          # ultimately, we'd like to log this somewhere useful, but due to
-          # https://github.com/habitat-sh/habitat/issues/2395, we need to
-          # avoid doing that for now.
+          # Redirect stderr to stdout
+          # This will be captured by Habitat and viewable via `journalctl`
+          # NOTE: We might want log to "{{pkg.svc_path}}/logs" and handle rotation
           exec 2>&1
 
           # InSpec will try to create a .cache directory in the user's home directory
           # so this needs to be someplace writeable by the hab user
           export HOME={{pkg.svc_var_path}}
 
-          PROFILE_IDENT="{{pkg.origin}}/{{pkg.name}}"
           RESULTS_DIR="{{pkg.svc_var_path}}/inspec_results"
           RESULTS_FILE="${RESULTS_DIR}/{{pkg.name}}.json"
 
-          # Create a directory for inspec formatter output
-          mkdir -p {{pkg.svc_var_path}}/inspec_results
+          # Create a directory for InSpec reporter output
+          mkdir -p $(dirname $RESULTS_FILE)
 
           while true; do
-            echo "Executing InSpec for ${PROFILE_IDENT}"
-            inspec exec {{pkg.path}}/dist --format=json > ${RESULTS_FILE}
+            echo "Executing InSpec for {{pkg.ident}}"
+            inspec exec "{{pkg.path}}/profiles/*" --reporter=json > ${RESULTS_FILE}
 
-            if [ $? -eq 0 ]; then
+            EXIT_STATUS=$?
+            if [ $EXIT_STATUS -eq 0 ]; then
               echo "InSpec run completed successfully."
+            elif [ $EXIT_STATUS -eq 100 ]; then
+              echo "InSpec run completed successfully, with at least 1 failed test"
+            elif [ $EXIT_STATUS -eq 101 ]; then
+              echo "InSpec run completed successfully, with skipped tests and no failures"
             else
-              echo "InSpec run did not complete successfully. If you do not see any errors above,"
-              echo "control failures were detected. Check the InSpec results here for details:"
-              echo ${RESULTS_FILE}
-              echo "Otherwise, troubleshoot any errors shown above."
+              echo "InSpec run did not complete successfully. Exited with status: $?"
             fi
+            echo "Results located here: ${RESULTS_FILE}"
 
-            source {{pkg.svc_config_path}}/settings.sh
-            echo "sleeping for ${SLEEP_TIME} seconds"
-            sleep ${SLEEP_TIME}
+            echo "Sleeping for {{cfg.sleep_time}} seconds"
+            sleep {{cfg.sleep_time}}
           done
         EOL
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 3.0.61
+  version: 3.0.64
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core