beaker-testmode_switcher 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b6fa280da0e2d74f94c99172bbdc84a0fd136eb
-  data.tar.gz: b7d5add69806870c20e23ee07e24412678c98dae
+  metadata.gz: 3e5e98040bb38ccc30cecf1a0c3105dcd152b82e
+  data.tar.gz: c6a864d09aec964392418110e6660402f2a37540
 SHA512:
-  metadata.gz: 43b4c25be5bdd16a76c56d57e7e8935ccc5e58cb83fa275f57404fc20218d8f93c876389ed5e367d99622fdf161313f0a6922d54efb1f1bfc5fde0242f6318d2
-  data.tar.gz: bb9b824bfd40e4dd11da7ca1bf3948cc83a3c1b61ab97c89ab96c48f706aec78f2f183418020ec3d0bd72d1b7c1a1a323f1b52063bf49ca7f0cd2e31ef3f4617
+  metadata.gz: ea53e552475d862693ff0a0b92cae19aea7cb235a4d290ba137d14ef0b6311f3d4003592db6cc8e333377a5b62ac388531399d7c1221b9ade06c5a3f1a4163f7
+  data.tar.gz: 5fd3d099591b07fc46cdc27f3d6b0c511da666d79a4c49c2d2b170ed119fee39c9156e0b7bdbb9f54d16cafbf7589d8143dc1721f9f07bf6577bc7d9e5da1fca

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 # increase the default metric limits to more realistic levels
 Metrics/BlockLength:
   Max: 200
@@ -28,7 +30,7 @@ Style/PercentLiteralDelimiters:
 Style/StringLiterals:
   Enabled: false
 
-Style/MultilineMethodCallBraceLayout:
+Layout/MultilineMethodCallBraceLayout:
   Enabled: false
 
 Style/FrozenStringLiteralComment:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2017-06-02 Version 0.2.1
+### Summary
+Fixes for shell_ex when running on Windows; and a minor README update.
+
 # 2017-03-03 Version 0.2.0
 ### Summary
 Make use of catch_changes, catch_failures, expect_changes and expect_failures. This makes beaker-testmode_switcher easier to integrate into modules.
@@ -7,11 +11,11 @@ Make use of catch_changes, catch_failures, expect_changes and expect_failures. T
 - Fix docs issue where `execute_manifest` options were listed under `resource
 
 # 2017-01-19 - Version 0.1.1
-###Summary
+### Summary
 
 This release adds a feature that provides control of specific nodes you would like to run an agent run on. Previously it was only possible to run on the default node.
 
-###Features
+### Features
 - Add execute_manifest_on() function
 - Add MAINTAINERS file
 - Addressing Rubocop errors

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'rake', '~> 10.0'
   gem 'rspec', '~> 3' unless ENV['TEST_FRAMEWORK'] && ENV['TEST_FRAMEWORK'] == 'beaker' # Don't install rpsec if the module is in beaker only mode
   gem 'rubocop', require: false
+  gem 'rubocop-rspec', require: false
 end
 
 group :development do

data/Guardfile

@@ -2,8 +2,7 @@
 # More info at https://github.com/guard/guard#readme
 
 ## Uncomment and set this to only include directories you want to watch
-directories %w(lib spec) \
-  .select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") }
+directories(%w(lib spec).select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") })
 
 ## Note: if you are using the `directories` clause above and you are not
 ## watching the project directory ('.'), then you will want to move

data/README.md

@@ -1,12 +1,12 @@
 # Beaker::TestmodeSwitcher
 
-When testing modules with beaker, you need to choose up-front whether to drive the tests using `puppet apply` or a master/agent setup. While choosing the apply approach is tempting due to the reduced resource usage, everyone is running master/agent setups, and those have subtle differences to `puppet apply` that might trip up your code. To solve this dilemma, use this gem to choose the test mode at runtime!
+When testing modules and other Puppet software with beaker, you need to choose up-front whether to drive the tests using `puppet apply` directly on an agent VM; or using a master/agent setup; or by running the code directly on your workstation. While choosing the apply approach is tempting due to the reduced resource usage, most Puppet deployments are running master/agent setups, and those have subtle differences to `puppet apply` that might trip up your code. To solve this dilemma, use this gem to choose the test mode at runtime!
 
-Beaker::TestmodeSwitcher supports running tests in master/agent mode, or using `puppet apply` or locally without any setup.
+Beaker::TestmodeSwitcher supports running tests in master/agent mode, or using `puppet apply` on an agent host, or locally without any setup.
 
 ## Usage
 
-Set up you module for beaker testing as usual. Additionally add
+Set up your module for beaker testing as usual. Additionally add
 
 ```ruby
 gem 'beaker-testmode_switcher'
@@ -22,9 +22,9 @@ to your `spec/spec_helper_acceptance.rb` to enable the DSL extensions. Instead o
 
 The `BEAKER_TESTMODE` environment variable determines how the tests are run:
 
-* `local`: No VMs are provisioned and tests are run with `puppet apply` using the context of your test runner. This mode uses the least resources and is great for development, but may require running the tests as root and could trash the system.
-* `apply`: VMs are provisioned as normal (determined by the nodeset) and tests are run with `puppet apply` on the specified node. This mode only requires a single VM and is great for running the tests in an isolated environment. When the nodeset has more than one node, exactly one has to have the 'default' role assigned. This will be the node to execute the manifests.
-* `agent`: VMs are provisioned as normal (determined by the nodeset). When running tests, the manifest is uploaded to the master and a full `puppet agent` run is kicked off on the specified node. This mode requires multiple VMs and a more involved provisioning step, but the tests run in a very production-like environment to ensure highest fidelity of the test results. The nodeset needs to contain one node with the 'master' role assigned. This will be the node to receive the manifest. When the nodeset has more than one node, exactly one has to have the 'default' role assigned. This will be the node to execute the puppet agent.
+* `local`: No VMs are provisioned and tests are run using the context of your test runner. This mode is great for development, but may require running the tests as root and may cause unwanted system changes to your workstation.
+* `apply`: VMs are provisioned as normal (determined by the nodeset) and tests of Puppet manifests are run with `puppet apply` on the specified node. This mode only requires a single VM and is great for running the tests in an isolated environment. When the nodeset has more than one node, exactly one has to have the 'default' role assigned. This will be the node to execute the manifests.
+* `agent`: VMs are provisioned as normal (determined by the nodeset). When running tests with Puppet manifests, the manifest is uploaded to the master and a `puppet agent` run is kicked off on the specified node. This mode requires multiple VMs and a more involved provisioning step, but the tests run in a more production-like environment to ensure highest fidelity of the test results. The nodeset needs to contain one node with the 'master' role assigned. This will be the node to receive the manifest. When the nodeset has more than one node, exactly one has to have the 'default' role assigned. This will be the node to execute the puppet agent.
 
 ## Acceptance tests
 
@@ -89,7 +89,11 @@ 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 release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. 
+
+### Releasing
+
+To release a new version, update the version number in `lib/beaker/testmode_switcher/version.rb`, update CHANGELOG.md, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/Rakefile

@@ -4,7 +4,7 @@ def beaker_command
   cmd_parts = []
   cmd_parts << "beaker"
   cmd_parts << "--debug"
-  cmd_parts << "--test spec/test"
+  cmd_parts << "--tests spec/test"
   cmd_parts << "--load-path lib"
   cmd_parts.flatten.join(" ")
 end
@@ -24,13 +24,14 @@ task :beaker do
   abort "Beaker test failed" unless system(beaker_command) == true
 end
 
-task :rubocop do
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # These make the rubocop experience maybe slightly less terrible
+  task.options = ['-D', '-S', '-E']
 end
 
 begin
-  task default: [:spec, :rubocop]
+  task default: %i[spec rubocop]
 rescue LoadError => error
   raise "LoadError for default rake target. [#{error}] "
 end

data/beaker-testmode_switcher.gemspec

@@ -1,4 +1,5 @@
 # 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/dsl.rb

@@ -5,7 +5,7 @@ module Beaker
     # include this module into your namespace to access the DSL parts of TestmodeSwitcher
     module DSL
       # pass through methods to the runner
-      [:create_remote_file_ex, :scp_to_ex, :shell_ex, :resource, :execute_manifest, :execute_manifest_on].each do |name|
+      %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)
         end

data/lib/beaker/testmode_switcher/local_runner.rb

@@ -117,7 +117,12 @@ module Beaker
             ready[0].each do |f|
               fileno = f.fileno
               begin
-                data = f.read_nonblock(1024)
+                begin
+                  data = f.read_nonblock(1024)
+                rescue IO::WaitReadable, Errno::EINTR
+                  IO.select([f])
+                  retry
+                end
                 until data.empty?
                   $stdout.write(data)
 
@@ -138,10 +143,14 @@ module Beaker
                     data = f.read_nonblock(1024)
                   rescue IO::EAGAINWaitReadable
                     data = ""
+                  rescue IO::WaitReadable, Errno::EINTR
+                    IO.select([f])
+                    retry
                   end
                 end
-              rescue EOFError # rubocop:disable Lint/HandleExceptions: expected exception
+              rescue EOFError, Errno::EBADF # rubocop:disable Lint/HandleExceptions: expected exception
                 # pass on EOF
+                # Also pass on Errno::EBADF (Bad File Descriptor) as it is thrown for Ruby 2.1.9 on Windows
               end
             end
           end

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.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

metadata

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