repomate 0.1.0 → 0.1.1

data/bin/repomate

@@ -57,7 +57,7 @@ elsif ARGV.include?("save")
 elsif ARGV.include?("load")
   cli.choose_checkpoint
 elsif ARGV.include?("listpackages")
-  cli.list_packagelist(options)
+  cli.list_packages(options)
 elsif ARGV.include?("setup")
   cli.setup(options)
 else

data/lib/repomate/base.rb

@@ -14,7 +14,9 @@ module RepoMate
       FileUtils.mkdir_p(Cfg.rootdir)
 
       @repository = Repository.new
+      @checkpoint = Checkpoint.new
       @metafile   = Metafile.new
+      @link       = Link.new
       @cpdbfile   = File.join(Cfg.rootdir, "checkpoints.db")
       @cpdb       = Database.new(@cpdbfile)
 
@@ -23,9 +25,6 @@ module RepoMate
         puts "\tPlease run \"repomate setup\" first!".hl(:red)
         puts
       end
-
-      create_checkpoints_table
-
     end
 
     # Add's a package to the staging area
@@ -85,7 +84,7 @@ module RepoMate
       end
       workload = newworkload
 
-      save_checkpoint
+      @checkpoint.create
       check_versions(workload)
     end
 
@@ -128,141 +127,12 @@ module RepoMate
           :newbasename          => source_package.newbasename
         }
       end
-
-      unlink(unlink_workload)
-      link(link_workload)
-    end
-
-    # links the workload
-    def link(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 unlink(workload)
-      action = false
-
-      workload.each do |entry|
-        package = Package.new(entry[:destination_fullname], entry[:suitename], entry[:component])
-        package.delete_checksums
-
-        File.unlink(entry[:destination_fullname])
-        puts "Package: #{package.newbasename} unlinked"
-        action = true
-      end
-
-      if action
-        cleandirs
-        @metafile.create
-      end
-    end
-
-    # Create the checkpoint table
-    def create_checkpoints_table
-      sql = "create table if not exists checkpoints (
-              date varchar(25),
-              suitename varchar(10),
-              component varchar(10),
-              architecture varchar(10),
-              basename varchar(70)
-      )"
-      @cpdb.query(sql)
-    end
-
-    # Saves a checkpoint
-    def save_checkpoint
-      datetime        = DateTime.now
-      source_category = "dists"
-
-      Architecture.dataset(source_category).each do |entry|
-        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}' )")
-        end
-      end
-
-      puts "Checkpoint (#{datetime.strftime("%F %T")}) saved"
-    end
-
-    # Loads a checkpoint
-    def load_checkpoint(number)
-      list            = get_checkpoints
-      link_workload   = []
-      unlink_workload = []
-      source_category = "dists"
-
-      Architecture.dataset(source_category).each do |entry|
-        destination = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], source_category)
-        destination.files.each do |fullname|
-          unlink_workload << {
-            :destination_fullname => fullname,
-            :component            => entry[:component],
-            :suitename            => entry[:suitename],
-            :architecture         => entry[:architecture]
-          }
-        end
-      end
-
-      @cpdb.query("select date, suitename, component, architecture, basename from checkpoints").each do |row|
-        if row[0] == list[number]
-            suitename    = row[1]
-            component    = row[2]
-            architecture = row[3]
-            basename     = row[4]
-            source       = Architecture.new(architecture, component, suitename, "pool")
-            destination  = Architecture.new(architecture, component, suitename, "dists")
-
-            link_workload << {
-              :source_fullname      => File.join(source.directory, basename),
-              :destination_fullname => File.join(destination.directory, basename),
-              :component            => component,
-              :suitename            => suitename,
-              :architecture         => architecture
-            }
-        end
-      end
-
-      unlink(unlink_workload)
-      link(link_workload)
-    end
-
-    # Returns a list of checkpoints for the cli
-    def get_checkpoints
-      order = 0
-      dates = []
-      list  = {}
-
-      @cpdb.query("select date from checkpoints group by date order by date asc").each do |row|
-        dates << row.first
-      end
-
-      dates.each do |date|
-        order += 1
-        list[order] = date
-      end
-
-      list
+      @link.destroy(unlink_workload)
+      @link.create(link_workload)
     end
 
     # Returns a list of packages
-    def get_packagelist(category)
+    def list_packages(category)
       packages = []
       if category.eql?("stage")
         Component.dataset(category).each do |entry|
@@ -296,40 +166,6 @@ module RepoMate
       end
       packages
     end
-
-    # cleans up unused directories
-    def cleandirs
-      action = false
-
-      @repository.categories.each do |category|
-        next if category.eql?("stage")
-        Architecture.dataset(category).each do |entry|
-          directory = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], category)
-          if directory.is_unused?(entry[:fullpath])
-            action = true
-            directory.destroy
-          end
-        end
-        Component.dataset(category).each do |entry|
-          directory = Component.new(entry[:component], entry[:suitename], category)
-          if directory.is_unused?(entry[:fullpath])
-            action = true
-            directory.destroy
-          end
-        end
-        Suite.dataset(category).each do |entry|
-          directory = Suite.new(entry[:suitename], category)
-          if directory.is_unused?(entry[:fullpath])
-            action = true
-            directory.destroy
-          end
-        end
-      end
-      if action
-        puts "Cleaning structure"
-        @metafile.create
-      end
-    end
   end
 end
 

data/lib/repomate/checkpoint.rb

@@ -0,0 +1,108 @@
+require 'repomate'
+require 'date'
+require 'time'
+
+# RepoMate module
+module RepoMate
+
+  # Class containing the main logic
+  class Checkpoint
+
+    # Init
+    def initialize
+      @link       = Link.new
+      @cpdbfile   = File.join(Cfg.rootdir, "checkpoints.db")
+      @cpdb       = Database.new(@cpdbfile)
+
+      create_table
+    end
+
+    # Create the checkpoint table
+    def create_table
+      sql = "create table if not exists checkpoints (
+              date varchar(25),
+              suitename varchar(10),
+              component varchar(10),
+              architecture varchar(10),
+              basename varchar(70)
+      )"
+      @cpdb.query(sql)
+    end
+
+    # Saves a checkpoint
+    def create
+      datetime        = DateTime.now
+      source_category = "dists"
+
+      Architecture.dataset(source_category).each do |entry|
+        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}' )")
+        end
+      end
+
+      puts "Checkpoint (#{datetime.strftime("%F %T")}) saved"
+    end
+
+    # Loads a checkpoint
+    def load(number)
+      cplist          = list
+      link_workload   = []
+      unlink_workload = []
+      source_category = "dists"
+
+      Architecture.dataset(source_category).each do |entry|
+        destination = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], source_category)
+        destination.files.each do |fullname|
+          unlink_workload << {
+            :destination_fullname => fullname,
+            :component            => entry[:component],
+            :suitename            => entry[:suitename],
+            :architecture         => entry[:architecture]
+          }
+        end
+      end
+
+      @cpdb.query("select date, suitename, component, architecture, basename from checkpoints").each do |row|
+        if row[0] == cplist[number]
+            suitename    = row[1]
+            component    = row[2]
+            architecture = row[3]
+            basename     = row[4]
+            source       = Architecture.new(architecture, component, suitename, "pool")
+            destination  = Architecture.new(architecture, component, suitename, "dists")
+
+            link_workload << {
+              :source_fullname      => File.join(source.directory, basename),
+              :destination_fullname => File.join(destination.directory, basename),
+              :component            => component,
+              :suitename            => suitename,
+              :architecture         => architecture
+            }
+        end
+      end
+
+      @link.destroy(unlink_workload)
+      @link.create(link_workload)
+    end
+
+    # Returns a list of checkpoints for the cli
+    def list
+      order = 0
+      dates = []
+      list  = {}
+
+      @cpdb.query("select date from checkpoints group by date order by date asc").each do |row|
+        dates << row.first
+      end
+
+      dates.each do |date|
+        order += 1
+        list[order] = date
+      end
+
+      list
+    end
+  end
+end

data/lib/repomate/cli.rb

@@ -11,6 +11,7 @@ module RepoMate
     def initialize
       @repomate   = Base.new
       @repository = Repository.new
+      @checkpoint = Checkpoint.new
     end
 
     # Sets up the base directory structure by calling the repository class
@@ -67,15 +68,15 @@ module RepoMate
     # Save a checkpoint
     def save_checkpoint
       # Add verification and some output here
-      @repomate.save_checkpoint
+      @checkpoint.create
     end
 
     # List all packages, see cli output
-    def list_packagelist(options)
+    def list_packages(options)
       if options.repodir?
         architecture = "unknown"
 
-        packages = @repomate.get_packagelist(options[:repodir])
+        packages = @repomate.list_packages(options[: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}"
@@ -88,7 +89,7 @@ module RepoMate
 
     # Choose a checkpoint to restore.
     def choose_checkpoint
-      list = @repomate.get_checkpoints
+      list = @checkpoint.list
 
       if list.empty?
         STDERR.puts "We can't restore because we don't have checkpoints"
@@ -115,7 +116,7 @@ Everything between the last two \"publish (-P) commands\" will be lost if you pr
         STDERR.puts "Invalid number"
         exit 1
       else
-        @repomate.load_checkpoint(number)
+        @checkpoint.load(number)
       end
     end
   end

data/lib/repomate/configuration.rb

@@ -35,7 +35,7 @@ module RepoMate
         :architectures => [ "all", "amd64" ],
         :origin        => 'Repository',
         :label         => 'Repository',
-        :gpg_enable    => 'yes',
+        :gpg_enable    => 'no',
         :gpg_email     => 'someone@example.net',
         :gpg_password  => 'secret',
       }

data/lib/repomate/link.rb

@@ -0,0 +1,98 @@
+require 'repomate'
+
+# RepoMate module
+module RepoMate
+
+  # Class containing the main logic
+  class Link
+
+    # Init
+    def initialize
+      @repository = Repository.new
+      @metafile   = Metafile.new
+    end
+
+    def exist?(fullname)
+      File.exists?(fullname)
+    end
+
+    # 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
+
+        if File.exists?(entry[:destination_fullname])
+          File.unlink(entry[:destination_fullname])
+          puts "Package: #{package.newbasename} unlinked"
+          action = true
+        else
+          puts "Package: #{package.newbasename} was not linked"
+        end
+      end
+
+      if action
+        cleanup
+        @metafile.create
+      end
+    end
+
+    # cleans up unused directories
+    def cleanup
+      action = false
+
+      @repository.categories.each do |category|
+        next if category.eql?("stage")
+        Architecture.dataset(category).each do |entry|
+          directory = Architecture.new(entry[:architecture], entry[:component], entry[:suitename], category)
+          if directory.is_unused?(entry[:fullpath])
+            action = true
+            directory.destroy
+          end
+        end
+        Component.dataset(category).each do |entry|
+          directory = Component.new(entry[:component], entry[:suitename], category)
+          if directory.is_unused?(entry[:fullpath])
+            action = true
+            directory.destroy
+          end
+        end
+        Suite.dataset(category).each do |entry|
+          directory = Suite.new(entry[:suitename], category)
+          if directory.is_unused?(entry[:fullpath])
+            action = true
+            directory.destroy
+          end
+        end
+      end
+      if action
+        puts "Cleaning structure"
+        @metafile.create
+      end
+    end
+  end
+end

data/lib/repomate.rb

@@ -11,4 +11,6 @@ require 'repomate/metafile'
 require 'repomate/package'
 require 'repomate/repository'
 require 'repomate/suite'
+require 'repomate/link'
+require 'repomate/checkpoint'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repomate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000Z
+date: 2012-05-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70364475911480 !ruby/object:Gem::Requirement
+  requirement: &70123941015720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70364475911480
+  version_requirements: *70123941015720
 - !ruby/object:Gem::Dependency
   name: gpgme
-  requirement: &70364475910880 !ruby/object:Gem::Requirement
+  requirement: &70123941014540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70364475910880
+  version_requirements: *70123941014540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70364475910280 !ruby/object:Gem::Requirement
+  requirement: &70123941012640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70364475910280
+  version_requirements: *70123941012640
 - !ruby/object:Gem::Dependency
   name: colors
-  requirement: &70364475909740 !ruby/object:Gem::Requirement
+  requirement: &70123941010240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70364475909740
+  version_requirements: *70123941010240
 description: ! "# RepoMate\n\nTool to manage debian repositories.\n\n## This project
   is really new and not completely tested. Use it at your own risk.\n\n\n## The idea\n\nThe
   idea was to create a small, leightweight and easy to use debian repository management
@@ -71,34 +71,32 @@ description: ! "# RepoMate\n\nTool to manage debian repositories.\n\n## This pro
   to have all what apt needs in just one directory.\n\nnewpackage -> (add) -> stage
   -> (publish) -> production\n\n\n## Features\n\n### Checkpoints\n\nCheckpoints may
   help if you accidently published a bunch of packages to the wrong suite (lenny,
-  squeeze,…) or component (main, contrib, non-free,…).\n\nIf you did:\n\n    sbin/repomate
+  squeeze,…) or component (main, contrib, non-free,…).\n\nIf you did:\n\n    repomate
   load\n\nChoose the last checkpoint and be happy again.\n\nNote that checkpoints
   will be auto-saved before each publish sequence.\n\n## Installation\n\n### Repository
   server\n\ndpkg is used to compare package versions. I tried to do it on my own,
   but debian uses very annoying version strings with a couple of variants.\n\nPlease
   make sure you have the following packages installed:\n\n* ruby\n* dpkg\n* libsqlite3-dev\n\n####
-  Get RepoMate\n    \n    cd /opt\n    git clone git@github.com:floriansp/repomate.git\n
-  \   \n    gem install bundler\n    bundle install\n    \n#### Configure RepoMate\n\nGPG
+  Get RepoMate\n    \n    gem install repomate\n    \n#### Configure RepoMate\n\nGPG
   ist enabled by default. If you don't want it, just set the value of gpg_enable to
   \"no\" otherwise generate a gpg key and add the needed values to the configfile.\n\nCreate
-  the config file if you don't want the default configuration.\n    \n    vi ~/.repomate.yml\n
+  the config file if you don't want the default configuration.\n    \n    vi ~/.repomate\n
   \   \nSample config:\n       \n    ---\n    :rootdir: /var/lib/repomate/repository\n
-  \   :logdir: /var/log/repomate\n    :redolog: redo.log\n    :database: repomate.db\n
-  \   :dpkg: /usr/bin/dpkg\n    :suites:\n        - lenny\n        - squeeze\n    :components:\n
-  \       - main\n        - contrib\n    :architectures:\n        - all\n        -
-  amd64\n    :origin: Repository\n    :label: Repository\n    :gpg_enable: yes\n    :gpg_email:
-  someone@example.net\n    :gpg_password: secret\n \n    \n#### Configure webserver\n\nConfigure
-  your favorite webserver by adding RepoMate's rootdirectory to a site or vhost.\n\n####
-  Adding packages\n\n    sbin/repomate add -s squeeze package.deb\n    sbin/repomate
-  publish\n\n\n### Client\n\nAdd something like this to your machines /etc/apt/sources.list:\n
-  \   \n    deb [arch=all,amd64] http://server/repository squeeze main    \n    \n\n###
-  Examples\n\nSetup base directory structure (optional):\n\n    repomate setup -s
-  squeeze [ -c main ]\n\nAdd a package to the staging area:\n\n    repomate add -s
-  squeeze <path_to_packagefile>\n\nPublish all packages from the staging area. That
-  means they will be linked to production:\n\n    repomate publish\n\nLoad a checkpoint:\n\n
-  \   repomate load\n\nSave a checkpoint:\n\n    repomate save\n\nList all packages
-  in pool:\n\n    repomate listpackages -r pool\n\nList all packages in stage:\n\n
-  \   repomate listpackages -r stage\n"
+  \   :logdir: /var/log/repomate\n    :dpkg: /usr/bin/dpkg\n    :suites:\n        -
+  lenny\n        - squeeze\n    :components:\n        - main\n        - contrib\n
+  \   :architectures:\n        - all\n        - amd64\n    :origin: Repository\n    :label:
+  Repository\n    :gpg_enable: yes\n    :gpg_email: someone@example.net\n    :gpg_password:
+  secret\n \n    \n#### Configure webserver\n\nConfigure your favorite webserver by
+  adding RepoMate's rootdirectory to a site or vhost.\n\n#### Adding packages\n\n
+  \   repomate add -s squeeze package.deb\n    repomate publish\n\n\n### Client\n\nAdd
+  something like this to your machines /etc/apt/sources.list:\n    \n    deb [arch=all,amd64]
+  http://server/repository squeeze main    \n    \n\n### Examples\n\nSetup base directory
+  structure (optional):\n\n    repomate setup -s squeeze [ -c main ]\n\nAdd a package
+  to the staging area:\n\n    repomate add -s squeeze <path_to_packagefile>\n\nPublish
+  all packages from the staging area. That means they will be linked to production:\n\n
+  \   repomate publish\n\nLoad a checkpoint:\n\n    repomate load\n\nSave a checkpoint:\n\n
+  \   repomate save\n\nList all packages in pool:\n\n    repomate listpackages -r
+  pool\n\nList all packages in stage:\n\n    repomate listpackages -r stage\n"
 email:
 - flo@doobie.cc
 - michael.ehrenreich@me.com
@@ -108,14 +106,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/repomate
-- etc/config.yml
 - lib/repomate/architecture.rb
 - lib/repomate/base.rb
 - lib/repomate/category.rb
+- lib/repomate/checkpoint.rb
 - lib/repomate/cli.rb
 - lib/repomate/component.rb
 - lib/repomate/configuration.rb
 - lib/repomate/database.rb
+- lib/repomate/link.rb
 - lib/repomate/metafile.rb
 - lib/repomate/package.rb
 - lib/repomate/repository.rb

data/etc/config.yml

@@ -1,18 +0,0 @@
----
-:rootdir: /var/lib/repomate/repository
-:logdir: /var/log/repomate
-:dpkg: /usr/bin/dpkg
-:suites:
-    - lenny
-    - squeeze
-:components:
-    - main
-    - contrib
-:architectures:
-    - all
-    - amd64
-:origin: Repository
-:label: Repository
-:gpg_enable: yes
-:gpg_email: someone@example.net
-:gpg_password: secret