repomate 0.1.6 → 0.1.7

data/bin/repomate

@@ -32,7 +32,7 @@ options = Slop.parse do
   on :s, :suitename=, "Set the name of the suite (lenny/squeeze...)", :argument => true
   on :c, :component=, "Set the name of the component (main/contrib...)", :default => "main"
   on :a, :architecture=, "Set the name of the component (main/contrib...)", :argument => true
-  on :r, :repodir, "Type of pool/category (stage/pool/dists)", :argument => true
+  on :r, :category, "Category (stage/pool/dists)", :argument => true
   on :force, "Force action", :default => false
   on :h, :help, 'Print this help message', :tail => true do
     puts help
@@ -63,7 +63,7 @@ elsif ARGV.include?("load")
 elsif ARGV.include?("remove")
   cli.choose_package("remove")
 elsif ARGV.include?("listpackages")
-  cli.list_packages(options[:repodir])
+  cli.list_packages(options)
 elsif ARGV.include?("setup")
   cli.setup(options)
 else

data/lib/repomate/base.rb

@@ -25,7 +25,7 @@ module RepoMate
         package     = Package.new(entry[:package_fullname], entry[:suitename], entry[:component])
         destination = Component.new(entry[:component], entry[:suitename], "stage")
 
-        FileUtils.copy(entry[:package_fullname], File.join(destination.directory, package.newbasename))
+        FileUtils.move(entry[:package_fullname], File.join(destination.directory, package.newbasename))
       end
     end
 
@@ -94,7 +94,9 @@ module RepoMate
             puts "Package: #{target_package.newbasename} will be replaced with #{source_package.newbasename}"
             unlink_workload << {
               :destination_fullname => target_fullname,
-              :newbasename          => target_package.newbasename
+              :newbasename          => target_package.newbasename,
+              :suitename            => target_package.suitename,
+              :component            => target_package.component
             }
           elsif system("#{dpkg} --compare-versions #{source_package.version} eq #{target_package.version}")
             puts "Package: #{source_package.newbasename} already exists with same version"
@@ -166,10 +168,17 @@ module RepoMate
     def remove(package)
       unlink_workload = []
 
-      path = Dir.glob(File.join(Cfg.rootdir, "dists", package[:suitename], package[:component], "*", package[:basename]))
+      @repository.categories.each do |category|
+        path = Dir.glob(File.join(Cfg.rootdir, category, package[:suitename], package[:component], "*", package[:basename]))
 
-      Dir.glob(path).each do |fullname|
-        unlink_workload << { :destination_fullname => fullname }
+        Dir.glob(path).each do |fullname|
+          unlink_workload << {
+            :destination_fullname => fullname,
+            :category  => category,
+            :suitename => package[:suitename],
+            :component => package[:component]
+          }
+        end
       end
 
       @checkpoint.delete_package(package)

data/lib/repomate/cli.rb

@@ -78,17 +78,17 @@ module RepoMate
     end
 
     # List all packages, see cli output
-    def list_packages(repodir)
-      if repodir
+    def list_packages(options)
+      if options.category?
         architecture = "unknown"
 
-        packages = @repomate.list_packages(repodir)
+        packages = @repomate.list_packages(options[:category])
         packages.each do |package|
             architecture = package[:architecture] if package[:architecture]
             printf "%-50s%-20s%s\n", package[:controlfile]['Package'], package[:controlfile]['Version'], "#{package[:suitename]}/#{package[:component]}/#{architecture}"
         end
       else
-        STDERR.puts "Specify a category with [-r|--repodir]"
+        STDERR.puts "Specify a category with [-r|--category]"
         exit 1
       end
     end

data/lib/repomate/link.rb

@@ -49,7 +49,7 @@ module RepoMate
 
         if File.exists?(entry[:destination_fullname])
           File.unlink(entry[:destination_fullname])
-          puts "Package: #{package.newbasename} unlinked"
+          puts "Package: #{package.newbasename} unlinked from category #{entry[:category]}"
           action = true
         else
           puts "Package: #{package.newbasename} was not linked"

data/lib/repomate/repository.rb

@@ -8,7 +8,7 @@ module RepoMate
 
     # Init
     def initialize
-      @categories = ["stage", "pool", "dists"]
+      @categories = ["dists", "pool", "stage"]
     end
 
     # Creates the base structure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repomate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70318586454540 !ruby/object:Gem::Requirement
+  requirement: &70268983483820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70318586454540
+  version_requirements: *70268983483820
 - !ruby/object:Gem::Dependency
   name: gpgme
-  requirement: &70318586453940 !ruby/object:Gem::Requirement
+  requirement: &70268983483220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318586453940
+  version_requirements: *70268983483220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70318586453340 !ruby/object:Gem::Requirement
+  requirement: &70268983482620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70318586453340
+  version_requirements: *70268983482620
 description: A tool to manage Debian repositories
 email:
 - flo@doobie.cc