dr 1.0.5 → 1.2.0

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/README.md

@@ -1,6 +1,6 @@
 # Kano Repository Manager
 
-[![Gem Version](https://badge.fury.io/rb/dr.svg)](http://badge.fury.io/rb/dr)
+[![Gem Version](https://badge.fury.io/rb/dr.svg)](http://badge.fury.io/rb/dr) [![Build Status](https://travis-ci.org/KanoComputing/kano-repository-manager.svg)](https://travis-ci.org/KanoComputing/kano-repository-manager) [![Join the chat at https://gitter.im/KanoComputing/kano-repository-manager](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/KanoComputing/kano-repository-manager?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 **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

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/bin/dr

@@ -17,6 +17,7 @@ require "dr/pkgversion"
 require "dr/shellcmd"
 require "dr/logger"
 require "dr/config"
+require "dr/server"
 
 
 class ExtendedThor < Thor
@@ -27,6 +28,10 @@ class ExtendedThor < Thor
   def initialize(*args)
     super
     Dr::Logger::set_verbosity options[:verbosity]
+    if not options[:log_file].nil?
+      file = File.open options[:log_file],"w"
+      Dr::Logger::set_logfile(file)
+    end
   end
 
 
@@ -61,7 +66,7 @@ class Archive < ExtendedThor
 end
 
 class Conf < ExtendedThor
-  desc "repo", "Configuration of the whole repository"
+  desc "repo KEY [VALUE]", "Configuration of the whole repository"
   def repo(key, value=nil)
     repo = get_repo_handle
 
@@ -75,7 +80,7 @@ class Conf < ExtendedThor
     end
   end
 
-  desc "package", "Package-specific configuration options"
+  desc "package PKG-NAME KEY [VALUE]", "Package-specific configuration options"
   def package(pkg_name, key, value=nil)
     repo = get_repo_handle
     pkg = repo.get_package pkg_name
@@ -145,13 +150,13 @@ class List < ExtendedThor
     end
   end
 
-  desc "versions PACKAGE", "DEPRECATED, please use builds instead"
+  desc "versions PKG-NAME", "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"
+  desc "builds PKG-NAME", "Show the history of all builds of a package"
   def builds(pkg_name)
     repo = get_repo_handle
     log :info, "Listing all buils of #{pkg_name.style "pkg-name"}"
@@ -183,27 +188,22 @@ class List < ExtendedThor
       else
         suites.each do |suite, codename|
           codename = suite if codename == nil
+          colour = suite_to_colour suite
 
-          colour = case suite
-          when "stable" then "red"
-          when "testing" then "yellow"
-          when "unstable" then "green"
-          else nil end
-
-            all_included = true
-            subpkgs.each do |subpkg|
-              unless repo.query_for_deb_version(suite, subpkg) == version
-                all_included = false
-              end
+          all_included = true
+          subpkgs.each do |subpkg|
+            unless repo.query_for_deb_version(suite, subpkg) == version
+              all_included = false
             end
+          end
 
-            if all_included
-              if colour
-                line << " " + open + codename.fg(colour) + close
-              else
-                line << " " + open + codename + close
-              end
+          if all_included
+            if colour
+              line << " " + open + codename.fg(colour) + close
+            else
+              line << " " + open + codename + close
             end
+          end
         end
       end
       log :info, "  #{line}"
@@ -239,12 +239,38 @@ class List < ExtendedThor
       end
     end
   end
+
+  desc "codenames", "Show the codenames of the configured suites"
+  def codenames
+    repo = get_repo_handle
+
+    suites = repo.get_suites
+
+    suites.each do |suite, codename|
+      codename = suite if codename == nil
+      colour = suite_to_colour suite
+
+      log :info, "#{codename.fg colour}: #{suite}"
+    end
+  end
+
+  private
+  def suite_to_colour(suite)
+    colour = case suite
+      when "stable-security" then "magenta"
+      when "stable" then "red"
+      when "testing" then "yellow"
+      when "unstable" then "green"
+      else nil end
+    return colour
+  end
 end
 
 
 class RepoCLI < ExtendedThor
   class_option :repo, :type => :string, :aliases => "-r"
   class_option :verbosity, :type => :string, :aliases => "-v", :default => "verbose"
+  class_option :log_file, :type => :string, :aliases => "-l", :default => nil
 
 
   desc "init [LOCATION]", "setup a whole new repository from scratch"
@@ -256,7 +282,7 @@ class RepoCLI < ExtendedThor
       :desc => "",
       :arches => ["amd64"],
       :components => ["main"],
-      :suites => ["stable", "testing", "unstable"],
+      :suites => ["stable-security", "stable", "testing", "unstable"],
       :build_environment => :kano,
       :codenames => []
     }
@@ -361,7 +387,7 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "build [pkg-name]", "build a package from the sources"
+  desc "build PKG-NAME", "build a package from the sources"
   method_option :branch, :aliases => "-b", :type => :string,
                 :desc => "build from a different branch"
   method_option :push, :aliases => "-p", :type => :string,
@@ -389,13 +415,16 @@ class RepoCLI < ExtendedThor
       if options["push"] == "push"
         repo.push pkg.name, version, "testing" # FIXME: should be configurable
       else
+        if repo.codename_to_suite(options["push"]) == 'stable-security'
+          raise "Package built, but can't push to #{options["push"]}, use the 'release-security' subcommand"
+        end
         repo.push pkg.name, version, options["push"]
       end
     end
   end
 
 
-  desc "push [pkg-name]", "push a built package to a specified suite"
+  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 :build, :aliases => "-b", :type => :string,
@@ -408,6 +437,10 @@ class RepoCLI < ExtendedThor
     suite = nil
     suite = options["suite"] if options.has_key? "suite"
 
+    if repo.codename_to_suite(options["suite"]) == 'stable-security'
+      raise "Can't push package to #{options["suite"]}, please use the 'release-security' subcommand"
+    end
+
     version = nil
     version = options["build"] if options.has_key? "build"
 
@@ -415,7 +448,7 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "unpush [pkg-name] [suite]", "remove a built package from a suite"
+  desc "unpush PKG-NAME SUITE", "remove a built package from a suite"
   def unpush(pkg_name, suite)
     repo = get_repo_handle
     repo.unpush pkg_name, suite
@@ -439,7 +472,7 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "rmbuild [pkg-name] [version]", "remove a built version of a package"
+  desc "rmbuild PKG-NAME VERSION", "remove a built version of a package"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "force removal even if the build is still used"
   def rmbuild(pkg_name, version)
@@ -447,7 +480,7 @@ class RepoCLI < ExtendedThor
     repo.remove_build pkg_name, version, options["force"] == true
   end
 
-  desc "update", "Update and rebuild (if necessary) all the packages in the suite"
+  desc "update [SUITE]", "Update and rebuild (if necessary) all the packages in the suite"
   def update(suite="testing")
     log :info, "Updating all packages in the #{suite.fg "blue"} suite"
     repo = get_repo_handle
@@ -479,7 +512,7 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "git-tag-release", "Mark relased packages' repositories"
+  desc "git-tag-release TAG", "Mark relased packages' repositories"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "Force override existing tags"
   method_option :package, :aliases => "-p", :type => :string,
@@ -539,7 +572,35 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "suite-diff", "Show the differences between packages in two suites"
+  desc "release-security PKG-NAME", "Push a built package from testing to 'stable-security' suite"
+  method_option :force, :aliases => "-f", :type => :boolean,
+                :desc => "Force-push the released package"
+  def release_security(pkg_name)
+    repo = get_repo_handle
+
+    suite_source = 'testing'
+
+    log :info, "Releasing pkg #{pkg_name.style "pkg-name"} package from '#{suite_source}' to 'stable-security'"
+
+    if !repo.suite_has_package? suite_source, pkg_name
+      log :err, "Package  #{pkg_name.style "pkg-name"} not in '#{suite_source}'"
+      raise "Package #{pkg_name.style "pkg-name"} doesn't exist in the repo"
+    end
+
+    prompt_msg = "Are you absolutely sure you want to push package #{pkg_name.style "pkg-name"} to 'stable-security'?"
+    negative_msg = "Couldn't confirm for releasing to stable-security"
+    prompt_to_confirm prompt_msg, negative_msg
+
+    version = repo.get_subpackage_versions(pkg_name)[suite_source].values.max
+    log :info, "Package version #{version.style "version"} found in '#{suite_source}'"
+    begin
+      repo.push pkg_name, version, "stable-security", (options["force"] == true)
+    rescue Dr::AlreadyExists
+      ;
+    end
+  end
+
+  desc "suite-diff SUITE OTHER-SUITE", "Show the differences between packages in two suites"
   def suite_diff(first, second)
     repo = get_repo_handle
 
@@ -578,7 +639,7 @@ class RepoCLI < ExtendedThor
   end
 
 
-  desc "force-sync", "Force cloning the sources repository from scratch again"
+  desc "force-sync PKG-NAME", "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,
@@ -644,12 +705,45 @@ class RepoCLI < ExtendedThor
           end
         elsif number != nil && kept >= number.to_i
             rmbuild pkg.name, version_string
-        else 
+        else
           kept += 1
         end
       end
     end
   end
+
+  desc "serve", "Start the archive server"
+  method_option :port, :aliases => "-p", :type => :numeric,
+                :desc => "The port to run the server on", :default => 80
+  method_option :bind, :aliases => "-b", :type => :string,
+                :desc => "Address to listen on", :default => "0.0.0.0"
+  method_option :route, :aliases => "-R", :type => :string,
+                :desc => "The route to serve the archive on", :default => "/"
+  def serve
+    repo = get_repo_handle
+    s = Dr::Server.new options["port"], options["route"],
+                       options["bind"], repo.get_archive_path
+    s.start
+  end
+
+  private
+  def prompt_to_confirm(prompt_msg, negative_message)
+    response = 'x'
+    while ! ['y', 'n'].include? response
+      print prompt_msg
+      print "[y/n]: "
+      response = STDIN.gets.strip.downcase
+      if response == 'n'
+        log :err, "Replied negatively to prompt, aborting..."
+        raise negative_message
+      elsif response == 'y'
+        log :info, "Received confirmation, will carry on"
+      else
+        print "Not an acceptable answer, please answer y/n\n"
+      end
+    end
+  end
+
 end
 
 

data/dr.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.18"
   spec.add_dependency "tco", "~> 0.1"
   spec.add_dependency "octokit", "~> 3.3"
+  spec.add_dependency "rack", "~> 1.6.4"
+  spec.add_dependency "thin", "~> 1.6.3"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.3"

data/lib/dr/gitpackage.rb

@@ -271,7 +271,7 @@ EOS
             expected_pkgs = get_subpackage_names "#{src_dir}/debian/control"
             expected_pkgs.each do |subpkg_name|
               includes = debs.inject(false) do |r, n|
-                r || ((/^#{br}\/#{subpkg_name}_#{version}/ =~ n) != nil)
+                r || ((/^#{br}\/#{subpkg_name}_#{version.to_s omit_epoch=true}/ =~ n) != nil)
               end
 
               unless includes

data/lib/dr/logger.rb

@@ -14,6 +14,7 @@ tco_conf.names["purple"] = "#90559e"
 tco_conf.names["blue"] = "#4D9EEB" #"#1b8efa"
 tco_conf.names["orange"] = "#ff842a"
 tco_conf.names["brown"] = "#6a4a3c"
+tco_conf.names["magenta"] = "#ff00ff"
 
 tco_conf.styles["info"] = {
   :fg => "green",
@@ -88,6 +89,12 @@ module Dr
       :verbose => 3
     }
 
+    @@log_file = nil
+
+    def self.set_logfile(file)
+      @@log_file = file
+    end
+
     def self.set_verbosity(level)
       msg = "Message verbosity level not recognised (#{})."
       raise msg unless @@logger_verbosity_levels.has_key? level.to_sym
@@ -117,6 +124,11 @@ module Dr
         out << " " << msg.chomp
         puts out
         STDOUT.flush
+
+        unless @@log_file.nil?
+           @@log_file.puts strip_colours out
+           @@log_file.flush
+        end
       end
     end
 
@@ -127,5 +139,10 @@ module Dr
     def tag(tag, msg)
       tag.fg("blue").bg("dark-grey") << " " << msg
     end
+
+    private
+    def self.strip_colours(string)
+      string.gsub(/\033\[[0-9]+(;[0-9]+){0,2}m/, '')
+    end
   end
 end

data/lib/dr/pkgversion.rb

@@ -82,11 +82,11 @@ module Dr
       compare(o) == 0
     end
 
-    def to_s
+    def to_s(omit_epoch=false)
       v = @upstream.clone
 
-      if @epoch > 0
-        v = "#{@epoch}:{v}"
+      if @epoch > 0 and not omit_epoch
+        v = "#{@epoch}:#{v}"
       end
 
       if @debian.length > 0

data/lib/dr/repo.rb

@@ -22,6 +22,10 @@ module Dr
 
     attr_reader :location
 
+    def get_archive_path
+      "#{@location}/archive"
+    end
+
     def initialize(loc)
       @location = File.expand_path loc
 

data/lib/dr/server.rb

@@ -0,0 +1,22 @@
+# Copyright (C) 2015 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2
+
+require "rack"
+
+module Dr
+  class Server
+    def initialize(port, root_route, address, archive_path)
+      @port = port
+      @host = address
+      @dir_server = Rack::Builder.new do
+        map root_route do
+          run Rack::Directory.new(archive_path)
+        end
+      end
+    end
+
+    def start
+      Rack::Handler::Thin.run(@dir_server, :Port => @port, :Host => @host)
+    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 = "1.0.5"
+  VERSION = "1.2.0"
 end

data/spec/pkgversion_spec.rb

@@ -12,21 +12,21 @@ describe Dr do
         one = Dr::PkgVersion.new('1:1.5-1')
         two = Dr::PkgVersion.new('2:1.5-1')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "works when equal" do
         one = Dr::PkgVersion.new('1:2.7-2')
         two = Dr::PkgVersion.new('1:2.7-2')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "works when smaller" do
         one = Dr::PkgVersion.new('2:3.6-1')
         two = Dr::PkgVersion.new('1:3.5')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
     end
 
@@ -35,42 +35,42 @@ describe Dr do
         one = Dr::PkgVersion.new('1:1.5-1')
         two = Dr::PkgVersion.new('1:1.6-1')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "works when smaller" do
         one = Dr::PkgVersion.new('1-1')
         two = Dr::PkgVersion.new('2')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "works when smaller with string inbetween" do
         one = Dr::PkgVersion.new('1.5')
         two = Dr::PkgVersion.new('1.16-5')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "works when equal" do
         one = Dr::PkgVersion.new('1.5-5')
         two = Dr::PkgVersion.new('1.5-5')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "equal with no debian version" do
         one = Dr::PkgVersion.new('15')
         two = Dr::PkgVersion.new('15')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "works when bigger" do
         one = Dr::PkgVersion.new('6.5')
         two = Dr::PkgVersion.new('1.16-5')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
     end
 
@@ -79,28 +79,28 @@ describe Dr do
         one = Dr::PkgVersion.new('1.5-1')
         two = Dr::PkgVersion.new('1.5-2')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "equal comparison" do
         one = Dr::PkgVersion.new('1.5-2')
         two = Dr::PkgVersion.new('1.5-2')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "bigger comparison" do
         one = Dr::PkgVersion.new('1.5-11')
         two = Dr::PkgVersion.new('1.5-9')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
 
       it "substring comparison" do
         one = Dr::PkgVersion.new('1.5-111')
         two = Dr::PkgVersion.new('1.5-11')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
     end
 
@@ -131,49 +131,49 @@ describe Dr do
         one = Dr::PkgVersion.new('1.5-7.20150320')
         two = Dr::PkgVersion.new('1.5-7.20150323')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "bigger date" do
         one = Dr::PkgVersion.new('1.5-7.20150328')
         two = Dr::PkgVersion.new('1.5-7.20150323')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
 
       it "equal dates" do
         one = Dr::PkgVersion.new('1.5-7.20150328')
         two = Dr::PkgVersion.new('1.5-7.20150328')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "equal dates with build numbers (smaller)" do
         one = Dr::PkgVersion.new('1.5-7.20150328build1')
         two = Dr::PkgVersion.new('1.5-7.20150328build5')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
 
       it "equal dates with build numbers (equal)" do
         one = Dr::PkgVersion.new('1.5-7.20150328build15')
         two = Dr::PkgVersion.new('1.5-7.20150328build15')
 
-        expect(one == two).to be_true
+        expect(one == two).to be true
       end
 
       it "equal dates with build numbers (bigger)" do
         one = Dr::PkgVersion.new('1.5-7.20150328build15')
         two = Dr::PkgVersion.new('1.5-7.20150328build5')
 
-        expect(one > two).to be_true
+        expect(one > two).to be true
       end
 
       it "build number substrings" do
         one = Dr::PkgVersion.new('1.5-7.20150328build11')
         two = Dr::PkgVersion.new('1.5-7.20150328build111')
 
-        expect(one < two).to be_true
+        expect(one < two).to be true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,6 +59,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +151,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -137,6 +170,7 @@ files:
 - lib/dr/package.rb
 - lib/dr/pkgversion.rb
 - lib/dr/repo.rb
+- lib/dr/server.rb
 - lib/dr/shellcmd.rb
 - lib/dr/utils.rb
 - lib/dr/version.rb