dr 0.1.13 → 0.1.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f081cd07df3b86b2a8818d16a0c2b76c3205514d
+  data.tar.gz: e873f13774d8f4bccf3d6b9ccec059150bfdd7ef
+SHA512:
+  metadata.gz: af79fd771e8a4ab7693ff38c5dfd78b490c57bf19eb9fd461d6a65c6e3fdcadfc86050055e45e32ca2f07dcbf275e4f1175b1ad81aec0e02a48e41984a6bab49
+  data.tar.gz: 34932b9939ca7c0a433af6df9e6b83d1c009bbe74128bc5eebf7f43ca20ae453f0cf42649438fd0dea0490eae63d734db372c1134b60823a454a287abd8554b0

data/README.md

@@ -1,29 +1,28 @@
-# Debian Repository Management Tool
+# Kano Repository Manager
 
-TODO: Write a gem description
+[![Gem Version](https://badge.fury.io/rb/dr.svg)](http://badge.fury.io/rb/dr)
 
-## Installation
+**dr** (stands for debian repository) is a Debian repository management tool.
+It will help you set up and maintain your own small package repository for any
+Debian-based distribution. You can keep your sources in **git** and use the
+**dr** tool to manage builds, versions, and releases. It works particularly
+well in case your development is very fast and you ship new versions of
+your packages often (even several times a day).
 
-Add this line to your application's Gemfile:
+The following diagram illustrates how `dr` works. It takes source packages
+that are managed in git repositories, builds them and serves them in
+different suites. For more information, please see this
+[project's wiki](https://github.com/KanoComputing/kano-package-system/wiki).
 
-    gem 'mkpkg'
+<p align="center">
+  <img src="http://i.imgur.com/pe8A9kd.png"
+       alt="How dr operates">
+</p>
 
-And then execute:
+It is the tool we use to manage our software repository and the custom
+packages for **Kano OS**. The application is written in **Ruby**, building
+on top of many other tools (such as reprepro, debuild, debhelper, and others).
 
-    $ bundle
+Here is like it looks like in the terminal:
 
-Or install it yourself as:
-
-    $ gem install mkpkg
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( http://github.com/<my-github-username>/mkpkg/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+![Example of using dr](http://linuxwell.com/assets/images/posts/tco-example.png)

data/bin/dr

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "thor"
 require "fileutils"
 require "io/console"
@@ -7,6 +10,7 @@ require "io/console"
 require "dr/repo"
 require "dr/gitpackage"
 require "dr/debpackage"
+require "dr/buildroot"
 
 require "dr/shellcmd"
 require "dr/logger"
@@ -162,6 +166,7 @@ class RepoCLI < ExtendedThor
       :arches => ["amd64"],
       :components => ["main"],
       :suites => ["stable", "testing", "unstable"],
+      :base => "Kano OS",
       :codenames => []
     }
 
@@ -171,6 +176,25 @@ class RepoCLI < ExtendedThor
     desc = ask "   Description [#{repo_conf[:desc]}]:"
     repo_conf[:desc] = desc if desc.length > 0
 
+    base_map = {}
+    puts "   Base OS [pick one]: "
+    Dr::BuildRoot.os_bases.each_with_index do |base, index|
+      base_name, base_params = base
+      base_map[index+1] = base_name
+
+      base_name = base_name.fg "yellow" if base_name == repo_conf[:base]
+      puts "     [#{index+1}] #{base_name}"
+    end
+
+    base = ask "   Your choice: "
+    until base.length == 0 || base_map.has_key?(base.to_i)
+      base = ask "   Your choice: "
+    end
+    repo_conf[:base] = base_map[base.to_i] if base.length > 0
+
+    # guess default arch
+    repo_conf[:arches] = [Dr::BuildRoot.os_bases[repo_conf[:base]][:arches][0]]
+
     arches = ask "   Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
     repo_conf[:arches] = arches.split(/\s+/) if arches.length > 0
 
@@ -343,8 +367,19 @@ class RepoCLI < ExtendedThor
     repo = get_repo_handle
 
     log :info, "Releasing all packages from testing"
-    repo.list_packages.each do |pkg|
-      repo.push pkg.name, nil, "stable", (options["force"] == true)
+    repo.list_packages("testing").each do |pkg|
+      begin
+        repo.push pkg.name, nil, "stable", (options["force"] == true)
+      rescue Dr::AlreadyExists
+        ;
+      end
+    end
+
+    log :info, "Removing packages that are not in testing any more"
+    repo.list_packages("release").each do |pkg|
+      if ! repo.suite_has_package? "testing", pkg.name
+        repo.unpush pkg.name, "release"
+      end
     end
   end
 
@@ -374,6 +409,6 @@ end
 
 begin
  RepoCLI.start ARGV
-rescue Exception => e
+rescue StandardError => e
   Dr::Logger.log :err, e.to_s
 end

data/lib/dr.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/version"
 require "dr/repo"
 

data/lib/dr/buildroot.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "tco"
 
 require "dr/logger"
@@ -7,46 +10,59 @@ module Dr
   class BuildRoot
     include Logger
 
-    def initialize(arch, br_archive=nil)
-      @location = br_archive
-
-      @extra_pkgs = "sudo,vim,ca-certificates,fakeroot,build-essential,curl," +
-                    "devscripts,debhelper,git,bc,locales,equivs,pkg-config"
-      @repos = {
-        :raspbian => {
-          :url => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian/",
-          :key => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian.public.key",
-          :src => true,
-          :codename => "wheezy",
-          :components => "main contrib non-free rpi"
+    @@os_bases = {
+      "Kano OS" => {
+        :arches => ["armhf", "armel"],
+        :repos => {
+          :raspbian => {
+            :url => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian/",
+            :key => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian.public.key",
+            :src => true,
+            :codename => "wheezy",
+            :components => "main contrib non-free rpi"
+          },
+
+          :raspi_foundation => {
+            :url => "http://archive.raspberrypi.org/debian/",
+            :key => "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key",
+            :src => false,
+            :codename => "wheezy",
+            :components => "main"
+          },
+
+          :kano => {
+            :url => "http://dev.kano.me/archive/",
+            :key => "http://dev.kano.me/archive/repo.gpg.key",
+            :src => false,
+            :codename => "devel",
+            :components => "main"
+          }
         },
+        :base => :raspbian,
+        :packages => []
+      }
+    }
+    def self.os_bases
+      @@os_bases
+    end
 
-        :raspi_foundation => {
-          :url => "http://archive.raspberrypi.org/debian/",
-          :key => "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key",
-          :src => false,
-          :codename => "wheezy",
-          :components => "main"
-        },
+    def initialize(base, arch, br_cache)
+      @location = "#{br_cache}/#{base.strip.downcase.gsub(" ", "_")}-#{arch}.tar.gz"
+      @base = base
+      @arch = arch
 
-        :kano => {
-          :url => "http://dev.kano.me/archive/",
-          :key => "http://dev.kano.me/archive/repo.gpg.key",
-          :src => false,
-          :codename => "devel",
-          :components => "main"
-        }
-      }
-      @base_repo = :raspbian
+      @essential_pkgs = "sudo,vim,ca-certificates,fakeroot,build-essential," +
+                        "curl,devscripts,debhelper,git,bc,locales,equivs," +
+                        "pkg-config,libfile-fcntllock-perl"
 
-      if br_archive == nil || !File.exists?(br_archive)
-        setup arch
+      if !File.exists?(@location)
+        setup base, arch
       end
     end
 
     def open
       Dir.mktmpdir do |tmp|
-        log :info, "Preparing the build root"
+        log :info, "Preparing #{@base.fg "blue"} #{@arch.fg "orange"} build root"
         ShellCmd.new "sudo tar xz -C #{tmp} -f #{@location}", :tag => "tar"
         begin
           log :info, "Mounting the /proc file system"
@@ -65,7 +81,19 @@ module Dr
     end
 
     private
-    def setup(arch)
+    def setup(base, arch)
+      unless @@os_bases.include? base
+        raise "OS base #{base.fg "blue"} isn't supported by dr."
+      end
+
+      unless @@os_bases[base][:arches].include? arch
+        raise "Arch #{arch.fg "blue"} not supported by this base."
+      end
+
+      repos = @@os_bases[base][:repos]
+      base_repo = @@os_bases[base][:base].to_sym
+      additional_pkgs = @@os_bases[base][:packages].join ","
+
       Dir.mktmpdir do |tmp|
         broot = "#{tmp}/broot"
         FileUtils.mkdir_p "#{tmp}/broot"
@@ -73,11 +101,11 @@ module Dr
         log :info, "Setting up the buildroot"
 
         begin
-          log :info, "Bootstrapping Raspian (first stage)"
+          log :info, "Bootstrapping #{base} (first stage)"
 
           cmd = "sudo debootstrap --foreign --variant=buildd --no-check-gpg " +
-                "--include=#{@extra_pkgs} --arch=#{arch} wheezy #{broot} " +
-                "#{@repos[@base_repo][:url]}"
+                "--include=#{@essential_pkgs},#{additional_pkgs} " +
+                "--arch=#{arch} wheezy #{broot} #{repos[base_repo][:url]}"
           debootsrap = ShellCmd.new cmd, {
             :tag => "debootstrap",
             :show_out => true
@@ -99,7 +127,7 @@ module Dr
 
           log :info, "Configuring the build root"
 
-          repo_setup_sequences = @repos.map do |name, repo|
+          repo_setup_sequences = repos.map do |name, repo|
             seq = "echo 'deb #{repo[:url]} #{repo[:codename]} " +
                   "#{repo[:components]}' >> /etc/apt/sources.list\n"
 

data/lib/dr/config.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "yaml"
 
 module Dr

data/lib/dr/debpackage.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/package"
 
 module Dr

data/lib/dr/gitpackage.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/package"
 require "dr/pkgversion"
 require "dr/shellcmd"

data/lib/dr/gnupg.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/shellcmd"
 require "dr/logger"
 

data/lib/dr/logger.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "tco"
 
 tco_conf = Tco::config

data/lib/dr/package.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/logger"
 require "dr/shellcmd"
 

data/lib/dr/pkgversion.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 module Dr
   class PkgVersion
     attr_accessor :upstream, :debian, :date, :build
@@ -63,7 +66,13 @@ module Dr
         v << ".#{today}"
       end
 
-      v << "build#{@build}" if @build > 0
+      if @build > 0
+        if @build < 10
+          v << "build0#{@build}"
+        else
+          v << "build#{@build}"
+        end
+      end
 
       v
     end

data/lib/dr/repo.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "dr/gitpackage"
 require "dr/debpackage"
 
@@ -10,6 +13,8 @@ require "fileutils"
 require "yaml"
 
 module Dr
+  class AlreadyExists < StandardError; end
+
   class Repo
     include Logger
 
@@ -19,6 +24,9 @@ module Dr
       @location = File.expand_path loc
 
       @packages_dir = "#{@location}/packages"
+
+      meta = "#{@location}/metadata"
+      @metadata = File.exists?(meta) ? YAML.load_file(meta) : {}
     end
 
     def setup(conf)
@@ -65,9 +73,15 @@ module Dr
       end
 
       FileUtils.mkdir_p @packages_dir
+      FileUtils.mkdir_p "#{@location}/buildroots"
+
+      @metadata = {"base-os" => conf[:base]}
+      File.open("#{@location}/metadata", "w" ) do |out|
+        YAML.dump(@metadata)
+      end
 
       conf[:arches].each do |arch|
-        BuildRoot.new arch, "#{@location}/build-root-#{arch}.tar.gz"
+        buildroot arch
       end
     end
 
@@ -93,7 +107,8 @@ module Dr
     end
 
     def buildroot(arch)
-      BuildRoot.new arch, "#{@location}/build-root-#{arch}.tar.gz"
+      cache_dir = "#{@location}/buildroots/"
+      BuildRoot.new @metadata["base-os"], arch, cache_dir
     end
 
     def get_package(name)
@@ -150,6 +165,12 @@ module Dr
       v
     end
 
+    def suite_has_package?(suite, pkg_name)
+      pkg_versions = get_subpackage_versions(pkg_name)[codename_to_suite(suite)]
+
+      pkg_versions.length > 0
+    end
+
     def suite_has_higher_pkg_version?(suite, pkg, version)
       used_versions = get_subpackage_versions(pkg.name)[codename_to_suite(suite)]
 
@@ -228,10 +249,12 @@ module Dr
           reprepro = "reprepro -b #{@location}/archive " +
                      "--gnupghome #{location}/gnupg-keyring/ removesrc " +
                      "#{suite} #{pkg.name}"
-          ShellCmd.new reprepro, :tag => "reprepro", :show_out => true
+          ShellCmd.new reprepro, :tag => "reprepro", :show_out => false
         else
-          log :err, "The same package of a higher version is already in the repo."
-          raise "Push failed"
+          log :warn, "The same package of a higher version is already in the " +
+                     "#{suite} suite."
+
+          raise AlreadyExists.new "Push failed"
         end
       end
 

data/lib/dr/shellcmd.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 require "open3"
 require "tco"
 

data/lib/dr/version.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
 module Dr
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.13
-  prerelease: 
+  version: 0.1.14
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tco
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,39 +55,37 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "dr works with distribution-level packaging\n                          tools
-  and helps you make and distribute your own\n                          Debian packages
-  through your own repository.\n                          This is a super early release,
-  certainly NOT ready\n                          for production."
+description: |-
+  dr works with distribution-level packaging
+                            tools and helps you make and distribute your own
+                            Debian packages through your own repository.
+                            This is a super early release, certainly NOT ready
+                            for production.
 email:
 - radek@kano.me
 executables:
@@ -125,27 +116,26 @@ files:
 homepage: http://github.com/KanoComputing/kano-package-system
 licenses:
 - GPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dr stands for debian-repository. It is a packaging tool that helps you make,
   distribute and maintain you own disto packages and repositories. It's in a very
   early stage, NOT READY for production.