prm 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c59c77246e92858fa026b811a193724c105bcdb
-  data.tar.gz: e7c006d04276746730d96438d58f5970c209f392
+  metadata.gz: a78bc2ba1b8f251c719f5d318745a40db260dd75
+  data.tar.gz: 579a58d6ddb8158d55b0a14c5e86a617d02711c2
 SHA512:
-  metadata.gz: b164948c21d5d6510a10839f2035cf6c3b3fc4d2fb2e2459cdd07ce4eec7ed46c064e657c0bcf29d6f520407a1d311b4c9b97679906f7805575d6e3bd2227a95
-  data.tar.gz: 7ac1d09b3b204e4d2e368a07db8a6ac4f6f9e2194d3e32a06880b35797e7523309abf0d305fae4273bd314b1df3c61879a8911c3df85e3c4072fce52af3c37c0
+  metadata.gz: 67862c147b674c244f4535f20e45b21bea801c2d314e3803b4621cf96c874df399f91c5172e34a93056232e5675604c077faaec1ea4ba077fc7615f24a8b2ef8
+  data.tar.gz: b5114cf8c52d7e528283036216ce7d25278006e7d8f3980d32bdabdc8712b428ba1f4be5d788ff3a39850e470d1145453a0f7144b120cbea11069b92e60b0124

data/bin/prm

@@ -31,10 +31,13 @@ class Main < Clamp::Command
 	  "This option will be removed in next stable release (0.3.0)\n"
   end
   option ["-k", "--gpg"], "GPG KEY",  "Sign release files with this GPG key", :default => false
+  option ["-x", "--gpg_passphrase"], "GPG PASSPHRASE", "Passphrase for GPG key [DEB ONLY]", :default => false
+  option ["-x", "--gpg_passphrase"], "GPG PASSPHRASE", "Passphrase for GPG key", :default => false
+  option ["-n", "--gpg_sign_algorithm"], "GPG SIGN ALGORITHM", "Digest algorithm to use for signing (e.g SHA1, SHA512, etc)", :default => false
 
   def execute
 	if version?
-		puts "PRM version: 0.2.14\n"
+		puts "PRM version: 0.2.15\n"
 		exit
 	end
 
@@ -63,6 +66,8 @@ class Main < Clamp::Command
 	end
     unless gpg.nil?
       r.gpg = gpg
+      r.gpg_passphrase = gpg_passphrase
+      r.gpg_sign_algorithm = gpg_sign_algorithm
     end
     unless accesskey.nil?
       r.accesskey = accesskey

data/lib/prm/repo.rb

@@ -2,11 +2,12 @@ require 'rubygems'
 require 'fileutils'
 require 'zlib'
 require 'digest/md5'
+require 'digest/sha1'
 require 'digest/sha2'
 require 'erb'
 require 'find'
 require 'thread'
-require 'peach' 
+require 'peach'
 require 'aws/s3'
 require 'arr-pm'
 require File.join(File.dirname(__FILE__), 'rpm.rb')
@@ -81,50 +82,55 @@ module Debian
 
         npath = "dists/" + r + "/" + c + "/" + "binary-" + a + "/"
 
-        d = File.open(pfpath, "w+")	
+        d = File.open(pfpath, "w+")
         write_mutex = Mutex.new
 
         Dir.glob("#{fpath}*.deb").peach do |deb|
-            md5sum = ''
-            tdeb = deb.split('/').last
-            md5sum_path = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/" + tdeb
+            algs = {
+                'md5' => Digest::MD5.new,
+                'sha1' => Digest::SHA1.new,
+                'sha256' => Digest::SHA256.new
+            }
+            sums = {
+                'md5' => '',
+                'sha1' => '',
+                'sha256' => ''
+            }
+            tdeb = File.basename(deb)
+            init_size = File.size(deb)
+            deb_contents = nil
 
             FileUtils.mkdir_p "tmp/#{tdeb}/"
             if not nocache
-                FileUtils.mkdir_p path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/"
-            end
-            `ar p #{deb} control.tar.gz | tar zx -C tmp/#{tdeb}/`
-
-            init_size = `wc -c < #{deb}`
+                sums.keys.each do |s|
+                    sum_path = "#{path}/dists/#{r}/#{c}/binary-#{a}/#{s}-results/#{tdeb}"
+                    FileUtils.mkdir_p File.dirname(sum_path)
 
-            if deb.split("/").last.to_s == md5sum_path.split("/").last.to_s
-
-            end
-            
-            if File.exists?("#{md5sum_path}") && nocache.nil? 
-                file = File.open(md5sum_path, 'r')
-                md5sum = file.read
-                file.close
-            else
-                md5sum = Digest::MD5.file(deb)
-                if nocache.nil?
-                    File.open(md5sum_path, 'w') { |file| file.write(md5sum) }
-                end
-            end
+                    if File.exist?(sum_path)
+                        stored_sum = File.read(sum_path)
+                        sum = stored_sum unless nocache.nil?
+                    end
 
-            if File.exists?("#{md5sum_path}") && nocache
-                file = File.open(md5sum_path, 'r')
-                temp_md5sum = file.read
-                file.close
+                    unless sum
+                        deb_contents ||= File.read(deb)
+                        sum = algs[s].hexdigest(deb_contents)
+                    end
 
-                if md5sum != temp_md5sum
-                    puts "WARN: md5sum mismatch on #{deb}\n"
+                    sums[s] = sum
+                    if nocache.nil?
+                        File.open(sum_path, 'w') { |f| f.write(sum) }
+                    elsif sum != stored_sum
+                        puts "WARN: #{s}sum mismatch on #{deb}\n"
+                    end
                 end
             end
