vanagon 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3414d151dd4f8f7162a06b6dfe3a5dc8c9b066
-  data.tar.gz: 944acf2e2cfa169c60f3072d05a5add5c03ac25c
+  metadata.gz: fd0b8d155b61fe71dc4b21216f3cd8674734c790
+  data.tar.gz: b3b1554b32d14049b08eb56c89206f9b71e120ff
 SHA512:
-  metadata.gz: d88e78e71ccdd7f878141dc0b26d741bbef71b9f9c21e8cc8f766bf241bc8c317c6090e9781508f812d17dddc46e8af42f39d38274618934d4871de498eecf45
-  data.tar.gz: 0152bcaa044f2c8f939a7c8bb4434801d023397d7d156692f6648a55bceca6958a3182577fd6b4492999712cb07ce7eaef017e7c7150cf2205153ddd318750e7
+  metadata.gz: f9646e8ab2503dfe9433e91f25af53c2a7debcadb276d9d4338a4f8ff11749a3125f7ec04a007c855bf7e6a5b9878e5bba9227fb42e2aa73d14e9d8e9bcf5462
+  data.tar.gz: 945246b7da4cc69b58a919c6f91df69db236e9be28039c7b1c0e78acf90e2b285c268b3730204a03050026901a4f890245fec9e89918098026fa6067eaf8ff47

data/lib/vanagon/component/dsl.rb

@@ -184,7 +184,11 @@ class Vanagon
           # Return here because there is no file to install, just a string read in
           return
         when "windows"
-          @component.service = OpenStruct.new(:id => "#{service_name.gsub(/[^A-Za-z0-9]/, '').upcase}", :service_file => service_file)
+          @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"\
+          )
           # return here as we are just collecting the name of the service file to put into the harvest filter list.
           return
         else

data/lib/vanagon/driver.rb

@@ -11,6 +11,7 @@ class Vanagon
   class Driver
     include Vanagon::Utilities
     attr_accessor :platform, :project, :target, :workdir, :verbose, :preserve
+    attr_accessor :timeout, :retry_count
 
     def initialize(platform, project, options = { :configdir => nil, :target => nil, :engine => nil, :components => nil, :skipcheck => false })
       @verbose = false
@@ -24,8 +25,7 @@ class Vanagon
       @platform = Vanagon::Platform.load_platform(platform, File.join(@@configdir, "platforms"))
       @project = Vanagon::Project.load_project(project, File.join(@@configdir, "projects"), @platform, components)
       @project.settings[:skipcheck] = options[:skipcheck]
-      @@logger = Logger.new('vanagon_hosts.log')
-      @@logger.progname = 'vanagon'
+      loginit('vanagon_hosts.log')
 
       # If a target has been given, we don't want to make any assumptions about how to tear it down.
       engine = 'base' if target
@@ -76,14 +76,13 @@ class Vanagon
       @engine.startup(@workdir)
 
       puts "Target is #{@engine.target}"
-
-      install_build_dependencies
+      retry_task { install_build_dependencies }
       @project.fetch_sources(@workdir)
       @project.make_makefile(@workdir)
       @project.make_bill_of_materials(@workdir)
       @project.generate_packaging_artifacts(@workdir)
       @engine.ship_workdir(@workdir)
-      @engine.dispatch("(cd #{@engine.remote_workdir}; #{@platform.make})")
+      retry_task { @engine.dispatch("(cd #{@engine.remote_workdir}; #{@platform.make})") }
       @engine.retrieve_built_artifact
       @engine.teardown unless @preserve
       cleanup_workdir unless @preserve
@@ -95,7 +94,7 @@ class Vanagon
       if @engine.name == "hardware"
         @engine.teardown
       end
-  end
+    end
 
     def prepare(workdir = nil)
       @workdir = workdir ? FileUtils.mkdir_p(workdir).first : Dir.mktmpdir
@@ -115,5 +114,22 @@ class Vanagon
       puts e.backtrace.join("\n")
       raise e
     end
+
+    # Retry the provided block, use the retry count and timeout
+    # values from the project, if available, otherwise use some
+    # sane defaults.
+    def retry_task(&block)
+      @timeout = @project.timeout || 3600
+      @retry_count = @project.retry_count || 3
+      Vanagon::Utilities.retry_with_timeout(@retry_count, @timeout) { yield }
+    end
+    private :retry_task
+
+    # Initialize the logging instance
+    def loginit(logfile)
+      @@logger = Logger.new(logfile)
+      @@logger.progname = 'vanagon'
+    end
+    private :loginit
   end
 end

data/lib/vanagon/platform/windows.rb

@@ -289,6 +289,105 @@ class Vanagon
         File.join("windows", target_repo, @architecture)
       end
 
+      # Generate correctly formatted wix elements that match the
+      # structure of the directory input
+      #
+      # @param services, Array of components services
+      # and optionally:
+      # @return [string] correctly formatted wix element string
+      def generate_wix_dirs(services)
+        directories = []
+        services.map { |svc| directories.push({ :path => svc.service_file, :bindir_id => svc.bindir_id }) }
+        # root refers to the root of an n-ary tree (which we are about to make)
+        root = { :children => [] }
+        # iterate over all paths specified and break each one
+        # in to its specific directories. This will generate_wix_dirs
+        # an n-ary tree structure matching the specs from the input
+        directories.each do |dir|
+          # Always start at the beginning
+          curr = root
+          names = strip_path(dir[:path])
+          # The last entry in this list will be the actual file,
+          # which we do not want, we only want it's base path
+          names.pop
+          names.each do |name|
+            curr = insert_child(curr, name)
+          end
+          # at this point, curr will be the top dir, override the id if
+          # id exists
+          curr[:bindir_ids].push(dir[:bindir_id])
+        end
+        return generate_wix_from_graph(root)
+      end
+
+      # insert a new object with the name "name" if it doesn't already
+      # exist. Then assign curr to either the new child or the one that
+      # already exists here
+      #
+      # @param [HASH] curr, current object we are on
+      # @param [string] name, name of new object we are to search for and
+      #                 create if necessary
+      def insert_child(curr, name)
+        #The Id field will default to name, but be overridden later
+        new_obj = { :name => name, :id => name, :bindir_ids => [], :children => [] }
+        if (child_index = includes_child(new_obj, curr[:children]))
+          curr = curr[:children][child_index]
+        else
+          curr[:children].push(new_obj)
+          curr = new_obj
+        end
+        return curr
+      end
+
+      # strip and split the directory path into single names
+      # @param [string] path string of directory
+      def strip_path(path)
+        if path.include?("/") || path.include?("\\")
+          # The regex in the last part of this if warrants some
+          # explanation. Specifically it matches any combinations
+          # of any letters, then the : char, then finally either
+          # the char / or the char \. it's meant to parse out drive
+          # roots on windows
+          if path.start_with?("/") || path.start_with?("\\") || path.start_with?("SourceDir") || path =~ (/([A-Za-z])*\:(\/|\\)/)
+            path = path.sub(/\/|\\|([A-Za-z])*\:(\/|\\)|(\/|\\)?(SourceDir)(\/|\\)?/, '')
+          end
+          names = path.split(/\/|\\/)
+        end
+        return names
+      end
+
+      # Find if child element is the same as one of
+      # the old_children elements, return that child
+      def includes_child(new_child, old_children)
+        old_children.each_with_index do |curr_old_child, index|
+          return index if curr_old_child[:name] == new_child[:name]
+        end unless old_children.empty?
+        return nil
+      end
+
+
+      # Recursively generate wix element structure
+      #
+      # @param root, the (empty) root of an n-ary tree containing the
+      # structure of directories
+      def generate_wix_from_graph(root)
+        string = ''
+        unless root[:children].empty?
+          root[:children].each do |child|
+            string += ("<Directory Name=\"#{child[:name]}\" Id=\"#{child[:id]}\">\n")
+            unless child[:bindir_ids].empty?
+              child[:bindir_ids].each do |bindir_id|
+                string += ("<Directory Id=\"#{bindir_id}\" />\n")
+              end
+            end
+            string += generate_wix_from_graph(child)
+            string += ("</Directory>\n")
+          end
+          return string
+        end
+        return ''
+      end
+
       # Constructor. Sets up some defaults for the windows platform and calls the parent constructor
       #
       # Mingw varies on where it is installed based on architecture. We want to use which ever is on the system.

data/lib/vanagon/project.rb

@@ -11,7 +11,7 @@ class Vanagon
     attr_accessor :version, :directories, :license, :description, :vendor
     attr_accessor :homepage, :requires, :user, :repo, :noarch, :identifier
     attr_accessor :cleanup, :version_file, :release, :replaces, :provides
-    attr_accessor :bill_of_materials
+    attr_accessor :bill_of_materials, :retry_count, :timeout
 
     # Loads a given project from the configdir
     #
@@ -101,6 +101,22 @@ class Vanagon
       replaces.flatten.uniq
     end
 
+    # Grabs a specific service based on which name is passed in
+    # note that if the name is wrong or there was no
+    # @component.install_service call in the component, this
+    # will return nil
+    #
+    # @param [string] name of service to grab
+    # @return [@component.service obj] specific service
+    def get_service(name)
+      @components.each do |component|
+        if component.name == name
+          return component.service
+        end
+      end
+      return nil
+    end
+
     # Collects all of the provides for the project and its components
     #
     # @return [Array] array of package level provides for the project

data/resources/solaris/10/postinstall.erb

@@ -35,3 +35,8 @@ fi
     fi
   <%- end -%>
 <%- end -%>
+
+<%- get_services.each do |service| -%>
+  # Restarting service <%= service.name %>
+  /usr/sbin/svcadm restart <%= service.name %> || true
+<%- end -%>

data/resources/solaris/11/p5m.erb

@@ -53,8 +53,11 @@ set name=org.opensolaris.smf.fmri <%= get_services.map {|service| "value=svc:/#{
 <%- end -%>
 
 <%- get_configfiles.each do |config| -%>
-# Preserve the old conf file on upgrade
+# Preserve the old conf file on upgrade, restart services on config file change
 <transform file path=<%= strip_and_escape(config.path) %>$ -> add preserve renamenew>
+  <%- get_services.each do |service| -%>
+    <transform file path=<%= strip_and_escape(config.path) %>$ -> add restart_fmri <%= "svc:/#{service.name}:*" %> >
+  <%- end -%>
 <%- end -%>
 
 # Set any required owner, group or mode transformations

data/resources/windows/wix/{componentrefs.wxs.erb → directorylist.wxs.erb}

@@ -2,10 +2,8 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
   <Fragment>
-    <ComponentGroup Id="ServiceListGroup">
-      <%- get_services.each do |service| -%>
-      <ComponentGroupRef Id="Service_<%= service.id %>" />
-      <%- end -%>
-    </ComponentGroup>
+    <DirectoryRef Id='TARGETDIR'>
+      <%= @platform.generate_wix_dirs(self.get_services) %>
+    </DirectoryRef>
   </Fragment>
 </Wix>

data/resources/windows/wix/project.wxs.erb

@@ -15,8 +15,10 @@
       Description="<%= "#{settings[:product_id]}#{@platform.architecture == "x64" ? " (64-bit)" : ""}" %> Installer"
       Comments="<%= @homepage %>"
       Compressed="yes"
-      Platform="<%= @platform.architecture %>"
-    />
+      Platform="<%= @platform.architecture %>" />
+
+      <!--  We are discussing a MAINT PR to move the componentfilegroup to seperate file 
+            This would allow project to specify additional fragments if needed -->
 
     <MajorUpgrade AllowDowngrades="yes" />
     <Media Id="1" Cabinet="<%= settings[:product_id] %>.cab" EmbedCab="yes" CompressionLevel="high" />
@@ -25,7 +27,13 @@
       <!-- We can add all components by referencing this one thing -->
       <ComponentGroupRef Id="ProductComponentGroup" />
       <ComponentGroupRef Id="RegistryComponentGroup" />
-      <ComponentGroupRef Id="ServiceListGroup" />
+      <%- get_services.each do |service| -%>
+      <ComponentGroupRef Id="<%= service.component_group_id %>" />
+      <%- end -%>
+      <!-- All of these Include refs are expected to be present -->
+      <ComponentGroupRef Id="FragmentProperties" />
+      <ComponentGroupRef Id="FragmentSequences" />
+      <ComponentGroupRef Id="FragmentCustomActions" />
     </Feature>
     <!-- We will use DirectoryRef at the project level to hook in the project directory structure -->
     <Directory Id='TARGETDIR' Name='SourceDir' />

data/spec/lib/vanagon/platform/windows_spec.rb

@@ -1,4 +1,7 @@
 require 'vanagon/platform'
+require 'vanagon/project'
+require 'vanagon/common'
+
 
 # These constants are defined for the purpose of the project/generic file merge tests
 # to point these directories to test areas under the /tmp directory.
@@ -26,14 +29,17 @@ describe "Vanagon::Platform::Windows" do
       :output_dir_with_target => "windows/thing/x64",
       :target_user            => "Administrator",
       :projname               => "test-proj",
-      :block                  => %Q[ platform "windows-2012r2-x64" do |plat| end ]
+      :block                  => %Q[ platform "windows-2012r2-x64" do |plat| plat.servicetype 'windows' end ]
     },
   ]
 
   platforms.each do |plat|
-    context "on #{plat[:name]} we should behave ourselves" do
+    context "on #{plat[:name]}" do
       let(:platform) { plat }
       let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
+      let (:project_block) {
+"project 'test-fixture' do |proj|
+end" }
 
       before do
         cur_plat.instance_eval(plat[:block])
@@ -160,6 +166,123 @@ describe "Vanagon::Platform::Windows" do
           expect(File).not_to exist("#{WORKDIR}/wix/file-3.wxs.erb")
           expect(File).not_to exist("#{WORKDIR}/wix/file-4.wxs.erb")
         end
+
+
+        describe "generate_wix_dirs" do
+
+          it "returns one directory with install_service defaults" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('/opt/bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="opt" Id="opt">
+<Directory Id="SERVICETESTBINDIR" />
+</Directory>
+HERE
+            )
+          end
+
+          it "returns one directory with non-default name" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('/opt/bin.exe', nil, "service-test-2")
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="opt" Id="opt">
+<Directory Id="SERVICETEST2BINDIR" />
+</Directory>
+HERE
+            )
+          end
+
+          it "returns nested directory correctly with \\" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('root\\programfiles\\bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="root" Id="root">
+<Directory Name="programfiles" Id="programfiles">
+<Directory Id="SERVICETESTBINDIR" />
+</Directory>
+</Directory>
+HERE
+            )
+          end
+
+          it "removes any drive roots" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('C:\\programfiles\\bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="programfiles" Id="programfiles">
+<Directory Id="SERVICETESTBINDIR" />
+</Directory>
+HERE
+            )
+          end
+
+          it "removes SourceDir" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('SourceDir\\programfiles\\bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="programfiles" Id="programfiles">
+<Directory Id="SERVICETESTBINDIR" />
+</Directory>
+HERE
+            )
+          end
+
+
+          it "adds a second directory for the same input but different components" do
+            cur_plat.instance_eval(plat[:block])
+            comp = Vanagon::Component::DSL.new('service-test', {}, cur_plat._platform)
+            comp.install_service('/programfiles/bin.exe')
+            comp2 = Vanagon::Component::DSL.new('service-test-2', {}, cur_plat._platform)
+            comp2.install_service('/programfiles/bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp._component.service, comp2._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="programfiles" Id="programfiles">
+<Directory Id="SERVICETESTBINDIR" />
+<Directory Id="SERVICETEST2BINDIR" />
+</Directory>
+HERE
+            )
+          end
+
+          it "returns correctly formatted multiple nested directories" do
+            cur_plat.instance_eval(plat[:block])
+            comp1 = Vanagon::Component::DSL.new('service-test1', {}, cur_plat._platform)
+            comp1.install_service('/opt/oneUp/twoUp/bin.exe')
+            comp2 = Vanagon::Component::DSL.new('service-test2', {}, cur_plat._platform)
+            comp2.install_service('/opt/oneUpAgain/twoUp/bin.exe')
+            comp3 = Vanagon::Component::DSL.new('service-test3', {}, cur_plat._platform)
+            comp3.install_service('/opt/oneUpAgain/twoUpAgain/bin.exe')
+            expect(cur_plat._platform.generate_wix_dirs([comp1._component.service, comp2._component.service, comp3._component.service].flatten.compact)).to eq( \
+<<-HERE
+<Directory Name="opt" Id="opt">
+<Directory Name="oneUp" Id="oneUp">
+<Directory Name="twoUp" Id="twoUp">
+<Directory Id="SERVICETEST1BINDIR" />
+</Directory>
+</Directory>
+<Directory Name="oneUpAgain" Id="oneUpAgain">
+<Directory Name="twoUp" Id="twoUp">
+<Directory Id="SERVICETEST2BINDIR" />
+</Directory>
+<Directory Name="twoUpAgain" Id="twoUpAgain">
+<Directory Id="SERVICETEST3BINDIR" />
+</Directory>
+</Directory>
+</Directory>
+HERE
+            )
+          end
+        end
       end
     end
   end

data/spec/lib/vanagon/utilities_spec.rb

@@ -154,5 +154,9 @@ describe "Vanagon::Utilities" do
       expect(Vanagon::Utilities).to receive(:remote_ssh_command).with(host, command, port).exactly(1).times.and_return(true)
       expect(Vanagon::Utilities.retry_with_timeout(tries, timeout) { Vanagon::Utilities.remote_ssh_command(host, command, port) }).to be(true)
     end
+
+    it 'raises a Vanagon::Error if the command times out' do
+      expect{ Vanagon::Utilities.retry_with_timeout(tries, timeout) { sleep 5 }.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.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,7 @@ files:
 - resources/windows/nuget/chocolateyInstall.ps1
 - resources/windows/nuget/chocolateyUninstall.ps1
 - resources/windows/nuget/project.nuspec.erb
-- resources/windows/wix/componentrefs.wxs.erb
+- resources/windows/wix/directorylist.wxs.erb
 - resources/windows/wix/filter.xslt.erb
 - resources/windows/wix/project.wxs.erb
 - resources/windows/wix/registryEntries.wxs.erb
@@ -157,6 +157,7 @@ files:
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
@@ -209,6 +210,7 @@ test_files:
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb