inspec-core 3.5.0 → 3.6.2

data/lib/plugins/inspec-init/test/functional/{inspec_init_test.rb → inspec_init_profile_test.rb}

@@ -11,7 +11,7 @@ class InitCli < MiniTest::Test
       profile = File.join(dir, 'test-profile')
       out = run_inspec_process("init profile test-profile", prefix: "cd #{dir} &&")
       assert_equal 0, out.exit_status
-      assert_includes out.stdout, 'Create new profile at'
+      assert_includes out.stdout, 'Creating new profile at'
       assert_includes out.stdout, profile
       assert_includes Dir.entries(profile).join, 'inspec.yml'
       assert_includes Dir.entries(profile).join, 'README.md'
@@ -23,7 +23,7 @@ class InitCli < MiniTest::Test
       profile = File.join(dir, 'test-profile')
       out = run_inspec_process("init profile --platform os test-profile", prefix: "cd #{dir} &&")
       assert_equal 0, out.exit_status
-      assert_includes out.stdout, 'Create new profile at'
+      assert_includes out.stdout, 'Creating new profile at'
       assert_includes out.stdout, profile
       assert_includes Dir.entries(profile).join, 'inspec.yml'
       assert_includes Dir.entries(profile).join, 'README.md'
@@ -55,19 +55,19 @@ class InitCli < MiniTest::Test
       profile = File.join(dir, 'test-gcp-profile')
       out = run_inspec_process("init profile --platform gcp test-gcp-profile", prefix: "cd #{dir} &&")
       assert_equal 0, out.exit_status
-      assert_includes out.stdout, 'Create new profile at'
+      assert_includes out.stdout, 'Creating new profile at'
       assert_includes out.stdout, profile
       assert_includes Dir.entries(profile).join, 'inspec.yml'
       assert_includes Dir.entries(profile).join, 'README.md'
     end
   end
 
-  def test_generating_inspec_profile_aws
+  def test_generating_inspec_profile_os
     Dir.mktmpdir do |dir|
-      profile = File.join(dir,'test-aws-profile')
-      out = run_inspec_process("init profile --platform aws test-aws-profile", prefix: "cd #{dir} &&")
+      profile = File.join(dir,'test-os-profile')
+      out = run_inspec_process("init profile --platform os test-os-profile", prefix: "cd #{dir} &&")
       assert_equal 0, out.exit_status
-      assert_includes out.stdout, 'Create new profile at'
+      assert_includes out.stdout, 'Creating new profile at'
       assert_includes out.stdout, profile
       assert_includes Dir.entries(profile).join, 'inspec.yml'
       assert_includes Dir.entries(profile).join, 'README.md'

data/lib/resources/filesystem.rb

@@ -6,12 +6,16 @@ module Inspec::Resources
     desc 'Use the filesystem InSpec resource to test file system'
     example "
       describe filesystem('/') do
-        its('size') { should be >= 32000 }
-        its('type') { should eq false }
+        its('size_kb') { should be >= 32000 }
+        its('free_kb') { should be >= 3200 }
+        its('type') { should cmp 'ext4' }
+        its('percent_free') { should be >= 20 }
       end
       describe filesystem('c:') do
-        its('size') { should be >= 90 }
-        its('type') { should eq 'NTFS' }
+        its('size_kb') { should be >= 9000 }
+        its('free_kb') { should be >= 3200 }
+        its('type') { should cmp 'NTFS' }
+        its('percent_free') { should be >= 20 }
       end
     "
     attr_reader :partition
@@ -42,9 +46,30 @@ module Inspec::Resources
       "FileSystem #{@partition}"
     end
 
+    def size_kb
+      info = @fsman.info(@partition)
+      info[:size_kb]
+    end
+
     def size
+      Inspec.deprecate(:filesystem_property_size, 'The `size` property did not reliably use the correct units.  Please use `size_kb` instead.')
+      if inspec.os.windows?
+        # On windows, we had a bug prior to #3767 in which the
+        # 'size' value was be scaled to GB in powershell.
+        # We now collect it in KB.
+        (size_kb / (1024 * 1024)).to_i
+      else
+        size_kb
+      end
+    end
+
+    def free_kb
       info = @fsman.info(@partition)
-      info[:size]
+      info[:free_kb]
+    end
+
+    def percent_free
+      100 * free_kb / size_kb
     end
 
     def type
@@ -67,13 +92,14 @@ module Inspec::Resources
 
   class LinuxFileSystemResource < FsManagement
     def info(partition)
-      cmd = inspec.command("df #{partition} --output=size")
+      cmd = inspec.command("df #{partition} -T")
       raise Inspec::Exceptions::ResourceFailed, "Unable to get available space for partition #{partition}" if cmd.stdout.nil? || cmd.stdout.empty? || !cmd.exit_status.zero?
-      value = cmd.stdout.gsub(/\dK-blocks[\r\n]/, '').strip
+      value = cmd.stdout.split(/\n/)[1].strip.split(' ')
       {
         name: partition,
-        size: value.to_i,
-        type: false,
+        size_kb: value[2].to_i,
+        free_kb: value[4].to_i,
+        type: value[1].to_s,
       }
     end
   end
@@ -82,8 +108,9 @@ module Inspec::Resources
     def info(partition)
       cmd = inspec.command <<-EOF.gsub(/^\s*/, '')
         $disk = Get-WmiObject Win32_LogicalDisk -Filter "DeviceID='#{partition}'"
-        $disk.Size = $disk.Size / 1GB
-        $disk | select -property DeviceID,Size,FileSystem | ConvertTo-Json
+        $disk.Size = $disk.Size / 1KB
+        $disk.FreeSpace = $disk.FreeSpace / 1KB
+        $disk | select -property DeviceID,Size,FileSystem,FreeSpace | ConvertTo-Json
       EOF
 
       raise Inspec::Exceptions::ResourceSkipped, "Unable to get available space for partition #{partition}" if cmd.stdout == '' || cmd.exit_status.to_i != 0
@@ -96,7 +123,8 @@ module Inspec::Resources
       end
       {
         name: fs['DeviceID'],
-        size: fs['Size'].to_i,
+        size_kb: fs['Size'].to_i,
+        free_kb: fs['FreeSpace'].to_i,
         type: fs['FileSystem'],
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.2
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -17,9 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +355,7 @@ files:
 - lib/inspec/completions/bash.sh.erb
 - lib/inspec/completions/fish.sh.erb
 - lib/inspec/completions/zsh.sh.erb
+- lib/inspec/config.rb
 - lib/inspec/control_eval_context.rb
 - lib/inspec/dependencies/cache.rb
 - lib/inspec/dependencies/dependency_set.rb
@@ -468,12 +469,31 @@ files:
 - lib/plugins/inspec-init/README.md
 - lib/plugins/inspec-init/lib/inspec-init.rb
 - lib/plugins/inspec-init/lib/inspec-init/cli.rb
+- lib/plugins/inspec-init/lib/inspec-init/cli_plugin.rb
+- lib/plugins/inspec-init/lib/inspec-init/cli_profile.rb
 - lib/plugins/inspec-init/lib/inspec-init/renderer.rb
-- lib/plugins/inspec-init/lib/inspec-init/templates/profiles/os/README.md
-- lib/plugins/inspec-init/lib/inspec-init/templates/profiles/os/controls/example.rb
-- lib/plugins/inspec-init/lib/inspec-init/templates/profiles/os/inspec.yml
-- lib/plugins/inspec-init/lib/inspec-init/templates/profiles/os/libraries/.gitkeep
-- lib/plugins/inspec-init/test/functional/inspec_init_test.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/Gemfile
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/LICENSE
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/README.md
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/Rakefile
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/inspec-plugin-template.gemspec
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/cli_command.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/plugin.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/version.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/functional/README.md
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/functional/inspec_plugin_template_test.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/helper.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/README.md
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/cli_args_test.rb
+- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/plugin_def_test.rb
+- lib/plugins/inspec-init/templates/profiles/os/README.md
+- lib/plugins/inspec-init/templates/profiles/os/controls/example.rb
+- lib/plugins/inspec-init/templates/profiles/os/inspec.yml
+- lib/plugins/inspec-init/templates/profiles/os/libraries/.gitkeep
+- lib/plugins/inspec-init/test/functional/inspec_init_plugin_test.rb
+- lib/plugins/inspec-init/test/functional/inspec_init_profile_test.rb
 - lib/plugins/inspec-plugin-manager-cli/README.md
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli.rb
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/cli_command.rb