inspec 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8809fbed2418c889f95bdd22b409fe730ccb92
-  data.tar.gz: a21f007a1136db0e5869d8789152a59ef648f462
+  metadata.gz: 84dfdf4c3180317c15fcb732fcf4cc0098b8177d
+  data.tar.gz: e239dd876de5734c0fd5ff9f3f539e55df91450b
 SHA512:
-  metadata.gz: 9a28f59896f7ae9ce9668ec6c6ba03ff78b1437e1d1a10def6bdb9967fc1257f4b8f22395e5174ca4b2271dcf7f27165f302d0dd4f535c04f7351faa7919139a
-  data.tar.gz: c4e01382ab5344ce014379172526f770341cb3fab75cb8da24be156f13efba8316fc2a0b055d96e6148e1a1b700e10a04386e387c9da98c726f7ab5e3e234c31
+  metadata.gz: 3c608e883ca7d72f263e9e5758ad589391a59ea6b68873bd3d3febd3c98b5e0eeb61b8ae0a0ba913ede5b600088281b9fdb3d303863515b401680ac0cbe3bd2d
+  data.tar.gz: 5334c5fa729531fca7de775064fb3b82cd0f93efe7d0adf9e9b8b8c2bc28dea4ccfc1f4dd2abcf81af695e6ac79c275231ad18315f55655ead316c3a208942b0

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.14.0](https://github.com/chef/inspec/tree/0.14.0) (2016-02-22)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.13.0...0.14.0)
+## [0.14.1](https://github.com/chef/inspec/tree/0.14.1) (2016-02-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.0...0.14.1)
+
+**Implemented enhancements:**
+
+- optimize appveyor [\#479](https://github.com/chef/inspec/pull/479) ([chris-rock](https://github.com/chris-rock))
+- fix windows tests [\#478](https://github.com/chef/inspec/pull/478) ([srenatus](https://github.com/srenatus))
+
+**Fixed bugs:**
+
+- ignore `pax\_global\_header` as valid file [\#480](https://github.com/chef/inspec/pull/480) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.14.0](https://github.com/chef/inspec/tree/v0.14.0) (2016-02-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.13.0...v0.14.0)
 
 **Fixed bugs:**
 
@@ -10,6 +22,10 @@
 - bugfix: handle edge-cases in upstart service [\#474](https://github.com/chef/inspec/pull/474) ([arlimus](https://github.com/arlimus))
 - replace targets with fetcher+reader system [\#473](https://github.com/chef/inspec/pull/473) ([arlimus](https://github.com/arlimus))
 
+**Merged pull requests:**
+
+- 0.14.0 [\#477](https://github.com/chef/inspec/pull/477) ([arlimus](https://github.com/arlimus))
+
 ## [v0.13.0](https://github.com/chef/inspec/tree/v0.13.0) (2016-02-19)
 [Full Changelog](https://github.com/chef/inspec/compare/v0.12.0...v0.13.0)
 

data/lib/inspec/plugins/fetcher.rb

@@ -33,6 +33,10 @@ module Inspec
       end
     end
 
+    BLACKLIST_FILES = [
+      'pax_global_header',
+    ].freeze
+
     class RelFetcher < Fetcher
       attr_reader :files
       attr_reader :prefix
@@ -56,6 +60,10 @@ module Inspec
 
       def get_prefix(fs)
         return '' if fs.empty?
+
+        # filter backlisted files
+        fs -= BLACKLIST_FILES
+
         sorted = fs.sort_by(&:length)
         get_folder_prefix(sorted)
       end

data/lib/inspec/version.rb

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

data/test/helper.rb

@@ -17,6 +17,7 @@ end
 require 'fileutils'
 require 'pathname'
 require 'tempfile'
+require 'tmpdir'
 require 'zip'
 
 require 'utils/base_cli'
@@ -51,8 +52,6 @@ class MockLoader
     undefined:  { family: nil, release: nil, arch: nil },
   }
 
-  @archives = {}
-
   # pass the os identifier to emulate a specific operating system
   def initialize(os = nil)
     # selects operating system
@@ -266,9 +265,7 @@ class MockLoader
 
   def self.profile_tgz(name)
     path = File.join(home, 'mock', 'profiles', name)
-    archive = Tempfile.new([name, '.tar.gz'])
-    dst = archive.path
-    archive.close
+    dst = File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname(name, '.tar.gz'))
 
     # generate relative paths
     files = Dir.glob("#{path}/**/*")
@@ -277,16 +274,13 @@ class MockLoader
     require 'inspec/archive/tar'
     tag = Inspec::Archive::TarArchiveGenerator.new
     tag.archive(path, relatives, dst)
-    @archives[dst] = archive
 
     dst
   end
 
   def self.profile_zip(name, opts = {})
     path = File.join(home, 'mock', 'profiles', name)
-    archive = Tempfile.new([name, '.zip'])
-    dst = archive.path
-    archive.close
+    dst = File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname(name, '.zip'))
 
     # rubyzip only works relative paths
     files = Dir.glob("#{path}/**/*")
@@ -295,7 +289,7 @@ class MockLoader
     require 'inspec/archive/zip'
     zag = Inspec::Archive::ZipArchiveGenerator.new
     zag.archive(path, relatives, dst)
-    @archives[dst] = archive
+
     dst
   end
 end

data/test/unit/fetchers.rb

@@ -48,6 +48,9 @@ describe Inspec::Plugins::RelFetcher do
     # extract folder structure buildup
     %w{/a /a/b /a/b/c}        => %w{c},
     %w{/a /a/b /a/b/c/d/e}    => %w{e},
+    # ignore pax_global_header, which are commonly seen in github tars and are not
+    # ignored by all tar streaming tools, its not extracted by GNU tar since 1.14
+    %w{/pax_global_header /a/b}    => %w{b},
   }.each do |ins, outs|
     describe 'empty profile' do
       let(:in_files) { ins }

data/test/unit/fetchers/tar_test.rb

@@ -12,7 +12,7 @@ describe Fetchers::Tar do
     _(reg['tar']).must_equal fetcher
   end
 
-  describe 'applied to a zipped archive' do
+  describe 'applied to a tar archive' do
     let(:target) { MockLoader.profile_tgz('complete-profile') }
     let(:res) { fetcher.resolve(target) }
 

data/test/unit/fetchers/url_test.rb

@@ -82,7 +82,7 @@ describe Fetchers::Url do
     let(:res) {
       mock_open = Minitest::Mock.new
       mock_open.expect :meta, {'content-type' => 'application/gzip'}
-      mock_open.expect :read, File.read(mock_file)
+      mock_open.expect :read, File.open(mock_file, 'rb').read
       fetcher.expects(:open).returns(mock_open)
       fetcher.resolve(target)
     }
@@ -115,7 +115,7 @@ describe Fetchers::Url do
     let(:res) {
       mock_open = Minitest::Mock.new
       mock_open.expect :meta, {'content-type' => 'application/zip'}
-      mock_open.expect :read, File.read(mock_file)
+      mock_open.expect :read, File.open(mock_file, 'rb').read
       fetcher.expects(:open).returns(mock_open)
       fetcher.resolve(target)
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Dominik Richter
@@ -207,9 +207,6 @@ files:
 - examples/profile/controls/gordon.rb
 - examples/profile/inspec.yml
 - examples/profile/libraries/gordon_config.rb
-- examples/resource/controls/tiny.rb
-- examples/resource/inspec.yml
-- examples/resource/libraries/tiny.rb
 - inspec.gemspec
 - lib/bundles/README.md
 - lib/bundles/inspec-compliance.rb
@@ -224,7 +221,6 @@ 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
@@ -486,8 +482,6 @@ files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
-- test/unit/mock/profiles/resource-tiny/inspec.yml
-- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/plugin_test.rb
 - test/unit/profile_context_test.rb
@@ -563,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.
@@ -729,8 +723,6 @@ test_files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
-- test/unit/mock/profiles/resource-tiny/inspec.yml
-- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/plugin_test.rb
 - test/unit/profile_context_test.rb

data/examples/resource/controls/tiny.rb

@@ -1,3 +0,0 @@
-describe tiny do
-require 'pry'; binding.pry
-end

data/examples/resource/inspec.yml

@@ -1,10 +0,0 @@
-name: resource
-title: InSpec Example Resources
-maintainer: Chef Software, Inc.
-copyright: Chef Software, Inc.
-copyright_email: support@chef.io
-license: Apache 2 license
-summary: Demonstrates the use of InSpec custom resources
-version: 1.0.0
-supports:
-  - linux

data/examples/resource/libraries/tiny.rb

@@ -1,3 +0,0 @@
-class Tiny < Inspec.resource(1)
-  name 'tiny'
-end

data/lib/bundles/inspec-supermarket.rb

@@ -1,13 +0,0 @@
-# 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 :API, 'inspec-supermarket/api'
-end
-
-require 'inspec-supermarket/cli'
-require 'inspec-supermarket/target'

data/test/unit/mock/profiles/resource-tiny/inspec.yml

@@ -1,10 +0,0 @@
-name: complete
-title: complete example profile
-maintainer: Chef Software, Inc.
-copyright: Chef Software, Inc.
-copyright_email: support@chef.io
-license: Proprietary, All rights reserved
-summary: Testing stub
-version: 1.0.0
-supports:
-- os-family: linux

data/test/unit/mock/profiles/resource-tiny/libraries/resource.rb

@@ -1,3 +0,0 @@
-class Tiny < Inspec.resource(1)
-  name 'tiny'
-end