prm 0.2.5 → 0.2.6

data/bin/prm

@@ -22,11 +22,11 @@ class Main < Clamp::Command
   option ["-d", "--directory"], "DIRECTORY", "Move packages from directory to target", :default => false
   option ["-s", "--snapshot"], "COMPONENT", "Creates a snapshot of a component", :default => false
   option ["-e", "--recent"], :flag, "Snapshot the most recent unique packages", :default => false
-  option ["-k", "--gpg"], :flag,  "Sign release files with users GPG key", :default => false
   option ["-g", "--generate"], :flag , "[DEPRECATED 0.2.4]" do
 	  warn "WARNING: Generate option (--generate) is deprecated\n" +
 	  "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
 
   def execute
 	if recent? && !snapshot
@@ -34,7 +34,7 @@ class Main < Clamp::Command
 	end
 
 	if type == "deb" && !component
-		raise "--deb option required the --component option!"
+		raise "--deb option required for the --component option!"
 	end
 
     r = PRM::Repo.new
@@ -42,8 +42,8 @@ class Main < Clamp::Command
     r.arch = arch
     r.type = type
     r.path = path
-    if gpg?
-      r.gpg = gpg?
+    unless gpg.nil?
+      r.gpg = gpg
     end
     unless accesskey.nil?
       r.accesskey = accesskey

data/lib/prm/repo.rb

@@ -32,8 +32,8 @@ module Debian
             }
             generate_release(path,r,component,arch)
 
-            if gpg == true
-                generate_release_gpg(path,r)
+            unless gpg == false
+                generate_release_gpg(path,r, gpg)
             end
         }
     end
@@ -130,7 +130,7 @@ module Debian
 
             write_mutex.synchronize do
                 # Copy the control file data into the Packages list
-                d.write(File.read("tmp/#{tdeb}/control"))
+                d.write(File.read("tmp/#{tdeb}/control").chomp)
                 d.write(package_info.join("\n"))
                 d.write("\n") # blank line between package info in the Packages file
             end
@@ -193,9 +193,14 @@ module Debian
     end
 
     # We expect that GPG is installed and a key has already been made
-    def generate_release_gpg(path,release)
+    def generate_release_gpg(path,release,gpg)
         Dir.chdir("#{path}/dists/#{release}") do
-            system "gpg --yes --output Release.gpg -b Release"
+            if gpg.nil?
+              sign_cmd = "gpg --yes --output Release.gpg -b Release"
+            else
+              sign_cmd = "gpg -u #{gpg} --yes --output Release.gpg -b Release"
+            end
+            system sign_cmd
         end
     end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prm
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Brett Gailey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-17 00:00:00 -07:00
+date: 2013-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency