beaker-rspec 4.0.0 → 5.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2FjZjdiOGRkODFmMTRjZTkzNmFhZGRmZWYzYzY4Y2RiYmI0ZDIyNQ==
+    Y2JlNjhkMWE1ZDc4NjRkMjJjY2RmMzg1MWE4YTI2ZTVkNTg5OWViNg==
   data.tar.gz: !binary |-
-    Y2MyOTg3NmNkYTAzODg1ZmFhYjgwMGYzNGIwYjM0Yzg1MDlkMTEyNw==
+    ODBmYzkwODQyYzFkNzlhYWRiNWJkNTJjOTVlZDg1YzMzZWI2MWYxNA==
 SHA512:
   metadata.gz: !binary |-
-    NzE4ZGM0YTRmNWIyYzM3ZmNmYzc2M2Y1YzQ5MmM2NzNiZmRjMzAzMTY2OWVh
-    ODcxOThkZjRjMjM3MDhhOGNhYmM4ZGRhZmU2Y2YzYTMxMWNlMzgwZGIzYWFj
-    NDJmODYxZTJlMDg3ZmZiNjc4YTE0ZjM5Yjc1YzQ1NGFjMTk0ZGU=
+    ZTMzNzI5MTY3YTQ2ZGI0MjA4ZDU1ZmFlNmY1MjE3NDliMTljNjEzNGVmNjBj
+    NDI1MmRmNTk4N2JhMzRiMmExMDRkZGM2Y2JhYmE0MTg1ZjhlZjk0ZGM4ODMy
+    ZjdlYTQ2NTM2ZWQzYzIxZDkyZjFkNjUzYjJlOTU0MGE2NTRlNmU=
   data.tar.gz: !binary |-
-    YTNmZjZlYjM2YjUzYmIyYzQxNWExMzMzMzk4NjlmZjYwYzc4N2I4ZGYxYzU0
-    M2UzNGJiN2JhZjAyYzdhZTRhNGZjMGExNzJiZTNiMmVmZWUzYzM0YjY5ZDI3
-    MjJmYTZhOTM0ZDdjZjI1MDU1YjlkMDdlNjI5NTRlOWRiZDcxODc=
+    MTU2MDA0NzkwOGQwOWMyYTVkMDE1YWU0ZDM5MTRjODFiODAyYzQ1M2JiMmYw
+    NTE2OTdkMjk3NDM1YzBhYWUwNDdjOTg2YWY1ZDFlZDEzY2QxZTA2ODQyNTZk
+    MTYxNDE0MjVmMjNlNmY2ZWFlOTI5ODJkYTE1ZWZhZjM3YWVhMGY=

data/beaker-rspec.gemspec

@@ -6,7 +6,7 @@ less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
 
 Gem::Specification.new do |s|
   s.name        = "beaker-rspec"
-  s.version     = '4.0.0'
+  s.version     = '5.0.0'
   s.authors     = ["Puppetlabs"]
   s.email       = ["sqa@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-rspec"
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '~> 2.0'
   s.add_runtime_dependency 'rspec'
-  s.add_runtime_dependency 'serverspec', '~> 1.0'
-  s.add_runtime_dependency 'specinfra', '~> 1.0'
+  s.add_runtime_dependency 'serverspec', '~> 2'
+  s.add_runtime_dependency 'specinfra', '~> 2'
 end

data/lib/beaker-rspec/helpers/serverspec.rb

@@ -1,78 +1,91 @@
 require 'serverspec'
 require 'specinfra'
-require 'specinfra/backend/exec'
 
-module SpecInfra
-  # Backend Module
-  #
-  # Contains the bridge between beaker-rspec and serverspec
-  module Backend
-    # Class BeakerExec
-    #
-    # Controls the running of Serverspec commands.
-    class BeakerExec < SpecInfra::Backend::Exec
-      # Run a command using serverspec.  Defaults to running on the 'default' test node, otherwise uses the
-      # node specified in @example.metadata[:node]
-      # @param [String] cmd The serverspec command to executed
-      # @param [Hash] opt No currently supported options
-      # @return [Hash] Returns a hash containing :exit_status, :stdout and :stderr
-      def run_command(cmd, opt={})
-        cmd = build_command(cmd)
-        cmd = add_pre_command(cmd)
-        ret = ssh_exec!(cmd)
+# Set specinfra backend to use our custom backend
+set :backend, 'BeakerExec'
 
-        if @example
-          @example.metadata[:command] = cmd
-          @example.metadata[:stdout]  = ret[:stdout]
-        end
+# Override existing specinfra configuration to avoid conflicts
+# with beaker's shell, stdout, stderr defines
+module Specinfra
+  module Configuration
+    class << self
+      VALID_OPTIONS_KEYS = [
+        :backend,
+        :env,
+        :path,
+        :pre_command,
+        :sudo_path,
+        :disable_sudo,
+        :sudo_options,
+        :docker_image,
+        :docker_url,
+        :lxc,
+        :request_pty,
+        :ssh_options,
+        :dockerfile_finalizer,
+      ].freeze
+    end
+  end
+end
+
+module Specinfra::Backend
+  class BeakerExec < Specinfra::Backend::Base
+    # Run a command using serverspec.  Defaults to running on the 'default' test node, otherwise uses the
+    # node specified in @example.metadata[:node]
+    # @param [String] cmd The serverspec command to executed
+    # @param [Hash] opt No currently supported options
+    # @return [Hash] Returns a hash containing :exit_status, :stdout and :stderr
+    def run_command(cmd, opt={})
+      cmd = build_command(cmd)
+      cmd = add_pre_command(cmd)
+      ret = ssh_exec!(cmd)
 
-        CommandResult.new ret
+      if @example
+        @example.metadata[:command] = cmd
+        @example.metadata[:stdout]  = ret[:stdout]
       end
 
-      private
-      # Execute the provided ssh command
-      # @param [String] command The command to be executed
-      # @return [Hash] Returns a hash containing :exit_status, :stdout and :stderr
-      def ssh_exec!(command)
-        if @example and @example.metadata[:node]
-          node = @example.metadata[:node]
-        else
-          node = default
-        end
+      CommandResult.new ret
+    end
 
-        r = on node, command, { :acceptable_exit_codes => (0..127) }
-        {
-          :exit_status => r.exit_code,
-          :stdout      => r.stdout,
-          :stderr      => r.stderr
-        }
+    # Execute the provided ssh command
+    # @param [String] command The command to be executed
+    # @return [Hash] Returns a hash containing :exit_status, :stdout and :stderr
+    def ssh_exec!(command)
+      if @example and @example.metadata[:node]
+        node = @example.metadata[:node]
+      else
+        node = default
       end
+      r = on node, command, { :acceptable_exit_codes => (0..127) }
+      {
+        :exit_status => r.exit_code,
+        :stdout      => r.stdout,
+        :stderr      => r.stderr
+      }
     end
-  end
-end
 
+    def build_command(cmd)
+      useshell = '/bin/sh'
+      cmd = cmd.shelljoin if cmd.is_a?(Array)
+      cmd = "#{useshell.shellescape} -c #{cmd.shellescape}"
 
-module SpecInfra
-  # Helper Module
-  #
-  #
-  module Helper
-    # BeakerBackend Module
-    #
-    module BeakerBackend
-      # @param commands_object [Object] The command object
-      # @return [SpecInfra::Backend::BeakerExec] Returns an instance of SpecInfra::Backend::BeakerExec
-      def backend(commands_object=nil)
-        if ! respond_to?(:commands)
-          commands_object = SpecInfra::Commands::Base.new
-        end
-        instance = SpecInfra::Backend::BeakerExec.instance
-        instance.set_commands(commands_object || commands)
-        instance
+      path = Specinfra.configuration.path
+      if path
+        cmd = %Q{env PATH="#{path}" #{cmd}}
+      end
+
+      cmd
+    end
+
+    def add_pre_command(cmd)
+      if Specinfra.configuration.pre_command
+        pre_cmd = build_command(Specinfra.configuration.pre_command)
+        "#{pre_cmd} && #{cmd}"
+      else
+        cmd
       end
     end
+
   end
 end
-
-include SpecInfra::Helper::BeakerBackend
-include SpecInfra::Helper::DetectOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 description: RSpec bindings for beaker, see https://github.com/puppetlabs/beaker
 email:
 - sqa@puppetlabs.com