simp-rake-helpers 5.11.2 → 5.12.0

data/spec/acceptance/files/testpackage/README

@@ -0,0 +1,8 @@
+The following scripts with problematic shebangs have their execute bits set in
+order to trigger the brp-mangle-shebangs script during an RPM build in EL8:
+
+* spec/classes/init_spec.rb:    #!/usr/bin/env rspec => #!/usr/bin/rspec
+* spec/files/mock_something.rb: #!/usr/bin/env ruby  => #!/usr/bin/ruby
+* utils/convert_v1_to_v2.rb:    #!/usr/bin/env ruby  => #!/usr/bin/ruby
+
+*** Do not change their execute bits in Git! ***

data/spec/acceptance/files/testpackage/spec/classes/init_spec.rb

@@ -0,0 +1 @@
+#!/usr/bin/env rspec

data/spec/acceptance/files/testpackage/spec/files/mock_something.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+#This is a mock executable for something
+puts 'hello world'

data/spec/acceptance/files/testpackage/utils/convert_v1_to_v2.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+# convert from version 1 to version 2
+puts "Running #{File.basename(__FILE__)}"

data/spec/acceptance/nodesets/default.yml

@@ -1,121 +1,21 @@
 HOSTS:
-  el6-build-server:
+  el7-build-server:
     roles:
       - default
-      - master
-      - agent
       - build_server
-    platform: el-6-x86_64
+    platform: el-7-x86_64
     hypervisor: docker
-    image: centos:6
-    docker_image_commands:
-      - 'yum install -y epel-release'
-      - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
-      - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
-      - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
-      - 'yum install -y facter rubygem-json'
-      # simp build-deps
-      - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools 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'
-
-      #
-      # Do our best to get one of the keys from at one of the servers, and to
-      # trust the right ones if the GPG keyservers return bad keys
-      #
-      # These are the keys we want:
-      #
-      #  409B6B1796C275462A1703113804BB82D39DC0E3 # mpapis@gmail.com
-      #  7D2BAF1CF37B13E2069D6956105BD0E739499BDB # piotr.kuczynski@gmail.com
-      #
-      # See:
-      #   - https://rvm.io/rvm/security
-      #   - https://github.com/rvm/rvm/blob/master/docs/gpg.md
-      #   - https://github.com/rvm/rvm/issues/4449
-      #   - https://github.com/rvm/rvm/issues/4250
-      #   - https://seclists.org/oss-sec/2018/q3/174
-      #
-      # NOTE (mostly to self): In addition to RVM's documented procedures,
-      # importing from https://keybase.io/mpapis may be a practical
-      # alternative for 409B6B1796C275462A1703113804BB82D39DC0E3:
-      #
-      #    curl https://keybase.io/mpapis/pgp_keys.asc | gpg2 --import
-      #
-      - 'runuser build_user -l -c "for i in {1..5}; do { gpg2 --keyserver  hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3; } && break || sleep 1; done"' 
-      - 'runuser build_user -l -c "for i in {1..5}; do { gpg2 --keyserver  hkp://pool.sks-keyservers.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; } && break || sleep 1; done"'
-#      - 'runuser build_user -l -c "gpg2 --refresh-keys"'
-      - 'runuser build_user -l -c "curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer -o rvm-installer && curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer.asc -o rvm-installer.asc && gpg2 --verify rvm-installer.asc rvm-installer && bash rvm-installer"'
-      - 'runuser build_user -l -c "rvm install 2.4"'
-      - 'runuser build_user -l -c "rvm use --default 2.4"'
-      - 'runuser build_user -l -c "rvm all do gem install bundler"'
-    mount_folders:
-      folder1:
-        host_path: ./
-        container_path: /host_files
-    docker_preserve_image: true
+    image: simpproject/simp_build_centos7
+    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
 
-  el7-build-server:
+  el8-build-server:
     roles:
       - build_server
-    platform: el-7-x86_64
+    platform: el-8-x86_64
     hypervisor: docker
-    image: centos:7
-    docker_cmd: '/sbin/sshd; tail -f /dev/null'
-    docker_image_commands:
-      - 'yum install -y epel-release'
-      - 'ln -sf /bin/true /usr/bin/systemctl'
-      # Work around regression in beaker-docker
-      # https://github.com/puppetlabs/beaker-docker/pull/15/files
-      - 'yum install -y sudo openssh-server openssh-clients'
-      - "sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config"
-      - "sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config"
-      - "sed -ri 's/^#?UseDNS .*/UseDNS no/' /etc/ssh/sshd_config"
-      - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
-      - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
-      - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
-      - 'yum install -y facter rubygem-json'
-      # simp build-deps
-      - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools clamav-update which'
-
-      # rvm build-deps
-      #
-      # Do our best to get one of the keys from at one of the servers, and to
-      # trust the right ones if the GPG keyservers return bad keys
-      #
-      # These are the keys we want:
-      #
-      #  409B6B1796C275462A1703113804BB82D39DC0E3 # mpapis@gmail.com
-      #  7D2BAF1CF37B13E2069D6956105BD0E739499BDB # piotr.kuczynski@gmail.com
-      #
-      # See:
-      #   - https://rvm.io/rvm/security
-      #   - https://github.com/rvm/rvm/blob/master/docs/gpg.md
-      #   - https://github.com/rvm/rvm/issues/4449
-      #   - https://github.com/rvm/rvm/issues/4250
-      #   - https://seclists.org/oss-sec/2018/q3/174
-      #
-      # NOTE (mostly to self): In addition to RVM's documented procedures,
-      # importing from https://keybase.io/mpapis may be a practical
-      # alternative for 409B6B1796C275462A1703113804BB82D39DC0E3:
-      #
-      #    curl https://keybase.io/mpapis/pgp_keys.asc | gpg2 --import
-      #
-      - 'runuser build_user -l -c "for i in {1..5}; do { gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3; } && { gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; } && break || sleep 1; done"'
-      - 'runuser build_user -l -c "gpg2 --refresh-keys"'
-      - 'runuser build_user -l -c "curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer -o rvm-installer && curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer.asc -o rvm-installer.asc && gpg2 --verify rvm-installer.asc rvm-installer && bash rvm-installer"'
-      - 'runuser build_user -l -c "rvm install 2.4"'
-      - 'runuser build_user -l -c "rvm use --default 2.4"'
-      - 'runuser build_user -l -c "rvm all do gem install bundler"'
-      - 'yum install -y rpm-sign'
-    mount_folders:
-      folder1:
-        host_path: ./
-        container_path: /host_files
+    image: simpproject/simp_build_centos8
+    docker_cmd: '["/sbin/init"]'
     docker_preserve_image: true
-    ssh:
-      password: root
-      auth_methods:
-        - password
 
 CONFIG:
   log_level: verbose
@@ -123,5 +23,30 @@ CONFIG:
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% else -%>
-  puppet_collection: puppet5
+  puppet_collection: puppet6
 <% end -%>
+  ssh:
+    password: root
+    auth_methods:
+      - password
+  docker_preserve_image: true
+  # This is necessary for pretty much all containers
+  docker_cap_add:
+    - AUDIT_WRITE
+  mount_folders:
+    host_files:
+      host_path: ./
+      container_path: /host_files
+  # All items below this point are required for systemd
+    cgroup:
+      host_path: /sys/fs/cgroup
+      container_path: /sys/fs/cgroup
+      opts: 'ro'
+  dockeropts:
+    HostConfig:
+      Tmpfs:
+        '/run': 'rw,noexec,nosuid,nodev,size=65536k'
+        '/run/lock': 'rw,noexec,nosuid,nodev,size=65536k'
+        '/tmp': 'rw,exec,nosuid,nodev,size=65536k'
+        '/sys/fs/cgroup/systemd': 'rw,size=65536k'
+        '/var/log/journal': 'rw,noexec,nodev,nosuid,size=65536k'

