beaker-rspec 5.0.0 → 5.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2JlNjhkMWE1ZDc4NjRkMjJjY2RmMzg1MWE4YTI2ZTVkNTg5OWViNg==
-  data.tar.gz: !binary |-
-    ODBmYzkwODQyYzFkNzlhYWRiNWJkNTJjOTVlZDg1YzMzZWI2MWYxNA==
+SHA1:
+  metadata.gz: 8380fa2b5f1c758616697cd232219138a0a1859a
+  data.tar.gz: 78294a37a2b4d1c8e13f11ac59af7fa4588195cd
 SHA512:
-  metadata.gz: !binary |-
-    ZTMzNzI5MTY3YTQ2ZGI0MjA4ZDU1ZmFlNmY1MjE3NDliMTljNjEzNGVmNjBj
-    NDI1MmRmNTk4N2JhMzRiMmExMDRkZGM2Y2JhYmE0MTg1ZjhlZjk0ZGM4ODMy
-    ZjdlYTQ2NTM2ZWQzYzIxZDkyZjFkNjUzYjJlOTU0MGE2NTRlNmU=
-  data.tar.gz: !binary |-
-    MTU2MDA0NzkwOGQwOWMyYTVkMDE1YWU0ZDM5MTRjODFiODAyYzQ1M2JiMmYw
-    NTE2OTdkMjk3NDM1YzBhYWUwNDdjOTg2YWY1ZDFlZDEzY2QxZTA2ODQyNTZk
-    MTYxNDE0MjVmMjNlNmY2ZWFlOTI5ODJkYTE1ZWZhZjM3YWVhMGY=
+  metadata.gz: 1355bd2ff61b7c4399983ab9839d2294cc423098bd336e97b3b21b77eff24578d1b449b5f37248b866774d8d3009bcfb5e4a1caa50f46000cadffffe2e66acd2
+  data.tar.gz: 826c814f863aa16e7a85e2bca368ed731a15f0c1439a6503d2c07acffdbc643a80547f090d8bc309cbccf0355bbbc4b4222b785bbbf77c2d248560d19a006d7d

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     = '5.0.0'
+  s.version     = '5.0.1'
   s.authors     = ["Puppetlabs"]
   s.email       = ["sqa@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-rspec"

data/lib/beaker-rspec/beaker_shim.rb

@@ -62,6 +62,12 @@ module BeakerRSpec
       RSpec.configuration.hosts
     end
 
+    # Accessor for default node
+    # @return [Beaker::Host]
+    def default_node
+      RSpec.configuration.default_node ||= find_only_one :default
+    end
+
     # Cleanup the testing framework, shut down test boxen and tidy up
     def cleanup
       @network_manager.cleanup

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

@@ -1,8 +1,39 @@
 require 'serverspec'
 require 'specinfra'
+require 'specinfra/backend/powershell/script_helper'
 
 # Set specinfra backend to use our custom backend
-set :backend, 'BeakerExec'
+set :backend, 'BeakerDispatch'
+
+module Specinfra
+
+  # Accessor for current example
+  def cur_example
+    Specinfra.backend.example
+  end
+
+  def get_working_node
+    example = cur_example
+    if example and example.metadata[:node]
+      node = example.metadata[:node]
+    else
+      node = default_node
+    end
+    node
+  end
+
+  # The cygwin backend
+  def cygwin_backend
+    @cygwin_backend ||= Specinfra::Backend::BeakerCygwin.instance
+  end
+
+  # Backend for everything non-cygwin
+  def exec_backend
+    @exec_backend ||= Specinfra::Backend::BeakerExec.instance
+  end
+
+end
+
 
 # Override existing specinfra configuration to avoid conflicts
 # with beaker's shell, stdout, stderr defines
@@ -25,38 +56,129 @@ module Specinfra
         :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)
+module Specinfra::Helper::Os
+  private
 
