repomate 0.2.2 → 0.2.3

data/bin/repomate

@@ -36,7 +36,7 @@ options = Slop.parse do
   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, :category, "Category (stage/pool/dists)", :argument => true
-  on :force, "Force action", :default => false
+  on :yes, "Always answer with yes", :default => false
   on :h, :help, 'Print this help message', :tail => true do
     puts help
     exit

data/lib/repomate/base.rb

@@ -15,6 +15,7 @@ module RepoMate
       @repository = Repository.new
       @link       = Link.new
       @checkpoint = Checkpoint.new
+      @metafile   = Metafile.new
     end
 
     # Add's a package to the staging area
@@ -51,6 +52,7 @@ module RepoMate
           }
         end
       end
+      
       workload
     end
 
@@ -96,6 +98,7 @@ module RepoMate
             :component            => package.component,
             :architecture         => package.architecture
           }
+                    
           Dir.glob("#{dists.directory}/#{package.name}*.deb") do |fullname|
             unlink_workload << {
               :destination_fullname => fullname,
@@ -104,11 +107,14 @@ module RepoMate
               :category             => 'dists'
             }
           end
+          
           FileUtils.move(stage_fullname, pool_fullname) unless File.exists?(pool_fullname)
+          @link.destroy(unlink_workload) unless unlink_workload.empty?
+          @link.create(link_workload) unless link_workload.empty?
         end
       end
-      @link.destroy(unlink_workload)
-      @link.create(link_workload)
+
+      @metafile.create unless link_workload.empty?
     end
 
     # Returns a list of packages
@@ -152,7 +158,7 @@ module RepoMate
       packages
     end
 
-    # Removes a package
+    # Activates a package
     def activate(entry)
       link_workload = []
 
@@ -171,10 +177,11 @@ module RepoMate
         puts "Package already activated"
       else
         @link.create(link_workload)
+        @metafile.create
       end
     end
 
-    # Removes a package
+    # Deactivates a package
     def deactivate(entry, mode)
       unlink_workload = []
 
@@ -195,6 +202,7 @@ module RepoMate
 
       @checkpoint.delete_package(entry) if mode.eql?("remove")
       @link.destroy(unlink_workload)
+      @metafile.create
     end
   end
 end

data/lib/repomate/checkpoint.rb

@@ -13,7 +13,8 @@ module RepoMate
       @link       = Link.new
       @cpdbfile   = File.join(Cfg.rootdir, "checkpoints.db")
       @cpdb       = Database.new(@cpdbfile)
-
+      @metafile   = Metafile.new
+      
       create_table
     end
 
@@ -93,6 +94,7 @@ module RepoMate
 
       @link.destroy(unlink_workload)
       @link.create(link_workload)
+      @metafile.create
     end
 
     # Deletes a package from checkpoint table

data/lib/repomate/cli.rb

@@ -41,23 +41,18 @@ module RepoMate
 
     # Get's all packages from the staging area. Packages need to be confirmed here.
     def publish(options)
-      action = true
+      workload  = []
       @repomate.prepare_publish.each do |entry|
-        workload  = []
         basename  = File.basename(entry[:source_fullname])
         suitename = entry[:suitename]
         component = entry[:component]
 
-        unless options.force?
+        unless options.yes?
           printf "\n%s", "Link #{basename} to production => #{suitename}/#{component}? [y|yes|n|no]: "
           input = STDIN.gets
         end
 
-        if options.force? || input =~ /(y|yes)/
-          @checkpoint.create if action
-
-          action = false
-
+        if options.yes? || input =~ /(y|yes)/
           workload << {
             :source_fullname      => entry[:source_fullname],
             :destination_fullname => entry[:destination_fullname],
@@ -66,9 +61,12 @@ module RepoMate
             :architecture         => entry[:architecture]
           }
         end
-
-        @repomate.publish(workload) unless workload.empty?
-       end
+      end
+      
+      unless workload.empty?
+        @checkpoint.create
+        @repomate.publish(workload)
+      end
     end
 
     # Save a checkpoint
@@ -126,7 +124,7 @@ Everything between the last two \"publish (-P) commands\" will be lost if you pr
       @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])
+          file = File.join(Architecture.new(entry[:architecture], entry[:component], entry[:suitename], "dists").directory, entry[:basename])
           next if File.exists?(file)
         elsif mode.eql?("deactivate")
           next unless entry[:category].eql?("dists")
@@ -167,7 +165,7 @@ Everything between the last two \"publish (-P) commands\" will be lost if you pr
             if entry[:number].eql?(number)
               if mode.eql?("activate")
                 @repomate.activate(entry)
-              else
+              elsif mode.eql?("deactivate")
                 @repomate.deactivate(entry, mode)
               end
             end

data/lib/repomate/link.rb

@@ -19,30 +19,22 @@ module RepoMate
 
     # links the workload
     def create(workload)
-      action = false
-
       workload.each do |entry|
         @repository.create(entry[:suitename], entry[:component], entry[:architecture])
 
         unless File.exists?(entry[:destination_fullname])
           package = Package.new(entry[:source_fullname], entry[:suitename], entry[:component])
+          
           package.create_checksums
 
           File.symlink(entry[:source_fullname], entry[:destination_fullname])
           puts "Package: #{package.newbasename} linked to production => #{entry[:suitename]}/#{entry[:component]}"
-          action = true
         end
       end
-
-      if action
-        @metafile.create
-      end
     end
 
     # unlinks workload
     def destroy(workload)
-      action = false
-
       workload.each do |entry|
         package = Package.new(entry[:destination_fullname], entry[:suitename], entry[:component])
         package.delete_checksums
@@ -50,16 +42,12 @@ module RepoMate
         if File.exists?(entry[:destination_fullname])
           File.unlink(entry[:destination_fullname])
           puts "Package: #{package.newbasename} unlinked from #{entry[:category]} => #{entry[:suitename]}/#{entry[:component]}"
-          action = true
         else
           puts "Package: #{package.newbasename} was not linked"
         end
       end
-
-      if action
-        cleanup
-        @metafile.create
-      end
+      
+      cleanup unless workload.empty?
     end
 
     # cleans up unused directories
@@ -90,9 +78,8 @@ module RepoMate
           end
         end
       end
-      if action
-        @metafile.create
-      end
+      
+      @metafile.create if action
     end
   end
 end

data/lib/repomate/metafile.rb

@@ -17,7 +17,7 @@ module RepoMate
       @repository = Repository.new
     end
 
-    # Returns a lit of all existing metafiles as array
+    # Returns a list of all existing metafiles as array
     def all
       rootdir  = Cfg.rootdir
       dirlist  = ["#{rootdir}/*/*", "#{rootdir}/*/*/*/*"]
@@ -42,6 +42,8 @@ module RepoMate
 
     # Creates all metafiles
     def create
+      puts "Creating Metafiles..."
+      
       destroy
       create_packages
 
@@ -110,8 +112,8 @@ module RepoMate
         end
 
         releasefile = File.join(Cfg.rootdir, source_category, suite, "Release")
-
         File.open(releasefile, 'w') { |file| file.puts suiterelease_template.result(binding).gsub(/^\s+\n|^\n|^\s{3}/, '') }
+        
         begin
           sign(releasefile)
         rescue

data/lib/repomate/package.rb

@@ -62,7 +62,7 @@ module RepoMate
       now      = DateTime.now
       md5      = Digest::MD5.file(@fullname).to_s
       sha1     = Digest::SHA1.file(@fullname).to_s
-      sha256   = Digest::SHA256.new(256).file(@fullname).to_s
+      sha256   = Digest::SHA2.new(256).file(@fullname).to_s
       @pkgdb.query("insert into checksums values ( '#{now}', '#{@basename}', '#{@mtime.iso8601}', '#{md5}', '#{sha1}', '#{sha256}' )")
     end
 

data/lib/repomate/templates/suiterelease.erb

@@ -33,9 +33,9 @@ SHA256:
   <% source = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], source_category) %>
   <% Dir.glob(File.join(entry[:fullpath], "Packages*")).each do |file| %>
     <% path = File.join(entry[:component], entry[:architecture_dir], File.basename(file)) %>
-    <%= Digest::SHA256.new(256).file(file) %> <%= File.size(file) %> <%= path %>
+    <%= Digest::SHA2.new(256).file(file) %> <%= File.size(file) %> <%= path %>
   <% end %>
   <% file = File.join(entry[:fullpath], "Release") %>
   <% path = File.join(entry[:component], entry[:architecture_dir], File.basename(file)) %>
-    <%= Digest::SHA256.new(256).file(file) %> <%= File.size(file) %> <%= path %>
+    <%= Digest::SHA2.new(256).file(file) %> <%= File.size(file) %> <%= path %>
 <% end %>

metadata

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