beaker-testmode_switcher 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ff5d01994fcc8fd23b932a148f2652929885a9
-  data.tar.gz: 1f09d49b242599f033255c7089837cf7a75fd19a
+  metadata.gz: ec3225e801b5af3ffb139c419e33d48567da102e
+  data.tar.gz: 0fcf5b39a4f30a8082a2c96c7aabf57b13fdb84a
 SHA512:
-  metadata.gz: 29e63bc99d6a810af62c3695f6a9447e81c73428a38367b95534e9cb38c801ddc8896cc9f484c93ad182ad639136e0240963e06bb7dc154ec5b3bce49faaf79e
-  data.tar.gz: 9ead4a0fc8906c2703c2fb66e7befd317fcd6b4b6a77c0684f9c777d18e0dcf2565fc38cba2c23ce6d9935af51e534d4d80c85bcc0b6ab979a859fafa373bfb5
+  metadata.gz: 583f09db223c94c6071b262bdb4898bb9e06ef7fe03ecea1fd77e416014cb32e369cf2fb436dbb603a8ff531796ec528036f87857e79052f290e82ed61924139
+  data.tar.gz: 60d24646077a43f5a1407d71ef8836d6a8811af011326850b69fcb5abea31f72037dd76b3fe3e410604fd63e63136bb51cadf35323664110f7ea5170867dea56

data/.travis.yml

@@ -3,8 +3,7 @@ cache: bundler
 bundler_args: --without development
 rvm:
   - 2.4.1
-  - 2.3.1
-  - 2.1.6
+  - 2.1.9
 env:
-  - TEST_FRAMEWORK="beaker-rspec"
+  - TEST_FRAMEWORK="rspec"
   - TEST_FRAMEWORK="beaker"

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2018-03-07 Version 0.4.0
+### Summary
+Adds the ability for execute_manifest_on to work in both agent and apply; improvements for create_remote_file_ex.
+
+### Features
+- Adds support for `execute_manifest_on` with `BEAKER_TESTMODE` set to `apply`
+
+### BugFixes
+- Fixes `create_remote_file_ex` so that opts accepts `:owner` instead of `:user`
+- Improves content handling for `create_remote_file_ex`
+- Minor fixes to option handling
+
 # 2017-06-08 Version 0.3.0
 ### Summary
 Adds a new parameter for shell_ex; and improvements for local test running.

data/README.md

@@ -42,10 +42,10 @@ To run the tests `bundle exec rake`
 
 This experimental version supports only a minimal set of functionality from the beaker DSL:
 
-* `create_remote_file_ex(file_path, file_content, opts = {})`: Creates a file at `file_path` with the content specified in `file_content` on the default node. `opts` can have the keys `:mode`, `:user`, and `:group` to specify the permissions, owner, and group respectively.
+* `create_remote_file_ex(file_path, file_content, opts = {})`: Creates a file at `file_path` with the content specified in `file_content` on the default node. `opts` can have the keys `:mode`, `:owner`, and `:group` to specify the permissions, owner, and group respectively.
+
+* `execute_manifest_on(hosts, manifest, opts = {})`: Execute the manifest on all nodes. This will only work when `BEAKER_TESTMODE` is set to `agent` or `apply`, and is not yet supported for `local`.
 
-* `execute_manifest_on(hosts, manifest, opts = {})`: Execute the manifest on all nodes. This will only work when `BEAKER_TESTMODE`, is set to `agent` and it will run a `puppet agent` run.
-  
   `opts` keys:
   * `:debug`, `:trace`, `:noop`: set to true to enable the puppet option of the same name.
   * `:dry_run`: set to true to skip executing the actual command.
@@ -56,7 +56,7 @@ This experimental version supports only a minimal set of functionality from the
   * `:expect_failures` enables detailed exit codes and causes a test failure if the puppet run indicates there were no failure during its execution.
 
 * `execute_manifest(manifest, opts = {})`: Execute the manifest on the default node. Depending on the `BEAKER_TESTMODE` environment variable, this may use `puppet agent` or `puppet apply`. Calls execute_manifest_on when `BEAKER_TESTMODE`=`agent`
-  
+
   `opts` keys:
   * `:debug`, `:trace`, `:noop`: set to true to enable the puppet option of the same name.
   * `:dry_run`: set to true to skip executing the actual command.
@@ -91,7 +91,7 @@ Other helpful methods:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. 
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ### Releasing
 

data/beaker-testmode_switcher.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'beaker/testmode_switcher/version'

data/lib/beaker/testmode_switcher/beaker_runners.rb

@@ -19,12 +19,12 @@ module Beaker
       # create a remote file (using puppet apply) on the default host
       def create_remote_file_ex(file_path, file_content, options = {})
         mode = options[:mode] || '0644'
-        user = options[:user] || 'root'
+        owner = options[:owner] || 'root'
         group = options[:group] || 'root'
-        file_content.tr!(/\\/, '\\')
-        file_content.tr!(/'/, "\\'")
-        file_content.tr!(/\n/, '\\n')
-        apply_manifest_on default, "file { '#{file_path}': ensure => present, content => '#{file_content}', mode => '#{mode}', user => '#{user}', group => '#{group}' }", catch_failures: true
+        file_content.gsub!(/\\/, '\\\\')
+        file_content.gsub!(/"/, '\\"')
+        file_content.gsub!(/\n/, '\n')
+        apply_manifest_on default, "file { '#{file_path}': ensure => present, content => \"#{file_content}\", mode => '#{mode}', owner => '#{owner}', group => '#{group}' }", catch_failures: true
       end
 
       # execute a puppet resource command on the default host
@@ -105,9 +105,16 @@ module Beaker
     class BeakerApplyRunner < BeakerRunnerBase
       # execute the manifest by running puppet apply on the default node
       def execute_manifest(manifest, opts = {})
+        execute_manifest_on(default, manifest, opts)
+      end
+
+      # execute the manifest by running puppet apply on all the hosts
+      def execute_manifest_on(hosts, manifest, opts = {})
         # acceptable_exit_codes and expect_changes are passed because we want detailed-exit-codes but want to
         # make our own assertions about the responses
-        res = apply_manifest(
+
+        res = apply_manifest_on(
+          hosts,
           manifest,
           debug: opts[:debug],
           dry_run: opts[:dry_run],

data/lib/beaker/testmode_switcher/local_runner.rb

@@ -14,7 +14,7 @@ module Beaker
         file_path_escaped = file_path.shellescape
         commands = []
         commands << "chmod #{opts[:mode].shellescape} #{file_path_escaped}" if opts[:mode]
-        commands << "chown #{opts[:user].shellescape} #{file_path_escaped}" if opts[:user]
+        commands << "chown #{opts[:owner].shellescape} #{file_path_escaped}" if opts[:owner]
         commands << "chgrp #{opts[:group].shellescape} #{file_path_escaped}" if opts[:group]
         if commands.empty?
           success_result
@@ -28,12 +28,14 @@ module Beaker
       # it accepts the following keys: :dry_run, :environment, :trace, :noop, and :debug
       def execute_manifest(manifest, opts = {})
         puts "Applied manifest [#{manifest}]" if ENV['DEBUG_MANIFEST']
-        cmd = ["bundle exec puppet apply -e #{manifest.delete("\n").shellescape} --detailed-exitcodes --modulepath spec/fixtures/modules --libdir lib"]
+        cmd = ["bundle exec puppet apply -e #{manifest.shellescape} --detailed-exitcodes --modulepath spec/fixtures/modules --libdir lib"]
         cmd << "--debug" if opts[:debug]
         cmd << "--noop" if opts[:noop]
         cmd << "--trace" if opts[:trace]
 
-        res = use_local_shell(cmd.join(' '), opts)
+        raise ArgumentError, 'Can\'t handle environment key' if opts.key? :environment
+
+        res = use_local_shell(cmd.join(' '))
         handle_puppet_run_returned_exit_code(get_acceptable_puppet_run_exit_codes(opts), res.exit_code)
 
         res
@@ -53,6 +55,10 @@ module Beaker
         cmd << type.shellescape
         cmd << name.shellescape
 
+        opts.delete(:debug)
+        opts.delete(:noop)
+        opts.delete(:trace)
+
         if opts[:values]
           opts[:values].each do |k, v|
             cmd << "#{k.shellescape}=#{v.shellescape}"

data/lib/beaker/testmode_switcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-testmode_switcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Puppet Labs
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2018-03-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.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Let's you run your puppet module tests in master/agent, apply or local mode.