repomate 0.2.0 → 0.2.1

data/bin/repomate

@@ -17,7 +17,7 @@ options = Slop.parse do
 
   Usage: #{$0} add -s squeeze [-c main] <package>
          #{$0} publish
-         #{$0} listpackages -r production
+         #{$0} listpackages -r stage
 
   Actions:
     add                - Add a package to the staging area
@@ -26,7 +26,10 @@ options = Slop.parse do
     load               - Load a checkpoint
     listpackages       - List packages
     setup              - Setup the pool
-    remove             - Removes a package from production
+    activate           - Activate (link) a package from pool
+    deactivate         - Deactivate (unlink) a package from production
+    remove             - Removes a package from production and pool
+
 
   Options:"
   on :s, :suitename=, "Set the name of the suite (lenny/squeeze...)", :argument => true
@@ -60,10 +63,14 @@ elsif ARGV.include?("save")
   cli.save_checkpoint
 elsif ARGV.include?("load")
   cli.choose_checkpoint
+elsif ARGV.include?("activate")
+  cli.choose_package("activate")
+elsif ARGV.include?("deactivate")
+  cli.choose_package("deactivate")
 elsif ARGV.include?("remove")
   cli.choose_package("remove")
 elsif ARGV.include?("listpackages")
-  cli.list_packages(options)
+  cli.listpackages(options)
 elsif ARGV.include?("setup")
   cli.setup(options)
 else

data/lib/repomate/base.rb

@@ -104,15 +104,7 @@ module RepoMate
               :category             => 'dists'
             }
           end
-          Dir.glob("#{pool.directory}/#{package.name}*.deb") do |fullname|
-            unlink_workload << {
-              :destination_fullname => fullname,
-              :suitename            => package.suitename,
-              :component            => package.component,
-              :category             => 'pool'
-            }
-          end
-          FileUtils.move(stage_fullname, pool_fullname)
+          FileUtils.move(stage_fullname, pool_fullname) unless File.exists?(pool_fullname)
         end
       end
       @link.destroy(unlink_workload)
@@ -120,44 +112,40 @@ module RepoMate
     end
 
     # Returns a list of packages
-    def list_packages(category)
+    def listpackages
       packages = []
-      number   = 0
-      if category.eql?("stage")
-        Component.dataset(category).each do |entry|
-          source = Component.new(entry[:component], entry[:suitename], category)
+
+      @repository.categories.each do |category|
+        Architecture.dataset(category).each do |entry|
+          source = Architecture.new(entry[:architecture], 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,
+              :category    => category,
               :basename    => File.basename(fullname),
               :controlfile => package.controlfile,
               :component   => entry[:component],
-              :suitename   => entry[:suitename]
+              :suitename   => entry[:suitename],
+              :architecture => entry[:architecture]
             }
           end
         end
-      else
-        Architecture.dataset(category).each do |entry|
-          source = Architecture.new(entry[:architecture], 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],
-              :architecture => entry[:architecture]
-            }
+        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])
+              packages << {
+                :fullname    => fullname,
+                :category    => category,
+                :basename    => File.basename(fullname),
+                :controlfile => package.controlfile,
+                :component   => entry[:component],
+                :suitename   => entry[:suitename],
+                :architecture => "unknown"
+              }
+            end
           end
         end
       end
@@ -165,23 +153,47 @@ module RepoMate
     end
 
     # Removes a package
-    def remove(package)
+    def activate(entry)
+      link_workload = []
+
+      package        = Package.new(entry[:fullname], entry[:suitename], entry[:component])
+      dists          = Architecture.new(package.architecture, entry[:component], entry[:suitename], "dists")
+      dists_fullname = File.join(dists.directory, package.basename)
+
+      link_workload << {
+        :source_fullname      => entry[:fullname],
+        :destination_fullname => dists_fullname,
+        :suitename            => package.suitename,
+        :component            => package.component,
+        :architecture         => package.architecture
+      }
+      if File.exists?(dists_fullname)
+        puts "Package already activated"
+      else
+        @link.create(link_workload)
+      end
+    end
+
+    # Removes a package
+    def deactivate(entry, mode)
       unlink_workload = []
 
       @repository.categories.each do |category|
-        path = Dir.glob(File.join(Cfg.rootdir, category, package[:suitename], package[:component], "*", package[:basename]))
+        next if mode.eql?("deactivate") && category.eql?("pool")
+
+        path = Dir.glob(File.join(Cfg.rootdir, category, entry[:suitename], entry[:component], "*", entry[:basename]))
 
         Dir.glob(path).each do |fullname|
           unlink_workload << {
             :destination_fullname => fullname,
             :category             => category,
-            :suitename            => package[:suitename],
-            :component            => package[:component]
+            :suitename            => entry[:suitename],
+            :component            => entry[:component]
           }
         end
       end
 
-      @checkpoint.delete_package(package)
+      @checkpoint.delete_package(entry) if mode.eql?("remove")
       @link.destroy(unlink_workload)
     end
   end

data/lib/repomate/checkpoint.rb

@@ -96,12 +96,12 @@ module RepoMate
     end
 
     # Deletes a package from checkpoint table
-    def delete_package(package)
+    def delete_package(entry)
       sql = "delete from checkpoints where
-              basename = '#{package[:basename]}' and
-              suitename = '#{package[:suitename]}' and
-              component = '#{package[:component]}' and
-              architecture = '#{package[:architecture]}'"
+              basename = '#{entry[:basename]}' and
+              suitename = '#{entry[:suitename]}' and
+              component = '#{entry[:component]}' and
+              architecture = '#{entry[:architecture]}'"
 
       @cpdb.query(sql)
     end

data/lib/repomate/cli.rb

@@ -73,26 +73,9 @@ module RepoMate
 
     # Save a checkpoint
     def save_checkpoint
-      # Add verification and some output here
       @checkpoint.create
     end
 
-    # List all packages, see cli output
-    def list_packages(options)
-      if options.category?
-        architecture = "unknown"
-
-        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|--category]"
-        exit 1
-      end
-    end
-
     # Choose a checkpoint to restore.
     def choose_checkpoint
       list = @checkpoint.list
@@ -126,24 +109,68 @@ Everything between the last two \"publish (-P) commands\" will be lost if you pr
       end
     end
 
-    # Choose a package
-    def choose_package(action)
-      packages  = @repomate.list_packages("dists")
-      packages.each do |package|
-        printf "%-7s%-50s%-20s%s\n", "#{package[:number]})", package[:controlfile]['Package'], package[:controlfile]['Version'], "#{package[:suitename]}/#{package[:component]}"
+    # List all packages, see cli output
+    def listpackages(options)
+      @repomate.listpackages.each do |entry|
+        next unless entry[:category].eql?(options[:category])
+        architecture = entry[:architecture] if entry[:architecture]
+        printf "%-50s%-20s%-10s%s\n", entry[:controlfile]['Package'], entry[:controlfile]['Version'], "#{entry[:category]}", "#{entry[:suitename]}/#{entry[:component]}/#{architecture}"
       end
+    end
 
-      printf "\n%s", "Enter number or [q|quit] to abord: "
-      input  = STDIN.gets
-      number = input.to_i
+    # Choose a package
+    def choose_package(mode)
+      packages = []
+      number   = 0
+
+      @repomate.listpackages.each do |entry|
+        next if entry[:category].eql?("stage")
+        if mode.eql?("activate")
+          file = File.join(Cfg.rootdir, "dists", entry[:suitename], entry[:component], "binary-#{entry[:architecture]}", entry[:basename])
+          next if File.exists?(file)
+        elsif mode.eql?("deactivate")
+          next unless entry[:category].eql?("dists")
+        elsif mode.eql?("remove")
+          next unless entry[:category].eql?("pool")
+        end
+        number += 1
+        packages << {
+          :number       => number,
+          :basename     => entry[:basename],
+          :fullname     => entry[:fullname],
+          :category     => entry[:category],
+          :suitename    => entry[:suitename],
+          :component    => entry[:component],
+          :architecture => entry[:architecture],
+          :controlfile  => entry[:controlfile]
+        }
+      end
 
-      if input =~ /(q|quit)/
-        puts "Aborting..."
-        exit 0
+      if number.zero?
+        puts "There are no packages to #{mode}"
       else
-        packages.each do |package|
-          if package[:number].eql?(number)
-            @repomate.remove(package) if action.eql?("remove")
+        puts "Select a package by entering the appropriate number\n\n"
+
+        packages.each do |entry|
+          printf "%-6s%-50s%-20s%s\n", "#{entry[:number]})", entry[:controlfile]['Package'], entry[:controlfile]['Version'], "#{entry[:suitename]}/#{entry[: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 |entry|
+            if entry[:number].eql?(number)
+              if mode.eql?("activate")
+                @repomate.activate(entry)
+              else
+                @repomate.deactivate(entry, mode)
+              end
+            end
           end
         end
       end

data/lib/repomate/configuration.rb

@@ -34,9 +34,10 @@ module RepoMate
         :architectures => [ "all", "amd64" ],
         :origin        => 'Repository',
         :label         => 'Repository',
-        :gpg_enable    => 'no',
+        :gpg           => false,
+        :gpg_enable    => false, # obsolete in a while
         :gpg_email     => 'someone@example.net',
-        :gpg_password  => 'secret',
+        :gpg_password  => 'secret'
       }
 
       unless filecontent.empty?

data/lib/repomate/metafile.rb

@@ -45,7 +45,7 @@ module RepoMate
       destroy
       create_packages
 
-      if Cfg.gpg_enable.eql?(true)
+      if Cfg.gpg
         if Cfg.gpg_password.nil? || Cfg.gpg_email.nil?
           puts "Configure password and email for GPG!"
           exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repomate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000Z
+date: 2012-06-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70097650765320 !ruby/object:Gem::Requirement
+  requirement: &70335555719140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70097650765320
+  version_requirements: *70335555719140
 - !ruby/object:Gem::Dependency
   name: gpgme
-  requirement: &70097650764720 !ruby/object:Gem::Requirement
+  requirement: &70335555718620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70097650764720
+  version_requirements: *70335555718620
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70097650763720 !ruby/object:Gem::Requirement
+  requirement: &70335555718120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70097650763720
+  version_requirements: *70335555718120
 description: A tool to manage Debian repositories
 email:
 - flo@doobie.cc