Replace staging module with archive module

.fixtures.yml

@@ -2,7 +2,7 @@ fixtures:
   repositories:
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
     inifile: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
-    staging: 'https://github.com/voxpupuli/puppet-staging.git'
     concat: 'https://github.com/puppetlabs/puppetlabs-concat.git'
+    archive: 'https://github.com/voxpupuli/puppet-archive.git'
   symlinks:
     splunk: "#{source_dir}"

manifests/forwarder.pp

@@ -73,16 +73,16 @@
   $path_delimiter  = $splunk::params::path_delimiter
   #no need for staging the source if we have yum or apt
   if $pkg_provider != undef and $pkg_provider != 'yum' and $pkg_provider != 'apt' and $pkg_provider != 'chocolatey' {
-    include ::staging
+    include ::archive::staging
 
-    $src_pkg_filename = staging_parse($package_source)
-    $pkg_path_parts   = [$staging::path, $staging_subdir, $src_pkg_filename]
+    $src_pkg_filename = basename($package_source)
+    $pkg_path_parts   = [$archive::path, $staging_subdir, $src_pkg_filename]
     $staged_package   = join($pkg_path_parts, $path_delimiter)
 
-    staging::file { $src_pkg_filename:
-      source => $package_source,
-      subdir => $staging_subdir,
-      before => Package[$package_name],
+    archive { $staged_package:
+      source  => $package_source,
+      extract => false,
+      before  => Package[$package_name],
     }
   }
 

manifests/init.pp

@@ -8,7 +8,7 @@
 #   The source URL for the splunk installation media (typically an RPM, MSI,
 #   etc). If a $src_root parameter is set in splunk::params, this will be
 #   automatically supplied. Otherwise it is required. The URL can be of any
-#   protocol supported by the nanliu/staging module. On Windows, this can
+#   protocol supported by the puppet/archive module. On Windows, this can
 #   be a UNC path to the MSI.
 #
 # [*package_name*]
@@ -73,17 +73,15 @@
   $path_delimiter  = $splunk::params::path_delimiter
 
   if $pkg_provider != undef and $pkg_provider != 'yum' and $pkg_provider != 'apt' and $pkg_provider != 'chocolatey' {
-    include ::staging
-
-    $src_pkg_filename = staging_parse($package_source)
-    $pkg_path_parts   = [$staging::path, $staging_subdir, $src_pkg_filename]
+    include ::archive::staging
+    $src_pkg_filename = basename($package_source)
+    $pkg_path_parts   = [$archive::path, $staging_subdir, $src_pkg_filename]
     $staged_package   = join($pkg_path_parts, $path_delimiter)
 
-    #no need for staging the source if we have yum or apt
-    staging::file { $src_pkg_filename:
-      source => $package_source,
-      subdir => $staging_subdir,
-      before => Package[$package_name],
+    archive { $staged_package:
+      source  => $package_source,
+      extract => false,
+      before  => Package[$package_name],
     }
   }
 

manifests/params.pp

@@ -30,7 +30,7 @@
 #   The root URL at which to find the splunk packages. The sane-default logic
 #   assumes that the packages are located under this URL in the same way that
 #   they are placed on download.splunk.com. The URL can be any protocol that
-#   the nanliu/staging module supports. This includes both puppet:// and
+#   the puppet/archive module supports. This includes both puppet:// and
 #   http://.  The expected directory structure is:
 #
 #     `-- $root_url

manifests/platform/solaris.pp

@@ -13,11 +13,11 @@
 # Requires: nothing
 #
 class splunk::platform::solaris inherits splunk::virtual {
-  include ::staging
+  include ::archive
   include ::splunk::params
   include ::splunk::platform::posix
 
-  $path         = $staging::path
+  $path         = $archive::path
   $subdir       = $splunk::params::staging_subdir
   $responsefile = "${path}/${subdir}/response.txt"
   $adminfile    = '/var/sadm/install/admin/splunk-noask'

metadata.json

@@ -71,13 +71,13 @@
       "name": "puppetlabs-inifile",
       "version_requirement": ">= 1.4.1 < 2.0.0"
     },
-    {
-      "name": "puppet-staging",
-      "version_requirement": ">= 2.0.1 < 3.0.0"
-    },
     {
       "name": "puppetlabs-concat",
       "version_requirement": "4.x"
+    },
+    {
+      "name": "puppet-archive",
+      "version_requirement": ">= 2.0.0 < 3.0.0"
     }
   ]
 }

spec/spec_helper_acceptance.rb

@@ -1,26 +1,18 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'
 
 run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+install_module
+install_module_dependencies
 
 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
-    # Install module and dependencies
     # Need to stage the Splunk/Splunkforwarder packages here.
-    puppet_module_install(source: proj_root, module_name: 'splunk')
-    hosts.each do |host|
-      on host, puppet('module', 'install', 'puppetlabs-stdlib'), acceptable_exit_codes: [0, 1]
-      on host, puppet('module', 'install', 'nanliu-staging'), acceptable_exit_codes: [0, 1]
-      on host, puppet('module', 'install', 'puppetlabs-inifile'), acceptable_exit_codes: [0, 1]
-      on host, puppet('module', 'install', 'puppetlabs-concat'), acceptable_exit_codes: [0, 1]
-    end
   end
 end

spec/spec_helper_system.rb

@@ -0,0 +1,27 @@
+require 'rspec-system/spec_helper'
+require 'rspec-system-puppet/helpers'
+require 'rspec-system-serverspec/helpers'
+include RSpecSystemPuppet::Helpers
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Enable colour
+  c.tty = true
+
+  c.include RSpecSystemPuppet::Helpers
+
+  # This is where we 'setup' the nodes before running our tests
+  c.before :suite do
+    # Install puppet
+    puppet_install
+
+    # Install modules and dependencies
+    puppet_module_install(source: proj_root, module_name: 'splunk')
+    shell('puppet module install puppet-archive --version 2.0.0')
+    shell('puppet module install puppetlabs-stdlib --version 3.0.0')
+    shell('puppet module install puppetlabs-inifile --version 1.0.0')
+    shell('puppet module install puppetlabs-concat --version 4.0.0')
+  end
+end