-      if @example
-        @example.metadata[:command] = cmd
-        @example.metadata[:stdout]  = ret[:stdout]
+  # Override detect_os to look at the node platform, short circuit discoverability
+  # when we know that we have a windows node
+  def detect_os
+    return Specinfra.configuration.os if Specinfra.configuration.os
+    backend = Specinfra.backend
+    node = get_working_node
+    if node['platform'] =~ /windows/
+      return {:family => 'windows'}
+    end
+    Specinfra::Helper::DetectOs.subclasses.each do |c|
+      res = c.detect
+      if res
+        res[:arch] ||= Specinfra.backend.run_command('uname -m').stdout.strip
+        return res
       end
+    end
+  end
+end
 
-      CommandResult.new ret
+class Specinfra::CommandFactory
+  class << self
+    # Force creation of a windows command
+    def get_windows_cmd(meth, *args)
+
+      action, resource_type, subaction = breakdown(meth)
+      method =  action
+      method += "_#{subaction}" if subaction
+
+      common_class = Specinfra::Command
+      base_class = common_class.const_get('Base')
+      os_class = common_class.const_get('Windows')
+      version_class = os_class.const_get('Base')
+      command_class = version_class.const_get(resource_type.to_camel_case)
+
+      command_class = command_class.create
+      if command_class.respond_to?(method)
+        command_class.send(method, *args)
+      else
+        raise NotImplementedError.new("#{method} is not implemented in #{command_class}")
+      end
+    end
+
+  end
+end
+
+module Specinfra
+  # Rewrite the runner to use the appropriate backend based upon platform information
+  class Runner
+
+    def self.method_missing(meth, *args)
+      backend = Specinfra.backend
+      node = get_working_node
+      if node['platform'] !~ /windows/
+        processor = Specinfra::Processor
+        if processor.respond_to?(meth)
+          processor.send(meth, *args)
+        elsif backend.respond_to?(meth)
+          backend.send(meth, *args)
+        else
+          run(meth, *args)
+        end
+      else
+        if backend.respond_to?(meth)
+          backend.send(meth, *args)
+        else
+          run(meth, *args)
+        end
+      end
+    end
+
+    private
+
+    def self.run(meth, *args)
+      backend = Specinfra.backend
+      node = get_working_node
+      if node['platform'] =~ /windows/
+        cmd = Specinfra.command.get_windows_cmd(meth, *args)
+      else
+        cmd = Specinfra.command.get(meth, *args)
+      end
+      backend = Specinfra.backend
+      ret = backend.run_command(cmd)
+      if meth.to_s =~ /^check/
+        ret.success?
+      else
+        ret
+      end
+    end
+  end
+end
+
+module Specinfra::Backend::PowerShell
+  class Command
+    # Do a better job at escaping regexes, handle both LF and CRLF (YAY!)
+    def convert_regexp(target)
+      case target
+      when Regexp
+        target.source
+      else
+        Regexp.escape(target.to_s.gsub '/', '\/').gsub('\n', '(\r\n|\n)')
+      end
+    end
+  end
+end
+
+module Specinfra::Backend
+  class BeakerBase < Specinfra::Backend::Base
+    # Example accessor
+    def example
+      @example
     end
 
     # 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
+    def ssh_exec!(node, command)
       r = on node, command, { :acceptable_exit_codes => (0..127) }
       {
         :exit_status => r.exit_code,
@@ -65,6 +187,86 @@ module Specinfra::Backend
       }
     end
 
