inspec 0.32.0 → 0.33.0

data/lib/inspec/version.rb

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

data/lib/matchers/matchers.rb

@@ -232,7 +232,7 @@ end
 RSpec::Matchers.define :cmp do |first_expected|
 
   def integer?(value)
-    !(value =~ /\A[1-9]\d*\Z/).nil?
+    !(value =~ /\A0+\Z|\A[1-9]\d*\Z/).nil?
   end
 
   def float?(value)

data/lib/resources/apache_conf.rb

@@ -21,7 +21,7 @@ module Inspec::Resources
 
     def initialize(conf_path = nil)
       @conf_path = conf_path || inspec.apache.conf_path
-      @conf_dir = File.dirname(@conf_path)
+      @conf_dir = conf_path ? File.dirname(@conf_path) : inspec.apache.conf_dir
       @files_contents = {}
       @content = nil
       @params = nil

data/lib/resources/mysql.rb

@@ -33,7 +33,7 @@ module Inspec::Resources
       @log_dir = '/var/log/'
       @log_path = '/var/log/mysql.log'
       @log_group = 'adm'
-      case os[:release]
+      case inspec.os[:release]
       when '14.04'
         @log_dir_group = 'syslog'
       else

data/lib/resources/powershell.rb

@@ -22,13 +22,9 @@ module Inspec::Resources
       unless inspec.os.windows?
         return skip_resource 'The `script` resource is not supported on your OS yet.'
       end
-
-      # encodes a script as base64 to run as powershell encodedCommand
-      # this comes with performance issues: @see https://gist.github.com/fnichol/7b20596b950e65fb96f9
-      require 'winrm'
-      script = WinRM::PowershellScript.new(script)
-      cmd = "powershell -encodedCommand #{script.encoded}"
-      super(cmd)
+      # since WinRM 2.0 and the default use of powershell for local execution in
+      # train, we do not need to wrap the script here anymore
+      super(script)
     end
 
     # we cannot determine if a command exists, because that does not work for scripts

data/lib/resources/service.rb

@@ -407,9 +407,9 @@ module Inspec::Resources
       # read all enabled services from runlevel
       # on rhel via: 'chkconfig --list', is not installed by default
       # bash: for i in `find /etc/rc*.d -name S*`; do basename $i | sed -r 's/^S[0-9]+//'; done | sort | uniq
-      enabled_services_cmd = inspec.command('find /etc/rc*.d -name S*')
+      enabled_services_cmd = inspec.command('find /etc/rc*.d /etc/init.d/rc*.d -name S*').stdout
       service_line = %r{rc(?<runlevel>[0-6])\.d/S[^/]*?#{Regexp.escape service_name}$}
-      all_services = enabled_services_cmd.stdout.split("\n").map { |line|
+      all_services = enabled_services_cmd.split("\n").map { |line|
         service_line.match(line)
       }.compact
       enabled = !all_services.empty?
@@ -575,7 +575,7 @@ module Inspec::Resources
     # - 6: Pause Pending
     # - 7: Paused
     def info(service_name)
-      cmd = inspec.command("New-Object -Type PSObject | Add-Member -MemberType NoteProperty -Name Service -Value (Get-Service -Name #{service_name}| Select-Object -Property Name, DisplayName, Status) -PassThru | Add-Member -MemberType NoteProperty -Name WMI -Value (Get-WmiObject -Class Win32_Service | Where-Object {$_.Name -eq '#{service_name}' -or $_.DisplayName -eq '#{service_name}'} | Select-Object -Property StartMode) -PassThru | ConvertTo-Json")
+      cmd = inspec.command("New-Object -Type PSObject | Add-Member -MemberType NoteProperty -Name Service -Value (Get-Service -Name '#{service_name}'| Select-Object -Property Name, DisplayName, Status) -PassThru | Add-Member -MemberType NoteProperty -Name WMI -Value (Get-WmiObject -Class Win32_Service | Where-Object {$_.Name -eq '#{service_name}' -or $_.DisplayName -eq '#{service_name}'} | Select-Object -Property StartMode) -PassThru | ConvertTo-Json")
 
       # cannot rely on exit code for now, successful command returns exit code 1
       # return nil if cmd.exit_status != 0

data/lib/resources/vbscript.rb

@@ -2,6 +2,8 @@
 # author: Christoph Hartmann
 # author: Dominik Richter
 
+require 'securerandom'
+
 module Inspec::Resources
   # This resource allows users to run vbscript on windows machines. We decided
   # not to use scriptcontrol, due to the fact that it works on 32 bit systems only:
@@ -34,10 +36,11 @@ module Inspec::Resources
 
     def initialize(vbscript)
       return skip_resource 'The `vbscript` resource is not supported on your OS yet.' unless inspec.os.windows?
-
+      @seperator = SecureRandom.uuid
       cmd = <<-EOH
 $vbscript = @"
 #{vbscript}
+Wscript.Stdout.Write "#{@seperator}"
 "@
 $filename = [System.IO.Path]::GetTempFileName() + ".vbs"
 New-Item $filename -type file -force -value $vbscript | Out-Null
@@ -47,8 +50,21 @@ EOH
       super(cmd)
     end
 
+    def result
+      @result ||= parse_stdout
+    end
+
     def to_s
       'Windows VBScript'
     end
+
+    private
+
+    def parse_stdout
+      res = inspec.backend.run_command(@command)
+      parsed_result = res.stdout.gsub(/#{@seperator}\r\n$/, '')
+      res.stdout = parsed_result
+      res
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -296,6 +296,7 @@ files:
 - lib/inspec/cli.rb
 - lib/inspec/completions/bash.sh.erb
 - lib/inspec/completions/zsh.sh.erb
+- lib/inspec/control_eval_context.rb
 - lib/inspec/dependencies/dependency_set.rb
 - lib/inspec/dependencies/lockfile.rb
 - lib/inspec/dependencies/requirement.rb
@@ -303,10 +304,12 @@ files:
 - lib/inspec/dependencies/vendor_index.rb
 - lib/inspec/describe.rb
 - lib/inspec/dsl.rb
+- lib/inspec/dsl_shared.rb
 - lib/inspec/env_printer.rb
 - lib/inspec/errors.rb
 - lib/inspec/expect.rb
 - lib/inspec/fetcher.rb
+- lib/inspec/library_eval_context.rb
 - lib/inspec/log.rb
 - lib/inspec/metadata.rb
 - lib/inspec/objects.rb