dr 0.0.3 → 0.0.4

data/bin/dr

@@ -107,36 +107,36 @@ class RepoCLI < ExtendedThor
       :codenames => []
     }
 
-    name = ask "  Repository name "<< "[#{repo_conf[:name].fg("yellow")}]:"
+    name = ask "   Repository name "<< "[#{repo_conf[:name].fg("yellow")}]:"
     repo_conf[:name] = name if name.length > 0
 
-    desc = ask "  Description [#{repo_conf[:desc]}]:"
+    desc = ask "   Description [#{repo_conf[:desc]}]:"
     repo_conf[:desc] = desc if desc.length > 0
 
-    arches = ask "  Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
+    arches = ask "   Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
     repo_conf[:arches] = arches.split /\s+/ if arches.length > 0
 
-    components = ask "  Components [#{repo_conf[:components].join(" ").fg("yellow")}]:"
+    components = ask "   Components [#{repo_conf[:components].join(" ").fg("yellow")}]:"
     repo_conf[:components] = components.split /\s+/ if components.length > 0
 
     repo_conf[:gpg_name] = ""
     while repo_conf[:gpg_name].length == 0
-      repo_conf[:gpg_name] = ask "  Cert owner name (#{"required".fg("red")}):"
+      repo_conf[:gpg_name] = ask "   Cert owner name (#{"required".fg("red")}):"
       repo_conf[:gpg_name].strip!
     end
 
     repo_conf[:gpg_mail] = ""
     while repo_conf[:gpg_mail].length == 0
-      repo_conf[:gpg_mail] = ask "  Cert owner e-mail (#{"required".fg("red")}):"
+      repo_conf[:gpg_mail] = ask "   Cert owner e-mail (#{"required".fg("red")}):"
       repo_conf[:gpg_mail].strip!
     end
 
-    print "  Passphrase (#{"optional".fg("green")}): "
+    print "   Passphrase (#{"optional".fg("green")}): "
     repo_conf[:gpg_pass] = STDIN.noecho(&:gets).chomp
     print "\n"
 
     repo_conf[:suites].each do |s|
-      codename = ask "  Codename for '#{s.fg("yellow")}':"
+      codename = ask "   Codename for '#{s.fg("yellow")}':"
       repo_conf[:codenames].push codename
     end
 
@@ -149,7 +149,7 @@ class RepoCLI < ExtendedThor
     :desc => "Add source package managed in a git repo"
   method_option :deb, :aliases => "-d",
     :desc => "Add a prebuilt binary deb package only"
-  method_option :force, :aliases => "-f",
+  method_option :force, :aliases => "-f", :type => :boolean,
     :desc => "Proceed even if the package already exists"
   method_option :branch, :aliases => "-b",
     :desc => "Set a default branch other than master (valid only with --git)"
@@ -163,18 +163,12 @@ class RepoCLI < ExtendedThor
 
       Dr::GitPackage::setup repo, options["git"], branch
     when options.has_key?("deb")
-      Dr::DebPackage::setup repo, options["deb"]
+      Dr::DebPackage::setup repo, options["deb"], options["force"]
     else
       raise ArgumentError, "Either --git or --deb must be specified"
     end
   end
 
-  # drepo build [pkg-name] --branch [topic-branch]
-  # drepo build [pkg-name] --branch [topic-branch] --push [suite] -f
-  #
-  #   - The old script basically
-  #   - Change versions to date stamps
-  #   - Add support for scratch suite builds
   desc "build [pkg-name]", "build a package from the sources"
   method_option :branch, :aliases => "-b", :type => :string,
                 :desc => "build from a different branch"
@@ -203,7 +197,6 @@ class RepoCLI < ExtendedThor
     end
   end
 
-  # drepo push [pkg-name] -f --suite X --version Y
   desc "push [pkg-name]", "push a built package to a specified suite"
   method_option :suite, :aliases => "-s", :type => :string,
                 :desc => "the target suite (defaults to testing)"

data/lib/dr/buildroot.rb

@@ -15,7 +15,7 @@ module Dr
       @repo = "http://mirrordirector.raspbian.org/raspbian/"
 
       if br_archive == nil || !File.exists?(br_archive)
-        setup
+        setup arch
       end
     end
 

data/lib/dr/debpackage.rb

@@ -2,17 +2,27 @@ require "dr/package"
 
 module Dr
   class DebPackage < Package
-    def self.setup(repo, deb_file)
-      puts "Adding the #{File.basename deb_file} package ..."
-      src_name = `dpkg-deb --field #{deb_file} Source`.chomp
+    def self.setup(repo, deb_file, force=false)
+      dpkg = ShellCmd.new "dpkg-deb --field #{deb_file} Source", :tag => "dpkg"
+      src_name = dpkg.out.chomp
       if src_name == ""
-        src_name = `dpkg-deb --field #{deb_file} Package`.chomp
+        dpkg = ShellCmd.new "dpkg-deb --field #{deb_file} Package", :tag => "dpkg"
+        src_name = dpkg.out.chomp
       end
-      puts "Source package: #{src_name}"
 
-      version = `dpkg-deb --field #{deb_file} Version`.chomp
+      log :info, "Adding the #{File.basename(deb_file).fg("blue")} 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
+        raise "This deb file is already in the repo"
+      end
+
+      log :info, "Adding a build to the #{src_name.fg "blue"} source package"
+
       FileUtils.mkdir_p deb_dir
       FileUtils.cp "#{deb_file}", "#{deb_dir}/"
     end
@@ -20,5 +30,11 @@ module Dr
     def initialize(name, repo)
       super name, repo
     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"
+    end
   end
 end

data/lib/dr/gitpackage.rb

@@ -174,15 +174,6 @@ EOS
       version
     end
 
-    def build_exists?(version)
-      File.directory? "#{@repo.location}/packages/#{@name}/builds/#{version}"
-    end
-
-    def remove_build(version)
-      raise "Build #{version.fg("blue")} not found" unless build_exists? version
-      FileUtils.rm_rf "#{@repo.location}/packages/#{@name}/builds/#{version}"
-    end
-
     private
     def update_from_origin(branch)
       log :info, "Pulling changes from origin"

data/lib/dr/package.rb

@@ -1,4 +1,5 @@
 require "dr/logger"
+require "dr/shellcmd"
 
 module Dr
   class Package
@@ -22,5 +23,14 @@ module Dr
 
       versions.sort.reverse
     end
+
+    def build_exists?(version)
+      File.directory? "#{@repo.location}/packages/#{@name}/builds/#{version}"
+    end
+
+    def remove_build(version)
+      raise "Build #{version.fg("blue")} not found" unless build_exists? version
+      FileUtils.rm_rf "#{@repo.location}/packages/#{@name}/builds/#{version}"
+    end
   end
 end

data/lib/dr/pkgversion.rb

@@ -38,8 +38,7 @@ module Dr
     end
 
     def ==(o)
-      @upstream == o.upstream && @debian == o.debian &&
-      @date == o.date && @build == o.build
+      self.to_s == o.to_s
     end
 
     def to_s

data/lib/dr/repo.rb

@@ -46,7 +46,7 @@ module Dr
             f.puts "Codename: #{conf[:codenames][i]}"
           end
 
-          if conf[:name][i].length > 0
+          if conf[:name].length > 0
             f.puts "Origin: #{conf[:name]} - #{s}"
             f.puts "Label: #{conf[:name]} - #{s}"
           end
@@ -150,7 +150,7 @@ module Dr
         versions[suite] = {}
         reprepro_cmd = "reprepro --basedir #{location}/archive " +
                      "--list-format '${package} ${version}\n' " +
-                     "listfilter #{suite} 'Source (== raspberrypi-firmware)' " +
+                     "listfilter #{suite} 'Source (== #{pkg_name})' " +
                      "2>/dev/null"
         reprepro = ShellCmd.new reprepro_cmd, :tag => "reprepro"
         reprepro.out.chomp.each_line do |line|
@@ -170,7 +170,7 @@ module Dr
         end
       else
         if pkg.history.length == 0
-          log :err, "Package #{pkg_name} has not been built yet"
+          log :err, "No built packages available for #{pkg_name}"
           log :err, "Please, run a build first and the push."
           raise "Push failed"
         end
@@ -186,11 +186,19 @@ module Dr
         suite = "testing"
       end
 
-      # FIXME: This will not work with packages that don't build a deb
-      #        with the same name as the source package
-      current_version = query_for_deb_version suite, pkg.name
+      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)]
+
+      is_of_higher_version = true
+      names.each do |name|
+        if used_versions.has_key?(name) && version <= used_versions[name]
+          is_of_higher_version = false
+        end
+      end
 
-      if current_version != nil && current_version >= version
+      unless is_of_higher_version
         log :warn, "Version #{version.fg("blue")} already available in #{suite}"
         if force
           reprepro = "reprepro -b #{@location}/archive " +
@@ -204,7 +212,6 @@ module Dr
       end
 
       log :info, "Pushing #{pkg_name} version #{version} to #{suite}"
-      debs = Dir["#{@location}/packages/#{pkg.name}/builds/#{version}/*"]
       reprepro = "reprepro -b #{@location}/archive " +
                  "--gnupghome #{location}/gnupg-keyring/ includedeb " +
                  "#{suite} #{debs.join " "}"
@@ -232,20 +239,18 @@ module Dr
       pkg = get_package pkg_name
 
       if is_used? pkg_name
-        log :warn, "Package #{pkg_name} is still used"
-        raise "The '#{pkg_name}' package is still used." unless force
+        log :warn, "The #{pkg_name.fg "blue"} package is still used"
+        raise "Operation canceled, add -f to remove anyway" unless force
 
         log :info, "Will be force-removed anyway"
-        get_suites.zip(versions).each do |suite, version|
-          log :info, "Removing #{pkg_name} v#{version} from #{suite}"
-          unpush pkg_name, suite[0] if version != nil
+        versions = get_subpackage_versions(pkg_name)
+        get_suites.each do |suite, codename|
+          unpush pkg_name, suite unless versions[suite].empty?
         end
       end
 
-      if !is_used?(pkg_name) || force
-        log :info, "Removing #{pkg_name} from the repository"
-        FileUtils.rm_rf "#{location}/packages/#{pkg_name}"
-      end
+      log :info, "Removing #{pkg_name} from the repository"
+      FileUtils.rm_rf "#{location}/packages/#{pkg_name}"
     end
 
     def remove_build(pkg_name, version, force=false)
@@ -296,5 +301,13 @@ 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/version.rb

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

metadata

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