dr 0.0.4 → 0.0.5

data/bin/dr

@@ -17,7 +17,7 @@ class ExtendedThor < Thor
   include Dr::Logger
 
   def get_repo_handle
-    if @conf == nil
+    unless @conf
       @conf = Dr::Config.new ["/etc/dr.conf", "~/.dr.conf"]
     end
 

data/lib/dr/debpackage.rb

@@ -23,6 +23,9 @@ module Dr
 
       log :info, "Adding a build to the #{src_name.fg "blue"} source package"
 
+      log :info, "Signing the deb file"
+      repo.sign_deb deb_file
+
       FileUtils.mkdir_p deb_dir
       FileUtils.cp "#{deb_file}", "#{deb_dir}/"
     end

data/lib/dr/gitpackage.rb

@@ -163,6 +163,9 @@ EOS
               FileUtils.mkdir_p build_dir
               debs.each do |pkg|
                 FileUtils.cp pkg, build_dir
+
+                log :info, "Signing the #{File.basename(pkg).fg("blue")} package"
+                @repo.sign_deb "#{build_dir}/#{File.basename(pkg)}"
               end
             end
           end

data/lib/dr/gnupg.rb

@@ -59,7 +59,11 @@ END
       key
     end
 
-    def get_id
+    def get_key_id(key)
+      cmd = "gpg --homedir #{@keyring} --with-colons --list-public-keys #{key}"
+      gpg = ShellCmd.new cmd, :tag => "gpg"
+
+      gpg.out.lines.grep(/^pub/)[0].split(":")[9]
     end
 
     def export_pub(key, location)

data/lib/dr/repo.rb

@@ -289,7 +289,25 @@ module Dr
       Dir["#{@location}/packages/#{pkg.name}/builds/#{version}/*"]
     end
 
+    def sign_deb(deb)
+      keyring = "#{@location}/gnupg-keyring"
+      gpg = GnuPG.new keyring
+      key_id = gpg.get_key_id get_key
+
+      cmd = "dpkg-sig -k '#{key_id}' -s builder -g '--homedir #{keyring}' #{deb}"
+      ShellCmd.new cmd, :tag => "dpkg-sig", :show_out => true
+    end
+
     private
+    def get_key
+      File.open "#{@location}/archive/conf/distributions", "r" do |f|
+        f.each_line do |line|
+          m = line.match /^SignWith: (.+)/
+          return m.captures[0] if m
+        end
+      end
+    end
+
     def is_used?(pkg_name, version=nil)
       versions_by_suite = get_subpackage_versions pkg_name
       versions_by_suite.inject(false) do |rslt, hash_pair|

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor