dr 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f081cd07df3b86b2a8818d16a0c2b76c3205514d
-  data.tar.gz: e873f13774d8f4bccf3d6b9ccec059150bfdd7ef
+  metadata.gz: 242402de0362275310fd746e3c9ba832a963fd0d
+  data.tar.gz: 5a0a15e68b0863c37c19dc556d9a3aff43a61989
 SHA512:
-  metadata.gz: af79fd771e8a4ab7693ff38c5dfd78b490c57bf19eb9fd461d6a65c6e3fdcadfc86050055e45e32ca2f07dcbf275e4f1175b1ad81aec0e02a48e41984a6bab49
-  data.tar.gz: 34932b9939ca7c0a433af6df9e6b83d1c009bbe74128bc5eebf7f43ca20ae453f0cf42649438fd0dea0490eae63d734db372c1134b60823a454a287abd8554b0
+  metadata.gz: 540afeb391762426284f47ff8defc361b1d7aad061c39af8ebe7ca494175d3b5357c9eb3af6141179d325f9250619c0a7460879a7a178b29daacc55f0dfdbf43
+  data.tar.gz: cabec28d4f33d8a1a0ee1cc5d6a9a59b27b004c86c96bf2d135b51514cb8fd70367e8c0351a6915159fbbf31fe714a208af4860f787a4635b8e0ce5b8c478e18

data/bin/dr

@@ -7,6 +7,7 @@ require "thor"
 require "fileutils"
 require "io/console"
 
+require "dr"
 require "dr/repo"
 require "dr/gitpackage"
 require "dr/debpackage"
@@ -21,15 +22,11 @@ class ExtendedThor < Thor
   include Dr::Logger
 
   def get_repo_handle
-    unless @conf
-      @conf = Dr::Config.new ["/etc/dr.conf", "~/.dr.conf"]
-    end
-
     if options.has_key? "repo"
       Dr::Repo.new options["repo"]
     else
-      if @conf.default_repo != nil
-        Dr::Repo.new @conf.repositories[@conf.default_repo][:location]
+      if Dr.config.default_repo != nil
+        Dr::Repo.new Dr.config.repositories[Dr.config.default_repo][:location]
       else
         log :warn, "No repo was specified, using '#{Dir.pwd}'."
         Dr::Repo.new Dir.pwd
@@ -166,7 +163,7 @@ class RepoCLI < ExtendedThor
       :arches => ["amd64"],
       :components => ["main"],
       :suites => ["stable", "testing", "unstable"],
-      :base => "Kano OS",
+      :distro => "Kano OS",
       :codenames => []
     }
 
@@ -176,27 +173,46 @@ 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
+    distro_map = {}
+    puts "   Distribution [pick one]: "
+    Dr::config.distros.each_with_index do |distro, index|
+      distro_name, distro_params = distro
+      distro_map[index+1] = distro_name
 
-      base_name = base_name.fg "yellow" if base_name == repo_conf[:base]
-      puts "     [#{index+1}] #{base_name}"
+      distro_name = distro_name.fg "yellow" if distro_name == repo_conf[:distro]
+      puts "     [#{index+1}] #{distro_name}"
     end
 
-    base = ask "   Your choice: "
-    until base.length == 0 || base_map.has_key?(base.to_i)
-      base = ask "   Your choice: "
+    distro = ask "   Your choice: "
+    until distro.length == 0 || distro_map.has_key?(distro.to_i)
+      distro = ask "   Your choice: "
     end
-    repo_conf[:base] = base_map[base.to_i] if base.length > 0
+    repo_conf[:distro] = distro_map[distro.to_i] if distro.length > 0
 
+    require 'pp'
     # guess default arch
-    repo_conf[:arches] = [Dr::BuildRoot.os_bases[repo_conf[:base]][:arches][0]]
+    pp Dr::config.distros
+    pp Dr::config.distros[repo_conf[:distro]]
+    repo_conf[:arches] = [Dr::config.distros[repo_conf[:distro]][:arches][0]]
+
+    while true
+      str = ask "   Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
+      break if str.length == 0
+
+      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"
+        end
 
-    arches = ask "   Architectures [#{repo_conf[:arches].join(" ").fg("yellow")}]:"
-    repo_conf[:arches] = arches.split(/\s+/) if arches.length > 0
+        supported
+      end
+      next if !arches_valid
+
+      repo_conf[:arches] = arches
+      break
+    end
 
     components = ask "   Components [#{repo_conf[:components].join(" ").fg("yellow")}]:"
     repo_conf[:components] = components.split /\s+/ if components.length > 0
@@ -360,6 +376,40 @@ class RepoCLI < ExtendedThor
     log :info, "Updated #{updated.to_s.fg "blue"} packages in #{suite.fg "blue"}"
   end
 
+  desc "git-tag-release", "Mark relased packages' repositories"
+  method_option :force, :aliases => "-f", :type => :boolean,
+                :desc => "Force override existing tags"
+  method_option :package, :aliases => "-p", :type => :string,
+                :desc => "Only tag a single package"
+  method_option :summary, :aliases => "-s", :type => :string,
+                :desc => "A summary for the release (Github only)"
+  method_option :title, :aliases => "-t", :type => :string,
+                :desc => "A title for the release (Github only)"
+  def git_tag_release(tag)
+    repo = get_repo_handle
+
+    packages = if options["package"] == nil
+      repo.list_packages "stable"
+    else
+      if repo.get_subpackage_versions(options["package"])["stable"].empty?
+        log :warn, "This package isn't in the #{"stable".fg "green"} branch, skipping."
+      end
+
+      [repo.get_package(options["package"])]
+    end
+
+    packages.each do |pkg|
+      if pkg.is_a? Dr::GitPackage
+        version = repo.get_subpackage_versions(pkg.name)["stable"].values.max
+        bm = repo.get_build_metadata pkg.name, version
+
+        pkg.tag_release tag, bm["revision"], options
+      else
+        log :info, "#{pkg.name.style "pkg-name"} is not associated with a git repo, skipping"
+      end
+    end
+  end
+
   desc "release", "Push all the packages from testing to release"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "Force-push all released packages"
@@ -368,8 +418,9 @@ class RepoCLI < ExtendedThor
 
     log :info, "Releasing all packages from testing"
     repo.list_packages("testing").each do |pkg|
+      v = repo.get_subpackage_versions(pkg.name)["testing"].values
       begin
-        repo.push pkg.name, nil, "stable", (options["force"] == true)
+        repo.push pkg.name, v.max, "stable", (options["force"] == true)
       rescue Dr::AlreadyExists
         ;
       end
@@ -407,8 +458,14 @@ class RepoCLI < ExtendedThor
   end
 end
 
-begin
- RepoCLI.start ARGV
-rescue StandardError => e
+#begin
+  Dr::check_dependencies [
+    "git", "reprepro", "gzip", "debuild", "debootstrap", "qemu-*-static",
+    "chroot", "curl", "gpg", "tar", "dpkg", "dpkg-deb", "dpkg-sig", "rm",
+    "sudo"
+  ]
+
+  RepoCLI.start ARGV
+#rescue StandardError => e
   Dr::Logger.log :err, e.to_s
-end
+#end

data/lib/dr.rb

@@ -3,7 +3,19 @@
 
 require "dr/version"
 require "dr/repo"
+require "dr/logger"
 
 module Dr
-  # Your code goes here...
+  def self.check_dependencies(deps=[])
+    ENV["PATH"].split(File::PATH_SEPARATOR).each do |path_dir|
+      deps.delete_if do |dep_name|
+        Dir[File.join(path_dir, dep_name)].length > 0
+      end
+    end
+
+    if deps.length > 0
+      Logger.log :warn, "Missing some dependencies:"
+      deps.each { |dep| Logger.log :warn, "  #{dep.fg "red"}" }
+    end
+  end
 end

data/lib/dr/buildroot.rb

@@ -5,47 +5,12 @@ require "tco"
 
 require "dr/logger"
 require "dr/shellcmd"
+require "dr/config"
 
 module Dr
   class BuildRoot
     include Logger
 
-    @@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
-
     def initialize(base, arch, br_cache)
       @location = "#{br_cache}/#{base.strip.downcase.gsub(" ", "_")}-#{arch}.tar.gz"
       @base = base
@@ -82,17 +47,17 @@ module Dr
 
     private
     def setup(base, arch)
-      unless @@os_bases.include? base
-        raise "OS base #{base.fg "blue"} isn't supported by dr."
+      unless Dr.config.distros.include? base
+        raise "Sorry, OS base #{base.fg "blue"} isn't supported by dr."
       end
 
-      unless @@os_bases[base][:arches].include? arch
+      unless Dr.config.distros[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 ","
+      repos = Dr.config.distros[base][:repos]
+      base_repo = Dr.config.distros[base][:base_repo].to_sym
+      additional_pkgs = Dr.config.distros[base][:packages].join ","
 
       Dir.mktmpdir do |tmp|
         broot = "#{tmp}/broot"

data/lib/dr/config.rb

@@ -3,10 +3,14 @@
 
 require "yaml"
 
+require "dr/distros"
+
 module Dr
   class Config
     attr_reader :default_repo, :repositories
 
+    include Distros
+
     def initialize(locations)
       @default_repo = nil
       @repositories = {}
@@ -42,6 +46,18 @@ module Dr
           raise "Default repo #{@default_repo} doesn't exist"
         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)
+        end
+      end
     end
   end
+
+  @config = Config.new ["/etc/dr.conf", "~/.dr.conf"]
+  def self.config
+    @config
+  end
 end

data/lib/dr/gitpackage.rb

@@ -6,6 +6,7 @@ require "dr/pkgversion"
 require "dr/shellcmd"
 
 require "yaml"
+require "octokit"
 
 module Dr
   class GitPackage < Package
@@ -250,6 +251,55 @@ EOS
       version
     end
 
+    def tag_release(tag_name, revision, options={})
+      url = get_repo_url
+
+      log :info, "Tagging #{@name.style "pkg-name"} package for " +
+                 "#{tag_name.fg "yellow"} release"
+
+      gh_repo = case url
+        when /git\@github.com\:/i then url.split(":")[1].gsub(/\.git$/, "").strip
+        when /github.com\//i then url.split("/")[-2..-1].join("/").gsub(/\.git$/, "").strip
+        else nil
+      end
+
+      if gh_repo == nil
+        git_cmd = "git --git-dir #{@git_dir} tag #{tag}"
+        git = ShellCmd.new git_cmd,
+          :tag => "git",
+          :show_out => false,
+          :raise_on_error => false
+
+        if git.status == 128
+          log :warn, "Tag #{tag_name.fg "yellow"} already exists."
+          return
+        end
+
+        git_cmd = "git --git-dir #{@git_dir} push origin --tags"
+        git = ShellCmd.new git_cmd, :show_out => false
+
+        return
+      end
+
+      title = options["title"] || "Kano OS #{tag_name}"
+      summary = options["summary"] || "https://github.com/KanoComputing/peldins/wiki/Changelog-#{tag_name}"
+
+      token = ENV["GITHUB_API_TOKEN"]
+      client = Octokit::Client.new :access_token => token
+
+      releases = client.releases gh_repo
+      ri = releases.index { |r| r[:tag_name] == tag_name }
+
+      if ri == nil
+        client.create_release gh_repo, tag_name,
+          :target_commitish => revision,
+          :name => title,
+          :body => summary
+      else
+        log :warn, "The #{tag_name.fg "yellow"} release exists already for #{@name.style "pkg-name"}."
+      end
+    end
+
     private
     def update_from_origin(branch)
       log :info, "Pulling changes from origin"
@@ -269,6 +319,12 @@ EOS
       [original_rev, current_rev]
     end
 
+    def get_repo_url
+      git_cmd = "git --git-dir #{@git_dir} config --get remote.origin.url"
+      git = ShellCmd.new git_cmd, :tag => "git"
+      git.out
+    end
+
     def get_version(changelog_file)
       File.open changelog_file, "r" do |f|
         f.each_line do |l|
@@ -305,12 +361,6 @@ EOS
       arches.uniq
     end
 
-    def get_repo_url
-      git_cmd = "git --git-dir #{@git_dir} --bare remote show origin -n"
-      git = ShellCmd.new git_cmd, :tag => "git"
-      git.out.lines.grep(/Fetch URL/)[0].chomp[13..-1]
-    end
-
     def get_current_branch
       git_cmd = ShellCmd.new "git --git-dir #{@git_dir} --bare branch", {
         :tag => "git"

data/lib/dr/repo.rb

@@ -26,12 +26,15 @@ module Dr
       @packages_dir = "#{@location}/packages"
 
       meta = "#{@location}/metadata"
-      @metadata = File.exists?(meta) ? YAML.load_file(meta) : {}
+      begin
+        @metadata = YAML.load_file(meta)
+      rescue
+        @metadata = {}
+      end
     end
 
     def setup(conf)
       log :info, "Creating the archive directory"
-
       begin
         FileUtils.mkdir_p location
       rescue Exception => e
@@ -75,7 +78,7 @@ module Dr
       FileUtils.mkdir_p @packages_dir
       FileUtils.mkdir_p "#{@location}/buildroots"
 
-      @metadata = {"base-os" => conf[:base]}
+      @metadata = {"distro" => conf[:distro]}
       File.open("#{@location}/metadata", "w" ) do |out|
         YAML.dump(@metadata)
       end
@@ -108,7 +111,7 @@ module Dr
 
     def buildroot(arch)
       cache_dir = "#{@location}/buildroots/"
-      BuildRoot.new @metadata["base-os"], arch, cache_dir
+      BuildRoot.new @metadata["distro"], arch, cache_dir
     end
 
     def get_package(name)

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.1.14"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor