dr 0.0.6 → 0.1.0

data/README.md

@@ -1,4 +1,4 @@
-# Mkpkg
+# Debian Repository Management Tool
 
 TODO: Write a gem description
 

data/bin/dr

@@ -50,45 +50,103 @@ class Archive < ExtendedThor
 end
 
 class List < ExtendedThor
-  desc "packages", "show a list of source packages in the repo"
+  desc "packages", "Show a list of source packages in the repo"
   def packages()
     repo = get_repo_handle
     log :info, "Listing all source packages in the repository"
 
     repo.list_packages.each do |pkg|
-      log :info, "  #{pkg.name}"
+      log :info, "  #{pkg.name.fg "orange"}"
     end
   end
 
-  desc "versions PACKAGE", "show the history of all available versions for a package"
+  desc "versions PACKAGE", "Show the history of all available versions for a package"
   def versions(pkg_name)
     repo = get_repo_handle
-    log :info, "Listing all built versions of '#{pkg_name}'"
+    log :info, "Listing all built versions of #{pkg_name.style "pkg-name"}"
 
     suites = repo.get_suites
 
     pkg = repo.get_package pkg_name
     pkg.history.each do |version|
-      line = "#{version}"
-      suites.each do |suite, codename|
-        codename = suite if codename == nil
-        if pkg.build_exists? version
-          debs = repo.get_build pkg.name, version
-          subpkgs = debs.map { |p| subpkg = File.basename(p).split("_")[0] }
-
-          all_included = true
-          subpkgs.each do |subpkg|
-            unless repo.query_for_deb_version(suite, subpkg) == version
-              all_included = false
+      line = "#{version.style "version"}"
+
+      if pkg.build_exists? version
+        debs = repo.get_build pkg.name, version
+
+        metadata = repo.get_build_metadata pkg.name, version
+        if metadata.has_key? "branch"
+          open = "{".fg "dark-grey"
+          close = "}".fg "dark-grey"
+          line << " " + open + metadata["branch"].fg("blue") + close
+        end
+
+        subpkgs = debs.map { |p| subpkg = File.basename(p).split("_")[0] }
+      end
+
+      open = "[".fg "dark-grey"
+      close = "]".fg "dark-grey"
+
+      if subpkgs.length == 0
+        line << " " + open + "broken".fg("red") + close
+      else
+        suites.each do |suite, codename|
+          codename = suite if codename == nil
+
+          colour = case suite
+          when "stable" then "red"
+          when "testing" then "yellow"
+          when "unstable" then "green"
+          else nil end
+
+            all_included = true
+            subpkgs.each do |subpkg|
+              unless repo.query_for_deb_version(suite, subpkg) == version
+                all_included = false
+              end
             end
-          end
 
-          line << " [#{codename}]" if all_included
+            if all_included
+              if colour
+                line << " " + open + codename.fg(colour) + close
+              else
+                line << " " + open + codename + close
+              end
+            end
         end
       end
       log :info, "  #{line}"
     end
   end
+
+  desc "suite SUITE", "Show the names and versions of packages in the suite"
+  def suite(suite)
+    repo = get_repo_handle
+
+    suites = repo.get_suites
+    exists = suites.inject(false) { |r, s| r || s.include?(suite) }
+    raise "Suite '#{suite}' doesn't exist" unless exists
+
+    log :info, "Listing all the packages in #{suite.fg "blue"}"
+
+    suite = repo.codename_to_suite suite
+    suite_packages = repo.list_packages
+    suite_packages.each do |pkg|
+      versions = repo.get_subpackage_versions pkg.name
+      unless versions[suite].empty?
+        if versions[suite].length == 1 && versions[suite].has_key?(pkg.name)
+          log :info, "  #{pkg.name.style "pkg-name"}  " +
+                     "#{versions[suite][pkg.name].style "version"}"
+        else
+          log :info, "  #{pkg.name.style "pkg-name"}"
+          versions[suite].each do |subpkg, version|
+            log :info, "    #{subpkg.style "subpkg-name"}  " +
+                       "#{version.style "version"}"
+          end
+        end
+      end
+    end
+  end
 end
 
 class RepoCLI < ExtendedThor
@@ -188,6 +246,11 @@ class RepoCLI < ExtendedThor
     pkg = repo.get_package pkg_name
     version = pkg.build branch, force
 
+    unless version
+      log :warn, "Build stopped (add -f to build anyway)"
+      return
+    end
+
     if options["push"] && version
       if options["push"] == "push"
         repo.push pkg.name, version, "testing" # FIXME: should be configurable
@@ -223,6 +286,7 @@ class RepoCLI < ExtendedThor
   end
 
   desc "list SUBCOMMAND [ARGS]", "show information about packages"
+  map "l" => :list, "ls" => :list
   subcommand "list", List
 
   desc "rm [pkg-name]", "remove a package completely from the build system"
@@ -241,7 +305,30 @@ class RepoCLI < ExtendedThor
     repo.remove_build pkg_name, version, options["force"] == true
   end
 
-  desc "release", "push all the packages from testing to release"
+  desc "update", "Update and rebuild (if necessary) all the packages in the suite"
+  def update(suite="testing")
+    log :info, "Updating all packages in the #{suite.fg "blue"} suite"
+    repo = get_repo_handle
+
+    updated = 0
+    repo.list_packages(suite).each do |pkg|
+      log :info, "Updating #{pkg.name.style "pkg-name"}"
+      begin
+        version = pkg.build
+      rescue Dr::Package::UnableToBuild
+        log :info, ""
+        next
+      end
+
+      log :info, ""
+      repo.push pkg.name, version, suite if version
+      updated += 1
+    end
+
+    log :info, "Updated #{updated.to_s.fg "blue"} packages in #{suite.fg "blue"}"
+  end
+
+  desc "release", "Push all the packages from testing to release"
   def release
     repo = get_repo_handle
 
@@ -251,6 +338,19 @@ class RepoCLI < ExtendedThor
     end
   end
 
+  desc "force-sync", "Force cloning the sources repository from scratch again"
+  def force_sync(pkg_name)
+    repo = get_repo_handle
+    pkg = repo.get_package pkg_name
+
+    if pkg.is_a? Dr::GitPackage
+      pkg.reinitialise_repo
+    else
+      raise "The source of #{pkg_name.style "pkg-name"} is not managed by " +
+            "#{"dr".bright}"
+    end
+  end
+
   desc "snapshot", "save a snapshot of the archive"
   def snapshot(tag)
     repo = get_repo_handle
@@ -263,7 +363,7 @@ class RepoCLI < ExtendedThor
 end
 
 begin
-  RepoCLI.start ARGV
+ RepoCLI.start ARGV
 rescue Exception => e
   Dr::Logger.log :err, e.to_s
 end

data/lib/dr/debpackage.rb

@@ -10,24 +10,24 @@ module Dr
         src_name = dpkg.out.chomp
       end
 
-      log :info, "Adding the #{File.basename(deb_file).fg("blue")} package"
+      deb_file_name = File.basename(deb_file)
+      log :info, "Adding the #{deb_file_name.style "subpkg-name"} package"
 
       dpkg = ShellCmd.new "dpkg-deb --field #{deb_file} Version", :tag => "dpkg"
       version = dpkg.out.chomp
 
       deb_dir = "#{repo.location}/packages/#{src_name}/builds/#{version}"
 
-      if File.exists?("#{deb_dir}/#{File.basename deb_file}") && !force
+      if File.exists?("#{deb_dir}/#{deb_file_name}") && !force
         raise "This deb file is already in the repo"
       end
 
-      log :info, "Adding a build to the #{src_name.fg "blue"} source package"
-
-      log :info, "Signing the deb file"
-      repo.sign_deb deb_file
-
+      log :info, "Adding a build to the #{src_name.style "pkg-name"} source package"
       FileUtils.mkdir_p deb_dir
       FileUtils.cp "#{deb_file}", "#{deb_dir}/"
+
+      log :info, "Signing the deb file"
+      repo.sign_deb "#{deb_dir}/#{deb_file_name}"
     end
 
     def initialize(name, repo)
@@ -35,9 +35,9 @@ module Dr
     end
 
     def build(branch=nil, force=false)
-      log :warn, "The source of the #{@name.fg "blue"} package is not " +
-                 "managed by #{"dr".bright}"
-      raise "Unable to build the package"
+      log :warn, "The sources of the #{@name.style "pkg-name"} package are " +
+                 "not managed by #{"dr".bright}"
+      raise UnableToBuild.new "Unable to build the package"
     end
   end
 end

data/lib/dr/gitpackage.rb

@@ -2,20 +2,30 @@ require "dr/package"
 require "dr/pkgversion"
 require "dr/shellcmd"
 
+require "yaml"
+
 module Dr
   class GitPackage < Package
     def self.setup(repo, git_addr, default_branch, force=false)
       Dir.mktmpdir do |tmp|
-        git_cmd = "git clone --branch #{default_branch} #{git_addr} #{tmp}/git"
+        git_cmd = "git clone --mirror --branch #{default_branch} " +
+                  "#{git_addr} #{tmp}/git"
+        ShellCmd.new git_cmd, :tag => "git", :show_out => true
+
+        FileUtils.mkdir_p "#{tmp}/src"
+
+        log :info, "Extracting the sources"
+        git_cmd ="git --git-dir #{tmp}/git --bare archive " +
+                 "--format tar #{default_branch} | tar x -C #{tmp}/src"
         ShellCmd.new git_cmd, :tag => "git", :show_out => true
 
-        unless File.exists? "#{tmp}/git/debian/control"
+        unless File.exists? "#{tmp}/src/debian/control"
           log :err, "The debian packaging files not found in the repository"
           raise "Adding a package from #{git_addr} failed"
         end
 
         src_name = nil
-        File.open "#{tmp}/git/debian/control", "r" do |f|
+        File.open "#{tmp}/src/debian/control", "r" do |f|
           f.each_line do |line|
             match = line.match /^Source: (.+)$/
             if match
@@ -36,16 +46,16 @@ module Dr
           raise "Adding failed"
         end
 
-        log :info, "Adding #{src_name.fg "blue"} to the repository"
+        log :info, "Adding #{src_name.style "pkg-name"} to the repository"
         FileUtils.mkdir_p "#{pkg_dir}"
 
         log :info, "Setting up builds directory"
         FileUtils.mkdir_p "#{pkg_dir}/builds"
 
         log :info, "Setting up the source directory"
-        FileUtils.mv "#{tmp}/git/.git", "#{pkg_dir}/source"
+        FileUtils.mv "#{tmp}/git", "#{pkg_dir}/source"
 
-        log :info, "Package #{src_name} added successfully"
+        log :info, "The #{src_name.style "pkg-name"} package added successfully"
       end
     end
 
@@ -53,11 +63,57 @@ module Dr
       super name, repo
 
       @git_dir = "#{repo.location}/packages/#{name}/source"
+      @default_branch = get_current_branch
+    end
 
-      git_cmd = ShellCmd.new "git --git-dir #{@git_dir} branch", {
-        :tag => "git-clone"
-      }
-      @default_branch = git_cmd.out.chomp.lines.grep(/^*/)[0][2..-1]
+    def reinitialise_repo
+      git_addr = get_repo_url
+
+      log :info, "Re-downloading the source repository of " +
+                 "#{@name.style "pkg-name"}"
+      Dir.mktmpdir do |tmp|
+        git_cmd = "git clone --mirror --branch #{@default_branch} " +
+                  "#{git_addr} #{tmp}/git"
+        ShellCmd.new git_cmd, :tag => "git", :show_out => true
+
+        src_dir = "#{tmp}/src"
+        FileUtils.mkdir_p src_dir
+
+        log :info, "Extracting the sources"
+        git_cmd ="git --git-dir #{@git_dir} --bare archive " +
+                 "--format tar #{@default_branch} | tar x -C #{src_dir}"
+        ShellCmd.new git_cmd, :tag => "git", :show_out => true
+
+        unless File.exists? "#{tmp}/src/debian/control"
+          log :err, "The debian packaging files not found in the repository"
+          raise "Adding a package from #{git_addr} failed"
+        end
+
+        src_name = nil
+        File.open "#{tmp}/src/debian/control", "r" do |f|
+          f.each_line do |line|
+            match = line.match /^Source: (.+)$/
+            if match
+              src_name = match.captures[0]
+              break
+            end
+          end
+        end
+
+        unless src_name
+          log :err, "Couldn't identify the source package"
+          raise "Adding a package from #{git_addr} failed"
+        end
+
+        unless src_name == @name
+          log :err, "The name of the package in the repo has changed"
+          raise "Adding a package from #{git_addr} failed"
+        end
+
+        src_dir = "#{@repo.location}/packages/#{@name}/source"
+        FileUtils.rm_rf src_dir
+        FileUtils.mv "#{tmp}/git", "#{src_dir}"
+      end
     end
 
     def build(branch=nil, force=false)
@@ -68,17 +124,17 @@ module Dr
       if curr_rev != orig_rev || force
         Dir.mktmpdir do |src_dir|
           log :info, "Extracting the sources"
-          git_cmd ="git --git-dir #{@git_dir} archive " +
+          git_cmd ="git --git-dir #{@git_dir} --bare archive " +
                    "--format tar #{branch} | tar x -C #{src_dir}"
           ShellCmd.new git_cmd, :tag => "git", :show_out => true
 
           version = PkgVersion.new get_version "#{src_dir}/debian/changelog"
-          log :info, "Source version: #{version}"
+          log :info, "Source version: #{version.to_s.style "version"}"
 
           while build_exists? version
             version.increment!
           end
-          log :info, "Building version: #{version}"
+          log :info, "Building version: #{version.to_s.style "version"}"
 
           log :info, "Updating changelog"
           now = Time.new.strftime("%a, %-d %b %Y %T %z")
@@ -108,8 +164,9 @@ module Dr
           end
           arches.each do |arch|
             @repo.buildroot(arch).open do |br|
-              log :info, "Building the #{@name.fg("blue")} package " +
-                         "v#{version} for #{arch}"
+              log :info, "Building the #{@name.style "pkg-name"} package " +
+                         "version #{version.to_s.style "version"} for #{arch}"
+
               # Moving to the proper directory
               build_dir_name = "#{@name}-#{version.upstream}"
               build_dir = "#{br}/#{build_dir_name}"
@@ -164,15 +221,22 @@ EOS
               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)}"
+                deb_filename = File.basename(pkg)
+                log :info, "Signing the #{deb_filename.style "subpkg-name"} package"
+                @repo.sign_deb "#{build_dir}/#{deb_filename}"
+              end
+
+              log :info, "Writing package metadata"
+              File.open "#{build_dir}/.metadata", "w" do |f|
+                YAML.dump({"branch" => branch}, f)
               end
+              log :info, "The #{@name.style "pkg-name"} package has been " +
+                         "built successfully."
             end
           end
         end
       else
-        log :info, "There were no changes in the #{pkg.name.fg("blue")} package"
-        log :info, "Build stopped (add -f to build anyway)"
+        log :info, "There were no changes in the #{@name.style "pkg-name"} package"
       end
       version
     end
@@ -181,26 +245,26 @@ EOS
     def update_from_origin(branch)
       log :info, "Pulling changes from origin"
 
-      git_cmd = "git --git-dir #{@git_dir} rev-parse #{branch} 2>/dev/null"
+      git_cmd = "git --git-dir #{@git_dir} --bare rev-parse #{branch} 2>/dev/null"
       git = ShellCmd.new git_cmd, :tag => "git"
 
       original_rev = git.out.chomp
       original_rev = nil if original_rev == branch
 
       begin
-        if @default_branch == branch
-          git_cmd = "git --git-dir #{@git_dir} pull origin #{branch}"
+        #if @default_branch == branch
+          git_cmd = "git --git-dir #{@git_dir} --bare fetch origin"
           ShellCmd.new git_cmd, :tag => "git", :show_out => true
-        else
-          git_cmd = "git --git-dir #{@git_dir} fetch origin #{branch}:#{branch}"
-          ShellCmd.new git_cmd, :tag => "git", :show_out => true
-        end
+        #else
+        #  git_cmd = "git --git-dir #{@git_dir} --bare fetch origin #{branch}:#{branch}"
+        #  ShellCmd.new git_cmd, :tag => "git", :show_out => true
+        #end
       rescue Exception => e
         log :err, "Unable to pull from origin"
         raise e
       end
 
-      git_cmd = "git --git-dir #{@git_dir} rev-parse #{branch} 2>/dev/null"
+      git_cmd = "git --git-dir #{@git_dir} --bare rev-parse #{branch} 2>/dev/null"
       git = ShellCmd.new git_cmd, :tag => "git"
       current_rev = git.out.chomp
 
@@ -242,5 +306,18 @@ EOS
 
       arches.uniq
     end
+
+    def get_repo_url
+      git_cmd = "git --git-dir #{@git_dir} --bare remote show origin -n"
+      git = ShellCmd.new git_cmd, :tag => "git"
+      git.out.lines.grep(/Fetch URL/)[0].chomp[13..-1]
+    end
+
+    def get_current_branch
+      git_cmd = ShellCmd.new "git --git-dir #{@git_dir} --bare branch", {
+        :tag => "git"
+      }
+      git_cmd.out.chomp.lines.grep(/^\*/)[0][2..-1].chomp
+    end
   end
 end

data/lib/dr/logger.rb

@@ -4,11 +4,13 @@ tco_conf = Tco::config
 
 tco_conf.names["green"] = "#99ad6a"
 tco_conf.names["yellow"] = "#d8ad4c"
-tco_conf.names["red"] = "#cf6a4c"
+tco_conf.names["red"] = "#cc333f" #"#cf6a4c"
 tco_conf.names["light-grey"] = "#ababab"
 tco_conf.names["dark-grey"] = "#2b2b2b"
 tco_conf.names["purple"] = "#90559e"
-tco_conf.names["blue"] = "#1b8efa"
+tco_conf.names["blue"] = "#4D9EEB" #"#1b8efa"
+tco_conf.names["orange"] = "#ff842a"
+tco_conf.names["brown"] = "#6a4a3c"
 
 tco_conf.styles["info"] = {
   :fg => "green",
@@ -43,6 +45,27 @@ tco_conf.styles["log-head"] = {
   :underline => false
 }
 
+tco_conf.styles["pkg-name"] = {
+  :fg => "orange",
+  :bg => "",
+  :bright => false,
+  :underline => false
+}
+
+tco_conf.styles["subpkg-name"] = {
+  :fg => "purple",
+  :bg => "",
+  :bright => false,
+  :underline => false
+}
+
+tco_conf.styles["version"] = {
+  :fg => "brown",
+  :bg => "",
+  :bright => false,
+  :underline => false
+}
+
 Tco::reconfigure tco_conf
 
 module Dr
@@ -74,7 +97,7 @@ module Dr
     end
 
     def tag(tag, msg)
-      tag.fg("blue") << " " << msg
+      tag.fg("blue").bg("dark-grey") << " " << msg
     end
   end
 end

data/lib/dr/package.rb

@@ -3,6 +3,9 @@ require "dr/shellcmd"
 
 module Dr
   class Package
+    class UnableToBuild < RuntimeError
+    end
+
     attr_reader :name
 
     include Logger
@@ -32,5 +35,9 @@ module Dr
       raise "Build #{version.fg("blue")} not found" unless build_exists? version
       FileUtils.rm_rf "#{@repo.location}/packages/#{@name}/builds/#{version}"
     end
+
+    def <=>(o)
+      self.name <=> o.name
+    end
   end
 end

data/lib/dr/pkgversion.rb

@@ -37,6 +37,14 @@ module Dr
       self
     end
 
+    def <(o)
+      self.to_s < o.to_s
+    end
+
+    def <=(o)
+      self.to_s <= o.to_s
+    end
+
     def ==(o)
       self.to_s == o.to_s
     end

data/lib/dr/repo.rb

@@ -7,6 +7,7 @@ require "dr/gnupg"
 require "dr/buildroot"
 
 require "fileutils"
+require "yaml"
 
 module Dr
   class Repo
@@ -72,15 +73,23 @@ module Dr
 
     def list_packages(suite=nil)
       pkgs = []
+
       if suite
-        a = 1
+        Dir.foreach @packages_dir do |pkg_name|
+          unless pkg_name =~ /^\./
+            versions = get_subpackage_versions pkg_name
+            unless versions[codename_to_suite suite].empty?
+              pkgs.push get_package pkg_name
+            end
+          end
+        end
       else
         Dir.foreach @packages_dir do |pkg_name|
           pkgs.push get_package pkg_name unless pkg_name =~ /^\./
         end
       end
 
-      pkgs
+      pkgs.sort
     end
 
     def buildroot(arch)
@@ -89,7 +98,7 @@ module Dr
 
     def get_package(name)
       unless File.exists? "#{@packages_dir}/#{name}"
-        raise "Package '#{name}' doesn't exist in the repo."
+        raise "Package #{name.style "pkg-name"} doesn't exist in the repo"
       end
 
       if File.exists? "#{@packages_dir}/#{name}/source"
@@ -150,7 +159,8 @@ module Dr
         versions[suite] = {}
         reprepro_cmd = "reprepro --basedir #{location}/archive " +
                      "--list-format '${package} ${version}\n' " +
-                     "listfilter #{suite} 'Source (== #{pkg_name})' " +
+                     "listfilter #{suite} 'Source (== #{pkg_name}) | " +
+                     "Package (== #{pkg_name})' " +
                      "2>/dev/null"
         reprepro = ShellCmd.new reprepro_cmd, :tag => "reprepro"
         reprepro.out.chomp.each_line do |line|
@@ -189,7 +199,7 @@ module Dr
       debs = Dir["#{@location}/packages/#{pkg.name}/builds/#{version}/*"]
       names = debs.map { |deb| File.basename(deb).split("_")[0] }
 
-      used_versions = get_subpackage_versions(pkg.name)[to_suite(suite)]
+      used_versions = get_subpackage_versions(pkg.name)[codename_to_suite(suite)]
 
       is_of_higher_version = true
       names.each do |name|
@@ -199,7 +209,9 @@ module Dr
       end
 
       unless is_of_higher_version
-        log :warn, "Version #{version.fg("blue")} already available in #{suite}"
+        log :warn, "The #{suite} suite already contains " +
+                   "#{pkg.name.style "pkg-name"} version " +
+                   "#{version.to_s.style "version"}"
         if force
           reprepro = "reprepro -b #{@location}/archive " +
                      "--gnupghome #{location}/gnupg-keyring/ removesrc " +
@@ -211,7 +223,8 @@ module Dr
         end
       end
 
-      log :info, "Pushing #{pkg_name} version #{version} to #{suite}"
+      log :info, "Pushing #{pkg_name.style "pkg-name"} version " +
+                 "#{version.to_s.style "version"} to #{suite}"
       reprepro = "reprepro -b #{@location}/archive " +
                  "--gnupghome #{location}/gnupg-keyring/ includedeb " +
                  "#{suite} #{debs.join " "}"
@@ -228,7 +241,7 @@ module Dr
         raise "Unpush failed"
       end
 
-      log :info, "Removing #{pkg_name} from #{suite}"
+      log :info, "Removing #{pkg_name.style "pkg-name"} from #{suite}"
       reprepro = "reprepro -b #{@location}/archive " +
                  "--gnupghome #{location}/gnupg-keyring/ removesrc " +
                  "#{suite} #{pkg.name}"
@@ -239,7 +252,7 @@ module Dr
       pkg = get_package pkg_name
 
       if is_used? pkg_name
-        log :warn, "The #{pkg_name.fg "blue"} package is still used"
+        log :warn, "The #{pkg_name.style "pkg-name"} package is still used"
         raise "Operation canceled, add -f to remove anyway" unless force
 
         log :info, "Will be force-removed anyway"
@@ -249,7 +262,7 @@ module Dr
         end
       end
 
-      log :info, "Removing #{pkg_name} from the repository"
+      log :info, "Removing #{pkg_name.style "pkg-name"} from the repository"
       FileUtils.rm_rf "#{location}/packages/#{pkg_name}"
     end
 
@@ -258,20 +271,20 @@ module Dr
 
       if is_used?(pkg_name, version)
         if force
-          log :info, "Force-removing #{version.fg("blue")} version of " +
-                     "#{pkg_name.fg("blue")}"
+          log :info, "Force-removing #{version.style "version"} version of " +
+                     "#{pkg_name.style "pkg-name"}"
           versions_by_suite = get_subpackage_versions pkg_name
           versions_by_suite.each do |suite, versions|
             unpush pkg_name, suite if versions.has_value? version
           end
         else
-          log :warn, "This build of #{pkg_name} is " +
+          log :warn, "This build of #{pkg_name.style "pkg-name"} is " +
                      "still being used, add -f to force-remove"
           return
         end
       else
-        log :info, "Removing the #{version.fg("blue")} version of " +
-                    "#{pkg_name.fg("blue")}"
+        log :info, "Removing the #{version.style "version"} version of " +
+                   "#{pkg_name.style "pkg-name"}"
       end
 
       pkg.remove_build version
@@ -284,11 +297,25 @@ module Dr
       raise "The package hasn't been built yet." unless hist.length > 0
       version = hist[0] unless version
 
-      raise "Build #{version} doesn't exist" unless pkg.build_exists? version
+      unless pkg.build_exists? version
+        raise "Build #{version.style "version"} doesn't exist"
+      end
 
       Dir["#{@location}/packages/#{pkg.name}/builds/#{version}/*"]
     end
 
+    def get_build_metadata(pkg_name, version)
+      pkg = get_package pkg_name
+      raise "Build #{version} doesn't exist" unless pkg.build_exists? version
+
+      md_file = "#{@location}/packages/#{pkg.name}/builds/#{version}/.metadata"
+      if File.exists? md_file
+        YAML.load_file md_file
+      else
+        {}
+      end
+    end
+
     def sign_deb(deb)
       keyring = "#{@location}/gnupg-keyring"
       gpg = GnuPG.new keyring
@@ -298,6 +325,14 @@ module Dr
       ShellCmd.new cmd, :tag => "dpkg-sig", :show_out => true
     end
 
+    def codename_to_suite(codename_or_suite)
+      get_suites.each do |suite, codename|
+        return suite if codename_or_suite == suite || codename_or_suite == codename
+      end
+
+      nil
+    end
+
     private
     def get_key
       File.open "#{@location}/archive/conf/distributions", "r" do |f|
@@ -319,13 +354,5 @@ module Dr
         end
       end
     end
-
-    def to_suite(codename_or_suite)
-      get_suites.each do |suite, codename|
-        return suite if codename_or_suite == suite || codename_or_suite == codename
-      end
-
-      nil
-    end
   end
 end

data/lib/dr/shellcmd.rb

@@ -53,14 +53,14 @@ module Dr
       if @status.exitstatus != @expect
         out_lines = @out.split "\n"
         if out_lines.length > 10
-          out_lines = out_lines[-9..-1]
+          out_lines = out_lines[-10..-1]
         end
 
         out_lines.each do |l|
-          l = @tag.fg("#1b8efa") + " " + l if @tag
+          l = tag(@tag, l.fg("red")) if @tag
           log(:err, l.chomp)
         end
-        raise "'#{@cmd}' failed!" if @raise_on_error
+        raise "'#{@cmd}' failed!".fg("red") if @raise_on_error
       end
     end
   end

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

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