dr 0.2.5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4035bfe641151aba4792cf6ebedbc80d1fd2e6
-  data.tar.gz: 715befd405538961117520a551330201fb57c22b
+  metadata.gz: 48dfeab96a546a1ea867447378a4db3d2004a87a
+  data.tar.gz: f9002254094f0d190ce164e74c39118e44a0aaee
 SHA512:
-  metadata.gz: bcc322d82a50e31a7c230fc5f7bf9ec66beb1206f4a8c79bd4a427a3a2b931f32ff14183a37f71bfad47d5cd5025ed3759bb0726fbd85ba5cffb43c547301dfb
-  data.tar.gz: e2b1950538b9f104945f86efcaa55a471a2fbbabca3cc8c1f76b27e5e61c5037f7a99e6d6cd63a6951d9c225d2d4723e551fa64a17deb1e5138916da3f940ace
+  metadata.gz: 93d864a9d2c275c1c90bee88d8f2d91c91797659c86648183fb8df996a71ec6563ce801b553775598d3a28e35bd1836ff49270b72c22365e2f0cf21e2d71a244
+  data.tar.gz: 0eaa169652f489a898171edb18758306c276a46bd149260fb425bf7d94fb7683067dad0e6dd16fd91eb074d19992631d08ad9942ac43bdfa18eb707980bcb6fc

data/bin/dr

@@ -12,6 +12,7 @@ require "dr/repo"
 require "dr/gitpackage"
 require "dr/debpackage"
 require "dr/buildroot"
+require "dr/pkgversion"
 
 require "dr/shellcmd"
 require "dr/logger"
@@ -59,6 +60,79 @@ class Archive < ExtendedThor
   #end
 end
 
+class Conf < ExtendedThor
+  desc "repo", "Configuration of the whole repository"
+  def repo(key, value=nil)
+    repo = get_repo_handle
+
+    metadata = repo.get_configuration
+
+    if value == nil
+      value = dot_get_value metadata, key
+      puts value if value
+    else
+      repo.set_configuration dot_set_value metadata, key, value
+    end
+  end
+
+  desc "package", "Package-specific configuration options"
+  def package(pkg_name, key, value=nil)
+    repo = get_repo_handle
+    pkg = repo.get_package pkg_name
+
+    metadata = pkg.get_configuration
+
+    if value == nil
+      value = dot_get_value metadata, key
+      puts value if value
+    else
+      pkg.set_configuration dot_set_value metadata, key, value
+    end
+  end
+
+  private
+  def dot_set_value(dict, key, value)
+    levels = key.split(".").map {|l| l.to_sym}
+    raise "Incorrect key" if levels.length == 0
+
+    begin
+      last = levels.pop
+      object = dict
+      levels.each do |l|
+        object[l] = {} unless object.has_key? l
+        object = object[l]
+      end
+
+      if value.length > 0
+        object[last] = value
+      else
+        object.delete last
+      end
+    rescue
+      log :err, "The configuration key '#{key}' isn't right"
+      raise "Incorrect key"
+    end
+
+    dict
+  end
+
+  def dot_get_value(dict, key)
+    levels = key.split(".").map {|l| l.to_sym}
+    raise "Incorrect key" if levels.length == 0
+
+    begin
+      last = levels.pop
+      object = dict
+      levels.each do |l|
+        object = object[l]
+      end
+      return object[last]
+    rescue
+      log :err, "The configuration key '#{key}' isn't right"
+      raise "Incorrect key"
+    end
+  end
+end
 
 class List < ExtendedThor
   desc "packages", "Show a list of source packages in the repo"
@@ -71,11 +145,16 @@ class List < ExtendedThor
     end
   end
 
-
-  desc "versions PACKAGE", "Show the history of all available versions for a package"
+  desc "versions PACKAGE", "DEPRECATED, please use builds instead"
   def versions(pkg_name)
+    log :warn, "This subcommand is deprecated, please use builds instead"
+    builds pkg_name
+  end
+
+  desc "builds PACKAGE", "Show the history of all builds of a package"
+  def builds(pkg_name)
     repo = get_repo_handle
-    log :info, "Listing all built versions of #{pkg_name.style "pkg-name"}"
+    log :info, "Listing all buils of #{pkg_name.style "pkg-name"}"
 
     suites = repo.get_suites
 
@@ -178,7 +257,7 @@ class RepoCLI < ExtendedThor
       :arches => ["amd64"],
       :components => ["main"],
       :suites => ["stable", "testing", "unstable"],
-      :distro => "Kano OS",
+      :build_environment => :kano,
       :codenames => []
     }
 
@@ -188,40 +267,38 @@ class RepoCLI < ExtendedThor
     desc = ask "   Description [#{repo_conf[:desc]}]:"
     repo_conf[:desc] = desc if desc.length > 0
 
-    distro_map = {}
-    puts "   Distribution [pick one]: "
-    Dr::config.distros.each_with_index do |distro, index|
-      distro_name = distro[0]
-      distro_map[index+1] = distro_name
-
-      distro_name = distro_name.fg "yellow" if distro_name == repo_conf[:distro]
-      puts "     [#{index+1}] #{distro_name}"
+    puts "   Default build environment [pick one]: "
+    Dr::config.build_environments.each do |id, benv|
+      puts "     [#{id.to_s.fg "blue"}] #{benv[:name]}"
     end
 
-    distro = ask "   Your choice: "
-    until distro.length == 0 || distro_map.has_key?(distro.to_i)
-      distro = ask "   Your choice: "
+    benv = nil
+    loop do
+      benv_str = ask "   Your choice [#{repo_conf[:build_environment].to_s.fg "yellow"}]:"
+      benv = benv_str.to_sym
+      break if Dr::config.build_environments.has_key? benv_str.to_sym
     end
-    repo_conf[:distro] = distro_map[distro.to_i] if distro.length > 0
+    repo_conf[:build_environment] = benv
 
-    require 'pp'
-    # guess default arch
-    pp Dr::config.distros
-    pp Dr::config.distros[repo_conf[:distro]]
-    repo_conf[:arches] = [Dr::config.distros[repo_conf[:distro]][:arches][0]]
+    # guess repo arches
+    repo_conf[:arches] = Dr::config.build_environments[benv][:arches]
 
-    while true
+    loop do
       str = ask "   Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
       break if str.length == 0
 
+      # Determine the available architectures
+      avail = Dr.config.build_environments[benv][:arches]
+
       arches = str.split(/\s+/)
       arches_valid = arches.reduce(true) do |acc, arch|
-        supported = Dr::config.distros[repo_conf[:distro]][:arches].include?(arch)
-        if !supported
-          puts "     " + "#{arch.fg "yellow"}" + " not supported by the distro"
+        if !avail.include?(arch)
+          puts "     " + "#{arch.fg "yellow"}" +
+               " not supported by the build environments you selected"
+          acc = false
         end
 
-        supported
+        acc
       end
       next if !arches_valid
 
@@ -321,7 +398,7 @@ class RepoCLI < ExtendedThor
   desc "push [pkg-name]", "push a built package to a specified suite"
   method_option :suite, :aliases => "-s", :type => :string,
                 :desc => "the target suite (defaults to testing)"
-  method_option :version, :aliases => "-v", :type => :string,
+  method_option :build, :aliases => "-b", :type => :string,
                 :desc => "which version to push (defaults to the highest one build)"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "force inclusion of the package to the suite"
@@ -332,7 +409,7 @@ class RepoCLI < ExtendedThor
     suite = options["suite"] if options.has_key? "suite"
 
     version = nil
-    version = options["version"] if options.has_key? "version"
+    version = options["build"] if options.has_key? "build"
 
     repo.push pkg_name, version, suite, options["force"] == true
   end
@@ -344,11 +421,15 @@ class RepoCLI < ExtendedThor
     repo.unpush pkg_name, suite
   end
 
-
   desc "list SUBCOMMAND [ARGS]", "show information about packages"
   map "l" => :list, "ls" => :list
   subcommand "list", List
 
+
+  desc "config SUBCOMMAND [ARGS]", "configure your repository"
+  map "c" => :config, "conf" => :config, "configure" => :config
+  subcommand "config", Conf
+
   desc "rm [pkg-name]", "remove a package completely from the build system"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "force removal even if the package is still used"
@@ -459,25 +540,75 @@ class RepoCLI < ExtendedThor
 
 
   desc "force-sync", "Force cloning the sources repository from scratch again"
+  method_option :url, :aliases => "-u", :type => :string,
+                :desc => "The URL to clone from"
+  method_option :branch, :aliases => "-b", :type => :string,
+                :desc => "The default branch to use for building"
   def force_sync(pkg_name)
     repo = get_repo_handle
     pkg = repo.get_package pkg_name
 
     if pkg.is_a? Dr::GitPackage
-      pkg.reinitialise_repo
+      pkg.reinitialise_repo options["url"], options["branch"]
     else
       raise "The source of #{pkg_name.style "pkg-name"} is not managed by " +
             "#{"dr".bright}"
     end
   end
 
-  desc "snapshot", "save a snapshot of the archive"
-  def snapshot(tag)
+  #desc "snapshot", "save a snapshot of the archive"
+  #def snapshot(tag)
+  #  repo = get_repo_handle
+  #end
+
+  desc "cleanup", "Remove builds beyond certain date or number"
+  method_option :package, :aliases => "-p", :type => :string,
+                :desc => "Cleanup this package only"
+  method_option :date, :aliases => "-d", :type => :string,
+                :desc => "Remove builds beyond this date (YYYYMMDD)"
+  method_option :number, :aliases => "-n", :type => :string,
+                :desc => "Keep only N newest builds"
+  def cleanup
     repo = get_repo_handle
 
-    log :info, "Releasing all packages from testing"
-    repo.list_packages.each do |pkg|
-      repo.push pkg.name, nil, "stable"
+    if options["date"] != nil && options["number"] != nil
+      log :err, "Can't use -n and -d at the same time"
+      raise "Bad arguments"
+    end
+
+    date = options["date"]
+    number = options["number"]
+
+    if options["date"] == nil && options["number"] == nil
+      number = 10
+    end
+
+    packages = unless options["package"] == nil
+      [repo.get_package(options["package"])]
+    else
+      repo.list_packages
+    end
+
+    packages.each do |pkg|
+      kept = 0
+      pkg.history.each do |version_string|
+        # Can't remove a used build
+        if repo.is_used? pkg.name, version_string
+          kept += 1
+          next
+        end
+
+        if date != nil
+          version = Dr::PkgVersion.new version_string
+          if version.date.to_i < date.to_i
+            rmbuild pkg.name, version_string
+          end
+        elsif number != nil && kept >= number.to_i
+            rmbuild pkg.name, version_string
+        else 
+          kept += 1
+        end
+      end
     end
   end
 end
@@ -493,4 +624,8 @@ begin
   RepoCLI.start ARGV
 rescue StandardError => e
   Dr::Logger.log :err, e.to_s
+  e.backtrace.each do |line|
+    line = "  #{line}" if line.length > 0 && line[0] == '/'
+    Dr::Logger.log :err, line.fg("grey")
+  end
 end

data/dr.conf-example

@@ -9,3 +9,18 @@ repositories:
 
   - name: "sandbox"
     location: "/path/to/the/sandbox/repo"
+
+build_environments:
+  basic_wheezy:
+    name: "Test Build Environment"
+    arches: [armhf, x86_64]
+    repos:
+      wheezy:
+        url: "http://ftp.uk.debian.org/debian/"
+        key: "https://ftp-master.debian.org/keys/archive-key-7.0.asc"
+        src: false
+        codename: wheezy
+        components: main nonfree
+    base_repo: wheezy
+    packages: []
+

data/lib/dr/{distros.rb → build_environments.rb}

@@ -1,12 +1,12 @@
 # Copyright (C) 2014 Kano Computing Ltd.
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
 
-
 module Dr
-  module Distros
-    @@distros = {
-      "Kano OS" => {
-        :arches => ["armhf", "armel"],
+  module BuildEnvironments
+    @@build_environments = {
+      :kano => {
+        :name =>"Kano OS",
+        :arches => ["armhf"],
         :repos => {
           :raspbian => {
             :url => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian/",
@@ -17,8 +17,8 @@ module Dr
           },
 
           :raspi_foundation => {
-            :url => "http://archive.raspberrypi.org/debian/",
-            :key => "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key",
+            :url => "http://dev.kano.me/mirrors/raspberrypi/",
+            :key => "http://dev.kano.me/mirrors/raspberrypi/raspberrypi.gpg.key",
             :src => false,
             :codename => "wheezy",
             :components => "main"
@@ -34,15 +34,31 @@ module Dr
         },
         :base_repo => :raspbian,
         :packages => []
+      },
+
+      :wheezy => {
+        :name => "Debian Wheezy",
+        :arches => ["x86_64"],
+        :repos => {
+          :wheezy => {
+            :url => "http://ftp.uk.debian.org/debian/",
+            :key => "https://ftp-master.debian.org/keys/archive-key-7.0.asc",
+            :src => true,
+            :codename => "wheezy",
+            :components => "main contrib non-free"
+          }
+        },
+        :base_repo => :wheezy,
+        :packages => []
       }
     }
 
-    def distros
-      @@distros
+    def build_environments
+      @@build_environments
     end
 
-    def add_distro(name, distro)
-      @@distros[name] = distro
+    def add_build_environment(name, benv)
+      @@build_environments[name.to_sym] = benv
     end
   end
 end

data/lib/dr/buildroot.rb

@@ -11,23 +11,31 @@ module Dr
   class BuildRoot
     include Logger
 
-    def initialize(base, arch, br_cache)
-      @location = "#{br_cache}/#{base.strip.downcase.gsub(" ", "_")}-#{arch}.tar.gz"
-      @base = base
+    def initialize(env, arch, br_cache)
       @arch = arch
+      if arch == "all"
+        unless Dr::config.build_environments.has_key? env
+          log :err, "Unkown build environment: #{env.to_s.fg "red"}"
+          raise "Build environment not recognised"
+        end
+        @arch = Dr::config.build_environments[env][:arches][0]
+      end
+
+      @location = "#{br_cache}/#{env.to_s}-#{@arch}.tar.gz"
+      @env = env
 
       @essential_pkgs = "sudo,vim,ca-certificates,fakeroot,build-essential," +
                         "curl,devscripts,debhelper,git,bc,locales,equivs," +
                         "pkg-config,libfile-fcntllock-perl"
 
-      if !File.exists?(@location)
-        setup base, arch
+      unless File.exists?(@location)
+        setup @env, @arch
       end
     end
 
     def open
       Dir.mktmpdir do |tmp|
-        log :info, "Preparing #{@base.fg "blue"} #{@arch.fg "orange"} build root"
+        log :info, "Preparing #{@env.to_s.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"
@@ -46,18 +54,16 @@ module Dr
     end
 
     private
-    def setup(base, arch)
-      unless Dr.config.distros.include? base
-        raise "Sorry, OS base #{base.fg "blue"} isn't supported by dr."
+    def setup(env, arch)
+      unless Dr.config.build_environments.has_key? env
+        raise "Sorry, build environment #{env.to_s.fg "blue"} isn't supported by dr."
       end
 
-      unless Dr.config.distros[base][:arches].include? arch
-        raise "Arch #{arch.fg "blue"} not supported by this base."
+      unless Dr.config.build_environments[env][:arches].include? arch
+        raise "Arch #{arch.fg "blue"} not supported by this build environment."
       end
 
-      repos = Dr.config.distros[base][:repos]
-      base_repo = Dr.config.distros[base][:base_repo].to_sym
-      additional_pkgs = Dr.config.distros[base][:packages].join ","
+      repos = Dr.config.build_environments[env][:repos]
 
       Dir.mktmpdir do |tmp|
         broot = "#{tmp}/broot"
@@ -66,30 +72,15 @@ module Dr
         log :info, "Setting up the buildroot"
 
         begin
-          log :info, "Bootstrapping #{base} (first stage)"
-
-          cmd = "sudo debootstrap --foreign --variant=buildd --no-check-gpg " +
-                "--include=#{@essential_pkgs},#{additional_pkgs} " +
-                "--arch=#{arch} wheezy #{broot} #{repos[base_repo][:url]}"
-          debootsrap = ShellCmd.new cmd, {
-            :tag => "debootstrap",
-            :show_out => true
-          }
+          arch_cmd = ShellCmd.new "arch"
+          arch = arch_cmd.out.strip
 
-          static_qemu = Dir["/usr/bin/qemu-*-static"]
-          static_qemu.each do |path|
-            cp = ShellCmd.new "sudo cp #{path} #{broot}/usr/bin", {
-              :tag => "cp"
-            }
+          if @arch == arch
+            setup_native broot
+          else
+            setup_foreign broot
           end
 
-          log :info, "Bootstrapping Raspian (#{arch} stage)"
-          cmd = "sudo chroot #{broot} /debootstrap/debootstrap --second-stage"
-          debootstrap = ShellCmd.new cmd, {
-            :tag => "debootstrap",
-            :show_out => true
-          }
-
           log :info, "Configuring the build root"
 
           repo_setup_sequences = repos.map do |name, repo|
@@ -141,5 +132,53 @@ EOF"
         end
       end
     end
+
+    def setup_foreign(broot)
+      repos = Dr.config.build_environments[@env][:repos]
+      base_repo = Dr.config.build_environments[@env][:base_repo].to_sym
+      additional_pkgs = Dr.config.build_environments[@env][:packages].join ","
+      codename = repos[base_repo][:codename]
+      url = repos[base_repo][:url]
+
+      log :info, "Bootstrapping #{@env.to_s} (foreign chroot, first stage)"
+      cmd = "sudo debootstrap --foreign --variant=buildd --no-check-gpg " +
+            "--include=#{@essential_pkgs},#{additional_pkgs} " +
+            "--arch=#{@arch} #{codename} #{broot} #{url}"
+      debootsrap = ShellCmd.new cmd, {
+        :tag => "debootstrap",
+        :show_out => true
+      }
+
+      static_qemu = Dir["/usr/bin/qemu-*-static"]
+      static_qemu.each do |path|
+        cp = ShellCmd.new "sudo cp #{path} #{broot}/usr/bin", {
+          :tag => "cp"
+        }
+      end
+
+      log :info, "Bootstrapping Raspian (#{@arch} stage)"
+      cmd = "sudo chroot #{broot} /debootstrap/debootstrap --second-stage"
+      debootstrap = ShellCmd.new cmd, {
+        :tag => "debootstrap",
+        :show_out => true
+      }
+    end
+
+    def setup_native(broot)
+      repos = Dr.config.build_environments[@env][:repos]
+      base_repo = Dr.config.build_environments[@env][:base_repo].to_sym
+      additional_pkgs = Dr.config.build_environments[@env][:packages].join ","
+      codename = repos[base_repo][:codename]
+      url = repos[base_repo][:url]
+
+      log :info, "Bootstrapping #{@env.to_s} (native chroot)"
+      cmd = "sudo debootstrap --variant=buildd --no-check-gpg " +
+            "--include=#{@essential_pkgs},#{additional_pkgs} " +
+            "#{codename} #{broot} #{repos[base_repo][:url]}"
+      debootsrap = ShellCmd.new cmd, {
+        :tag => "debootstrap",
+        :show_out => true
+      }
+    end
   end
 end

data/lib/dr/config.rb

@@ -3,13 +3,13 @@
 
 require "yaml"
 
-require "dr/distros"
+require "dr/build_environments"
 
 module Dr
   class Config
     attr_reader :default_repo, :repositories
 
-    include Distros
+    include BuildEnvironments
 
     def initialize(locations)
       @default_repo = nil
@@ -47,10 +47,10 @@ module Dr
         end
       end
 
-      if conf_file.has_key? "distros"
-        conf_file["distros"].each do |name, distro|
-          distro_sym_keys = distro.inject({}) { |memo,(k,v)| memo[k.to_sym] = v; memo }
-          add_distro(name, distro_sym_keys)
+      if conf_file.has_key? "build_environments"
+        conf_file["build_environments"].each do |id, be|
+          be_sym_keys = be.inject({}) { |memo,(k,v)| memo[k.to_sym] = v; memo }
+          add_build_environment(id, be_sym_keys)
         end
       end
     end

data/lib/dr/gitpackage.rb

@@ -4,6 +4,7 @@
 require "dr/package"
 require "dr/pkgversion"
 require "dr/shellcmd"
+require "dr/utils"
 
 require "yaml"
 require "octokit"
@@ -70,8 +71,9 @@ module Dr
       @default_branch = get_current_branch
     end
 
-    def reinitialise_repo
-      git_addr = get_repo_url
+    def reinitialise_repo(git_addr=nil, branch=nil)
+      git_addr ||= get_repo_url
+      branch ||= @default_branch
 
       log :info, "Re-downloading the source repository of " +
                  "#{@name.style "pkg-name"}"
@@ -83,7 +85,7 @@ module Dr
         src_dir = "#{tmp}/src"
         FileUtils.mkdir_p src_dir
 
-        checkout @default_branch, src_dir
+        checkout branch, src_dir
 
         unless File.exists? "#{tmp}/src/debian/control"
           log :err, "The debian packaging files not found in the repository"
@@ -115,6 +117,25 @@ module Dr
         FileUtils.rm_rf src_dir
         FileUtils.mv "#{tmp}/git", "#{src_dir}"
       end
+
+      @default_branch = branch
+    end
+
+    def get_configuration
+      md_file = "#{@repo.location}/packages/#{@name}/metadata"
+      if File.exists? md_file
+        Utils::symbolise_keys YAML.load_file md_file
+      else
+        {}
+      end
+    end
+
+    def set_configuration(config)
+      # TODO: Some validation needed
+      md_file = "#{@repo.location}/packages/#{@name}/metadata"
+      File.open(md_file, "w") do |f|
+        YAML.dump Utils::stringify_symbols(config), f
+      end
     end
 
     def build(branch=nil, force=false)
@@ -139,7 +160,13 @@ module Dr
       Dir.mktmpdir do |src_dir|
         checkout branch, src_dir
 
-        version = PkgVersion.new get_version "#{src_dir}/debian/changelog"
+        version_string = get_version "#{src_dir}/debian/changelog"
+        unless version_string
+          log :err, "Couldn't get the version string from the changelog"
+          raise "The changelog format doesn't seem be right"
+        end
+
+        version = PkgVersion.new version_string
         log :info, "Source version: #{version.source.style "version"}"
 
         while build_exists? version
@@ -168,14 +195,28 @@ module Dr
         repo_arches = @repo.get_architectures
         pkg_arches = get_architectures("#{src_dir}/debian/control")
         arches = case
-          when pkg_arches.include?("any") || pkg_arches.include?("all")
+          when pkg_arches.include?("any")
             repo_arches
+          when pkg_arches.include?("all")
+            ["all"]
           else
             repo_arches & pkg_arches
           end
 
+        if repo_arches.length == 0
+          log :error, "#{@name.style "pkg-name"} cannot be build for any of " +
+                      "the architectures supported by this repository"
+          raise "Unable to build the package for this repository"
+        end
+
+        benv = :default
+        src_meta = get_configuration
+        if src_meta.has_key? :build_environment
+          benv = src_meta[:build_environment].to_sym
+        end
+
         arches.each do |arch|
-          @repo.buildroot(arch).open do |br|
+          @repo.buildroot(arch, benv).open do |br|
             log :info, "Building the #{@name.style "pkg-name"} package " +
                        "version #{version.to_s.style "version"} for #{arch}"
 

data/lib/dr/package.rb

@@ -42,6 +42,14 @@ module Dr
       FileUtils.rm_rf "#{@repo.location}/packages/#{@name}/builds/#{version}"
     end
 
+    def get_configuration
+      {}
+    end
+
+    def set_configuration(config)
+      raise "This package isn't configurable"
+    end
+
     def <=>(o)
       self.name <=> o.name
     end

data/lib/dr/repo.rb

@@ -8,6 +8,7 @@ require "dr/shellcmd"
 require "dr/logger"
 require "dr/gnupg"
 require "dr/buildroot"
+require "dr/utils"
 
 require "fileutils"
 require "yaml"
@@ -24,13 +25,6 @@ module Dr
       @location = File.expand_path loc
 
       @packages_dir = "#{@location}/packages"
-
-      meta = "#{@location}/metadata"
-      begin
-        @metadata = YAML.load_file(meta)
-      rescue
-        @metadata = {}
-      end
     end
 
     def setup(conf)
@@ -78,13 +72,27 @@ module Dr
       FileUtils.mkdir_p @packages_dir
       FileUtils.mkdir_p "#{@location}/buildroots"
 
-      @metadata = {"distro" => conf[:distro]}
+      metadata = {
+        "default_build_environment" => conf[:build_environment].to_s
+      }
       File.open("#{@location}/metadata", "w" ) do |out|
-        YAML.dump(@metadata)
+        out.write metadata.to_yaml
       end
+    end
+
+    def get_configuration
+        meta_file = "#{@location}/metadata"
+        if File.exists? meta_file
+          Utils::symbolise_keys YAML.load_file(meta_file)
+        else
+          {}
+        end
+    end
 
-      conf[:arches].each do |arch|
-        buildroot arch
+    def set_configuration(new_metadata)
+      # TODO: Some validation needed
+      File.open("#{@location}/metadata", "w" ) do |out|
+        out.write Utils::stringify_symbols(new_metadata).to_yaml
       end
     end
 
@@ -109,9 +117,13 @@ module Dr
       pkgs.sort
     end
 
-    def buildroot(arch)
+    def buildroot(arch, build_env=:default)
+      if build_env == :default
+        build_env = get_configuration[:default_build_environment].to_sym
+      end
+
       cache_dir = "#{@location}/buildroots/"
-      BuildRoot.new @metadata["distro"], arch, cache_dir
+      BuildRoot.new build_env, arch, cache_dir
     end
 
     def get_package(name)
@@ -371,16 +383,6 @@ module Dr
       nil
     end
 
-    private
-    def get_key
-      File.open "#{@location}/archive/conf/distributions", "r" do |f|
-        f.each_line do |line|
-          m = line.match /^SignWith: (.+)/
-          return m.captures[0] if m
-        end
-      end
-    end
-
     def is_used?(pkg_name, version=nil)
       versions_by_suite = get_subpackage_versions pkg_name
       versions_by_suite.inject(false) do |rslt, hash_pair|
@@ -392,5 +394,15 @@ module Dr
         end
       end
     end
+
+    private
+    def get_key
+      File.open "#{@location}/archive/conf/distributions", "r" do |f|
+        f.each_line do |line|
+          m = line.match /^SignWith: (.+)/
+          return m.captures[0] if m
+        end
+      end
+    end
   end
 end

data/lib/dr/utils.rb

@@ -0,0 +1,42 @@
+# Copyright (C) 2014 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+
+module Dr
+  module Utils
+    def self.symbolise_keys(hash)
+      if hash.is_a? Hash
+        hash.inject({}) do |new_hash, (key, value)|
+          new_hash[key.to_sym] = symbolise_keys value
+          new_hash
+        end
+      else
+        hash
+      end
+    end
+
+    def self.stringify_keys(hash)
+      return hash unless hash.is_a? Hash
+
+      hash.inject({}) do |new_hash, (key, value)|
+        new_hash[key.to_s] = stringify_keys value
+        new_hash
+      end
+    end
+
+    def self.stringify_symbols(var)
+      case
+        when var.is_a?(Hash)
+          var.inject({}) do |new_hash, (key, value)|
+            new_hash[key.to_s] = stringify_keys value
+            new_hash
+          end
+        when var.is_a?(Array)
+          var.map {|e| stringify_symbols e}
+        when var.is_a?(Symbol)
+          var.to_s
+        else
+          var
+      end
+    end
+  end
+end

data/lib/dr/version.rb

@@ -2,5 +2,5 @@
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
 
 module Dr
-  VERSION = "0.2.5"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.1
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,10 +116,10 @@ files:
 - dr.conf-example
 - dr.spec
 - lib/dr.rb
+- lib/dr/build_environments.rb
 - lib/dr/buildroot.rb
 - lib/dr/config.rb
 - lib/dr/debpackage.rb
-- lib/dr/distros.rb
 - lib/dr/gitpackage.rb
 - lib/dr/gnupg.rb
 - lib/dr/logger.rb
@@ -127,6 +127,7 @@ files:
 - lib/dr/pkgversion.rb
 - lib/dr/repo.rb
 - lib/dr/shellcmd.rb
+- lib/dr/utils.rb
 - lib/dr/version.rb
 homepage: http://github.com/KanoComputing/kano-package-system
 licenses:
@@ -155,3 +156,4 @@ summary: dr stands for debian-repository. It is a packaging tool that helps you
   distribute and maintain you own disto packages and repositories. It's in a very
   early stage, NOT READY for production.
 test_files: []
+has_rdoc: