repomate 0.1.4 → 0.1.5

data/bin/repomate

@@ -9,6 +9,9 @@ require 'repomate'
 require 'rubygems'
 require 'slop'
 
+# check for dpkg
+raise "dpkg is not installed or configured" unless File.exists?(RepoMate::Cfg.dpkg)
+
 options = Slop.parse do
   banner "RepoMate (A simple debian repository management tool)
 
@@ -23,12 +26,13 @@ options = Slop.parse do
     load               - Load a checkpoint
     listpackages       - List packages
     setup              - Setup the pool
+    remove             - Removes a package from production
 
   Options:"
   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/production)", :argument => true
+  on :r, :repodir, "Type of pool/category (stage/pool/dists)", :argument => true
   on :force, "Force action", :default => false
   on :h, :help, 'Print this help message', :tail => true do
     puts help
@@ -56,8 +60,10 @@ elsif ARGV.include?("save")
   cli.save_checkpoint
 elsif ARGV.include?("load")
   cli.choose_checkpoint
+elsif ARGV.include?("remove")
+  cli.choose_package("remove")
 elsif ARGV.include?("listpackages")
-  cli.list_packages(options)
+  cli.list_packages(options[:repodir])
 elsif ARGV.include?("setup")
   cli.setup(options)
 else

data/lib/repomate/base.rb

@@ -13,8 +13,8 @@ module RepoMate
       FileUtils.mkdir_p(Cfg.rootdir)
 
       @repository = Repository.new
-      @checkpoint = Checkpoint.new
       @link       = Link.new
+      @checkpoint = Checkpoint.new
     end
 
     # Add's a package to the staging area
@@ -73,20 +73,16 @@ module RepoMate
         FileUtils.move(entry[:source_fullname], entry[:destination_fullname])
       end
       workload = newworkload
-
-      @checkpoint.create
       check_versions(workload)
     end
 
     # Does the link job after checking versions through dpkg
     def check_versions(workload)
-      dpkg = Cfg.dpkg
-
-      raise "dpkg is not installed" unless File.exists?(dpkg)
-
       link_workload   = []
       unlink_workload = []
 
+      dpkg = Cfg.dpkg
+
       workload.each do |entry|
         source_package       = Package.new(entry[:source_fullname], entry[:suitename], entry[:component])
         destination_fullname = File.join(entry[:destination_dir], source_package.newbasename)
@@ -124,14 +120,19 @@ module RepoMate
     # Returns a list of packages
     def list_packages(category)
       packages = []
+      number   = 0
       if category.eql?("stage")
         Component.dataset(category).each do |entry|
           source = Component.new(entry[:component], entry[:suitename], category)
           source.files.each do |fullname|
             package = Package.new(fullname, entry[:suitename], entry[:component])
 
+            number += 1
+
             packages << {
+              :number      => number,
               :fullname    => fullname,
+              :basename    => File.basename(fullname),
               :controlfile => package.controlfile,
               :component   => entry[:component],
               :suitename   => entry[:suitename]
@@ -144,8 +145,12 @@ module RepoMate
           source.files.each do |fullname|
             package = Package.new(fullname, entry[:suitename], entry[:component])
 
+            number += 1
+
             packages << {
+              :number       => number,
               :fullname     => fullname,
+              :basename     => File.basename(fullname),
               :controlfile  => package.controlfile,
               :component    => entry[:component],
               :suitename    => entry[:suitename],
@@ -156,6 +161,20 @@ module RepoMate
       end
       packages
     end
+
+    # Removes a package
+    def remove(package)
+      unlink_workload = []
+
+      path = File.join(Cfg.rootdir, "*", package[:suitename], package[:component], "*", package[:basename])
+
+      Dir.glob(path).each do |fullname|
+        unlink_workload << { :destination_fullname => fullname }
+      end
+
+      @checkpoint.delete_package(package)
+      @link.destroy(unlink_workload)
+    end
   end
 end
 

data/lib/repomate/checkpoint.rb

@@ -87,6 +87,11 @@ module RepoMate
       @link.create(link_workload)
     end
 
+    # Deletes a package from checkpoint table
+    def delete_package(package)
+      @cpdb.query("delete from checkpoints where basename = '#{package[:basename]}' and suitename = '#{package[:suitename]}' and component = '#{package[:component]}' and architecture = '#{package[:architecture]}'")
+    end
+
     # Returns a list of checkpoints for the cli
     def list
       order = 0

data/lib/repomate/cli.rb

@@ -41,6 +41,7 @@ module RepoMate
 
     # Get's all packages from the staging area. Packages need to be confirmed here.
     def publish(options)
+      action = true
       @repomate.prepare_publish.each do |entry|
         workload  = []
         basename  = File.basename(entry[:source_fullname])
@@ -53,6 +54,10 @@ module RepoMate
         end
 
         if options.force? || input =~ /(y|yes)/
+          @checkpoint.create if action
+
+          action = false
+
           workload << {
             :source_fullname      => entry[:source_fullname],
             :destination_fullname => entry[:destination_fullname],
@@ -61,6 +66,7 @@ module RepoMate
             :architecture         => entry[:architecture]
           }
         end
+
         @repomate.publish(workload) unless workload.empty?
        end
     end
@@ -72,11 +78,11 @@ module RepoMate
     end
 
     # List all packages, see cli output
-    def list_packages(options)
-      if options.repodir?
+    def list_packages(repodir)
+      if repodir
         architecture = "unknown"
 
-        packages = @repomate.list_packages(options[:repodir])
+        packages = @repomate.list_packages(repodir)
         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}"
@@ -119,6 +125,29 @@ Everything between the last two \"publish (-P) commands\" will be lost if you pr
         @checkpoint.load(number)
       end
     end
+
+    # Choose a package
+    def choose_package(action)
+      packages  = @repomate.list_packages("dists")
+      packages.each do |package|
+        printf "%d) %-50s%-20s%s\n", package[:number], package[:controlfile]['Package'], package[:controlfile]['Version'], "#{package[:suitename]}/#{package[:component]}"
+      end
+
+      printf "\n%s", "Enter number or [q|quit] to abord: "
+      input  = STDIN.gets
+      number = input.to_i
+
+      if input =~ /(q|quit)/
+        puts "Aborting..."
+        exit 0
+      else
+        packages.each do |package|
+          if package[:number].eql?(number)
+            @repomate.remove(package) if action.eql?("remove")
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/repomate/configuration.rb

@@ -28,7 +28,6 @@ module RepoMate
 
       defaults = {
         :rootdir       => '/var/lib/repomate/repository',
-        :logdir        => '/var/log/repomate',
         :dpkg          => '/usr/bin/dpkg',
         :suites        => [ "lenny", "squeeze" ],
         :components    => [ "main", "contrib" ],

data/lib/repomate/link.rb

@@ -12,6 +12,7 @@ module RepoMate
       @metafile   = Metafile.new
     end
 
+    # Checks if file exists
     def exist?(fullname)
       File.exists?(fullname)
     end

data/lib/repomate/metafile.rb

@@ -45,7 +45,7 @@ module RepoMate
       destroy
       create_packages
 
-      if Cfg.gpg_enable
+      if Cfg.gpg_enable.eql?(true)
         if Cfg.gpg_password.nil? || Cfg.gpg_email.nil?
           puts "Configure password and email for GPG!"
           exit 1
@@ -85,7 +85,6 @@ module RepoMate
     def create_release
       source_category = "dists"
       suites          = []
-
       archrelease_template  = ERB.new File.new(File.join(File.dirname(__FILE__), "templates/archrelease.erb")).read, nil, "%"
       suiterelease_template = ERB.new File.new(File.join(File.dirname(__FILE__), "templates/suiterelease.erb")).read, nil, "%"
 
@@ -118,7 +117,7 @@ module RepoMate
         rescue
           destroy
           create_packages
-          puts "GPG email/password incorrect"
+          puts "GPG email/password incorrect or gpg is not installed!"
           return
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repomate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70248180314500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.4
+  version_requirements: *70248180314500
 - !ruby/object:Gem::Dependency
   name: gpgme
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70248180314020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,15 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+  version_requirements: *70248180314020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70248180313420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,12 +44,7 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+  version_requirements: *70248180313420
 description: A tool to manage Debian repositories
 email:
 - flo@doobie.cc
@@ -108,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A tool to manage Debian repositories