beaker-testmode_switcher 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5e98040bb38ccc30cecf1a0c3105dcd152b82e
-  data.tar.gz: c6a864d09aec964392418110e6660402f2a37540
+  metadata.gz: c7ff5d01994fcc8fd23b932a148f2652929885a9
+  data.tar.gz: 1f09d49b242599f033255c7089837cf7a75fd19a
 SHA512:
-  metadata.gz: ea53e552475d862693ff0a0b92cae19aea7cb235a4d290ba137d14ef0b6311f3d4003592db6cc8e333377a5b62ac388531399d7c1221b9ade06c5a3f1a4163f7
-  data.tar.gz: 5fd3d099591b07fc46cdc27f3d6b0c511da666d79a4c49c2d2b170ed119fee39c9156e0b7bdbb9f54d16cafbf7589d8143dc1721f9f07bf6577bc7d9e5da1fca
+  metadata.gz: 29e63bc99d6a810af62c3695f6a9447e81c73428a38367b95534e9cb38c801ddc8896cc9f484c93ad182ad639136e0240963e06bb7dc154ec5b3bce49faaf79e
+  data.tar.gz: 9ead4a0fc8906c2703c2fb66e7befd317fcd6b4b6a77c0684f9c777d18e0dcf2565fc38cba2c23ce6d9935af51e534d4d80c85bcc0b6ab979a859fafa373bfb5

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 bundler_args: --without development
 rvm:
+  - 2.4.1
   - 2.3.1
   - 2.1.6
 env:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2017-06-08 Version 0.3.0
+### Summary
+Adds a new parameter for shell_ex; and improvements for local test running.
+
+### Features
+- Implements `:chdir` option to `shell_ex`.
+
+### BugFixes
+- Makes `my_hosts` and `logger` global methods optional.
+
 # 2017-06-02 Version 0.2.1
 ### Summary
 Fixes for shell_ex when running on Windows; and a minor README update.

data/README.md

@@ -79,6 +79,8 @@ This experimental version supports only a minimal set of functionality from the
   `opts` keys:
   * `:dry_run`: set to true to skip executing the actual command.
   * `:environment`: pass environment variables for the command as a hash.
+  * `:chdir`: the directory in which to run the command.
+  * See `Process.spawn()`'s `options` argument for more attributes.
 
 Other helpful methods:
 

data/lib/beaker/testmode_switcher/beaker_runners.rb

@@ -58,8 +58,9 @@ module Beaker
       end
 
       # execute an arbitrary command on the default host
-      def shell_ex(cmd)
-        shell(cmd)
+      def shell_ex(cmd, opts = {})
+        cmd = "cd #{opts[:chdir]}; " + cmd if opts.key? :chdir
+        shell(cmd, opts)
       end
     end
 

data/lib/beaker/testmode_switcher/dsl.rb

@@ -7,7 +7,10 @@ module Beaker
       # pass through methods to the runner
       %i[create_remote_file_ex scp_to_ex shell_ex resource execute_manifest execute_manifest_on].each do |name|
         define_method(name) do |*args|
-          Beaker::TestmodeSwitcher.runner(hosts, logger).send(name, *args)
+          # `hosts`, and `logger` are beaker DSL accessors in the global scope. Do not fail here, if they're not available.
+          my_hosts = (hosts if respond_to? :hosts)
+          my_logger = (logger if respond_to? :logger)
+          Beaker::TestmodeSwitcher.runner(my_hosts, my_logger).send(name, *args)
         end
       end
     end

data/lib/beaker/testmode_switcher/local_runner.rb

@@ -19,7 +19,7 @@ module Beaker
         if commands.empty?
           success_result
         else
-          use_local_shell(commands.join(' && '), opts)
+          use_local_shell(commands.join(' && '), {})
         end
       end
 
@@ -70,8 +70,6 @@ module Beaker
       end
 
       # run a command through a local shell
-      # Pass options to alter execution through `opts`:
-      # * `:environment`: default: `{}`; these will be treated as extra environment variables that should be set before running the command
       def shell_ex(cmd, opts = {})
         use_local_shell(cmd, opts)
       end
@@ -87,24 +85,24 @@ module Beaker
       end
 
       # fork/exec a process and collect its output
-      def use_local_shell(cmd, opts)
+      def use_local_shell(cmd, opts = {})
         if opts[:dry_run]
           puts "Would have run '#{cmd}'"
           success_result
         else
-          capture_command(cmd, opts[:environment] || {})
+          capture_command(cmd, opts)
         end
       end
 
       # runs a command and captures its output in a Beaker::Result
-      def capture_command(cmd, environment)
+      def capture_command(cmd, opts = {})
         blocks = {
           combined: [],
           out: [],
           err: []
         }
         exit_code = -1
-        Open3.popen3(environment, cmd) do |stdin, stdout, stderr, wait_thr|
+        Open3.popen3(opts[:environment] || {}, cmd, opts) do |stdin, stdout, stderr, wait_thr|
           # TODO: pass through $stdin/terminal to subprocess to allow interaction - e.g. pry - the subprocess
           stdin.close_write
 

data/lib/beaker/testmode_switcher/version.rb

@@ -1,6 +1,6 @@
 module Beaker
   # central definition of this gem's version
   module TestmodeSwitcher
-    VERSION = "0.2.1".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-testmode_switcher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Puppet Labs
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Let's you run your puppet module tests in master/agent, apply or local mode.