data/spec/acceptance/support/build_project_helpers.rb

@@ -57,16 +57,40 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
   # Scans a host path for the 'SIMP Development' GPG key and returns its Key ID
   #
   # @param [Host, String, Symbol] host Beaker host
-  # @param [Hash{Symbol=>String}] opts Beaker options Hash for `#on` ({})
-  # @param [String] proj_dir Absolute path to the parent project directory
+  # @param [String] key_dir Absolute path to GPG key dir
   # @param [Hash{Symbol=>String}] opts Beaker options Hash for `#on` ({})
   # @return [String] GPG dev signing Key ID
   #
-  def dev_signing_key_id(host, proj_dir, opts = {})
-    key_dir = distribution_dir(host, proj_dir, opts) + '/build_keys/dev'
-    res = on(host, %(#{run_cmd} "gpg --list-keys --fingerprint --homedir='#{key_dir}' 'SIMP Development'"))
-    lines = res.stdout.lines.select { |x| x =~ %r{Key fingerprint =} }
-    raise "No 'SIMP Development' GPG keys found under ''" if lines.empty?
-    lines.first.strip.split(%r{\s+})[-4..-1].join.downcase
+  def dev_signing_key_id(host, key_dir, opts = {})
+    # NOTE: This search uses a substring match on 'SIMP Development'.
+    res = on(host, %(#{run_cmd} "gpg --with-colons --fingerprint --homedir='#{key_dir}' 'SIMP Development'"), opts)
+    pub_lines = res.stdout.lines.select { |x| x.start_with?('pub') }
+    raise "No 'SIMP Development' GPG keys found in '#{key_dir}'" if pub_lines.empty?
+    pub_lines.first.split(':')[4].downcase
+  end
+
+  # Returns true when a gpg-agent daemon using the specified GPG home directory
+  # (aka key directory) is running.
+  #
+  # @param [Host, String, Symbol] host Beaker host
+  # @param [String] gpg_homedir Absolute path to GPG home dir
+  def gpg_agent_running?(host, gpg_homedir)
+
+    # This check is being used in tests to verify no gpg-agent for gpg_homedir
+    # is running.  On slow VMs, the gpg-agent can take some time to shutdown.
+    # So wait up to 20 seconds for gpg-agent to shutdown before finalizing
+    # gpg-agent status to be reported.
+
+    retries = 20
+    agent_exists = true
+    while (agent_exists || (retries > 0))
+      result = on(host, "pgrep -c -f 'gpg-agent.*homedir.*#{gpg_homedir}'", :accept_all_exit_codes => true)
+      agent_exists  = (result.stdout.strip != '0')
+      break unless agent_exists
+      sleep 1
+      retries -= 1
+    end
+
+    agent_exists
   end
 end

data/spec/lib/simp/ci/gitlab_spec.rb

@@ -35,8 +35,7 @@ describe Simp::Ci::Gitlab do
   describe '#validate_config' do
     it 'succeeds when no .gitlab-ci.yml file exists and no tests exist' do
       proj_dir = File.join(files_dir, 'no_gitlab_config_without_tests')
-      expect{ Simp::Ci::Gitlab.new(proj_dir).validate_config }.
-        to_not raise_error
+      expect{ Simp::Ci::Gitlab.new(proj_dir).validate_config }.to_not raise_error
     end
 
     it 'succeeds but warns when no .gitlab-ci.yml file exists but tests exist' do
@@ -56,9 +55,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"valid","errors":[]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_config }.
         to_not raise_error
@@ -68,9 +67,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"invalid","errors":["root config contains unknown keys: pup5.5-unit"]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_config }.
         to raise_error(Simp::Ci::Gitlab::LintError,
@@ -97,7 +96,7 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).returns('')
+      expect(validator).to receive(:`).and_return('')
 
       expect{ validator.validate_yaml }.
         to output(/Could not find 'curl'/).to_stdout
@@ -107,8 +106,8 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
-      validator.stubs(:`).with(Not(equals('which curl'))).returns('{}')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return('{}')
 
       expect{ validator.validate_yaml }.
         to output(/Unable to lint check/).to_stdout
@@ -118,9 +117,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"valid","errors":[]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_yaml }.
         to_not raise_error
@@ -132,9 +131,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"invalid","errors":["root config contains unknown keys: pup5.5-unit"]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_yaml }.
         to raise_error(Simp::Ci::Gitlab::LintError,

data/spec/lib/simp/command_utils_spec.rb

@@ -0,0 +1,29 @@
+require 'simp/command_utils'
+require 'spec_helper'
+
+describe Simp::CommandUtils do
+  RSpec.configure do |c|
+    c.include Simp::CommandUtils
+  end
+
+  describe '.which' do
+    it 'should return location of command that exists' do
+      expect(Facter::Core::Execution).to receive(:which).with('ls').and_return('/usr/bin/ls')
+      expect( which('ls') ).to eq('/usr/bin/ls')
+    end
+
+    it 'should return nil if command does not exist by default' do
+      expect( which('/does/not/exist/command') ).to be nil
+    end
+
+    it 'should fail if command does not exist if fail=true' do
+      expect{ which('/does/not/exist/command', true) }.to raise_error(
+        RuntimeError, /Warning: Command \/does\/not\/exist\/command not found/)
+    end
+
+    it 'should cache commands' do
+      allow(Facter::Core::Execution).to receive(:which).with('ls').and_return('/path1/ls', '/path2/ls')
+      expect( which('ls') ).to eq('/path1/ls')
+    end
+  end
+end

data/spec/lib/simp/componentinfo_spec.rb

@@ -257,10 +257,16 @@ describe Simp::ComponentInfo do
        /Could not extract version and release from /)
    end
 
-   # This has to be a case in which version and release can be read
-   # from spec file but the changelog (which is optional) can't.  Could
-   # be mocked, but would like a real-world test case.
-   xit 'fails when changelog cannot be read from asset RPM spec file'
+   it 'fails when changelog cannot be read from asset RPM spec file' do
+     skip(
+       <<~SKIP.strip.split("\n").join(' ')
+         This has to be a case in which version and release can be read from
+         spec file but the changelog (which is optional) can't.
 
+         It *could* be mocked, but is probably not worth the LOE unless we
+         encounter a real-world test case."
+       SKIP
+     )
+   end
   end
 end

data/spec/lib/simp/local_gpg_signing_key_spec.rb.beaker-only

@@ -1,14 +1,24 @@
 require 'simp/local_gpg_signing_key'
 require 'spec_helper'
 require 'fileutils'
+require 'timeout'
 require 'tmpdir'
 
+
+def get_key_id(keydir, key_email)
+  key_id = nil
+  key_info = `gpg --with-colons --homedir=#{keydir} --list-keys '<#{key_email}>' 2>&1 | grep ^pub:`
+  unless key_info.strip.empty?
+    key_id = key_info.split(':')[4]
+  end
+end
+
 describe Simp::LocalGpgSigningKey do
   include FileUtils
 
   before :all do
     TMP_DIR     = Dir.mktmpdir('spec_test__simp_local_gpg_signing_key')
-    TMP_DEV_DIR = File.join(TMP_DIR, 'dev')
+    TMP_DEV_KEYDIR = File.join(TMP_DIR, 'dev')
     OPTS        = {verbose: ENV['VERBOSE'].to_s =~ /^(yes|true)$/ }
 
     mkdir_p TMP_DIR
