repomate 0.1.7 → 0.1.8

data/lib/repomate/base.rb

@@ -10,7 +10,7 @@ module RepoMate
 
     # Init
     def initialize
-      FileUtils.mkdir_p(Cfg.rootdir)
+      FileUtils.mkdir_p(Cfg.rootdir) unless File.exists?(Cfg.rootdir)
 
       @repository = Repository.new
       @link       = Link.new
@@ -56,67 +56,68 @@ module RepoMate
 
     # Publish all staged packages. Packages will be moved from stage to pool and linked to dists
     def publish(workload)
-      newworkload = []
-      workload.each do |entry|
-        destination = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], "dists")
-        basename    = File.basename(entry[:source_fullname])
-
-        @repository.create(entry[:suitename], entry[:component], entry[:architecture])
-
-        newworkload << {
-          :source_fullname => entry[:destination_fullname],
-          :destination_dir => destination.directory,
-          :component       => entry[:component],
-          :suitename       => entry[:suitename],
-          :architecture    => entry[:architecture]
-        }
-        FileUtils.move(entry[:source_fullname], entry[:destination_fullname])
-      end
-      workload = newworkload
-      check_versions(workload)
-    end
-
-    # Does the link job after checking versions through dpkg
-    def check_versions(workload)
       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)
 
-        Dir.glob("#{entry[:destination_dir]}/#{source_package.name}*.deb") do |target_fullname|
-          target_package = Package.new(target_fullname, entry[:suitename], entry[:component] )
+        action = true
+
+        @repository.create(entry[:suitename], entry[:component], entry[:architecture])
+
+        package        = Package.new(entry[:source_fullname], entry[:suitename], entry[:component])
+        pool           = Architecture.new(package.architecture, entry[:component], entry[:suitename], "pool")
+        dists          = Architecture.new(package.architecture, entry[:component], entry[:suitename], "dists")
+        pool_fullname  = File.join(pool.directory, package.basename)
+        dists_fullname = File.join(dists.directory, package.basename)
+        stage_fullname = package.fullname
+
+        Dir.glob("#{pool.directory}/#{package.name}*.deb") do |pool_fullname|
+          pool_package = Package.new(pool_fullname, entry[:suitename], entry[:component] )
+          if system("#{Cfg.dpkg} --compare-versions #{package.version} gt #{pool_package.version}")
+            puts "Package: #{pool_package.newbasename} will be replaced with #{package.newbasename}"
+          elsif system("#{Cfg.dpkg} --compare-versions #{package.version} eq #{pool_package.version}")
+            puts "Package: #{pool_package.newbasename} already exists with same version"
+            action = false
+            next
+          elsif system("#{Cfg.dpkg} --compare-versions #{package.version} lt #{pool_package.version}")
+            puts "Package: #{pool_package.newbasename} already exists with higher version"
+            File.unlink(package.fullname)
+            action = false
+            next
+          end
+        end
 
-          if system("#{dpkg} --compare-versions #{source_package.version} gt #{target_package.version}")
-            puts "Package: #{target_package.newbasename} will be replaced with #{source_package.newbasename}"
+        if action
+          link_workload << {
+            :source_fullname      => pool_fullname,
+            :destination_fullname => dists_fullname,
+            :suitename            => package.suitename,
+            :component            => package.component,
+            :architecture         => package.architecture
+          }
+          Dir.glob("#{dists.directory}/#{package.name}*.deb") do |fullname|
             unlink_workload << {
-              :destination_fullname => target_fullname,
-              :newbasename          => target_package.newbasename,
-              :suitename            => target_package.suitename,
-              :component            => target_package.component
+              :destination_fullname => fullname,
+              :suitename            => package.suitename,
+              :component            => package.component,
+              :architecture         => package.architecture,
+              :category             => 'dists'
             }
-          elsif system("#{dpkg} --compare-versions #{source_package.version} eq #{target_package.version}")
-            puts "Package: #{source_package.newbasename} already exists with same version"
-            return
-          elsif system("#{dpkg} --compare-versions #{source_package.version} lt #{target_package.version}")
-            puts "Package: #{source_package.newbasename} already exists with higher version"
-            return
           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)
         end
-
-        link_workload << {
-          :source_fullname      => source_package.fullname,
-          :destination_fullname => destination_fullname,
-          :suitename            => source_package.suitename,
-          :component            => source_package.component,
-          :newbasename          => source_package.newbasename
-        }
       end
-      @link.destroy(unlink_workload)
-      @link.create(link_workload)
+        @link.destroy(unlink_workload)
+        @link.create(link_workload)
     end
 
     # Returns a list of packages
@@ -174,9 +175,9 @@ module RepoMate
         Dir.glob(path).each do |fullname|
           unlink_workload << {
             :destination_fullname => fullname,
-            :category  => category,
-            :suitename => package[:suitename],
-            :component => package[:component]
+            :category             => category,
+            :suitename            => package[:suitename],
+            :component            => package[:component]
           }
         end
       end

data/lib/repomate/checkpoint.rb

@@ -24,8 +24,8 @@ module RepoMate
               suitename varchar(10),
               component varchar(10),
               architecture varchar(10),
-              basename varchar(70)
-      )"
+              basename varchar(70))"
+
       @cpdb.query(sql)
     end
 
@@ -38,7 +38,15 @@ module RepoMate
         source = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], source_category)
         source.files.each do |fullname|
           basename = File.basename(fullname)
-          @cpdb.query("insert into checkpoints values ( '#{datetime}', '#{entry[:suitename]}', '#{entry[:component]}', '#{entry[:architecture]}', '#{basename}' )")
+
+          sql = "insert into checkpoints values (
+                  '#{datetime}',
+                  '#{entry[:suitename]}',
+                  '#{entry[:component]}',
+                  '#{entry[:architecture]}',
+                  '#{basename}')"
+
+          @cpdb.query(sql)
         end
       end
 
@@ -89,7 +97,13 @@ module RepoMate
 
     # 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]}'")
+      sql = "delete from checkpoints where
+              basename = '#{package[:basename]}' and
+              suitename = '#{package[:suitename]}' and
+              component = '#{package[:component]}' and
+              architecture = '#{package[:architecture]}'"
+
+      @cpdb.query(sql)
     end
 
     # Returns a list of checkpoints for the cli

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 from category #{entry[:category]}"
+          puts "Package: #{package.newbasename} unlinked from #{entry[:category]} => #{entry[:suitename]}/#{entry[:component]}"
           action = true
         else
           puts "Package: #{package.newbasename} was not linked"
@@ -91,7 +91,6 @@ module RepoMate
         end
       end
       if action
-        puts "Cleaning structure"
         @metafile.create
       end
     end

data/lib/repomate/metafile.rb

@@ -66,7 +66,7 @@ module RepoMate
         source.files.each do |fullname|
           package = Package.new(fullname, entry[:suitename], entry[:component])
 
-          checksums = package.get_checksums
+          checksums = package.load_checksums
 
           packagesfile = File.join(entry[:fullpath], "Packages")
           size         = File.size(fullname)

data/lib/repomate/package.rb

@@ -47,12 +47,11 @@ module RepoMate
     end
 
     # Gets checksums for the given package
-    def get_checksums
+    def load_checksums
       result = []
 
       @pkgdb.query("select md5, sha1, sha256 from checksums where basename = '#{@basename}' and mtime = '#{@mtime.iso8601}'").each do |row|
         result = row
-        # puts "Hit: #{@basename} #{result}"
       end
       result
     end

metadata

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