vanagon 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5dc9e0c896685503aafc10ec2bae7531dd36299289a7b07850db2ec5547f32c
-  data.tar.gz: 8ec86222166a7d4ecd99026c3ca0e46793f2da2b3f284eafe024236bc2449d56
+  metadata.gz: 6fb1135d000a2b468d3a998b6ef1e7547d26f835d06b67f2ba502fb710d1f06b
+  data.tar.gz: ffac33c290bc103a851d8bc9f468ec8a838465ac0e12125446c86a2b22cbde9e
 SHA512:
-  metadata.gz: 54be38ffc28ceb63f22de1dd5912c823881f7d5c0188733960ddfa2c170c959174b181491db92007f8319a762f22cef0ed417ecf44bf3ad7f1305c18e7b89e56
-  data.tar.gz: ea4ff7c8f3ed9ebafc4e9fefbb689464431ff22299fb7c4bc9d1582451c249dba8628c28426b2d9cd9c46526a4e9be9ded30c060bbe70acb5b2d6cb3021174b0
+  metadata.gz: 388e8520c4231c89b4170d3f99ac590caea60e98ebe5ccd2a0b5cee159c595b80b897d45c91dfda3b063da2c636420ae1c8e96a52eb87b17fef1d99d8848ba15
+  data.tar.gz: 1ca438d9b68285bfcf8b269d1fe8217736bad75d868ecb7452fac4a499dab15d3eae8200ab9a4860763c0a5217335f17b4f7561ce58c0984f331356be594607a

data/README.md

@@ -197,8 +197,8 @@ Port of the system where redis is running. Defaults to *6379*.
 ##### `VANAGON_USE_MIRRORS`
 Controls whether component sources are downloaded directly from upstream URLs
 or from configured mirrors. Most Puppet projects using Vanagon default to
-fetching components from internal mirrors. Set this variable to `n` when
-building outside of the Puppet private network to download directly from
+fetching components from internal mirrors. Set this variable to `n` or `false`
+when building outside of the Puppet private network to download directly from
 upstream sources.
 
 ##### `VANAGON_RETRY_COUNT`

data/lib/vanagon/component.rb

@@ -180,6 +180,7 @@ class Vanagon
       @preremove_actions = []
       @postremove_actions = []
       @install_only = false
+      @service = []
     end
 
     # Adds the given file to the list of files and returns @files.
@@ -305,7 +306,7 @@ class Vanagon
     def get_source(workdir) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       opts = options.merge({ workdir: workdir })
       if url || !mirrors.empty?
-        if ENV['VANAGON_USE_MIRRORS'] == 'n'
+        if ENV['VANAGON_USE_MIRRORS'] == 'n' or ENV['VANAGON_USE_MIRRORS'] == 'false'
           fetch_url(opts)
         else
           fetch_mirrors(opts) || fetch_url(opts)

data/lib/vanagon/component/dsl.rb

@@ -168,37 +168,42 @@ 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_type [String] type of the service (network, application, system, etc)
+      #        init_system [String] the init system on which to install service (sysv, systemd)
+      #        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"
           # modify version in smf manifest so service gets restarted after package upgrade
           @component.install << %{#{@component.platform.sed} -ri 's/(<service.*version=)(".*")/\\1"#{Time.now.to_i}"/' #{service_file}}
-          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"\
@@ -206,13 +211,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
@@ -223,7 +228,8 @@ 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], :init_system => init_system)
       end
 
       # Copies a file from source to target during the install phase of the component

data/lib/vanagon/component/source/git.rb

@@ -26,14 +26,38 @@ class Vanagon
           #        git command has failed. Useful in instances where a URL
           #        prompts for credentials despite not being a git remote
           # @return [Boolean] whether #url is a valid Git repo or not
+
+          # [RE-13837] This ought to be the way to do this. Unfortunately,
+          # there's a bug in Git.ls_remote that when ssh prints something like
+          #  Warning: Permanently added 'github.com,192.30.255.113' (RSA)
+          # Git.ls_remote attempts to parse it as actual git output and fails
+          # with: NoMethodError: undefined method `split' for nil:NilClass
+          #
+          # We'll work around that case by calling 'git ls-remote' directly ourselves.
+          #
+          # I'm leaving in the broken version here for a time when the ruby-git library
+          # is fixed.
+
+          #def valid_remote?(url, timeout = 0)
+          #  Timeout.timeout(timeout) do
+          #    !!::Git.ls_remote(url)
+          #  end
+          #rescue ::Git::GitExecuteError
+          #  false
+          #rescue Timeout::Error
+          #  false
+          #end
+
           def valid_remote?(url, timeout = 0)
             Timeout.timeout(timeout) do
-              !!::Git.ls_remote(url)
+              Vanagon::Utilities.local_command("git ls-remote #{url} > /dev/null 2>&1")
+              return false unless $?.exitstatus.zero?
+              return true
             end
-          rescue ::Git::GitExecuteError
-            false
           rescue Timeout::Error
-            false
+            return false
+          rescue RuntimeError
+            return false
           end
         end
 

data/lib/vanagon/platform.rb

@@ -33,6 +33,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.
@@ -245,6 +248,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
@@ -553,5 +557,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

@@ -10,6 +10,7 @@ require 'vanagon/platform/solaris_11'
 require 'vanagon/platform/windows'
 require 'vanagon/logger'
 require 'securerandom'
+require 'ostruct'
 require 'uri'
 
 class Vanagon
@@ -219,6 +220,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
@@ -231,8 +237,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

@@ -351,10 +351,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,29 @@
 <%- 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.eql?('systemd') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; then
+    if [ -z "$2" ]; then
+      systemctl enable <%= service.name %>.service >/dev/null || :
+    else
+      systemctl try-restart <%= service.name %>.service >/dev/null || :
+    fi
+  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.eql?('sysv') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "init" ]; 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
 fi
   <%- end -%>
@@ -27,17 +38,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,14 @@ 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 [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; then
+    systemctl daemon-reload >/dev/null 2>&1 || :
+  else
+    if [ "$1" = "purge" ] ; then
+      update-rc.d <%= service.name %> remove > /dev/null
+    fi
+  fi
 fi
-  <%- end -%>
 <%- end -%>

data/resources/deb/prerm.erb

@@ -13,15 +13,25 @@ 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.eql?('systemd') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; 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
 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.eql?('sysv') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "init" ]; then
+    if [ -x "<%= service.service_file %>" ] && [ "$1" = remove ]; then
+      invoke-rc.d <%= service.name %> stop || true
+    fi
+  fi
 fi
   <%- end -%>
 <%- end -%>

data/resources/rpm/project.spec.erb

@@ -98,7 +98,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}
@@ -108,7 +108,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? -%>
@@ -256,15 +256,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
@@ -305,17 +305,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 || :
@@ -336,18 +336,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

@@ -34,6 +34,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|
@@ -575,15 +585,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
@@ -602,7 +612,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
@@ -621,7 +658,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
@@ -640,7 +677,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
@@ -661,7 +698,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/component/source/git_spec.rb

@@ -14,8 +14,8 @@ describe "Vanagon::Component::Source::Git" do
 
   # before(:each) blocks are run before each example
   before :each do
-    allow(Git)
-      .to receive(:ls_remote)
+    allow(Vanagon::Component::Source::Git)
+      .to receive(:valid_remote?)
             .and_return(true)
 
     allow(File).to receive(:realpath).and_return(@workdir)
@@ -24,8 +24,8 @@ describe "Vanagon::Component::Source::Git" do
   describe "#initialize" do
     it "raises error on initialization with an invalid repo" do
       # Ensure initializing a repo fails without calling over the network
-      allow(Git)
-        .to receive(:ls_remote)
+      allow(Vanagon::Component::Source::Git)
+        .to receive(:valid_remote?)
               .and_return(false)
 
       expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }

data/spec/lib/vanagon/component_spec.rb

@@ -108,6 +108,18 @@ describe "Vanagon::Component" do
       expect(subject).to receive(:fetch_url)
       subject.get_source(@workdir)
     end
+
+    it 'retrieves from a canonical URI if VANAGON_USE_MIRRORS is set to "false"' do
+      allow(ENV).to receive(:[]).with('VANAGON_USE_MIRRORS').and_return('false')
+      allow(subject)
+        .to receive(:fetch_url)
+        .and_return(true)
+
+      # We expect #get_source to skip mirrors
+      expect(subject).not_to receive(:fetch_mirrors)
+      expect(subject).to receive(:fetch_url)
+      subject.get_source(@workdir)
+    end
   end
 
   describe "#get_sources" do

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

data/spec/lib/vanagon/utilities_spec.rb

@@ -72,12 +72,15 @@ describe "Vanagon::Utilities" do
   describe '#local_command' do
     it 'runs commands in an unpolluted environment' do
       cmd = lambda { |arg| %(echo 'if [ "$#{arg}" = "" ]; then exit 0; else exit 1; fi' | /bin/sh) }
-      vars = %w(BUNDLE_BIN_PATH BUNDLE_GEMFILE)
+      vars = %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE]
       vars.each do |var|
         Vanagon::Utilities.local_command(cmd.call(var))
         expect($?.exitstatus).to eq(0)
       end
     end
+    it 'raises a RuntimeError when given a bad thing' do
+      expect { Vanagon::Utilities.local_command('__bogus__comand__') }.to raise_error(RuntimeError)
+    end
   end
 
   describe '#ssh_command' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: fustigit
   requirement: !ruby/object:Gem::Requirement
@@ -293,41 +293,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/dsl_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/makefile_spec.rb
 - spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/makefile_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/git/rev_list_spec.rb