@@ -24,9 +34,17 @@ describe Simp::LocalGpgSigningKey do
     ENV['GPG_AGENT_INFO'] = ORIGINAL_GPG_AGENT_INFO
   end
 
+  let(:gpg_keydir) { TMP_DEV_KEYDIR }
+  let(:gpg_email_name) { 'gatekeeper@simp.development.key' }
+  let(:opts) { OPTS }
+
   shared_examples_for 'it just generated a local gpg signing key' do
-    it 'creates a local gpg-agent' do
-      expect(agent_info.reject{|x| x.nil?}.keys).to include(:info, :socket, :pid)
+    it 'has the key in the keyring' do
+      expect(get_key_id(gpg_keydir, gpg_email_name)).to_not be_nil
+    end
+
+    it 'had created a local gpg-agent' do
+      expect(agent_info.reject{|x| x.nil?}.keys).to include(:socket, :pid)
     end
 
     it 'had a gpg-agent socket' do
@@ -35,62 +53,141 @@ describe Simp::LocalGpgSigningKey do
     end
 
     it 'has killed the local gpg-agent' do
+      begin
+        # it may take some time for the local gpg-agent to die
+        Timeout::timeout(30) do
+          done = !File.exist?(agent_info[:socket])
+          until(done)
+            sleep(2)
+            done = !File.exist?(agent_info[:socket])
+          end
+        end
+      rescue Timeout::Error
+        puts "agent_info = #{agent_info}"
+        puts "gpg-agent processes running:\n#{`pgrep -f gpg-agent`}"
+      end
+
       expect(File.exist?(agent_info[:socket])).to be false
     end
   end
 
-
   shared_examples_for 'a valid gpg signing key environment' do
-    it 'has a local GPG signing key' do
-      Dir.chdir(TMP_DEV_DIR) { expect(Dir['*']).to include('RPM-GPG-KEY-SIMP-Dev') }
+    it 'has an exported local GPG signing key' do
+      Dir.chdir(gpg_keydir) { expect(Dir['*']).to include('RPM-GPG-KEY-SIMP-Dev') }
     end
 
-    it 'has a populated a gpg-agent directory' do
-      Dir.chdir(TMP_DEV_DIR) do |_dir|
-        expect(Dir['*'].sort).to include(
-          'gengpgkey',
-          'pubring.gpg',
-        )
-      end
+    it 'has a keygen params file with info required for package signing' do
+      params_file = File.join(gpg_keydir, 'gengpgkey')
+      expect(File.exist?(params_file)).to be true
+
+      content = File.read(params_file)
+      expect(content).to match(/^Passphrase: .*$/)
+      expect(content).to match(/^Name-Email: #{gpg_email_name}$/)
     end
   end
 
   shared_examples_for 'it encountered an unexpired local gpg signing key' do
     it 'reuses an unexpired local gpg signing key' do
-      expect{described_class.new(TMP_DEV_DIR,OPTS).ensure_key}.to output(
+      expect{described_class.new(gpg_keydir,opts).ensure_key}.to output(
         /^GPG key \(gatekeeper@simp\.development\.key\) will expire in 14 days\./
       ).to_stdout
+
+      expect(get_key_id(gpg_keydir, gpg_email_name)).to eq original_key_id
     end
 
     it 'reuses an unexpired local gpg signing key' do
-      expect{described_class.new(TMP_DEV_DIR,OPTS).ensure_key}.to output(
+      expect{described_class.new(gpg_keydir,opts).ensure_key}.to output(
         /^GPG key \(gatekeeper@simp\.development\.key\) will expire in 14 days\./
       ).to_stdout
+
+      expect(get_key_id(gpg_keydir, gpg_email_name)).to eq original_key_id
     end
   end
 
   context '#ensure_key' do
     before :all do
-      rm_rf   TMP_DEV_DIR
+      rm_rf   TMP_DEV_KEYDIR
       ENV['GPG_AGENT_INFO'] = nil
     end
 
+
     context 'when run from scratch' do
       before :all do
-        FIRST_RUN_AGENT_INFO  = described_class.new(TMP_DEV_DIR,OPTS).ensure_key
+        FIRST_RUN_AGENT_INFO  = described_class.new(TMP_DEV_KEYDIR,OPTS).ensure_key
       end
+
       let(:agent_info){ FIRST_RUN_AGENT_INFO }
+
       it_behaves_like 'it just generated a local gpg signing key'
       it_behaves_like 'a valid gpg signing key environment'
     end
 
     context 'when run again' do
       before :all do
-        SECOND_RUN_AGENT_INFO = described_class.new(TMP_DEV_DIR,OPTS).ensure_key
+        SECOND_RUN_AGENT_INFO = described_class.new(TMP_DEV_KEYDIR,OPTS).ensure_key
       end
+
       let(:agent_info){ SECOND_RUN_AGENT_INFO }
+      let(:original_key_id) { get_key_id(gpg_keydir, gpg_email_name) }
+
       it_behaves_like 'it encountered an unexpired local gpg signing key'
       it_behaves_like 'a valid gpg signing key environment'
     end
   end
+
+  context '#gpg_agent_info' do
+    before :all do
+      rm_rf   TMP_DEV_KEYDIR
+    end
+
+    # other use cases already tested in ensure_key tests
+    it 'returns nil when no gpg agent env file exists' do
+      expect(described_class.new(gpg_keydir,opts).gpg_agent_info).to be_nil
+    end
+  end
+
+  context '#dev_key_days_left' do
+    before :all do
+      rm_rf   TMP_DEV_KEYDIR
+    end
+
+    let(:gpg_cmd) {  "gpg --with-colons --homedir=#{gpg_keydir} --list-keys '<#{gpg_email_name}>' 2>&1" }
+
+    it 'returns 0 when key is not found' do
+      expect(described_class.new(gpg_keydir,opts).dev_key_days_left).to eq 0
+    end
+
+    it 'returns 0 when key is expired' do
+      generator = described_class.new(gpg_keydir,opts)
+      output = <<~EOM
+        tru::1:1521838828:0:3:1:5
+        pub:e:4096:1:722B97A808E7DAEA:1521838554:1523048154::-:::sc::::::23::0:
+        fpr:::::::::5DD3E8D45C99780DCA7D0B83722B97A808E7DAEA:
+        uid:e::::1521838554::773C55CA511CCE31244D86D4AB70F6499024695F::SIMP Development (Development key 1521838554) <gatekeeper@simp.development.key>::::::::::0:
+      EOM
+      expect(generator).to receive(:`).with(gpg_cmd).and_return(output)
+
+      expect(generator.dev_key_days_left).to eq 0
+    end
+
+    it 'returns # days left when unexpired key is found with ISO 8601 date' do
+      generator = described_class.new(gpg_keydir,opts)
+
+      require 'date'
+      creation_date = DateTime.now - 5
+      expiration_date = creation_date + 14
+      creation_str = creation_date.iso8601.gsub(/:|-/,'')
+      expiration_str = expiration_date.iso8601.gsub(/:|-/,'')
+
+      output = <<~EOM
+        tru::1:1521838828:0:3:1:5
+        pub:u:4096:1:722B97A808E7DAEA:#{creation_str}:#{expiration_str}::-:::sc::::::23::0:
+        fpr:::::::::5DD3E8D45C99780DCA7D0B83722B97A808E7DAEA:
+        uid:e::::1521838554::773C55CA511CCE31244D86D4AB70F6499024695F::SIMP Development (Development key 1521838554) <gatekeeper@simp.development.key>::::::::::0:
+      EOM
+      expect(generator).to receive(:`).with(gpg_cmd).and_return(output)
+
+      expect(generator.dev_key_days_left).to eq 9
+    end
+  end
 end