simp-rake-helpers 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM4NTg3YTQxOTJiN2M2OWQzYmUyYzNkYjJiNzUzZDNjYWNmOWNmMA==
+    NDg3MWJlYTIwNDYzNDAzZWI4MTgxMDUyNWIzMmJhNjJhZGI0NzQ2ZQ==
   data.tar.gz: !binary |-
-    NDVkODU1ODAyNmI3ZmFjMGRmOTFiN2NkNzZiYjdkNTlkNjY3Yjk5Yg==
+    MDViOWQ1MjVjNGYyMmQ5ZGEyZTY4NjJmMmRiZGY3OTc3YTBhNTg5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmJlOWM0NWU2ZTllZGE0Mjc4NTc3MmVjNzZiMDEyMDg0ZjQ1MzdlYjY0N2Zl
-    YWZkZTc2Y2MxMDFjYzMzZTY2MjhlMTk3ZWYyOWU3OTA5YTJkNTYwMTJkNjFh
-    N2JjZWJmZjgwY2VjMThhZDRiOGRiM2Q3NWVkZjk0Zjc2ZTI0Mjg=
+    NDhkNTEyMDUzMmUzMDY0NjVlOTM5NjRkNzNmY2NmOGEyODM3ZTE2YTRhZWQ0
+    MjI1MjgyMzhkNjIxNDI5NGNjOGNlNDkwMzUwMGU2NDMxNThjMDNiMThlN2My
+    MTA1MDI3NTQwNmIxYmM1ZGFiMmE2MWZhZWZmMTU3ZjQzZTk4NDA=
   data.tar.gz: !binary |-
-    Y2EwYzRkOTkzNmIxNmMwMjk0MTg5ODE1MWY1MjRlYzUxMjZkYTlhYTBlZjJl
-    NjBiYjMzNWRkYTA2MDU0NmUxMDhlZjMwNmNjYjFlNDU0MzhhMGE2YWU0NWNh
-    NzQyMTM0MmJiMDBmMjRlYTY4ODc4NjIwZjVkNTIzNjkzYWEzZjY=
+    NWU5NDZkZThiMmFkZTc1MTkyOTQ4MDFhNWYwMTZhZjA5OGEyYzI2N2UwYTQw
+    Y2Q1NWFiN2MzYThlODg2Yzc0ZjVjOTI3NjE1NmJlOGRjNGMyMmE0ZDFjZjVk
+    NzAyYTU3NTU2MjUxNWI1NzU4MTFhMzFiNTljNzM5Yzc3NGE5Njk=

data/lib/simp/rake/build/auto.rb

@@ -244,6 +244,23 @@ module Simp::Rake::Build
 
           Rake::Task['iso:build'].invoke(tarball,staging_dir,do_prune)
 
+
+          _isos = Dir[ File.join(Dir.pwd,'SIMP-*.iso') ]
+          if _isos.size == 0
+            fail "ERROR: No SIMP ISOs found in '#{Dir.pwd}'"
+          elsif _isos.size > 1
+            warn "WARNING: More than one SIMP ISO found in '#{Dir.pwd}'"
+            _isos.each{ |i| warn i }
+          end
+
+          # NOTE: It is possible at this point (given the right
+          # `SIMP_BUILD_xxx=no` flags) that iso:build will not have set
+          # `@simp_output_iso`.  So, we look at the ISOs in the staging dir
+          # (there should only be one) and take our best guess.
+          if @simp_output_iso.nil?
+             @simp_output_iso = File.basename(_isos.first)
+          end
+
           output_file = full_iso_name ? full_iso_name : @simp_output_iso
           if iso_name_tag
             output_file.sub!(/\.iso$/i, "__#{iso_name_tag}.iso")

data/lib/simp/rake/build/iso.rb

@@ -107,7 +107,7 @@ module Simp::Rake::Build
 
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
-          vermap = YAML::load_file("#{@base_dir}/rakefiles/vermap.yaml")
+          vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))
 
           tarfiles.each do |tarball|
             namepieces = File.basename(tarball,".tar.gz").split('-')

data/lib/simp/rake/build/pkg.rb

@@ -479,27 +479,27 @@ module Simp::Rake::Build
           end
 
           yum_conf_template = <<-EOF
-      [main]
-      keepcache=0
-      exactarch=1
-      obsoletes=1
-      gpgcheck=0
-      plugins=1
-      installonly_limit=5
-
-      <% repo_files.each do |repo| -%>
-      include=file://<%= repo %>
-      <% end -%>
-          EOF
+[main]
+keepcache=0
+exactarch=1
+obsoletes=1
+gpgcheck=0
+plugins=1
+installonly_limit=5
+
+<% repo_files.each do |repo| -%>
+include=file://<%= repo %>
+<% end -%>
+  EOF
 
           yum_repo_template = <<-EOF
-      [<%= repo_name %>]
-      name=<%= repo_name %>
-      baseurl=file://<%= repo_path %>
-      enabled=1
-      gpgcheck=0
-      protect=1
-          EOF
+[<%= repo_name %>]
+name=<%= repo_name %>
+baseurl=file://<%= repo_path %>
+enabled=1
+gpgcheck=0
+protect=1
+  EOF
 
           fail "#{args.target_dir} does not exist!" if not File.directory?(args.target_dir)
 
@@ -607,7 +607,7 @@ module Simp::Rake::Build
 
                 if build_module
                   unique_build = (get_cpu_limit != 1)
-                  sh %{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}]}
+                  %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}]}
 
                   # Glob all generated rpms, and add their metadata to a result array.
                   pkginfo = Hash.new

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler