simp-rake-helpers 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9d12b61c9cbf1d5f9143d3fe5d6af7f38019023e
-  data.tar.gz: e73156476af4b7deacd26a04daa067796125c21c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjAxMDc4MmVmNzM4ZWVmNDMzYjI2ZmU5ODA0OGMyMjkwMzIwOTViMw==
+  data.tar.gz: !binary |-
+    NTVmNzdmZGVhMjdhYzEzNGY1YTBjODEyMTNlYmZkYmJlNTM1YjU4Yw==
 SHA512:
-  metadata.gz: 428b0d6fda5038f7ca0b8d01afbce8cebfbd0fd246b7f98c35cbfb2d3b01246ac1ca9d8fa727e493ab2a2f30a2b136281d6122502e869939e1b9a3b9eb513f1d
-  data.tar.gz: b37f3e18f80764b7554c6aea51e0ea4e7aaba993bf464272ac3d9129e7842ae9ad6712eb8e2e05e4019f41635c41eff82d4dd238db34dca6ac1cfc1e68dc41c3
+  metadata.gz: !binary |-
+    NmVjMWZhZGM3YjEwZmNjYmRlZmNhMmM0YTA3ZDVmNzAxNTNkNDU2M2RjMGM3
+    ZmM4NDFkNjkyOTU3OWYwZjY3NzFhYzA4ZTRjZGRkNWYzMDM0MDQxYTY0MzNm
+    ZTNiNWQ3ZDM1MzM3MjIzODhlNGE3NGZiNDhmY2YwOTdjZDY1ZTM=
+  data.tar.gz: !binary |-
+    MWExNWM4NTA5MGViNGEzNGViNzEzMWUwZmIzODc2OTkwOThkYzYzOTY1NTg0
+    NGVkM2Q0NTk1OWViOGJjMmZiOGFkYjZhYTExNWQ5NDVjZTZhOGVjNmFkODdk
+    MDRjZDlhNWU2MjQ5MzQ3MmUyYjlkN2IwZTM0NGYxNTc4NjJiZmI=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.12 / 2015-11-13
+* Ensure that openssl, openssl-devel, and vim-enhanced are installed in mock by
+  default
+
 ### 1.0.11 / 2015-07-30
 * Allow simp/rpm to be used independently of Rake
 * Ensure that packages are not re-signed that have already been signed by the

data/lib/simp/rake/helpers.rb

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

data/lib/simp/rake/pkg.rb

@@ -292,17 +292,31 @@ module Simp::Rake
       mock_cmd += " --uniqueext=#{unique_ext}" if unique
       mock_cmd += ' --offline'                 if mock_offline
 
-      initialized = is_mock_initialized( mock_cmd, chroot)
+      initialized = is_mock_initialized(mock_cmd, chroot)
 
       unless initialized && init
-        sh %Q(#{mock_cmd} --root #{chroot} --init ##{unique_ext} )
+        sh %Q(#{mock_cmd} --root #{chroot} --init #{unique_ext})
       else
         # Remove any old build cruft from the mock directory.
         # This is kludgy but WAY faster than rebuilding them all, even with a cache.
         sh %Q(#{mock_cmd} --root #{chroot} --chroot "/bin/rm -rf /builddir/build/BUILDROOT /builddir/build/*/*")
       end
 
-      mock_cmd + " --no-clean --no-cleanup-after --resultdir=#{@pkg_dir} --disable-plugin=package_state"
+      # Install useful stock packages
+      if ENV.fetch( 'SIMP_RAKE_MOCK_EXTRAS', 'yes' ) == 'yes'
+        pkgs = ['openssl', 'openssl-devel']
+
+        env_pkgs = ENV.fetch('SIMP_RAKE_MOCK_PKGS','')
+        unless env_pkgs.empty?
+          pkgs = pkgs + env_pkgs.split(',')
+        end
+
+        pkgs.each do |pkg|
+          sh %Q(#{mock_cmd} --root #{chroot} --install #{pkg})
+        end
+      end
+
+      return mock_cmd + " --no-clean --no-cleanup-after --resultdir=#{@pkg_dir} --disable-plugin=package_state"
     end
 
     def is_mock_initialized( mock_cmd, chroot )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,14 +57,14 @@ dependencies:
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -158,7 +158,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
@@ -168,7 +168,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
@@ -227,8 +227,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4'
-description: |2
-      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+description: ! '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+
+'
 email: simp@simp-project.org
 executables: []
 extensions: []
@@ -267,17 +268,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers