simp-rake-helpers 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634a98e0e356154a6e3b6b7de9ff0d9eb770567c
-  data.tar.gz: 489dd7824a61d2653f834c7b8aa439cc72d54af0
+  metadata.gz: a40b24af8acd6375996bbff04bae317ca1ca14ef
+  data.tar.gz: 0e7e32fa2e9b89c52835d7aa927f33155cd6ef9c
 SHA512:
-  metadata.gz: 6fc82f8926ba09add101cbf6c25ac1af2e35d0e41b85eb36c5cae3b4aa315540b105148d7e14cdbe748187109bcd4c6a99663c0a640aeb18d92901ee23f0690d
-  data.tar.gz: 8b15e4d15e6370e5ecbb56f380b51c49ff3b660dcb039242dacfe980abf67c816ae7212515a84ce3e4292d2d553cc619675e370f031056bc3e6699305da8d43e
+  metadata.gz: 4dfaa320cba4dced53633da150e2c172dd96b79f071df22299f2f858ecc7b760dd39847a4429e13d4c055f2b3d220f4f190afe36074563a260ae6b381f17db14
+  data.tar.gz: 37b47d3eedbf0e30b3dc8f94932b82f7e7a10cff047193e5a8dcecc4017d0f49a7fadcb64f94e79ee482dd7a0a111bfd665af6377ac9afa696e28e71b2d933ec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.5.4 / 2016-09-12
+* Several fixes for building on systems that are connected to the Red Hat
+  Network directly. Tested on AWS.
+
 ### 2.5.3 / 2016-08-31
 * Bumped the requirement for puppet-lint to >= 1.0 and < 3.0
 

data/lib/simp/rake.rb

@@ -22,13 +22,7 @@ module Simp::Rake
 
       @puppetfile.each_module do |mod|
         path = mod[:path]
-        if Dir.exists?(path)
-          @module_paths.push(path)
-        end
-      end
-
-      if @module_paths.empty?
-        fail("Error: Could not find any module paths in 'Puppetfile.#{method}'")
+        @module_paths.push(path)
       end
     end
   end

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

@@ -98,6 +98,14 @@ module Simp::Rake::Build
           do_unpack        = ENV['SIMP_BUILD_unpack'] != 'no'
           full_iso_name    = ENV.fetch('SIMP_BUILD_iso_name', false)
           iso_name_tag     = ENV.fetch('SIMP_BUILD_iso_tag', false)
+
+          # Skip a bunch of unnecessary stuff if we're passed a tarball
+          if tarball
+            do_docs = false
+            do_checkout = false
+            do_bundle = false
+          end
+
           @dirty_repos     = nil
           @simp_output_iso = nil
 

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

@@ -50,6 +50,9 @@ module Simp::Rake::Build
           ) do |mod|
 
             status = true
+
+            fail("Could not find directory #{mod}") unless Dir.exist?(mod)
+
             next unless File.exists?(File.join(mod,'Gemfile'))
             puts "\n#{mod}\n" if verbose
             Dir.chdir(mod) do
@@ -182,7 +185,17 @@ module Simp::Rake::Build
               full_pkg = source.split('/').last
               unless File.exist?(full_pkg)
                 puts("Downloading: #{full_pkg}")
-                %x(curl -L --max-redirs 10 -s -o "#{full_pkg}" -k "#{source}")
+                unless @use_yumdownloader
+                  %x(curl -L --max-redirs 10 -s -o "#{full_pkg}" -k "#{source}")
+                  unless %x(file #{full_pkg}).include?('RPM')
+                    @use_yumdownloader = true
+                    FileUtils.rm(full_pkg)
+                  end
+                end
+
+                if @use_yumdownloader
+                  %x(yumdownloader -c #{yum_conf} #{File.basename(full_pkg,'.rpm')} 2>/dev/null )
+                end
 
                 unless $?.success?
                   raise(SIMPBuildException,"Could not download")
@@ -270,7 +283,7 @@ module Simp::Rake::Build
               end
             end
 
-            return yum_conf
+            return File.absolute_path(yum_conf)
           end
 
           def get_known_packages(target_dir=Dir.pwd)

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

@@ -244,7 +244,7 @@ module Simp::Rake::Build
 
           r10k_helper.each_module do |mod|
             unless File.directory?(mod[:path])
-              $stderr.puts("Warning: '#{mod[:path]}' is not a module...skipping")
+              $stderr.puts("Warning: '#{mod[:path]}' is not a module...skipping") if File.exist?(mod[:path])
               next
             end
 

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

@@ -643,6 +643,9 @@ protect=1
               try_build = true
               while(try_build) do
                 begin
+
+                  fail("Could not find directory #{dir}") unless Dir.exist?(dir)
+
                   Dir.chdir(dir) do
                     if File.exist?('Rakefile')
                       unique_build = (get_cpu_limit != 1)

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler