vanagon 0.15.8 → 0.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b888b83c086532fafab1b26a95612b9aec0c1449
-  data.tar.gz: 0f83ce37ec9de2f7a2d300a39c4c13be2fa31e5e
+  metadata.gz: d495893440327f099e0b318c1d7e5966a7c186e6
+  data.tar.gz: c626b8ca9a1e48dbe0d08d6bc3857e7226223233
 SHA512:
-  metadata.gz: cb032a8851cf6ca13d90d6b68093d91fc0bd0b9bb3750f426a77d34471697cee71f98cffa8783da7bf91180e814f4ac0fbb4b821585e02c4802353a3d5b6e09e
-  data.tar.gz: 50c1814cc34f4be7182b4cce7b41c8852041de4b8a9fa7c8c9775195287e70db9ae9d3557a4605f82d38bebcbba6e4b2cc791264004b6c9034bf979a9907ea30
+  metadata.gz: 78aee1207d6b21ac432bf07bda73f9491d1b19ae80271b545fad51e1cffcf27e8b3f5adba2a3b70bf1713c555feb5000a6b8f50a0f40b0fc184d9e49b3c21127
+  data.tar.gz: b81d5f2cf49c8de57cbbc4d5b952eaecaed7af319a03b500c9aaa1c001b91cff03584e20976470caf84dccae6858cf1572dad59e2f26553ee5c1c1939b00a51f

data/lib/vanagon/component.rb

@@ -175,6 +175,7 @@ class Vanagon
       @preremove_actions = []
       @postremove_actions = []
       @install_only = false
+      @service = []
     end
 
     # Adds the given file to the list of files and returns @files.

data/lib/vanagon/component/dsl.rb

@@ -163,36 +163,40 @@ class Vanagon
       #
       # @param service_file [String] path to the service file relative to the source
       # @param default_file [String] path to the default file relative to the source
-      # @param service_name [String] name of the service
-      # @param service_type [String] type of the service (network, application, system, etc)
-      # @param link_target [String] executable service file should be linked to
-      def install_service(service_file, default_file = nil, service_name = @component.name, service_type: nil, link_target: nil) # rubocop:disable Metrics/AbcSize
-        case @component.platform.servicetype
+      # @param options optional extra parameters
+      #        service_name [String] name of the service
+      #        service_type [String] type of the service (network, application, system, etc)
+      #        link_target [String] executable service file should be linked to
+      def install_service(service_file, default_file = nil, service_name = @component.name, **options) # rubocop:disable Metrics/AbcSize
+        init_system = options[:init_system] || @component.platform.servicetype
+        servicedir = @component.platform.get_service_dir(init_system)
+
+        case init_system
         when "sysv"
-          target_service_file = File.join(@component.platform.servicedir, service_name)
+          target_service_file = File.join(servicedir, service_name)
           target_default_file = File.join(@component.platform.defaultdir, service_name)
           target_mode = '0755'
           default_mode = '0644'
         when "systemd"
-          target_service_file = File.join(@component.platform.servicedir, "#{service_name}.service")
+          target_service_file = File.join(servicedir, "#{service_name}.service")
           target_default_file = File.join(@component.platform.defaultdir, service_name)
           target_mode = '0644'
           default_mode = '0644'
         when "launchd"
-          target_service_file = File.join(@component.platform.servicedir, "#{service_name}.plist")
+          target_service_file = File.join(servicedir, "#{service_name}.plist")
           target_mode = '0644'
           default_mode = '0644'
         when "smf"
-          target_service_file = File.join(@component.platform.servicedir, service_type.to_s, "#{service_name}.xml")
+          target_service_file = File.join(servicedir, options[:service_type].to_s, "#{service_name}.xml")
           target_default_file = File.join(@component.platform.defaultdir, service_name)
           target_mode = '0644'
           default_mode = '0755'
         when "aix"
-          @component.service = OpenStruct.new(:name => service_name, :service_command => File.read(service_file).chomp)
+          @component.service << OpenStruct.new(:name => service_name, :service_command => File.read(service_file).chomp)
           # Return here because there is no file to install, just a string read in
           return
         when "windows"
-          @component.service = OpenStruct.new(\
+          @component.service << OpenStruct.new(\
             :bindir_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '').upcase}BINDIR", \
             :service_file => service_file, \
             :component_group_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '')}Component"\
@@ -200,13 +204,13 @@ class Vanagon
           # return here as we are just collecting the name of the service file to put into the harvest filter list.
           return
         else
-          fail "Don't know how to install the #{@component.platform.servicetype}. Please teach #install_service how to do this."
+          fail "Don't know how to install the #{init_system}. Please teach #install_service how to do this."
         end
 
         # Install the service and default files
-        if link_target
-          install_file(service_file, link_target, mode: target_mode)
-          link link_target, target_service_file
+        if options[:link_target]
+          install_file(service_file, options[:link_target], mode: target_mode)
+          link options[:link_target], target_service_file
         else
           install_file(service_file, target_service_file, mode: target_mode)
         end
@@ -217,7 +221,7 @@ class Vanagon
         end
 
         # Register the service for use in packaging
-        @component.service = OpenStruct.new(:name => service_name, :service_file => target_service_file, :type => service_type)
+        @component.service << OpenStruct.new(:name => service_name, :service_file => target_service_file, :type => options[:service_type])
       end
 
       # Copies a file from source to target during the install phase of the component

data/lib/vanagon/platform.rb

@@ -32,6 +32,9 @@ class Vanagon
     # Where does a given platform expect to find init scripts/service files?
     # e.g. /etc/init.d, /usr/lib/systemd/system
     attr_accessor :servicedir
+    # Array of OpenStructs containing the servicetype and the corresponding
+    # servicedir
+    attr_accessor :servicetypes
     # Where does a given platform's init system expect to find
     # something resembling 'defaults' files. Most likely to apply
     # to Linux systems that use SysV-ish, upstart, or systemd init systems.
@@ -239,6 +242,7 @@ class Vanagon
       # Our first attempt at defining metadata about a platform
       @cross_compiled ||= false
       @valid_operators ||= ['<', '>', '<=', '>=', '=']
+      @servicetypes = []
     end
 
     def shell # rubocop:disable Lint/DuplicateMethods
@@ -530,5 +534,33 @@ class Vanagon
     def validate_operator(operator_string)
       valid_operators.include?(operator_string)
     end
+
+    # Get all configured service types (added through plat.servicetype)
+    # @return array of service types, empty array if none have been configured
+    def get_service_types
+      if @servicetypes.any?
+        @servicetypes.flat_map(&:servicetype).compact
+      elsif @servicetype
+        [@servicetype]
+      else
+        []
+      end
+    end
+
+    # Get configured service dir (added through plat.servicedir, or plat.servicetype 'foo', servicedir: 'bar')
+    # @param servicetype the service type you want the service dir for (optional)
+    # @raises VanagonError if more than one service dir is found
+    def get_service_dir(servicetype = '')
+      if @servicetypes.empty?
+        return @servicedir
+      end
+      servicedir = @servicetypes.select { |s| s.servicetype.include?(servicetype) }.flat_map(&:servicedir).compact
+
+      if servicedir.size > 1
+        raise Vanagon::Error, "You can only have one service dir for each service type. Found '#{servicedir.join(',')}' for service type #{servicetype}"
+      end
+
+      servicedir.first
+    end
   end
 end

data/lib/vanagon/platform/dsl.rb

@@ -9,6 +9,7 @@ require 'vanagon/platform/solaris_10'
 require 'vanagon/platform/solaris_11'
 require 'vanagon/platform/windows'
 require 'securerandom'
+require 'ostruct'
 require 'uri'
 
 class Vanagon
@@ -218,6 +219,11 @@ class Vanagon
       # @param dir [String] Directory where service files live on the platform
       def servicedir(dir)
         @platform.servicedir = dir
+
+        # Add to the servicetypes array if we haven't already
+        if @platform.servicetype && @platform.servicedir && @platform.servicetypes.select { |s| s.servicetype == @platform.servicetype }.empty?
+          @platform.servicetypes << OpenStruct.new(:servicetype => @platform.servicetype, :servicedir => @platform.servicedir)
+        end
       end
 
       # Set the directory where default or sysconfig files live for the platform
@@ -230,8 +236,18 @@ class Vanagon
       # Set the servicetype for the platform so that services can be installed correctly.
       #
       # @param type [String] service type for the platform ('sysv' for example)
-      def servicetype(type)
-        @platform.servicetype = type
+      # @param servicedir [String] service dir for this platform and service type ('/etc/init.d' for example). Optional.
+      def servicetype(type, servicedir: nil) # rubocop:disable Metrics/AbcSize
+        if servicedir
+          @platform.servicetypes << OpenStruct.new(:servicetype => type, :servicedir => servicedir)
+        else
+          @platform.servicetype = type
+        end
+
+        # Add to the servicetypes array if we haven't already
+        if @platform.servicetype && @platform.servicedir && @platform.servicetypes.select { |s| s.servicetype == @platform.servicetype }.empty?
+          @platform.servicetypes << OpenStruct.new(:servicetype => @platform.servicetype, :servicedir => @platform.servicedir)
+        end
       end
 
       # Set the list of possible host to perform a build on (when not using

data/lib/vanagon/project.rb

@@ -289,10 +289,14 @@ class Vanagon
     # will return nil
     #
     # @param [string] name of service to grab
-    # @return [@component.service obj] specific service
+    # @return [@component.service obj] specific service, or array of services
+    #         if there's more than one
     def get_service(name)
       components.each do |component|
         if component.name == name
+          if component.service.size == 1
+            return component.service.first
+          end
           return component.service
         end
       end

data/resources/deb/postinst.erb

@@ -2,18 +2,23 @@
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-if [ -z "$2" ]; then
-  systemctl enable <%= service.name %>.service >/dev/null || :
-else
-  systemctl try-restart <%= service.name %>.service >/dev/null || :
+  <%- if service.init_system.nil? || service.init_system.eq?('systemd') -%>
+if [ -d '/run/systemd/system' ] ; then
+  if [ -z "$2" ]; then
+    systemctl enable <%= service.name %>.service >/dev/null || :
+  else
+    systemctl try-restart <%= service.name %>.service >/dev/null || :
+  fi
 fi
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ -x "<%= service.service_file %>" ]; then
-  update-rc.d <%= service.name %> defaults > /dev/null
+  <%- end -%>
+  <%- if service.init_system.nil? || service.init_system.eq?('sysv') -%>
+if [ ! -d '/run/systemd/system' ] ; then
+  if [ -x "<%= service.service_file %>" ]; then
+    update-rc.d <%= service.name %> defaults > /dev/null
 
-  if [ -n "$2" ]; then
-    invoke-rc.d <%= service.name %> condrestart || true
+    if [ -n "$2" ]; then
+      invoke-rc.d <%= service.name %> condrestart || true
+    fi
   fi
 fi
   <%- end -%>
@@ -27,17 +32,17 @@ fi
 
 # Set up any specific permissions needed...
 <%- (get_directories + get_configfiles + get_files).select { |pathname| pathname.has_overrides? }.uniq.each do |file_or_directory| -%>
-  <%= "chmod '#{file_or_directory.mode}' '#{file_or_directory.path}'" if file_or_directory.mode %>
+  <%= "chmod '#{file_or_directory.mode}' '#{file_or_directory.path}' &>/dev/null ||:" if file_or_directory.mode %>
   <%- if file_or_directory.owner -%>
     if getent passwd '<%= file_or_directory.owner %>' &> /dev/null; then
-      chown '<%= file_or_directory.owner %>' '<%= file_or_directory.path %>'
+      chown '<%= file_or_directory.owner %>' '<%= file_or_directory.path %>' &>/dev/null ||:
     else
       echo "Error updating '<%= file_or_directory.path %>': user '<%= file_or_directory.owner %>' does not exist."
     fi
   <%- end -%>
   <%- if file_or_directory.group -%>
     if getent group '<%= file_or_directory.group %>' &> /dev/null; then
-      chgrp '<%= file_or_directory.group %>' '<%= file_or_directory.path %>'
+      chgrp '<%= file_or_directory.group %>' '<%= file_or_directory.path %>' &>/dev/null ||:
     else
       echo "Error updating '<%= file_or_directory.path %>': group '<%= file_or_directory.group %>' does not exist."
     fi

data/resources/deb/postrm.erb

@@ -13,11 +13,11 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-systemctl daemon-reload >/dev/null 2>&1 || :
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ "$1" = "purge" ] ; then
-  update-rc.d <%= service.name %> remove > /dev/null
+if [ -d '/run/systemd/system' ] ; then
+  systemctl daemon-reload >/dev/null 2>&1 || :
+else
+  if [ "$1" = "purge" ] ; then
+    update-rc.d <%= service.name %> remove > /dev/null
+  fi
 fi
-  <%- end -%>
 <%- end -%>

data/resources/deb/prerm.erb

@@ -13,15 +13,19 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-if [ "$1" = remove ]; then
-  systemctl --no-reload disable <%= service.name %>.service > /dev/null 2>&1 || :
-  systemctl stop <%= service.name %>.service > /dev/null 2>&1 || :
+  <%- if service.init_system.nil? || service.init_system.eq?('systemd') -%>
+if [ -d '/run/systemd/system' ] ; then
+  if [ "$1" = remove ]; then
+    systemctl --no-reload disable <%= service.name %>.service > /dev/null 2>&1 || :
+    systemctl stop <%= service.name %>.service > /dev/null 2>&1 || :
+  fi
 fi
-
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ -x "<%= service.service_file %>" ] && [ "$1" = remove ]; then
-  invoke-rc.d <%= service.name %> stop || true
+  <%- end -%>
+  <%- if service.init_system.nil? || service.init_system.eq?('sysv') -%>
+if [ ! -d '/run/systemd/system' ] ; then
+  if [ -x "<%= service.service_file %>" ] && [ "$1" = remove ]; then
+    invoke-rc.d <%= service.name %> stop || true
+  fi
 fi
   <%- end -%>
 <%- end -%>

data/resources/rpm/project.spec.erb

@@ -76,7 +76,7 @@ Requires(post): /bin/touch
 <%- end -%>
 
 <%- if has_services? -%>
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
 BuildRequires:    systemd
 %{?systemd_requires}
@@ -86,7 +86,7 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     <%- if @platform.is_sles? -%>
 Requires: aaa_base
     <%- elsif @platform.is_linux? -%>
@@ -230,15 +230,15 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
   #
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_add_post <%= service.name %>.service
     <%- else -%>
       %systemd_post <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     chkconfig --add <%= service.name %> >/dev/null 2>&1 || :
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
     if /usr/bin/lssrc -s <%= service.name -%> > /dev/null 2>&1; then
       /usr/bin/chssys -s <%= service.name -%> -p <%= service.service_command -%> -w 7 -S -n 15 -f 9 > /dev/null 2>&1 || :
     else
@@ -279,17 +279,17 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
   #
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_del_postun <%= service.name %>.service
     <%- else -%>
       %systemd_postun_with_restart <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     if [ "$1" -eq 1 ]; then
       /sbin/service <%= service.name %> condrestart || :
     fi
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
     if  [ "$1" -eq 0 ]; then
       /usr/bin/rmssys -s <%= service.name -%> > /dev/null 2>&1 || :
       /usr/sbin/rmitab <%= service.name -%> > /dev/null 2>&1 || :
@@ -310,18 +310,18 @@ if [ "$1" -eq 0 ] ; then
 fi
 
 <%- get_services.each do |service| -%>
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_del_preun <%= service.name %>.service
     <%- else -%>
       %systemd_preun <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     if [ "$1" -eq 0 ]; then
       /sbin/service <%= service.name %> stop >/dev/null 2>&1 || :
       chkconfig --del <%= service.name %> || :
     fi
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
       # stop the service only on a real uninstall, not on upgrades
       if [ "$1" -eq 0 ] ; then
           /usr/bin/stopsrc -s <%= service.name -%> > /dev/null 2>&1 || :

data/spec/lib/vanagon/component/dsl_spec.rb

@@ -33,6 +33,16 @@ end" }
     plat._platform
   }
 
+  let (:dummy_platform_sysv_or_systemd) {
+    plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+    plat.instance_eval("platform 'debian-8-x86_64' do |plat|
+                       plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                       plat.servicetype 'systemd', servicedir: '/usr/lib/systemd/system'
+                       plat.defaultdir '/etc/default'
+                       end")
+    plat._platform
+  }
+
   let (:dummy_platform_smf) {
     plat = Vanagon::Platform::DSL.new('debian-11-i386')
     plat.instance_eval("platform 'debian-11-i386' do |plat|
@@ -567,15 +577,15 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test', mode: '0755'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'reads from a file when the OS is AIX for services' do
       comp = Vanagon::Component::DSL.new('service-test', {}, dummy_platform_aix)
       comp.install_service('spec/fixtures/component/mcollective.service', nil, 'mcollective')
-      expect(comp._component.service.name).to eq('mcollective')
-      expect(comp._component.service.service_command).to include('/opt/puppetlabs/puppet/bin/ruby')
-      expect(comp._component.service.service_command).not_to include("\n")
+      expect(comp._component.service.flat_map(&:name).compact).to include('mcollective')
+      expect(comp._component.service.flat_map(&:service_command).compact.first).to include('/opt/puppetlabs/puppet/bin/ruby')
+      expect(comp._component.service.flat_map(&:service_command).compact.first).not_to include("\n")
     end
 
     it 'adds the correct command to the install for the component for systemd platforms' do
@@ -594,7 +604,34 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/usr/lib/systemd/system/service-test.service', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
+    end
+
+    it 'adds the correct command when installing both systemd and sysv' do
+      comp = Vanagon::Component::DSL.new('service-test', {}, dummy_platform_sysv_or_systemd)
+      comp.install_service('component-client.init', 'component-client.sysconfig', init_system: 'sysv')
+      comp.install_service('component-client.service', 'component-client.sysconfig', init_system: 'systemd')
+      # Look for servicedir creation and copy - sysv
+      expect(comp._component.install).to include("install -d '/etc/init.d'")
+      expect(comp._component.install).to include("cp -p 'component-client.init' '/etc/init.d/service-test'")
+
+      # Look for servicedir creation and copy - systemd
+      expect(comp._component.install).to include("install -d '/usr/lib/systemd/system'")
+      expect(comp._component.install).to include("cp -p 'component-client.service' '/usr/lib/systemd/system/service-test.service'")
+
+      # Look for defaultdir creation and copy
+      expect(comp._component.install).to include("install -d '/etc/default'")
+      expect(comp._component.install).to include("cp -p 'component-client.sysconfig' '/etc/default/service-test'")
+
+      # Look for files and configfiles - sysv
+      expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('/etc/default/service-test'))
+      expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test', mode: '0755'))
+
+      # Look for files and configfiles - systemd
+      expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/usr/lib/systemd/system/service-test.service', mode: '0644'))
+
+      # The component should now have a service registered
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'adds the correct command to the install for smf services using a service_type' do
@@ -613,7 +650,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/var/svc/manifest/network/service-test.xml', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'adds the correct command to the install for smf services' do
@@ -632,7 +669,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/var/svc/manifest/service-test.xml', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'installs the file as a link when link_target is specified' do
@@ -653,7 +690,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
   end
 

data/spec/lib/vanagon/platform_spec.rb

@@ -1,6 +1,33 @@
 require 'vanagon/platform'
 
 describe "Vanagon::Platform" do
+  let(:deb_platform_just_servicedir) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicedir '/etc/init.d'
+                                       end
+                                       "}
+  let(:deb_platform_just_servicetype) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv'
+                                       end
+                                       "}
+  let(:deb_platform_multi_servicetypes) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                                       plat.servicetype 'systemd', servicedir: '/lib/systemd/system'
+                                       end
+                                       "}
+  let(:deb_platform_no_service) { "platform 'debian-test-fixture' do |plat|
+                                       end
+                                       "}
+  let(:deb_platform_servicetype) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv'
+                                       plat.servicedir '/etc/init.d'
+                                       end
+                                       "}
+  let(:deb_platform_bad_servicedir_block) { "platform 'debian-test-fixture' do |plat|
+                                            plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                                            plat.servicetype 'sysv', servicedir: '/etc/rc.d'
+                                            end
+                                            "}
+
   let(:platforms) do
     [
       {
@@ -172,4 +199,57 @@ describe "Vanagon::Platform" do
       end
     end
   end
+
+  describe "#get_service_type" do
+    it "returns plat.servicetype if that's the only thing set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_just_servicetype)
+      expect(plat._platform.get_service_types).to include('sysv')
+    end
+
+    it "returns from servicetypes if that's set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_servicetype)
+      expect(plat._platform.get_service_types).to include('sysv')
+    end
+
+    it "returns multiples if there's more than one" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_multi_servicetypes)
+      expect(plat._platform.get_service_types).to include('sysv')
+      expect(plat._platform.get_service_types).to include('systemd')
+    end
+
+    it "returns an empty array if nothing is set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_no_service)
+      expect(plat._platform.get_service_types.size).to eq(0)
+    end
+  end
+
+  describe "#get_service_dir" do
+    it "returns plat.servicedir if that's the only thing set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_just_servicedir)
+      expect(plat._platform.get_service_dir).to eq('/etc/init.d')
+    end
+
+    it "returns servicedirs set via servicetype" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_servicetype)
+      expect(plat._platform.get_service_dir).to eq('/etc/init.d')
+    end
+
+    it "returns the servicedir based on servicetype" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_multi_servicetypes)
+      expect(plat._platform.get_service_dir('systemd')).to eq('/lib/systemd/system')
+    end
+
+    it "fails if there are >1 servicedir for a service type" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_bad_servicedir_block)
+      expect { plat._platform.get_service_dir('sysv') }.to raise_error(Vanagon::Error)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.8
+  version: 0.15.9
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -264,41 +264,41 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/git/rev_list_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/utilities_spec.rb