inspec 1.0.0 → 1.35.1

data/Gemfile

@@ -2,13 +2,6 @@
 source 'https://rubygems.org'
 gemspec
 
-# pin dependency for Ruby 1.9.3 since bundler is not
-# detecting that net-ssh 3 does not work with 1.9.3
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
-  gem 'net-ssh', '~> 2.9'
-  gem 'tins', '~> 1.6.0'
-end
-
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
   gem 'json', '~> 1.8'
   gem 'rack', '< 2.0'
@@ -20,13 +13,14 @@ group :test do
   gem 'bundler', '~> 1.5'
   gem 'minitest', '~> 5.5'
   gem 'rake', '~> 10'
-  gem 'rubocop', '~> 0.36.0'
+  gem 'rubocop', '= 0.39.0'
   gem 'simplecov', '~> 0.10'
   gem 'concurrent-ruby', '~> 0.9'
   gem 'mocha', '~> 1.1'
   gem 'ruby-progressbar', '~> 1.8'
-  gem 'inquirer'
-  gem 'nokogiri', '~> 1.6'
+  gem 'webmock', '~> 2.3.2'
+  gem 'jsonschema', '~> 2.0.2'
+  gem 'm'
 end
 
 group :integration do
@@ -39,17 +33,10 @@ group :integration do
   gem 'kitchen-dokken'
 end
 
-group :simulator do
-  gem 'github-markup'
-  gem 'redcarpet'
-  gem 'docker-api'
-end
-
 group :tools do
   gem 'pry', '~> 0.10'
   gem 'rb-readline'
   gem 'license_finder'
-  gem 'github_changelog_generator', '~> 1'
 end
 
 # gems for Maintainers.md generation
@@ -60,3 +47,7 @@ group :maintenance do
   gem 'octokit'
   gem 'netrc'
 end
+
+group :deploy do
+  gem 'inquirer'
+end

data/MAINTAINERS.md

