simp-rake-helpers 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93def8d379879e106ff6d75e7824a955e62801a1
-  data.tar.gz: b1e7d9ac4a46ed7687ecbebcf27cac3d0c98248a
+  metadata.gz: 9d12b61c9cbf1d5f9143d3fe5d6af7f38019023e
+  data.tar.gz: e73156476af4b7deacd26a04daa067796125c21c
 SHA512:
-  metadata.gz: 07e7d770569a585dbd70a1036d95c02066999e20adbd5a8d525e45891b6ff8cbe84f23d7ceeaaa726a623b2341b15f858064cadf745a366b05cc4335f668db7d
-  data.tar.gz: 02c7c7d0dd9dd45b6223016079f8a88cbd6511c44b8709700047d4e1d65819ab755426af3f38388e5ceeed8ac97ab22f1e08d3d1c68c68425f0688e271dedde3
+  metadata.gz: 428b0d6fda5038f7ca0b8d01afbce8cebfbd0fd246b7f98c35cbfb2d3b01246ac1ca9d8fa727e493ab2a2f30a2b136281d6122502e869939e1b9a3b9eb513f1d
+  data.tar.gz: b37f3e18f80764b7554c6aea51e0ea4e7aaba993bf464272ac3d9129e7842ae9ad6712eb8e2e05e4019f41635c41eff82d4dd238db34dca6ac1cfc1e68dc41c3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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
+  presented key.
+* Worked around an issue where rpm --resign will prompt more than once for the
+  GPG key using the latest GPG version. This happens on the command line as
+  well.
+
 ### 1.0.10 / 2015-07-23
 * Relax dependency to allow puppet 3 or above
 

data/lib/simp/rake/helpers.rb

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

data/lib/simp/rpm.rb

@@ -133,35 +133,68 @@ module Simp
         end
       end
 
-      @@gpg_keys[gpg_key] = { :dir => keydir, :name => gpg_name, :password => gpg_password }
+      gpg_key_size = nil
+      gpg_key_id = nil
+      %x(gpg --homedir=#{keydir} --list-keys #{gpg_name} 2>&1).each_line do |line|
+        head,data = line.split(/\s+/)
+        if head == 'pub'
+          gpg_key_size,gpg_key_id = data.split('/')
+          break
+        end
+      end
+
+      if !gpg_key_size || !gpg_key_id
+        fail("Error getting GPG Key metadata")
+      end
+
+      @@gpg_keys[gpg_key] = {
+        :dir => keydir,
+        :name => gpg_name,
+        :key_id => gpg_key_id,
+        :key_size => gpg_key_size,
+        :password => gpg_password
+      }
     end
 
     # Signs the given RPM with the given gpg_key (see Simp::RPM.load_key for
     # details on the value of this parameter).
     def self.signrpm(rpm, gpg_key)
       gpgkey = load_key(gpg_key)
-      signcommand = "rpm " +
-          "--define '%_signature gpg' " +
-          "--define '%__gpg %{_bindir}/gpg' " +
-          "--define '%_gpg_name #{gpgkey[:name]}' " +
-          "--define '%_gpg_path #{gpgkey[:dir]}' " +
-          "--resign #{rpm}"
-      begin
-        PTY.spawn(signcommand) do |read, write, pid|
-          begin
-            read.expect(/Enter pass phrase: /) do |text|
-              write.print("#{gpgkey[:password]}\n")
+
+      gpg_sig = nil
+      %x(rpm -Kv #{rpm}).each_line do |line|
+        if line =~ /key\sID\s(.*):/
+          gpg_sig = $1.strip
+        end
+      end
+
+      unless gpg_sig == gpgkey[:key_id]
+        signcommand = "rpm " +
+            "--define '%_signature gpg' " +
+            "--define '%__gpg %{_bindir}/gpg' " +
+            "--define '%_gpg_name #{gpgkey[:name]}' " +
+            "--define '%_gpg_path #{gpgkey[:dir]}' " +
+            "--resign #{rpm}"
+        begin
+          PTY.spawn(signcommand) do |read, write, pid|
+            begin
+              while !read.eof? do
+                read.expect(/pass\s?phrase:.*/) do |text|
+                  write.puts(gpgkey[:password])
+                  write.flush
+                end
+              end
+            rescue Errno::EIO
+              # This ALWAYS happens in Ruby 1.8.
             end
-          rescue Errno::EIO
-            # This ALWAYS happens in Ruby 1.8.
+            Process.wait(pid)
           end
-          Process.wait(pid)
+  
+          raise "Failure running #{signcommand}" unless $?.success?
+        rescue Exception => e
+          puts "Error occured while attempting to sign #{rpm}, skipping."
+          puts e
         end
-
-        raise "Failure running #{signcommand}" unless $?.success?
-      rescue Exception => e
-        puts "Error occured while attempting to sign #{rpm}, skipping."
-        puts e
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler