simp-rake-helpers 1.0.13 → 1.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQ2NWYwNDBiMTViOTk4NDQyNGQ5ZTMwNDk3ZDYwMWUzNWU1OGMxZA==
+    OWJhYmVkZTM0MGM3MjU2ZTgzZTExYzBiZjdiYWViN2VhNGYwMDdjOQ==
   data.tar.gz: !binary |-
-    ODkzYzlhOWRjNDc4MjMxMDJjZWUzMWZmMTgxOWNhODM3MjgwMzAyMA==
+    MzkwYjg2Zjg4NmU1YjdiMzgxZjY5MzNlNDQ0YmNiNmI2Y2ZlNTk5NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTBiYWY0OTBiODcyZjg5Yjk4YjNkNWI5OTc4Yzc0ODE5ODAwYjk5M2I3ZWE1
-    ODMzMTc1MGU0NGIyNGI4ZjQ3ZWFjMTA4OWZiMmNiYjcyNGExYTQwMjk3Y2Ey
-    MGJlZGVkYzYzOTRhMjM3NmUxNmJkZjExYzY0YjBkNjc1MjdkYmM=
+    ZGQ5NTQwYzBlMjg3MzYxYWEwMjQ0NTQ4MjQ4OWI2ZmM2M2ZhMGFjYmFmZjRj
+    YTBlNTdkYWNjYjNiNzgxNzQzMWI2MmYxZDRhODQyZmMwYTI0NTAzMmU4YzJi
+    ZWM4ZmQyYTc0ZjIxZmE0NTFmZGM0NmNjNzMwMDQ4ZjcxNzY2ZTM=
   data.tar.gz: !binary |-
-    Y2EwMTI1NWE1ZjVjZTU4ODkyYjAzMDA1ZTFlZWVlN2FhNTE1ZDc3OGYwODBm
-    OTRhOTFiMGUyMmNjOGY0M2VhNTNkYTU3MmUxNmNhNTA0OTBiODhlNmUwZDU5
-    MDQ5Nzg3NjJhN2Q4OTI5ZTA3ZDIxMTk1ZTdiNDEzMTJiYTk1NjY=
+    MjE1MDVlMGZkZDNjNWQzMDAxZjY4MjQyZDU5M2ViZGE0OWYyODcyYjg3NzY1
+    MDljNjU2ZmI2M2FmNmVhNmFkOGZlZGMwYmZhN2Y2ZjkyZmVlOGRlOWM1ZDEz
+    NDAzMDJkMzA3MTBhZWY2MmRiZWFlNmEyOGI1M2NmYzgwNDY5OTU=

data/.gitignore

@@ -1,3 +1,4 @@
 *.sw[pnoqst]
 Gemfile.lock
 dist/
+/log/

data/.travis.yml

@@ -1,5 +1,9 @@
 ---
 language: ruby
+sudo: required
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y rpm
 rvm:
   - 1.9.3
   - 2.0.0

data/Rakefile

@@ -3,6 +3,8 @@
 require "rubygems"
 require 'rake/clean'
 require 'find'
+require 'rspec/core/rake_task'
+
 
 @package='simp-rake-helpers'
 @rakefile_dir=File.dirname(__FILE__)
@@ -10,6 +12,7 @@ require 'find'
 CLEAN.include "#{@package}-*.gem"
 CLEAN.include 'pkg'
 CLEAN.include 'dist'
+CLEAN.include 'spec/acceptance/files/testpackage/dist'
 Find.find( @rakefile_dir ) do |path|
   if File.directory? path
     CLEAN.include path if File.basename(path) == 'tmp'
@@ -27,12 +30,6 @@ task :chmod do
   end
 end
 
-desc 'run all RSpec tests'
-task :spec do
-  Dir.chdir @rakefile_dir
-  sh 'bundle exec rspec spec'
-end
-
 namespace :pkg do
   desc "build rubygem package for #{@package}"
   task :gem => :chmod do
@@ -53,4 +50,16 @@ namespace :pkg do
     end
   end
 end
+
+desc "Run acceptance tests"
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.pattern = 'spec/acceptance'
+end
+
+desc "Run spec tests"
+RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = ['--color']
+    t.pattern = 'spec/lib/simp/**/*_spec.rb'
+end
+
 # vim: syntax=ruby

data/lib/simp/rake/helpers.rb

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

data/lib/simp/rake/pkg.rb

@@ -30,12 +30,14 @@ module Simp::Rake
     # array of items to additionally clean
     attr_accessor :clean_list
 
-    #
-    attr_accessor :unique_name
+    # directory that contains all the mock chroots
+    attr_accessor :mock_root_dir
 
     # array of items to ignore when checking if the tarball needs to be rebuilt
     attr_accessor :ignore_changes_list
 
+    attr_reader   :spec_info
+
     def initialize( base_dir, unique_name=nil )
        @base_dir            = base_dir
        @pkg_name            = File.basename(@base_dir)
@@ -45,6 +47,7 @@ module Simp::Rake
        @clean_list          = []
        @ignore_changes_list = []
        @chroot_name         = unique_name
+       @mock_root_dir       = ENV.fetch('SIMP_BUILD_MOCK_root','/var/lib/mock')
 
        ::CLEAN.include( @pkg_dir )
 
@@ -80,9 +83,9 @@ module Simp::Rake
 
         # This gets the resting spec file and allows us to pull out the name
         @spec_info   = Simp::RPM.get_info( spec_file )
-        @chroot_name = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
 
         if chroot
+          @chroot_name = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
           mock_cmd = mock_pre_check( chroot, @chroot_name, unique ) + " --root #{chroot}"
 
           sh %Q(#{mock_cmd} --copyin #{spec_file} /tmp)
@@ -279,6 +282,12 @@ module Simp::Rake
               end
             end
           end
+
+          # remote chroot unless told not to (saves LOTS of space during ISO builds)
+          unless ENV['SIMP_RAKE_MOCK_cleanup'] == 'no'
+            cmd = %Q(#{mock_cmd} --root #{args.chroot} --clean)
+            sh cmd
+          end
         end
       end
     end
@@ -326,6 +335,7 @@ module Simp::Rake
       require_rebuild
     end
 
+
     # Run some pre-checks to make sure that mock will work properly.
     #
     # chroot   = name of mock chroot to use
@@ -338,7 +348,7 @@ module Simp::Rake
       raise %Q(unique_ext must be a String ("#{unique_ext}" = #{unique_ext.class})) unless unique_ext.is_a? String
 
       mock = ENV['mock'] || '/usr/bin/mock'
-      raise(Exception,"Could not find mock on your system, exiting") unless File.executable?('/usr/bin/mock')
+      raise(Exception,"Could not find mock on your system, exiting") unless File.executable?(mock)
 
       mock_configs = Pkg.get_mock_configs
       unless chroot
@@ -393,13 +403,5 @@ module Simp::Rake
       # A simple test to see if the chroot is initialized.
       initialized
     end
-
-    def pry
-      #FIXME: remove this debugging nonsense before release
-      if Rake::verbose.is_a? TrueClass
-        require 'pry'
-        binding.pry
-      end
-    end
   end
 end

data/spec/acceptance/files/testpackage/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+ Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/testpackage/build/testpackage.spec

@@ -0,0 +1,32 @@
+Name:           testpackage
+Version:        1
+Release:        0
+Summary:        dummy test package
+BuildArch:      noarch
+
+License:        Apache-2.0
+URL:            http://foo.bar
+
+%description
+A dummy package used to test Simp::RPM methods
+
+%prep
+exit 0
+
+%build
+exit 0
+
+
+%install
+exit 0
+
+%clean
+exit 0
+
+%files
+%doc
+
+
+%changelog
+* Wed Jun 10 2015 nobody
+- some comment

data/spec/acceptance/mock_tests_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper_acceptance'
+
+
+describe 'rake pkg:rpm[epel-6-x86_64,true]' do
+  before :all do
+    on 'container', 'bash --login -c "cd /host_files/spec/acceptance/files/testpackage; \
+                     gem install bundler; \
+                     bundle"'
+  end
+
+  context 'with SIMP_RAKE_MOCK_cleanup=no' do
+    before :each do
+      on 'container', 'mkdir -p -m 0755 /var/lib/mock'
+      on 'container', 'rm -rf /var/lib/mock/* /host_files/spec/acceptance/files/testpackage/dist',
+                      :accept_all_exit_codes => true
+    end
+
+    it 'should create an RPM and leave the mock directory' do
+
+      test_name 'runs SIMP_RAKE_MOCK_cleanup=no pkg:rpm[epel-6-x86_64,true]'
+      on 'container', 'SIMP_RAKE_MOCK_cleanup=no bash --login -c "cd /host_files/spec/acceptance/files/testpackage;  bundle exec rake pkg:rpm[epel-6-x86_64,true]"'
+
+      test_name 'produces RPM'
+      on 'container', 'test -f /host_files/spec/acceptance/files/testpackage/dist/testpackage-1-0.noarch.rpm'
+
+      test_name 'keeps mock chroot when SIMP_RAKE_MOCK_cleanup=no'
+      on 'container', 'test -d /var/lib/mock/epel-6-x86_64-testpackage__$USER'
+    end
+
+    it 'should create an RPM and leave the mock directory' do
+
+      test_name 'runs pkg:rpm'
+      on 'container', 'SIMP_RAKE_MOCK_cleanup=yes bash --login -c "cd /host_files/spec/acceptance/files/testpackage;  bundle exec rake pkg:rpm[epel-6-x86_64,true]"'
+
+      test_name 'produces RPM'
+      on 'container', 'test -f /host_files/spec/acceptance/files/testpackage/dist/testpackage-1-0.noarch.rpm'
+
+      test_name 'deletes mock chroot when SIMP_RAKE_MOCK_cleanup=yes'
+      on 'container', 'test -d /var/lib/mock/epel-6-x86_64-testpackage__$USER', {:acceptable_exit_codes => [1]}
+    end
+  end
+end

data/spec/acceptance/nodesets/default.yml

@@ -0,0 +1,56 @@
+HOSTS:
+  container:
+    roles:
+      - default
+      - master
+      - agent
+    platform:    el-6-x86_64
+    hypervisor:  docker
+    image:       'centos:centos6.7'
+    docker_image_commands:
+      - "echo 'Defaults !requiretty' >> /etc/sudoers"
+      - 'yum install -y epel-release'
+      # simp build-deps
+      - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav which'
+      # rvm build-deps
+      - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
+      - 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
+      - 'echo export rvm_prefix="\$HOME" > /root/.rvmrc && echo export rvm_path="\$HOME/.rvm" >> /root/.rvmrc'
+      - '\curl -sSL https://get.rvm.io | bash -s stable --ruby=1.9.3'
+      - 'source ~/.rvm/scripts/rvm'
+    # NOTE: the './' syntax requires BKR-704
+    mount_folders:
+      folder1:
+        # must be an absolute path, seemingly
+        host_path: ./
+        container_path: /host_files
+    docker_preserve_image: true
+CONFIG:
+  log_level: verbose
+  type:      foss
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#      - 'sed -i "s/UsePAM.*/UsePAM yes/g" /etc/ssh/sshd_config'
+#      - 'sed -i "s/#UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config'
+#      - "ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''"
+#      - "ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''"
+    #docker_cmd: '["/usr/sbin/sshd -e"]'

data/spec/spec_helper_acceptance.rb

@@ -0,0 +1,13 @@
+require 'beaker-rspec'
+require 'tmpdir'
+###require 'simp/beaker_helpers'
+###include Simp::BeakerHelpers
+
+RSpec.configure do |c|
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,6 +227,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: beaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: beaker-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 description: ! '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 
 '
@@ -250,6 +292,10 @@ files:
 - lib/simp/rake/helpers.rb
 - lib/simp/rake/pkg.rb
 - lib/simp/rpm.rb
+- spec/acceptance/files/testpackage/Rakefile
+- spec/acceptance/files/testpackage/build/testpackage.spec
+- spec/acceptance/mock_tests_spec.rb
+- spec/acceptance/nodesets/default.yml
 - spec/lib/simp/files/build/testpackage.spec
 - spec/lib/simp/files/testpackage-1-0.noarch.rpm
 - spec/lib/simp/files/testpackage-multi.spec
@@ -259,6 +305,7 @@ files:
 - spec/lib/simp/rake_spec.rb
 - spec/lib/simp/rpm_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_acceptance.rb
 homepage: https://github.com/simp/rubygem-simp-rake-helpers
 licenses:
 - Apache-2.0