vanagon 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ba6ccedb21955cc83f9a9b4c879952f97ae2c7
-  data.tar.gz: c6220fff6a4a1c7ba457447686610988cc778e77
+  metadata.gz: 0a8deb8d9d92862103087ff392bce7075f1b999a
+  data.tar.gz: b3d3744bd040bb78471170ad446ab70a918038d9
 SHA512:
-  metadata.gz: 73104a5003d115067156eba3a0dbebd8b089917392773a7b4e3f3bafc3904fc9befff092c80d509d04a9f1e9ac81911afc1369bea440330b015a2f6828feac00
-  data.tar.gz: d1c60858b7d44b348fd13bdbbd4454b7c4b6c3e5549384d6011d285f7f0ee099a36135bddc03938d1eded39b271091750b83280ddb4bf4937c4f15d41faeef44
+  metadata.gz: e19349ee79f2bf7c48f35adbd7a18d7544d5b7cd60dffb62edfe93a02d21cb9583f903eb688dd0ab1a9c60362d107b70a0ba43407c4ebf2e7ebe972ce9244aaa
+  data.tar.gz: 84253136c2c03f6253975532f61cb14a09f43aaa9ed27eeb641d9fc53d1e4aec53c4e688fe700b32e4edef4e263c907b3a332b4e88df62f9acb125f506a95421

data/bin/build

@@ -2,7 +2,7 @@
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
 optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<target>] [options]",
-                                 %i(workdir configdir engine preserve verbose skipcheck only_build remote-workdir))
+                                 %i[workdir configdir engine preserve verbose skipcheck only_build remote-workdir])
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/build_host_info

@@ -3,7 +3,7 @@ require 'json'
 
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i(workdir configdir engine))
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i[workdir configdir engine])
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/devkit

@@ -2,7 +2,7 @@
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
 optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<component-name>...] [options]",
-                                 %i(workdir configdir target engine))
+                                 %i[workdir configdir target engine])
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/inspect

@@ -6,7 +6,7 @@ require 'vanagon/extensions/hashable'
 
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i(workdir configdir engine))
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i[workdir configdir engine])
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/render

@@ -3,7 +3,7 @@ load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb
 
 optparse = Vanagon::OptParse.new(
   "#{File.basename(__FILE__)} <project-name> <platform-name> [options]",
-  %i(workdir configdir engine)
+  %i[workdir configdir engine]
 )
 options = optparse.parse! ARGV
 

data/lib/vanagon/component/dsl.rb

@@ -165,7 +165,8 @@ class Vanagon
       # @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)
-      def install_service(service_file, default_file = nil, service_name = @component.name, service_type: nil) # rubocop:disable Metrics/AbcSize
+      # @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
         when "sysv"
           target_service_file = File.join(@component.platform.servicedir, service_name)
@@ -203,7 +204,12 @@ class Vanagon
         end
 
         # Install the service and default files
-        install_file(service_file, target_service_file, mode: target_mode)
+        if link_target
+          install_file(service_file, link_target, mode: target_mode)
+          link link_target, target_service_file
+        else
+          install_file(service_file, target_service_file, mode: target_mode)
+        end
 
         if default_file
           install_file(default_file, target_default_file, mode: default_mode)

data/lib/vanagon/component/rules.rb

@@ -188,7 +188,7 @@ class Vanagon
           "#{platform[:make]} clean"
         )
 
-        %w(configure build install).each do |type|
+        %w[configure build install].each do |type|
           touchfile = "#{component.name}-#{type}"
           r.recipe << andand(
             "[ -e #{touchfile} ]",

data/lib/vanagon/component/source.rb

@@ -6,7 +6,7 @@ require 'vanagon/component/source/local'
 class Vanagon
   class Component
     class Source
-      SUPPORTED_PROTOCOLS = %w(file http https git).freeze
+      SUPPORTED_PROTOCOLS = %w[file http https git].freeze
       @rewrite_rules = {}
 
       class << self

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

@@ -13,7 +13,7 @@ class Vanagon
         attr_accessor :sum, :sum_type
 
         # Allowed checksum algorithms to use when validating files
-        CHECKSUM_TYPES = %w(md5 sha1 sha256 sha512).freeze
+        CHECKSUM_TYPES = %w[md5 sha1 sha256 sha512].freeze
 
         class << self
           def valid_url?(target_url) # rubocop:disable Metrics/AbcSize

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

@@ -8,17 +8,17 @@ class Vanagon
 
         # Extensions for files we intend to unpack during the build
         ARCHIVE_EXTENSIONS = {
-          "7z" => %w(.7z),
-          "bzip2" => %w(.bz2 .bz),
-          "cpio" => %w(.cpio),
-          "gzip" => %w(.gz .z),
-          "rar" => %w(.rar),
-          "tar" => %w(.tar),
-          "tbz2" => %w(.tar.bz2 .tbz2 .tbz),
-          "tgz" => %w(.tar.gz .tgz),
-          "txz" => %w(.tar.xz .txz),
-          "xz" => %w(.xz),
-          "zip" => %w(.zip),
+          "7z" => %w[.7z],
+          "bzip2" => %w[.bz2 .bz],
+          "cpio" => %w[.cpio],
+          "gzip" => %w[.gz .z],
+          "rar" => %w[.rar],
+          "tar" => %w[.tar],
+          "tbz2" => %w[.tar.bz2 .tbz2 .tbz],
+          "tgz" => %w[.tar.gz .tgz],
+          "txz" => %w[.tar.xz .txz],
+          "xz" => %w[.xz],
+          "zip" => %w[.zip],
         }.freeze
 
         class << self

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

@@ -533,6 +533,27 @@ end" }
       # The component should now have a service registered
       expect(comp._component.service.name).to eq('service-test')
     end
+
+    it 'installs the file as a link when link_target is specified' do
+      comp = Vanagon::Component::DSL.new('service-test', {}, dummy_platform_sysv)
+      comp.install_service('component-client.init', 'component-client.sysconfig', link_target: '/tmp/service-test')
+      # Look for servicedir creation and copy
+      expect(comp._component.install).to include("install -d '/etc/init.d'")
+      expect(comp._component.install).to include("cp -p 'component-client.init' '/tmp/service-test'")
+      expect(comp._component.install).to include("([[ '/etc/init.d/service-test' -ef '/tmp/service-test' ]] || ln -s '/tmp/service-test' '/etc/init.d/service-test')")
+
+      # 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
+      expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('/etc/default/service-test'))
+      expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/tmp/service-test', mode: '0755'))
+      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')
+    end
   end
 
   describe '#install_file' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -237,42 +237,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
+- 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/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/engine/base_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/pooler_spec.rb
-- spec/lib/vanagon/platform/solaris_11_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/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/project/dsl_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_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
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/makefile_spec.rb