inspec 2.0.45 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40edce262924f3f1fe00a6a1e1cbf8cc267da999
-  data.tar.gz: 2237b160408045985a93f5d94d8a0927a4789d94
+  metadata.gz: 184c03135e14f8d3cf287e8fed443c9fda98953a
+  data.tar.gz: 5d55d1635cd382e22a0f5114137549b43d63cefb
 SHA512:
-  metadata.gz: 9163df9d3744f72ff545af91d1a210072475a28fe9709bf0781a1fab5dbd581309b2ad6d92fb8c633958f2454c93cd202b655ef11550929711a403e0ba459545
-  data.tar.gz: 664a5975bc23a0241aa33e4d62558bdf6d7975ea1be1f5d5ef72ee1cacc452e0c37ef4ad50af9c8584b942b2530702bc0d96ead203c11fad80844b1862d56792
+  metadata.gz: 2996dd2613e5f390a2f1e4faefb61cde1c758222ea11b30f591526aa15412b6ad613b26464065dd114900749c5352f9856e6344fcbab02a4d8c66a938290533e
+  data.tar.gz: 7f42ef8a7a61e277c85d6db8302f9ade44f21a2ebbf94ebef118e2bdd39013754e610b89d68c936d524452e4abcb93b2151af76983063feb15d8354a17f78b45

data/CHANGELOG.md

@@ -1,36 +1,50 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.0.45 -->
-## [v2.0.45](https://github.com/chef/inspec/tree/v2.0.45) (2018-03-08)
+<!-- latest_release 2.1.0 -->
+## [v2.1.0](https://github.com/chef/inspec/tree/v2.1.0) (2018-03-15)
 
 #### Enhancements