+            `ar p #{deb} control.tar.gz | tar zx -C tmp/#{tdeb}/`
 
             package_info = [
                 "Filename: #{npath}#{s3_compatible_encode(tdeb)}",
-                "MD5sum: #{md5sum}",
+                "MD5sum: #{sums['md5']}",
+                "SHA1: #{sums['sha1']}",
+                "SHA256: #{sums['sha256']}",
                 "Size: #{init_size}"
             ]
 
@@ -132,7 +138,7 @@ module Debian
                 # Copy the control file data into the Packages list
                 d.write(File.read("tmp/#{tdeb}/control").gsub!(/\n+/, "\n"))
                 d.write(package_info.join("\n"))
-                d.write("\n") # blank line between package info in the Packages file
+                d.write("\n\n") # blank line between package info in the Packages file
             end
         end
 
@@ -161,7 +167,7 @@ module Debian
             end
         }
 
-        component_ar.each do |c| 
+        component_ar.each do |c|
             arch.each do |ar|
                 unreasonable_array.each do |unr|
                     tmp_path = "#{path}/dists/#{release}/#{c}/binary-#{ar}"
@@ -169,10 +175,12 @@ module Debian
                     filename = "#{c}/binary-#{ar}/#{unr}".chomp
 
                     byte_size = File.size("#{tmp_path}/#{unr}").to_s
-                    md5sum = Digest::MD5.file("#{tmp_path}/#{unr}").to_s
+                    file_contents = File.read("#{tmp_path}/#{unr}")
 
                     tmp_hash['size'] = byte_size
-                    tmp_hash['md5sum'] = md5sum
+                    tmp_hash['md5'] = Digest::MD5.hexdigest(file_contents)
+                    tmp_hash['sha1'] = Digest::SHA1.hexdigest(file_contents)
+                    tmp_hash['sha256'] = Digest::SHA256.hexdigest(file_contents)
                     release_info[filename] = tmp_hash
                 end
             end
@@ -192,10 +200,18 @@ module Debian
     # We expect that GPG is installed and a key has already been made
     def generate_release_gpg(path,release,gpg)
         Dir.chdir("#{path}/dists/#{release}") do
+            if gpg_sign_algorithm.nil?
+                sign_algorithm = "none"
+            else
+                sign_algorithm = gpg_sign_algorithm
+            end
+
             if gpg.nil?
-              sign_cmd = "gpg --yes --output Release.gpg -b Release"
+              sign_cmd = "gpg --digest-algo \"#{sign_algorithm}\" --yes --output Release.gpg -b Release"
+            elsif !gpg_passphrase.nil?
+              sign_cmd = "echo \'#{gpg_passphrase}\' | gpg --digest-algo \"#{sign_algorithm}\" -u #{gpg} --passphrase-fd 0 --yes --output Release.gpg -b Release"
             else
-              sign_cmd = "gpg -u #{gpg} --yes --output Release.gpg -b Release"
+              sign_cmd = "gpg --digest-algo \"#{sign_algorithm}\" -u #{gpg} --yes --output Release.gpg -b Release"
             end
             system sign_cmd
         end
@@ -213,7 +229,7 @@ module SNAP
             return
         end
 
-        release.each do |r| 
+        release.each do |r|
             time = Time.new
             now = time.strftime("%Y-%m-%d-%H-%M")
             new_snap = "#{snapname}-#{now}"
@@ -226,7 +242,7 @@ module SNAP
                 end
             end
 
-            if File.exists?("#{path}/dists/#{r}/#{snapname}") && !File.symlink?("#{path}/dists/#{r}/#{snapname}") 
+            if File.exists?("#{path}/dists/#{r}/#{snapname}") && !File.symlink?("#{path}/dists/#{r}/#{snapname}")
                 puts "Snapshot target is a filesystem, remove it or rename your snap target"
                 return
             end
@@ -352,6 +368,8 @@ module PRM
         attr_accessor :label
         attr_accessor :origin
         attr_accessor :gpg
+        attr_accessor :gpg_passphrase
+        attr_accessor :gpg_sign_algorithm
         attr_accessor :secretkey
         attr_accessor :accesskey
         attr_accessor :snapshot

data/lib/prm/rpm.rb

@@ -122,6 +122,13 @@ module Redhat
                 r_file.close
 
                 FileUtils.mv("#{repo_path}/repomd.xml.tmp", "#{repo_path}/repomd.xml")
+
+                unless gpg == false
+                    # We expect that GPG is installed and a key has already been made
+                    sign_cmd = "gpg -u #{gpg} --yes --detach-sign --armor #{repo_path}/repomd.xml"
+                    system sign_cmd
+                end
+
                 puts "Built Yum repository for #{r}\n"
             end
         end

data/templates/deb_release.erb

@@ -7,7 +7,17 @@ Origin: <%= origin %>
 Label: <%= label %>
 <% end -%>
 MD5Sum:
- d41d8cd98f00b204e9800998ecf8427e                  0 Release
+ d41d8cd98f00b204e9800998ecf8427e                                 0 Release
 <% release_info.each_pair do |k,v| -%>
- <%= "#{release_info[k]['md5sum']}                  #{release_info[k]['size']} #{k}" %>
+ <%= "#{release_info[k]['md5']}                                 #{release_info[k]['size']} #{k}" %>
+<% end -%>
+SHA1:
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                         0 Release
+<% release_info.each_pair do |k,v| -%>
+ <%= "#{release_info[k]['sha1']}                         #{release_info[k]['size']} #{k}" %>
+<% end -%>
+SHA256:
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release
+<% release_info.each_pair do |k,v| -%>
+ <%= "#{release_info[k]['sha256']} #{release_info[k]['size']} #{k}" %>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prm
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Brett Gailey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peach