Merge branch 'master' into 1.2.0

Author: davejrt

.fixtures.yml

@@ -3,5 +3,7 @@ fixtures:
     stdlib: 'puppetlabs-stdlib'
     apt: 'puppetlabs-apt'
     translate: 'puppetlabs-translate'
+    powershell: 'puppetlabs-powershell'
+    reboot: 'puppetlabs-reboot'
   symlinks:
-    docker: "#{source_dir}"
+    docker: "#{source_dir}"

.gitignore

@@ -11,3 +11,4 @@ doc
 log
 Gemfile.lock
 coverage/*
+/vendor/

.rubocop.yml

@@ -23,6 +23,7 @@ RSpec/BeforeAfterAll:
     A necessary evil in acceptance testing.
   Exclude:
   - spec/acceptance/**/*.rb
+  - spec/acceptance_swarm/**/*.rb
 RSpec/HookArgument:
   Description: Prefer explicit :each argument, matching existing module's style
   EnforcedStyle: each

.travis.yml

@@ -4,7 +4,6 @@ bundler_args: --without development system_tests
 before_install: rm Gemfile.lock || true
 sudo: false
 rvm:
-  - 2.1.6
   - 2.2.5
   - 2.3.3
 script:

CONTRIBUTING.md

@@ -81,6 +81,7 @@ run the integration tests against RHEL, CentOS and Debian.
     bundle exec rake acceptance:pooler:ubuntu-1404
     bundle exec rake acceptance:pooler:ubuntu-1604
     bundle exec rake acceptance:pooler:ubuntu-1610
+    bundle exec rake acceptance:pooler:win-2016
     bundle exec rake acceptance:vagrant:centos-70-x64
     bundle exec rake acceptance:vagrant:debian-81-x64
     bundle exec rake acceptance:vagrant:ubuntu-1404-x64

Gemfile

@@ -32,7 +32,7 @@ end
 group :system_tests do
   gem "beaker-puppet_install_helper", :require => false
   gem "beaker-rspec"
-  gem "beaker", "~> 2.0"
+  gem "beaker", "~> 3.13"
 end
 
 group :development do

Guardfile

@@ -15,3 +15,9 @@ group :acceptance do
     watch(%r{^spec\/acceptance\/.+\.rb$})
   end
 end
+
+group :acceptance_swarm do
+  guard :rake, :task => 'acceptance_swarm' do
+    watch(%r{^spec\/acceptance_swarm\/.+\.rb$})
+  end
+end

lib/facter/docker.rb

@@ -1,6 +1,12 @@
 require 'facter'
 require 'json'
 
+docker_command = if Facter.value(:kernel) == 'windows'
+                   'powershell -c docker'
+                 else
+                   'docker'
+                 end
+
 def interfaces
   Facter.value(:interfaces).split(',')
 end
@@ -23,7 +29,7 @@ def interfaces
   setcode do
     if Facter::Util::Resolution.which('docker')
       value = Facter::Core::Execution.execute(
-        "docker version --format '{{json .}}'",
+        "#{docker_command} version --format '{{json .}}'",
       )
       val = JSON.parse(value)
     end
@@ -37,7 +43,7 @@ def interfaces
     if docker_version !~ %r{1[.][0-9][0-2]?[.]\w+}
       if Facter::Util::Resolution.which('docker')
         docker_json_str = Facter::Util::Resolution.exec(
-          "docker info --format '{{json .}}'",
+          "#{docker_command} info --format '{{json .}}'",
         )
         docker = JSON.parse(docker_json_str)
         docker['network'] = {}

lib/puppet/parser/functions/docker_run_flags.rb

@@ -57,10 +57,11 @@ module Puppet::Parser::Functions
     if opts['read_only']
       flags << '--read-only=true'
     end
+    params_join_char = Facter.value(:osfamily).casecmp('windows').zero? ? ' ' : " \\\n"
 
     multi_flags = lambda { |values, format|
       filtered = [values].flatten.compact
-      filtered.map { |val| sprintf(format + " \\\n", val) }
+      filtered.map { |val| sprintf(format + params_join_char, val) }
     }
 
     [
@@ -88,6 +89,6 @@ module Puppet::Parser::Functions
 
     # Some software (inc systemd) will truncate very long lines using glibc's
     # max line length. Wrap options across multiple lines with '\' to avoid
-    flags.flatten.join(" \\\n        ")
+    flags.flatten.join(params_join_char)
   end
 end

lib/puppet/parser/functions/docker_stack_flags.rb

@@ -16,6 +16,10 @@ module Puppet::Parser::Functions
       flags << "--compose-file '#{opts['compose_file']}'"
     end
 
+    if opts['resolve_image'].to_s != 'undef'
+      flags << "--resolve-image '#{opts['resolve_image']}'"
+    end
+
     if opts['prune'].to_s != 'undef'
       flags << "--prune '#{opts['prune']}'"
     end