-- Refine deprecated methods to be consistent with supported fields in shadow file. [#2801](https://github.com/chef/inspec/pull/2801) ([miah](https://github.com/miah))
+- Pin to new Train version and update InSpec defaults [#2827](https://github.com/chef/inspec/pull/2827) ([jquick](https://github.com/jquick))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.0.32 -->
-### Changes since 2.0.32 release
+<!-- release_rollup since=2.0.45 -->
+### Changes since 2.0.45 release
+
+#### Bug Fixes
+- Write version_constraints as an array for inspec.lock [#2619](https://github.com/chef/inspec/pull/2619) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.0.48 -->
+
+#### Enhancements
+- Pin to new Train version and update InSpec defaults [#2827](https://github.com/chef/inspec/pull/2827) ([jquick](https://github.com/jquick)) <!-- 2.1.0 -->
+- quote password when generating mysql command string [#2685](https://github.com/chef/inspec/pull/2685) ([tolland](https://github.com/tolland)) <!-- 2.0.47 -->
 
 #### Merged Pull Requests
-- Added the missing variable reference [#2794](https://github.com/chef/inspec/pull/2794) ([frezbo](https://github.com/frezbo)) <!-- 2.0.42 -->
-- iptables resource: Add support for other bin paths [#2783](https://github.com/chef/inspec/pull/2783) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.0.37 -->
-- Update name of subnet fixture, fixing 3 failing integration tests [#2765](https://github.com/chef/inspec/pull/2765) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.0.36 -->
+- Sort file list for unit tests [#2812](https://github.com/chef/inspec/pull/2812) ([eramoto](https://github.com/eramoto)) <!-- 2.0.49 -->
+- Docs: Describe support boundary between RSpec and InSpec [#2753](https://github.com/chef/inspec/pull/2753) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.0.46 -->
+<!-- release_rollup -->
+
+<!-- latest_stable_release -->
+## [v2.0.45](https://github.com/chef/inspec/tree/v2.0.45) (2018-03-08)
 
 #### Enhancements
-- Refine deprecated methods to be consistent with supported fields in shadow file. [#2801](https://github.com/chef/inspec/pull/2801) ([miah](https://github.com/miah)) <!-- 2.0.45 -->
-- Remove os checks from initialize [#2797](https://github.com/chef/inspec/pull/2797) ([miah](https://github.com/miah)) <!-- 2.0.44 -->
-- Create reporter output directory if it does not exist [#2798](https://github.com/chef/inspec/pull/2798) ([jquick](https://github.com/jquick)) <!-- 2.0.43 -->
-- Update shadow resource to use FilterTable [#2642](https://github.com/chef/inspec/pull/2642) ([miah](https://github.com/miah)) <!-- 2.0.39 -->
-- Host resource: use bash over netcat in Linux [#2607](https://github.com/chef/inspec/pull/2607) ([jvale](https://github.com/jvale)) <!-- 2.0.38 -->
-- AWS API Pagination fixes [#2762](https://github.com/chef/inspec/pull/2762) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.0.35 -->
-- Fix aws-iam-users pagination [#2761](https://github.com/chef/inspec/pull/2761) ([trickyearlobe](https://github.com/trickyearlobe)) <!-- 2.0.34 -->
+- Fix aws-iam-users pagination [#2761](https://github.com/chef/inspec/pull/2761) ([trickyearlobe](https://github.com/trickyearlobe))
+- AWS API Pagination fixes [#2762](https://github.com/chef/inspec/pull/2762) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Host resource: use bash over netcat in Linux [#2607](https://github.com/chef/inspec/pull/2607) ([jvale](https://github.com/jvale))
+- Update shadow resource to use FilterTable [#2642](https://github.com/chef/inspec/pull/2642) ([miah](https://github.com/miah))
+- Create reporter output directory if it does not exist [#2798](https://github.com/chef/inspec/pull/2798) ([jquick](https://github.com/jquick))
+- Remove os checks from initialize [#2797](https://github.com/chef/inspec/pull/2797) ([miah](https://github.com/miah))
+- Refine deprecated methods to be consistent with supported fields in shadow file. [#2801](https://github.com/chef/inspec/pull/2801) ([miah](https://github.com/miah))
 
 #### Bug Fixes
-- Fix http with connection error [#2770](https://github.com/chef/inspec/pull/2770) ([Wing924](https://github.com/Wing924)) <!-- 2.0.41 -->
-- return 1 as exit code for commands that are not available [#2792](https://github.com/chef/inspec/pull/2792) ([chris-rock](https://github.com/chris-rock)) <!-- 2.0.40 -->
-- command resource: Add `exist?` for Alpine Linux [#2768](https://github.com/chef/inspec/pull/2768) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.0.33 -->
-<!-- release_rollup -->
+- command resource: Add `exist?` for Alpine Linux [#2768](https://github.com/chef/inspec/pull/2768) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- return 1 as exit code for commands that are not available [#2792](https://github.com/chef/inspec/pull/2792) ([chris-rock](https://github.com/chris-rock))
+- Fix http with connection error [#2770](https://github.com/chef/inspec/pull/2770) ([Wing924](https://github.com/Wing924))
 
+#### Merged Pull Requests
+- Update name of subnet fixture, fixing 3 failing integration tests [#2765](https://github.com/chef/inspec/pull/2765) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- iptables resource: Add support for other bin paths [#2783](https://github.com/chef/inspec/pull/2783) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Added the missing variable reference [#2794](https://github.com/chef/inspec/pull/2794) ([frezbo](https://github.com/frezbo))
 <!-- latest_stable_release -->
+
 ## [v2.0.32](https://github.com/chef/inspec/tree/v2.0.32) (2018-03-01)
 
 #### Bug Fixes
@@ -51,7 +65,6 @@
 - virtualization_resource: Fix `NoMethodError` on `nil:NilClass` [#2603](https://github.com/chef/inspec/pull/2603) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Docs: Clarify Matchers page to speak about Universal matchers [#2754](https://github.com/chef/inspec/pull/2754) ([clintoncwolfe](https://github.com/clintoncwolfe))
 - mssql_session -  Handling cases where the data is nil [#2752](https://github.com/chef/inspec/pull/2752) ([frezbo](https://github.com/frezbo))
-<!-- latest_stable_release -->
 
 ## [v2.0.17](https://github.com/chef/inspec/tree/v2.0.17) (2018-02-20)
 

data/docs/dsl_inspec.md

@@ -107,7 +107,7 @@ The following test shows how to audit machines running PostgreSQL to ensure that
 ```ruby
 control 'postgres-7' do
   impact 1.0
-  title 'Don't allow empty passwords'
+  title "Don't allow empty passwords"
   describe postgres_session('user', 'pass').query("SELECT * FROM pg_shadow WHERE passwd IS NULL;") do
    its('output') { should eq('') }
   end

data/docs/inspec_and_friends.md

@@ -9,8 +9,8 @@ relate to each other.
 
 ## RSpec
 
-RSpec is an awesome framework that is widely used to test Ruby code. It
-enables test-driven development (TDD) and helps developers to write
+RSpec is an awesome framework that is widely used by software engineers to test
+Ruby code. It enables test-driven development (TDD) and helps developers to write
 better code every day.
 
 InSpec is built on top of RSpec and uses it as the underlying foundation
@@ -40,6 +40,13 @@ control "sshd-11" do
 end
 ```
 
+That said, InSpec is not RSpec. Some key differences:
+
+ * In InSpec, `describe` blocks should not be nested; instead use `control` blocks to describe a higher-level grouping of tests.
+ * The RSpec `shared_example` construct is not supported.  Instead, create a simple custom resource that executes repetitious tasks.
+ * InSpec is aimed at compliance practitioners and infrastructure testers, so our focus is providing a few, well-supported, easy-to-use [universal matchers](https://www.inspec.io/docs/reference/matchers/), such as `cmp`. In contrast, RSpec is a tool designed for software engineers. It thus supports a very large range of matchers, to enable testing of software engineering constructs such as exceptions, Object Oriented Programming relationships, and so on. 
+ * While InSpec uses parts of the RSpec project and codebase, it is a separate project from InSpec. Rspec's release schedule and feature set are beyond the control of the InSpec team. While it is possible to use many of the RSpec core features within InSpec profiles, InSpec can only guarantee that the features described at [docs.inspec.io](https://docs.inspec.io) will function correctly. Some RSpec core functionality may be removed in future versions of InSpec as needed to ensure stability in the InSpec project.
+
 ## Serverspec
 
 Serverspec is the first extension of RSpec that enabled

data/docs/matchers.md

@@ -18,7 +18,7 @@ The following InSpec-supported universal matchers are available:
 * [`include`](#include) - look for an expected value in a list-valued property
 * [`match`](#match) - look for patterns in text using regular expressions
 
-<br>
+See [Explore InSpec resources](https://learn.chef.io/modules/explore-inspec-resources#/) on Learn Chef Rally to learn more about InSpec's built-in matchers.
 
 ## be
 

data/docs/plugin_kitchen_inspec.md

@@ -47,3 +47,4 @@ Use InSpec tests from the local file system:
           inspec_tests:
             - test/integration/default
 
+Check out [Detect and correct with Test Kitchen](https://learn.chef.io/modules/detect-correct-kitchen#/) on Learn Chef Rally for a hands-on look at how to use Test Kitchen to run InSpec profiles.

data/docs/profiles.md

@@ -29,7 +29,9 @@ where:
 * `files` is the directory with additional files that a profile can access (optional)
 * `README.md` should be used to explain the profile, its scope, and usage
 
-See a complete example profile in the InSpec open source repository: https://github.com/chef/inspec/tree/master/examples/profile
+See a complete example profile in the InSpec open source repository: [https://github.com/chef/inspec/tree/master/examples/profile](https://github.com/chef/inspec/tree/master/examples/profile)
+
+Also check out [Explore InSpec resources](https://learn.chef.io/modules/explore-inspec-resources#/) on Learn Chef Rally to learn more about how profiles are structured with hands-on examples.
 
 ## inspec.yml
 
@@ -111,6 +113,8 @@ and to target all of these examples in a single `inspec.yml` file:
 
 An InSpec profile can bring in the controls and custom resources from another InSpec profile. Additionally, when inheriting the controls of another profile, a profile can skip or even modify those included controls.
 
+For hands-on examples, check out [Create a custom InSpec profile](https://learn.chef.io/modules/create-a-custom-profile#/) on Learn Chef Rally.
+
 ## Defining the Dependencies
 
 Before a profile can use controls from another profile, the to-be-included profile needs to be specified in the including profile’s `inspec.yml` file in the `depends` section. For each profile to be included, a location for the profile from where to be fetched and a name for the profile should be included. For example:
@@ -298,7 +302,7 @@ See the full example in the InSpec open source repository: https://github.com/ch
 
 # Profile files
 
-An InSpec profile may contain additional files that can be accessed during tests. This covers use-cases where e.g. a list of ports is provided to be tested.
+An InSpec profile may contain additional files that can be accessed during tests. A profile file enables you to separate the logic of your tests from the data your tests check for, for example, the list of ports you require to be open.
 
 To access these files, they must be stored in the `files` directory at the root of a profile. They are accessed by their name relative to this folder with `inspec.profile.file(...)`.
 
@@ -332,6 +336,8 @@ The tests in `example.rb` can now access this file:
       end
     end
 
+For a more complete example that uses a profile file, see [Explore InSpec resources](https://learn.chef.io/modules/explore-inspec-resources#/) on Learn Chef Rally.
+
 # "should" vs. "expect" syntax
 
 Users familiar with the RSpec testing framework may know that there are two ways to write test statements: `should` and `expect`. The RSpec community decided that `expect` is the preferred syntax. However, InSpec recommends the `should` syntax as it tends to read more easily to those users who are not as technical.

data/docs/resources/docker.md.erb

@@ -139,7 +139,7 @@ Or execute the profile directly via URL:
 
 ### images
 
-`images` returns information about Docker image as returned by [docker images](https://docs.docker.com/engine/reference/commandline/images/).
+`images` returns information about a Docker image as returned by [docker images](https://docs.docker.com/engine/reference/commandline/images/).
 
     describe docker.images do
       its('ids') { should include 'sha:12b5df59...442b' }
@@ -183,9 +183,9 @@ Or execute the profile directly via URL:
 
 ### image
 
-  describe docker_container(name: 'an-echo-server') do
-    its('image') { should eq 'busybox:latest' }
-  end
+    describe docker_container(name: 'an-echo-server') do
+      its('image') { should eq 'busybox:latest' }
+    end
 
 ### repo
 

data/docs/resources/docker_container.md.erb

@@ -5,7 +5,7 @@ platform: linux
 
 # docker_container
 
-Use the `docker_container` InSpec audit resource to test a docker container.
+Use the `docker_container` InSpec audit resource to test a Docker container.
 
 <br>
 
@@ -72,7 +72,7 @@ The `tag` property tests the value of the image tag:
 
 ### ports
 
-The `ports` property tests the value the docker ports:
+The `ports` property tests the value the Docker ports:
 
     its('ports') { should eq '0.0.0.0:1234->1234/tcp' }
 
@@ -101,4 +101,3 @@ The `command` property tests the value of the container run command:
 ## Matchers
 
 For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
-

data/docs/resources/docker_image.md.erb

@@ -5,7 +5,7 @@ platform: linux
 
 # docker_image
 
-Use the `docker_image` InSpec audit resource to verify a docker image.
+Use the `docker_image` InSpec audit resource to verify a Docker image.
 
 <br>
 
@@ -70,7 +70,7 @@ The `tag` property tests the value of image tag:
 
     its('tag') { should eq 'latest' }
 
-### Test a docker image
+### Test a Docker image
 
     describe docker_image('alpine:latest') do
       it { should exist }

data/docs/resources/os.md.erb

@@ -13,7 +13,7 @@ Use the `os` InSpec audit resource to test the platform on which the system is r
 
 An `os` resource block declares the platform to be tested. The platform may specified via matcher or control block name. For example, using a matcher:
 
-    describe os[:family] do
+    describe os.family do
       it { should eq 'platform_family_name' }
     end
 
@@ -33,19 +33,19 @@ The following examples show how to use this InSpec audit resource.
 
 ### Test for RedHat
 
-    describe os[:family] do
+    describe os.family do
       it { should eq 'redhat' }
     end
 
 ### Test for Ubuntu
 
-    describe os[:family] do
+    describe os.family do
       it { should eq 'debian' }
     end
 
 ### Test for Microsoft Windows
 
-    describe os[:family] do
+    describe os.family do
       it { should eq 'windows' }
     end
 
@@ -103,28 +103,28 @@ Use the following helpers to test for operating system names, releases, and arch
        it { should eq 'foo' }
     end
 
-### os[:family] Symbols
+### os.family names
 
-Use `os[:family]` to enable more granular testing of platforms, platform names, architectures, and releases. Use any of the following platform-specific symbols to test for specific platforms:
+Use `os.family` to enable more granular testing of platforms, platform names, architectures, and releases. Use any of the following platform-specific names to test for specific platforms:
 
-* `:aix`
-* `:bsd` For platforms that are part of the Berkeley OS family: `:darwin`, `:freebsd`, `:netbsd`, and `:openbsd`.
-* `:debian`
-* `:hpux`
-* `:linux`. For platforms that are part of the Linux family: `:alpine`, `:amazon`, `:arch`, `:coreos`, `:exherbo`, `:fedora`, `:gentoo`, and `:slackware`.
-* `:redhat`. For platforms that are part of the Redhat family: `:centos`.
-* `:solaris`. For platforms that are part of the Solaris family: `:nexentacore`, `:omnios`, `:openindiana`, `:opensolaris`, and `:smartos`.
-* `:suse`
-* `:unix`
-* `:windows`
+* `aix`
+* `bsd` For platforms that are part of the Berkeley OS family `darwin`, `freebsd`, `netbsd`, and `openbsd`.
+* `debian`
+* `hpux`
+* `linux`. For platforms that are part of the Linux family `alpine`, `amazon`, `arch`, `coreos`, `exherbo`, `fedora`, `gentoo`, and `slackware`.
+* `redhat`. For platforms that are part of the Redhat family `centos`.
+* `solaris`. For platforms that are part of the Solaris family `nexentacore`, `omnios`, `openindiana`, `opensolaris`, and `smartos`.
+* `suse`
+* `unix`
+* `windows`
 
 For example, both of the following tests should have the same result:
 
-    if os[:family] == 'debian'
+    if os.family == 'debian'
       describe port(69) do
         its('processes') { should include 'in.tftpd' }
       end
-    elsif os[:family] == 'redhat'
+    elsif os.family == 'redhat'
       describe port(69) do
         its('processes') { should include 'xinetd' }
       end

data/docs/shell.md

@@ -6,12 +6,14 @@ title: InSpec Shell
 
 The InSpec interactive shell is a pry based REPL that can be used to
 quickly run InSpec controls and tests without having to write it to a
-file. Its functionality is similar to `chef shell` - it provides a way
-to exercise the InSpec DSL, its resources, tests and plugins without
+file. Its functionality is similar to [chef-shell](https://docs.chef.io/chef_shell.html) as it provides a way
+to exercise the InSpec DSL, its resources, tests, and plugins without
 having to create a profile or write a test file. See
 [http://pryrepl.org/](http://pryrepl.org/) for an introduction to what pry is and what it can
 do.
 
+See [Explore InSpec resources](https://learn.chef.io/modules/explore-inspec-resources#/) on Learn Chef Rally for a hands-on example that uses InSpec shell.
+
 ## Launching the shell
 
 If you are using InSpec from a platform-specific package (rpm, msi,
@@ -25,10 +27,10 @@ $ inspec help shell # This will describe inspec shell usage
 ```
 
 If you wish to connect to a remote machine (called a target within
-InSpec), you can use the `-t` flag. We support connecting using ssh,
-WinRm and Docker. If no target is provided, we implicitly support the
+InSpec), you can use the `-t` flag. We support connecting using SSH,
+WinRM and docker. If no target is provided, we implicitly support the
 "local" target - i.e. tests running on the current machine running
-InSpec. For an ssh connection, use `-i` for specifying ssh key files,
+InSpec. For an SSH connection, use `-i` for specifying SSH key files,
 and the `--sudo*` commands for requesting a privilege escalation after
 logging in. For a WinRM connection, use `--path` to change the login
 path, `--ssl` to use SSL for transport layer encryption.

data/inspec.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'train', '~> 1.1'
+  spec.add_dependency 'train', '~> 1.2'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'method_source', '~> 0.8'

data/lib/inspec/backend.rb

@@ -65,6 +65,7 @@ module Inspec
         connection.disable_cache(:command)
       else
         Inspec::Log.debug 'Option backend_cache is disabled'
+        connection.disable_cache(:file)
         connection.disable_cache(:command)
       end
 

data/lib/inspec/base_cli.rb

@@ -76,7 +76,7 @@ module Inspec
       option :create_lockfile, type: :boolean,
         desc: 'Write out a lockfile based on this execution (unless one already exists)'
       option :backend_cache, type: :boolean,
-        desc: 'Allow caching for backend command output.'
+        desc: 'Allow caching for backend command output. (default: true)'
       option :show_progress, type: :boolean,
         desc: 'Show progress while executing tests.'
     end
@@ -88,7 +88,7 @@ module Inspec
           'show_progress' => false,
           'color' => true,
           'create_lockfile' => true,
-          'backend_cache' => false,
+          'backend_cache' => true,
         },
         shell: {
           'reporter' => ['cli'],

data/lib/inspec/dependencies/requirement.rb

@@ -80,7 +80,7 @@ module Inspec
       h = {
         'name' => name,
         'resolved_source' => resolved_source,
-        'version_constraints' => version_constraints.to_s,
+        'version_constraints' => version_constraints,
       }
 
       if !dependencies.empty?

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '2.0.45'
+  VERSION = '2.1.0'
 end

data/lib/resources/mysql_session.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
 
+require 'shellwords'
+
 module Inspec::Resources
   class MysqlSession < Inspec.resource(1)
     name 'mysql_session'
@@ -25,21 +27,8 @@ module Inspec::Resources
     end
 
     def query(q, db = '')
-      # TODO: simple escape, must be handled by a library
-      # that does this securely
-      escaped_query = q.gsub(/\\/, '\\\\').gsub(/"/, '\\"').gsub(/\$/, '\\$')
-
-      # run the query
-      command = "mysql -u#{@user} -p#{@pass}"
-      if !@socket.nil?
-        command += " -S #{@socket}"
-      else
-        command += " -h #{@host}"
-      end
-      command += " --port #{@port}" unless @port.nil?
-      command += " #{db} -s -e \"#{escaped_query}\""
-
-      cmd = inspec.command(command)
+      mysql_cmd = create_mysql_cmd(q, db)
+      cmd = inspec.command(mysql_cmd)
       out = cmd.stdout + "\n" + cmd.stderr
       if out =~ /Can't connect to .* MySQL server/ || out.downcase =~ /^error/
         # skip this test if the server can't run the query
@@ -56,6 +45,31 @@ module Inspec::Resources
 
     private
 
+    def escape_string(query)
+      Shellwords.escape(query)
+    end
+
+    def create_mysql_cmd(q, db = '')
+      # TODO: simple escape, must be handled by a library
+      # that does this securely
+      escaped_query = q.gsub(/\\/, '\\\\').gsub(/"/, '\\"').gsub(/\$/, '\\$')
+
+      # construct the query
+      command = 'mysql'
+      command += " -u#{escape_string(@user)}" unless @user.nil?
+      command += " -p#{escape_string(@pass)}" unless @pass.nil?
+
+      if !@socket.nil?
+        command += " -S #{@socket}"
+      else
+        command += " -h #{@host}"
+      end
+      command += " --port #{@port}" unless @port.nil?
+      command += " #{db}" unless db.empty?
+      command += %{ -s -e "#{escaped_query}"}
+      command
+    end
+
     def init_fallback
       # support debian mysql administration login
       debian = inspec.command('test -f /etc/mysql/debian.cnf && cat /etc/mysql/debian.cnf').stdout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.0.45
+  version: 2.1.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement