inspec 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb4dc9badefe6bf34ad0969692d1185c9e5b31e
-  data.tar.gz: 46bca7c1a454afb81415070f573bc48801a0aa8a
+  metadata.gz: 1f48211d9143cfdb1bdf736389d72e2048bc26b3
+  data.tar.gz: 697546cf50666e244c114390238fbe1f0de18a91
 SHA512:
-  metadata.gz: 9b51e806a28c23227926dba00753cfcb9491221930bf16bd87baf7914b45bede895c6be023fe0ce1d2f29ce2009d1c68676aecc44964b04c195e7b7ccdee87c7
-  data.tar.gz: ef376dbe78816aa749ae27c1d934eb361c84e050c165cd494385fefe9ba59faa79af73ccda87e80c9af60ac6f54a8dc269cea2a50d8f6c0f0efe0d23d8bdcd89
+  metadata.gz: c8cf98323a40791eecd63b25cc6af48f49b2d139069f4f0e02d92e8daa03862048a01eec1c10f5d1b0008083eb43d6478b1721da7e3af8e30c87740cf61a54af
+  data.tar.gz: 5942695dbda9915900163f637ad847e0e75a7072ea0f5e415b74776a1c6158e0c4ccd0d80cfafb4c42c018b1f2c5a1dda76b88861c7a11ee92e41d89a4c05366

data/CHANGELOG.md

@@ -1,7 +1,31 @@
 # Change Log
 
-## [1.2.0](https://github.com/chef/inspec/tree/1.2.0) (2016-10-10)
-[Full Changelog](https://github.com/chef/inspec/compare/v1.1.0...1.2.0)
+## [1.2.1](https://github.com/chef/inspec/tree/1.2.1) (2016-10-15)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.2.0...1.2.1)
+
+**Implemented enhancements:**
+
+- Show actual value for cmp octal comparisons in string to match expected [\#1211](https://github.com/chef/inspec/pull/1211) ([alexpop](https://github.com/alexpop))
+
+**Fixed bugs:**
+
+- Using "cmp" Against File Mode Fails [\#1188](https://github.com/chef/inspec/issues/1188)
+- Unexpected failures with kitchen-inspec and inspec 1.0.0 [\#1187](https://github.com/chef/inspec/issues/1187)
+- Rspec deprecation warnings added to test summary creating invalid json file [\#952](https://github.com/chef/inspec/issues/952)
+- update train to fix empty target URIs [\#1221](https://github.com/chef/inspec/pull/1221) ([arlimus](https://github.com/arlimus))
+
+**Closed issues:**
+
+- www: typo on inspec.io [\#1197](https://github.com/chef/inspec/issues/1197)
+
+**Merged pull requests:**
+
+- move Inspec Habitat package to chef/inspec. [\#1216](https://github.com/chef/inspec/pull/1216) ([metadave](https://github.com/metadave))
+- fix kitchen-inspec integration-1187 [\#1213](https://github.com/chef/inspec/pull/1213) ([vjeffrey](https://github.com/vjeffrey))
+- Website: Fix typo in homepage code image [\#1210](https://github.com/chef/inspec/pull/1210) ([magwalk](https://github.com/magwalk))
+
+## [v1.2.0](https://github.com/chef/inspec/tree/v1.2.0) (2016-10-10)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.1.0...v1.2.0)
 
 **Implemented enhancements:**
 

data/README.md

@@ -110,6 +110,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:

data/Rakefile

@@ -167,3 +167,20 @@ task :release_docker do
   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 studio build ./habitat && " \
+          "hab pkg upload ./results/*.hart"
+    puts "--> #{cmd}"
+    sh('sh', '-c', cmd)
+end

data/examples/profile/inspec.lock

@@ -0,0 +1,3 @@
+---
+lockfile_version: 1
+depends: []

data/examples/ssh/README.md

@@ -0,0 +1,3 @@
+# Example InSpec Profile
+
+This example shows the implementation of an InSpec [profile](../../docs/profiles.rst).

data/examples/ssh/controls/example.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+# copyright: 2015, The Authors
+# license: All rights reserved
+
+title 'my hab tests'
+
+describe habitat do
+  it { should exist }
+end

data/examples/ssh/inspec.lock

@@ -0,0 +1,3 @@
+---
+lockfile_version: 1
+depends: []

data/examples/ssh/inspec.yml

@@ -0,0 +1,8 @@
+name: ssh
+title: InSpec Profile
+maintainer: The Authors
+copyright: The Authors
+copyright_email: you@example.com
+license: All Rights Reserved
+summary: An InSpec Compliance Profile
+version: 0.1.0

data/examples/ssh/libraries/habitat.rb

@@ -0,0 +1,13 @@
+
+class Habitat < Inspec.resource(1)
+  name "habitat"
+  example "
+    describe habitat do
+      it { should exist }
+    end
+  "
+
+  def exist?
+    inspec.file('hab').exist?
+  end
+end

data/inspec.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'train', '>=0.19.1', '<1.0'
+  spec.add_dependency 'train', '>=0.20.1', '<1.0'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'rainbow', '~> 2'

data/lib/inspec/rspec_json_formatter.rb

@@ -63,12 +63,12 @@ class InspecRspecMiniJson < RSpec::Core::Formatters::JsonFormatter
   private
 
   def format_example(example)
-    if example.metadata[:description_args].length == 0
-      code_description = example.metadata[:full_description]
-    else
+    if example.metadata[:description_args].length > 0 && !example.metadata[:skip].nil?
       # For skipped profiles, rspec returns in full_description the skip_message as well. We don't want
       # to mix the two, so we pick the full_description from the example.metadata[:example_group] hash.
       code_description = example.metadata[:example_group][:description]
+    else
+      code_description = example.metadata[:full_description]
     end
 
     res = {

data/lib/inspec/version.rb

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

data/lib/matchers/matchers.rb

@@ -305,12 +305,12 @@ RSpec::Matchers.define :cmp do |first_expected|
   end
 
   failure_message do |actual|
-    actual = '0' + actual.to_s(8) if octal?(@expected)
+    actual = ('0' + actual.to_s(8)).inspect if octal?(@expected)
     "\n" + format_expectation(false) + "\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 
   failure_message_when_negated do |actual|
-    actual = '0' + actual.to_s(8) if octal?(@expected)
+    actual = ('0' + actual.to_s(8)).inspect if octal?(@expected)
     "\n" + format_expectation(true) + "\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -344,8 +344,15 @@ files:
 - examples/profile/controls/example.rb
 - examples/profile/controls/gordon.rb
 - examples/profile/controls/meta.rb
+- examples/profile/inspec.lock
 - examples/profile/inspec.yml
 - examples/profile/libraries/gordon_config.rb
+- examples/ssh/README.md
+- examples/ssh/controls/example.rb
+- examples/ssh/inspec.lock
+- examples/ssh/inspec.yml
+- examples/ssh/libraries/.gitkeep
+- examples/ssh/libraries/habitat.rb
 - inspec.gemspec
 - lib/bundles/README.md
 - lib/bundles/inspec-compliance.rb