+  end
+end
+
+# Used as a container for the two backends, dispatches as windows/nix depending on node platform
+module Specinfra::Backend
+  class BeakerDispatch < BeakerBase
+
+    def dispatch_method(meth, *args)
+      if get_working_node['platform'] =~ /windows/
+        cygwin_backend.send(meth, *args)
+      else
+        exec_backend.send(meth, *args)
+      end
+    end
+
+    def run_command(cmd, opts={})
+      dispatch_method('run_command', cmd, opts)
+    end
+
+    def build_command(cmd)
+      dispatch_method('build_command', cmd)
+    end
+
+    def add_pre_command(cmd)
+      dispatch_method('add_pre_command', cmd)
+    end
+  end
+end
+
+# Backend for running serverspec commands on windows test nodes
+module Specinfra::Backend
+  class BeakerCygwin < BeakerBase
+    include Specinfra::Backend::PowerShell::ScriptHelper
+
+    # Run a windows style command using serverspec.  Defaults to running on the 'default_node'
+    # 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 = {})
+      node = get_working_node
+      script = create_script(cmd)
+      on node, "rm -f script.ps1"
+      create_remote_file(node, 'script.ps1', script)
+      # cygwin support /dev/null, if running from winrm would use < NULL
+      ret = ssh_exec!(node, "powershell.exe -File script.ps1 < /dev/null")
+
+      if @example
+        @example.metadata[:command] = script
+        @example.metadata[:stdout]  = ret[:stdout]
+      end
+
+      CommandResult.new ret
+    end
+  end
+end
+
+# Backend for running serverspec commands on non-windows test nodes
+module Specinfra::Backend
+  class BeakerExec < BeakerBase
+
+    # Run a unix style command using serverspec.  Defaults to running on the 'default_node'
+    # 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 = {})
+      node = get_working_node
+      cmd = build_command(cmd)
+      cmd = add_pre_command(cmd)
+      ret = ssh_exec!(node, cmd)
+
+      if @example
+        @example.metadata[:command] = cmd
+        @example.metadata[:stdout]  = ret[:stdout]
+      end
+
+      CommandResult.new ret
+    end
+
     def build_command(cmd)
       useshell = '/bin/sh'
       cmd = cmd.shelljoin if cmd.is_a?(Array)

data/lib/beaker-rspec/rake_task.rb

@@ -0,0 +1,5 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:beaker) do |c|
+  c.pattern = "spec/acceptance/**/*_spec.rb"
+end

data/lib/beaker-rspec/spec_helper.rb

@@ -12,6 +12,8 @@ RSpec.configure do |c|
   c.add_setting :options, :default => {}
   # Define persistant logger object
   c.add_setting :logger, :default => nil
+  # Define persistant default node
+  c.add_setting :default_node, :default => nil
 
   #default option values
   defaults = {

data/spec/acceptance/example_spec.rb

@@ -17,11 +17,48 @@ describe "ignore" do
      logger.notify("hi, I'm a notify message")
   end
 
-  hosts.each do |node|
-    describe service('ssh'), :node => node do
-      it { should be_running }
-      it { should be_enabled }
+  context "has serverspec support" do
+    hosts.each do |node|
+      sshd = case node['platform']
+             when /windows|el-|redhat|centos|debian/
+               'sshd'
+             else
+               'ssh'
+             end
+      describe service(sshd), :node => node do
+        it { should be_running }
+      end
+
+      usr = case node['platform']
+            when /windows/
+              'Administrator'
+            else
+              'root'
+            end
+      describe user(usr), :node => node do
+         it { should exist }
+      end
+    end
+  end
+
+  context "serverspec: can access default node" do
+    usr = case default['platform']
+          when /windows/
+            'Administrator'
+          else
+            'root'
+          end
+    describe user(usr) do
+       it { should exist }
     end
   end
 
+  context "serverspec: can match multiline file to multiline contents" do
+    contents = "four = five\n[one]\ntwo = three"
+    create_remote_file(default, "file_with_contents.txt", contents)
+    describe file("file_with_contents.txt") do
+      it { should be_file }
+      it { should contain(contents) }
+    end
+  end
 end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 description: RSpec bindings for beaker, see https://github.com/puppetlabs/beaker
@@ -171,7 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -179,6 +179,7 @@ files:
 - lib/beaker-rspec.rb
 - lib/beaker-rspec/beaker_shim.rb
 - lib/beaker-rspec/helpers/serverspec.rb
+- lib/beaker-rspec/rake_task.rb
 - lib/beaker-rspec/spec_helper.rb
 - sample.cfg
 - spec/acceptance/example_spec.rb
@@ -193,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RSpec bindings for beaker