@@ -27,4 +27,5 @@ To mention the team, use @chef/inspec-maintainers
 ### Maintainers
 
 * [Christoph Hartmann](https://github.com/chris-rock)
-* [Jason Reed](https://github.com/jcreedcmu)
+* [Adam Leff](https://github.com/adamleff)
+* [Alex Pop](https://github.com/alexpop)

data/MAINTAINERS.toml

@@ -25,7 +25,8 @@ project lead.
 
         maintainers = [
           "chris-rock",
-          "jcreedcmu"
+          "adamleff",
+          "alexpop"
         ]
 
 [people]
@@ -37,6 +38,10 @@ project lead.
     Name = "Christoph Hartmann"
     GitHub = "chris-rock"
 
-  [people.jcreedcmu]
-    Name = "Jason Reed"
-    GitHub = "jcreedcmu"
+  [people.adamleff]
+    Name = "Adam Leff"
+    GitHub = "adamleff"
+
+  [people.alexpop]
+    Name = "Alex Pop"
+    GitHub = "alexpop"

data/README.md

@@ -1,6 +1,6 @@
 # InSpec: Inspect Your Infrastructure
 
-[![Join the chat at https://gitter.im/chef/inspec](https://badges.gitter.im/chef/inspec.svg)](https://gitter.im/chef/inspec?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Slack](https://community-slack.chef.io/badge.svg)](https://community-slack.chef.io/)
 [![Build Status Master](https://travis-ci.org/chef/inspec.svg?branch=master)](https://travis-ci.org/chef/inspec)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/inspec?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/inspec/branch/master)
 
@@ -18,7 +18,7 @@ describe inetd_conf do
 end
 ```
 
-InSpec makes it easy to run your tests wherever you need. More options are found in our [CLI docs](http://inspec.io/docs/reference/cli/).
+InSpec makes it easy to run your tests wherever you need. More options are found in our [CLI docs](https://www.inspec.io/docs/reference/cli/).
 
 ```bash
 # run test locally
@@ -27,6 +27,9 @@ inspec exec test.rb
 # run test on remote host on SSH
 inspec exec test.rb -t ssh://user@hostname -i /path/to/key
 
+# run test on remote host using SSH agent private key authentication. Requires InSpec 1.7.1
+inspec exec test.rb -t ssh://user@hostname
+
 # run test on remote windows host on WinRM
 inspec exec test.rb -t winrm://Administrator@windowshost --password 'your-password'
 
@@ -45,6 +48,18 @@ inspec exec test.rb -t docker://container_id
 
 InSpec requires Ruby ( >1.9 ).
 
+### Install as package
+
+The InSpec package is available for MacOS, RedHat, Ubuntu and Windows. Download the latest package at [InSpec Downloads](https://downloads.chef.io/inspec) or install InSpec via script:
+
+```
+# RedHat, Ubuntu, and macOS
+curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P inspec
+
+# Windows
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project inspec
+```
+
 ### Install it via rubygems.org
 
 When installing from source, gem dependencies may require ruby build tools to be installed.
@@ -110,6 +125,19 @@ gem install inspec-*.gem
 
 On Windows, you need to install [Ruby](http://rubyinstaller.org/downloads/) with [Ruby Development Kit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) to build dependencies with its native extensions.
 
+### Install via Habitat
+
+Currently, this method of installation only supports Linux. See the [Habitat site](https://www.habitat.sh/) for more information.
+
+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"
+
+inspec
+```
+
 ### Run InSpec
 
 You should now be able to run:
@@ -156,11 +184,12 @@ describe sshd_config do
 end
 ```
 
-* Test your `kitchen.yml` file to verify that only Vagrant is configured as the driver.
+* Test your `kitchen.yml` file to verify that only Vagrant is configured as the driver.  The %w() formatting will
+pass rubocop lintng and allow you to access nested mappings.
 
 ```ruby
 describe yaml('.kitchen.yml') do
-  its('driver.name') { should eq('vagrant') }
+  its(%w(driver name)) { should eq('vagrant') }
 end
 ```
 
@@ -210,6 +239,9 @@ inspec exec test.rb -t docker://container_id
 
 # run with sudo
 inspec exec test.rb --sudo [--sudo-password ...] [--sudo-options ...] [--sudo_command ...]
+
+# run in a subshell
+inspec exec test.rb --shell [--shell-options ...] [--shell-command ...]
 ```
 
 ### detect
@@ -232,7 +264,7 @@ Which will provide you with:
 Remote Targets
 
 Platform | Versions | Architectures
- ---- | --- | --- | ---
+ --- | --- | ---
 AIX | 6.1, 7.1, 7.2 | ppc64
 CentOS | 5, 6, 7 | i386, x86_64
 Debian | 7, 8 | i386, x86_64
@@ -241,7 +273,7 @@ Mac OS X | 10.9, 10.10, 10.11 | x86_64
 Oracle Enterprise Linux | 5, 6, 7 | i386, x86_64
 Red Hat Enterprise Linux | 5, 6, 7 | i386, x86_64
 Solaris | 10, 11 | sparc, x86
-Windows | 7, 8, 8.1, 2008*, 2008R2* , 2012, 2012R2 | x86, x86_64
+Windows | 7, 8, 8.1, 10, 2008, 2008R2 , 2012, 2012R2, 2016 | x86, x86_64
 Ubuntu Linux | | x86, x86_64
 SUSE Linux Enterprise Server  | 11, 12 | x86_64
 Scientific Linux | 5.x, 6.x and 7.x | i386, x86_64
@@ -252,12 +284,12 @@ Gentoo Linux | | x86_64
 Arch Linux | | x86_64
 HP-UX | 11.31 | ia64
 
-* For Windows 2008 and 2008 R2 an updated Powershell (Windows Management Framework 5.0) is required.
+*For Windows, PowerShell 3.0 or above is required.*
 
 In addition, runtime support is provided for:
 
 Platform | Versions
- ---- | --- | ---
+ ---- | ----
 Debian | 8
 RHEL | 6, 7
 Ubuntu | 12.04+
@@ -268,28 +300,17 @@ Windows | 2012+
 
 Documentation
 
+ * https://www.inspec.io/docs/
+ * https://www.inspec.io/docs/reference/resources/
  * https://github.com/chef/inspec/tree/master/docs
 
-Blogs:
-
- * [The Road to InSpec](https://www.chef.io/blog/2015/11/04/the-road-to-inspec/)
- * [Introduction to InSpec](http://tfitch.com/automation-tools-bootcamp/inspec.html)
- * [InSpec Tutorial: Day 1 - Hello World](http://www.anniehedgie.com/inspec-basics-1)
- * [InSpec Tutorial: Day 2 - Command Resource Blog Logo](http://www.anniehedgie.com/inspec-basics-2)
- * [InSpec Tutorial: Day 3 - File Resource](http://www.anniehedgie.com/inspec-basics-3)
- * [InSpec Tutorial: Day 4 - Custom Matchers](http://www.anniehedgie.com/inspec-basics-4)
- * [InSpec Tutorial: Day 5 - Creating a Profile](http://www.anniehedgie.com/inspec-basics-5)
- * [InSpec Tutorial: Day 6 - Ways to Run It and Places to Store It](http://www.anniehedgie.com/inspec-basics-6)
- * [InSpec Tutorial: Day 7 - How to Inherit a Profile from Chef Compliance Server](http://www.anniehedgie.com/inspec-basics-7)
- * [Windows infrastructure testing using InSpec – Part I](http://datatomix.com/?p=236)
- * [Windows infrastructure testing using InSpec and Profiles – Part II](http://datatomix.com/?p=238)
- * [Testing Ansible with Inspec](http://scienceofficersblog.blogspot.de/2016/02/testing-ansible-with-inspec.html)
- * [Operating Chef/InSpec in an air gapped environment](https://github.com/jeremymv2/chef-intranet-scaffolding/blob/master/README.md)
-
-Podcasts:
-
- * [InSpec Foodfight](http://foodfightshow.org/2016/02/inspec.html)
- * [Test Driven Infrastructure With Arthur Maltson And Michael Goetz](https://www.arresteddevops.com/tdi/)
+Tutorials/Blogs/Podcasts:
+
+ * https://www.inspec.io/tutorials/
+
+Relationship to other tools (RSpec, Serverspec):
+
+ * https://www.inspec.io/docs/reference/inspec_and_friends/
 
 ## Share your Profiles
 

data/Rakefile

@@ -4,21 +4,28 @@
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rubocop/rake_task'
-require_relative 'tasks/docs'
 require_relative 'tasks/maintainers'
-require_relative 'tasks/www'
+require_relative 'tasks/spdx'
+
+# The docs tasks rely on ruby-progressbar. If we can't load it, then don't
+# load the docs tasks. This is necessary to allow this Rakefile to work
+# when the "tests" gem group in the Gemfile has been excluded, such as
+# during an appbundle-updater run.
+begin
+  require 'ruby-progressbar'
+  require_relative 'tasks/docs'
+rescue LoadError
+  puts 'docs tasks are unavailable because the ruby-progressbar gem is not available.'
+end
 
 # Rubocop
-desc 'Run Rubocop lint checks'
-task :rubocop do
-  RuboCop::RakeTask.new
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new(:lint)
+rescue LoadError
+  puts 'rubocop is not available. Install the rubocop gem to run the lint tests.'
 end
 
-# lint the project
-desc 'Run robocop linter'
-task lint: [:rubocop]
-
 # update command output for demo
 desc 'Run inspec commands and save results to www/app/responses'
 task :update_demo do
@@ -27,7 +34,7 @@ task :update_demo do
 end
 
 # run tests
-task default: [:test, :lint]
+task default: [:lint, :test]
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
@@ -122,14 +129,6 @@ end
 # Check the requirements for running an update of this repository.
 def check_update_requirements
   require_command 'git'
-  require_command 'github_changelog_generator', "\n"\
-    "For more information on how to install it see:\n"\
-    "  https://github.com/skywinder/github-changelog-generator\n"
-  require_env 'CHANGELOG_GITHUB_TOKEN', "\n"\
-    "Please configure this token to make sure you can run all commands\n"\
-    "against GitHub.\n\n"\
-    "See github_changelog_generator homepage for more information:\n"\
-    "  https://github.com/skywinder/github-changelog-generator\n"
 end
 
 # Show the current version of this gem.
@@ -138,32 +137,48 @@ task :version do
   inspec_version
 end
 
-desc 'Generate the changelog'
-task :changelog do
-  require_relative 'lib/inspec/version'
-  system "github_changelog_generator -u chef -p inspec --future-release #{Inspec::VERSION} --since-tag 0.7.0"
-end
-
-# Update the version of this gem and create an updated
-# changelog. It covers everything short of actually releasing
-# the gem.
-desc 'Bump the version of this gem'
-task :bump_version, [:version] do |_, args|
-  v = args[:version] || ENV['to']
-  fail "You must specify a target version!  rake bump_version to=1.2.3" if v.empty?
-  check_update_requirements
-  inspec_version(v)
-  Rake::Task['changelog'].invoke
-  Rake::Task['docs:cli'].invoke
-end
-
 desc 'Release a new docker image'
 task :release_docker do
   version = Inspec::VERSION
   cmd = "rm *.gem; gem build *gemspec && "\
         "mv *.gem inspec.gem && "\
         "docker build -t chef/inspec:#{version} . && "\
-        "docker push chef/inspec:#{version}"
+        "docker push chef/inspec:#{version} && "\
+        "docker tag chef/inspec:#{version} chef/inspec:latest &&"\
+        "docker push chef/inspec:latest"
   puts "--> #{cmd}"
   sh('sh', '-c', cmd)
 end
+
+desc 'Release a new Habitat package'
+task :release_habitat do
+    version = Inspec::VERSION
+    ENV['HAB_ORIGIN'] = "chef"
+    if Dir.exist?("./results") then
+        raise "Please remove the ./results directory"
+    end
+    if ! ENV.has_key?("HAB_AUTH_TOKEN") then
+        raise "Please set the HAB_AUTH_TOKEN environment variable"
+    end
+    cmd = "echo #{version} > ./habitat/VERSION && "\
+          "hab pkg build . && " \
+          "hab pkg upload ./results/*.hart --channel stable"
+    puts "--> #{cmd}"
+    sh('sh', '-c', cmd)
+end
+
+desc 'Release the website [deprecated]'
+task :www do
+  puts 'The Rake tasks for releasing the website are now in the www/ directory.'
+  puts 'Run `cd www` and then `rake --tasks` for a list of the www-related tasks available.'
+  exit(1)
+end
+
+namespace :www do
+  desc 'Release the website [deprecated]'
+  task :release do
+    puts 'The Rake tasks for releasing the website are now in the www/ directory.'
+    puts 'Run `cd www` and then `rake --tasks` for a list of the www-related tasks available.'
+    exit(1)
+  end
+end

data/bin/inspec

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Copyright 2015 Dominik Richter. All rights reserved.
+# Copyright 2015 Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
 

data/docs/dsl_inspec.md

@@ -44,7 +44,10 @@ where
 
 * `'sshd-8'` is the name of the control
 * `impact`, `title`, and `desc` define metadata that fully describes the importance of the control, its purpose, with a succinct and complete description
-* `impact` is an float that measures the importance of the compliance results and must be a value between `0.0` and `1.0`.
+* `impact` is an float that measures the importance of the compliance results and must be a value between `0.0` and `1.0`. The value ranges are:
+    * `0.0 to <0.4` these are controls with minor criticality
+    * `0.4 to <0.7` these are controls with major criticality
+    * `0.7 to 1.0` these are critical controls
 * `tag` is optional meta-information with with key or key-value pairs
 * `ref` is a reference to an external document
 * `describe` is a block that contains at least one test. A `control` block must contain at least one `describe` block, but may contain as many as required
@@ -68,13 +71,23 @@ describe.one do
 end
 ```
 
+#### Sensitive resources
+
+In some scenarios, you may be writing checks involving resources with sensitive content (e.g. a file resource). In the case of failures, it may be desired to suppress output. This can be done by adding the `:sensitive` flag to the resource definition
+
+```ruby
+describe file('/tmp/mysecretfile'), :sensitive do
+  its('content') { should contain 'secret_info' }
+end
+```
+
 ## Examples
 
 The following examples show simple compliance tests using a single `control` block.
 
 ## Test System Event Log
 
-The following test shows how to audit machines running Windows 2012 R2 that pwassword complexity is enabled:
+The following test shows how to audit machines running Windows 2012 R2 that password complexity is enabled:
 
 ```ruby
 control 'windows-account-102' do
@@ -89,7 +102,7 @@ end
 
 ## Are PosgtreSQL passwords empty?
 
-The following test shows how to audit machines running PostgerSQL to ensure that passwords are not empty.
+The following test shows how to audit machines running PostgreSQL to ensure that passwords are not empty.
 
 ```ruby
 control 'postgres-7' do
@@ -173,7 +186,7 @@ end
 
 ## Test Windows Registry Keys
 
-The following test shows how to audit machines to ensure Safe DLL Seach Mode is enabled:
+The following test shows how to audit machines to ensure Safe DLL Search Mode is enabled:
 
 ```ruby
 control 'windows-base-101' do

data/docs/dsl_resource.md

@@ -90,4 +90,4 @@ class GordonConfig < Inspec.resource(1)
 end
 ```
 
-For a full example, see our [example resource](../examples/profile/libraries/gordon_config.rb).
+For a full example, see our [example resource](https://github.com/chef/inspec/blob/master/examples/profile/libraries/gordon_config.rb).

data/docs/habitat.md

@@ -0,0 +1,192 @@
+---
+title: InSpec Integration with Habitat
+---
+
+# Habitat Integration
+
+InSpec provides an easy method to create an executable Habitat package for an InSpec profile. When run via the Habitat Supervisor, the package will run InSpec with your profile and write out its findings to a JSON file. This provides the ability to ship your compliance controls alongside your Habitat-packaged application and continuously run InSpec, providing you *Continuous Compliance.*
+
+## What is Habitat?
+
+Habitat by Chef is our new Application Automation tool that aims to make it easy, safe, and fast to build, deploy, and manage applications. From build dependencies, runtime dependencies, dynamic configuration, and service discovery (just to name a few), Habitat packages the automation with the application instead of relying on an underlying platform.
+
+To learn more about Habitat and try our demos and tutorials, visit [https://www.habitat.sh](https://www.habitat.sh).
+
+## Using the Habitat Integration
+
+After creating a Habitat package for an InSpec profile (see CLI commands below) and uploading the package to a Habitat Depot or manually distributing to a host, start the Habitat Supervisor with your package:
+
+```bash
+hab start adamleff/inspec-profile-frontend1
+```
+
+The Habitat Supervisor will install InSpec and execute your profile in a loop. By default, the loop runs every 300 seconds but can be changed via the `sleep_time` configuration value:
+
+```bash
+HAB_INSPEC_PROFILE_FRONTEND1="sleep_time = 60" hab start adamleff/inspec-profile-frontend1
+```
+
+The Habitat Supervisor will display output like this:
+
+```
+hab start adamleff/inspec-profile-frontend1
+∵ Missing package for core/hab-sup/0.17.0
+» Installing core/hab-sup/0.17.0
+↓ Downloading core/hab-sup/0.17.0/20170214235450
+    1.68 MB / 1.68 MB - [=========================================================================] 100.00 % 7.43 MB/s
+
+... more Habitat output here ...
+
+hab-sup(MN): Starting adamleff/inspec-profile-frontend1/0.1.0/20170328173005
+hab-sup(CS): adamleff/inspec-profile-frontend1/0.1.0/20170328173005 is not installed
+↓ Downloading adamleff-20160617201047 public origin key
+    79 B / 79 B | [===============================================================================] 100.00 % 2.64 MB/s
+☑ Cached adamleff-20160617201047 public origin key
+↓ Downloading chef/inspec/1.17.0/20170321214949
+    16.93 MB / 16.93 MB / [======================================================================] 100.00 % 10.49 MB/s
+
+... more Habitat output here ...
+
+★ Install of adamleff/inspec-profile-frontend1/0.1.0/20170328173005 complete with 9 new packages installed.
+hab-sup(MR): Butterfly Member ID d9bd761e18c144469d755b1b97406eb2
+hab-sup(MR): Starting butterfly on 0.0.0.0:9638
+hab-sup(MR): Starting http-gateway on 0.0.0.0:9631
+inspec-profile-frontend1.default(SR): Initializing
+inspec-profile-frontend1.default(SV): Starting process as user=hab, group=hab
+inspec-profile-frontend1.default(O): Executing InSpec for adamleff/inspec-profile-frontend1
+inspec-profile-frontend1.default(O): InSpec run completed successfully.
+inspec-profile-frontend1.default(O): sleeping for 300 seconds
+```
+
+The above sample output shows the supervisor starting, downloading the necessary dependencies for the supervisor and the InSpec profile, and then shows the supervisor running InSpec successfully.
+
+InSpec will write a JSON file in the `${svc_var_path}/inspec_results` directory containing the results of the last InSpec run. For example, for the `adamleff/inspec-profile-frontend1` package, the InSpec results will be at:
+
+```
+/hab/svc/inspec-profile-frontend1/var/inspec_results/inspec-profile-frontend1.json
+```
+
+## InSpec Habitat CLI Commands
+
+### inspec habitat profile create
+
+Create a Habitat package for an InSpec profile. InSpec will validate the profile, fetch and vendor any dependencies (if necessary), and build the Habitat package with a dependency on the latest InSpec. The resulting package will be saved to the current working directory.
+
+The package file will be named:
+
+```
+HABITAT_ORIGIN-inspec-profile-PROFILE_NAME-PROFILE_VERSION-BUILD_ID-x86_64-linux.hart
+```
+
+For example:
+
+```
+adamleff-inspec-profile-frontend1-0.1.0-20170328173005-x86_64-linux.hart
+```
+
+#### Syntax
+
+```bash
+inspec habitat profile create PROFILE_DIRECTORY
+```
+
+Example:
+
+```bash
+inspec habitat profile create ~/profiles/frontend1
+```
+
+### inspec habitat profile create
+
+Create a Habitat package for an InSpec profile. InSpec will validate the profile, fetch and vendor any dependencies (if necessary), and build the Habitat package with a dependency on the latest InSpec. The resulting package will be saved to the current working directory.
+
+The package can then be manually uploaded to a Habitat Depot or manually distributed to a host and installed via `hab pkg install`.
+
+The package file will be named:
+
+```
+HABITAT_ORIGIN-inspec-profile-PROFILE_NAME-PROFILE_VERSION-BUILD_ID-x86_64-linux.hart
+```
+
+For example:
+
+```
+adamleff-inspec-profile-frontend1-0.1.0-20170328173005-x86_64-linux.hart
+```
+
+#### Syntax
+
+```bash
+inspec habitat profile create PROFILE_DIRECTORY
+```
+
+#### Example
+
+```bash
+inspec habitat profile create ~/profiles/frontend1
+```
+
+#### Example Output
+
+```
+$ habitat profile create ~/profiles/frontend1
+[2017-03-28T13:29:32-04:00] INFO: Creating a Habitat artifact for profile: /Users/aleff/profiles/frontend1
+[2017-03-28T13:29:32-04:00] INFO: Checking to see if Habitat is installed...
+[2017-03-28T13:29:32-04:00] INFO: Copying profile contents to the work directory...
+[2017-03-28T13:29:32-04:00] INFO: Generating Habitat plan at /var/folders/v5/z54gb76j2rs3wrn65hmtyf1r0000gp/T/inspec-habitat-exporter20170328-4932-kg2ltd/habitat/plan.sh...
+[2017-03-28T13:29:32-04:00] INFO: Generating a Habitat run hook at /var/folders/v5/z54gb76j2rs3wrn65hmtyf1r0000gp/T/inspec-habitat-exporter20170328-4932-kg2ltd/habitat/hooks/run...
+[2017-03-28T13:29:32-04:00] INFO: Generating Habitat's default.toml configuration...
+[2017-03-28T13:29:32-04:00] INFO: Building our Habitat artifact...
+   hab-studio: Destroying Studio at /hab/studios/src (default)
+   hab-studio: Creating Studio at /hab/studios/src (default)
+   hab-studio: Importing adamleff secret origin key
+» Importing origin key from standard input
+★ Imported secret origin key adamleff-20160617201047.
+» Installing core/hab-backline
+↓ Downloading core/hab-backline/0.19.0/20170311034116
+    2.17 KB / 2.17 KB / [=========================================================================] 100.00 % 4.33 MB/s
+
+... more Habitat output here...
+
+[2017-03-28T13:30:18-04:00] INFO: Copying artifact to /Users/aleff...
+```
+
+### inspec habitat profile upload
+
+Create and then upload a Habitat package for an InSpec profile. Like the `inspec habitat profile create` command, InSpec will validate the profile, fetch and vendor any dependencies (if necessary), and build the Habitat package with a dependency on the latest InSpec. However, instead of saving the package locally to the workstation, InSpec will upload it to the depot defined in the `HAB_DEPOT` environment variable. If `HAB_DEPOT` is not defined, the package will be uploaded to the public Habitat depot at [https://app.habitat.sh](https://app.habitat.sh).
+
+#### Syntax
+
+```bash
+inspec habitat profile upload PROFILE_DIRECTORY
+```
+
+#### Example
+
+```bash
+inspec habitat profile upload ~/profiles/frontend1
+```
+
+#### Example Output
+```
+[2017-03-28T13:29:32-04:00] INFO: Creating a Habitat artifact for profile: /Users/aleff/profiles/frontend1
+[2017-03-28T13:29:32-04:00] INFO: Checking to see if Habitat is installed...
+[2017-03-28T13:29:32-04:00] INFO: Copying profile contents to the work directory...
+[2017-03-28T13:29:32-04:00] INFO: Generating Habitat plan at /var/folders/v5/z54gb76j2rs3wrn65hmtyf1r0000gp/T/inspec-habitat-exporter20170328-4932-kg2ltd/habitat/plan.sh...
+[2017-03-28T13:29:32-04:00] INFO: Generating a Habitat run hook at /var/folders/v5/z54gb76j2rs3wrn65hmtyf1r0000gp/T/inspec-habitat-exporter20170328-4932-kg2ltd/habitat/hooks/run...
+[2017-03-28T13:29:32-04:00] INFO: Generating Habitat's default.toml configuration...
+[2017-03-28T13:29:32-04:00] INFO: Building our Habitat artifact...
+   hab-studio: Destroying Studio at /hab/studios/src (default)
+   hab-studio: Creating Studio at /hab/studios/src (default)
+   hab-studio: Importing adamleff secret origin key
+» Importing origin key from standard input
+★ Imported secret origin key adamleff-20160617201047.
+» Installing core/hab-backline
+↓ Downloading core/hab-backline/0.19.0/20170311034116
+    2.17 KB / 2.17 KB / [=========================================================================] 100.00 % 4.33 MB/s
+
+... more Habitat output here...
+
+[2017-03-28T13:30:18-04:00] INFO: Uploading the Habitat artifact to our Depot...
+[2017-03-28T13:30:23-04:00] INFO: Upload complete!
+```

data/docs/inspec_and_friends.md

@@ -42,7 +42,7 @@ end
 
 ## Serverspec
 
-Serverspec can be credited as the first extension of RSpec that enabled
+Serverspec is the first extension of RSpec that enabled
 users to run RSpec tests on servers to verify deployed artifacts. It was
 created in March 2013 by Gosuke Miyashita and has been widely adopted.
 It is also one of the core test frameworks within test-kitchen and has
@@ -60,7 +60,9 @@ Lessons learned from Serverspec include:
 * Support for Windows is a first-class requirement.
 * A command line interface (CLI) is required for faster iteration of test code.
 
-### How is InSpec different than Serverspec
+You can also watch this [podcast](http://foodfightshow.org/2016/02/inspec.html) to find out more on the relationship of InSpec and Serverspec.
+
+### How is InSpec different from Serverspec
 
 One of the key differences is that InSpec targets more user groups. It
 is optimized for DevOps, Security, and Compliance professionals.