dr 1.0.1 → 1.0.2

data/bin/dr

@@ -539,6 +539,45 @@ class RepoCLI < ExtendedThor
   end
 
 
+  desc "suite-diff", "Show the differences between packages in two suites"
+  def suite_diff(first, second)
+    repo = get_repo_handle
+
+    first = repo.codename_to_suite first
+    if !first
+      log :err, "Can't find the #{first.fg 'blue'} suite in this repo"
+      raise "Suite doesn't exist"
+    end
+
+    second = repo.codename_to_suite second
+    if !second
+      log :err, "Can't find the #{second.fg 'blue'} suite in this repo"
+      raise "Suite doesn't exist"
+    end
+
+    log :info, "Showing the differences between #{first.fg 'green'} and #{second.fg 'red'}"
+    repo.list_packages(first).each do |pkg|
+      first_v = repo.get_subpackage_versions(pkg.name)[first].values.max
+
+      if !repo.suite_has_package? second, pkg.name
+        log :info, "#{pkg.name.fg 'orange'} is in #{first.fg 'green'} but not in #{second.fg 'red'}"
+        next
+      end
+
+      second_v = repo.get_subpackage_versions(pkg.name)[second].values.max
+      if Dr::PkgVersion.new(first_v) != Dr::PkgVersion.new(second_v)
+        log :info, "#{pkg.name.fg 'orange'} #{first_v.fg 'green'} != #{second_v.fg 'red'}"
+      end
+    end
+
+    repo.list_packages(second).each do |pkg|
+      if !repo.suite_has_package? first, pkg.name
+        log :info, "#{pkg.name.fg 'orange'} is in #{second.fg 'red'} but not in #{first.fg 'green'}"
+      end
+    end
+  end
+
+
   desc "force-sync", "Force cloning the sources repository from scratch again"
   method_option :url, :aliases => "-u", :type => :string,
                 :desc => "The URL to clone from"

data/lib/dr/pkgversion.rb

@@ -1,30 +1,49 @@
-# Copyright (C) 2014 Kano Computing Ltd.
-# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+# Copyright (C) 2014, 2015 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2
 
 module Dr
   class PkgVersion
-    attr_accessor :upstream, :debian, :date, :build
+    attr_accessor :epoch, :upstream, :debian, :date, :build
 
     def initialize(version_string)
-      @upstream = nil
-      @debian = nil
-      @date = nil
-      @build = 0
+      @epoch = 0       # integer
+      @upstream = ""   # string
+      @debian = ""     # string
+      @date = 0        # integer
+      @build = 0       # integer
 
-      v = version_string.split "-"
-      @upstream = v[0] if v.length > 0
+      v = version_string.split ":"
       if v.length > 1
-        dv = v[1].split "."
+        @epoch = v[0].to_i
+        version_string = v[1..-1].join ":"
+      end
 
-        @debian = dv[0] if dv.length > 0
-        if dv.length > 1
-          if dv[1] =~ /^[0-9]{8}/
-            @date = dv[1][0..7]
-          end
+      v = version_string.split "-"
+      if v.length == 1
+        @upstream = version_string
+      else
+        @upstream = v[0...-1].join "-"
 
-          match = dv[1].match /build([0-9]+)$/
-          if match
-            @build = match.captures[0]
+        # Check whether the is a build tag in the debian version
+        dv = v[-1].split "."
+        if dv.length == 1
+          @debian = v[-1]
+        else
+          @debian = dv[0]
+
+          build_tag = dv[1..-1].join "."
+
+          if build_tag =~ /^[0-9]{8}/
+            @date = dv[1][0..7].to_i
+
+            match = dv[1].match(/build([0-9]+)$/)
+            if match
+              @build = match.captures[0].to_i
+            end
+          else
+            # The part behind the '.' isn't a valid build tag,
+            # append the string back to debian version.
+            @debian << '.' << build_tag
           end
         end
       end
@@ -41,35 +60,40 @@ module Dr
     end
 
     def <(o)
-      self.to_s < o.to_s
+      compare(o) < 0
+    end
+
+    def >(o)
+      compare(o) > 0
     end
 
     def <=(o)
-      self.to_s <= o.to_s
+      compare(o) <= 0
+    end
+
+    def >=(o)
+      compare(o) >= 0
     end
 
     def ==(o)
-      self.to_s == o.to_s
+      compare(o) == 0
     end
 
     def to_s
       v = @upstream.clone
-      if @debian
+
+      if @epoch > 0
+        v = "#{@epoch}:{v}"
+      end
+
+      if @debian.length > 0
         v << "-#{@debian}"
-      else
-        v << "-0"
       end
 
-      if @date
+      if @date > 0
         v << ".#{@date}"
-      else
-        v << ".#{today}"
-      end
 
-      if @build > 0
-        if @build < 10
-          v << "build0#{@build}"
-        else
+        if @build > 0
           v << "build#{@build}"
         end
       end
@@ -79,7 +103,8 @@ module Dr
 
     def source
       v = "#{upstream}"
-      v << "-#{debian}" if @debian
+      v = "#{epoch}:#{v}" if @epoch > 0
+      v << "-#{debian}" if @debian.length > 0
       v
     end
 
@@ -87,5 +112,88 @@ module Dr
     def today
       Time.now.strftime "%Y%m%d"
     end
+
+    def compare(o)
+      return @epoch <=> o.epoch if @epoch != o.epoch
+
+      result = debian_version_string_compare @upstream, o.upstream
+      return result if result != 0
+
+      result = debian_version_string_compare @debian, o.debian
+      return result if result != 0
+
+      result = @date <=> o.date
+      return result if result != 0
+
+      @build <=> o.build
+    end
+
+    # Compare two version strings (either upstream or debian versions)
+    # in the Debian way
+    def debian_version_string_compare(str1, str2)
+      phase = :string
+      while true
+        return 0 if str1.length == 0 && str2.length == 0
+        return -1 if str1.length == 0
+        return 1 if str2.length == 0
+
+        if phase == :digit
+          part1 = str1.match(/^[0-9]*/)[0]
+          str1 = str1.sub(/^[0-9]*/, "")
+
+          part2 = str2.match(/^[0-9]*/)[0]
+          str2 = str2.sub(/^[0-9]*/, "")
+
+          result = part1.to_i <=> part2.to_i
+          return result if result != 0
+          phase = :string
+        else
+          part1 = str1.match(/^[^0-9]*/)[0]
+          str1 = str1.sub(/^[^0-9]*/, "")
+
+          part2 = str2.match(/^[^0-9]*/)[0]
+          str2 = str2.sub(/^[^0-9]*/, "")
+
+          result = debian_string_compare part1, part2
+          return result if result != 0
+          phase = :digit
+        end
+      end
+    end
+
+    # Compare two strings without any digits in the Debian way
+    def debian_string_compare(str1, str2)
+      return 0 if str1.length == 0 && str2.length == 0
+      return -1 if str1.length == 0
+      return 1 if str2.length == 0
+
+      c1 = str1[0]
+      c2 = str2[0]
+
+      # Both characters are letters and are not equal
+      #   -> compare them and return the result
+      return c1 <=> c2 if is_letter(c1) && is_letter(c2) && c1 != c2
+
+      # Both characters are non-letters and are not equal
+      # We need to sort out ~ being less than everything
+      if !is_letter(c1) && !is_letter(c2)
+        if c1 != c2
+          return -1 if c1 == '~'
+          return 1 if c2 == '~'
+          return c1 <=> c2
+        end
+      end
+
+      # If one is a letter and one isn't, non-letter is always smaller
+      return -1 if !is_letter(c1) && is_letter(c2)
+      return 1 if is_letter(c1) && !is_letter(c2)
+
+      # The characters are equal, compare the rest of the string
+      return debian_string_compare str1[1..-1], str2[1..-1]
+    end
+
+    def is_letter(str)
+      (str =~ /[a-z]/i) != nil
+    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.1"
+  VERSION = "1.0.2"
 end

data/spec/pkgversion_spec.rb

@@ -0,0 +1,180 @@
+# Tests for the PkgVersion class
+#
+# Copyright (C) 2015 Kano Computing Ltd.
+# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2
+
+require 'dr/pkgversion'
+
+describe Dr do
+  describe 'PkgVersion' do
+    describe "compare based on epoch" do
+      it "works when smaller" do
+        one = Dr::PkgVersion.new('1:1.5-1')
+        two = Dr::PkgVersion.new('2:1.5-1')
+
+        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
+      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
+      end
+    end
+
+    describe "compare based on upstram version" do
+      it "works when epoch is equal" do
+        one = Dr::PkgVersion.new('1:1.5-1')
+        two = Dr::PkgVersion.new('1:1.6-1')
+
+        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
+      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
+      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
+      end
+
+      it "equal with no debian version" do
+        one = Dr::PkgVersion.new('15')
+        two = Dr::PkgVersion.new('15')
+
+        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
+      end
+    end
+
+    describe "compare based on debian version" do
+      it "smaller comparison" do
+        one = Dr::PkgVersion.new('1.5-1')
+        two = Dr::PkgVersion.new('1.5-2')
+
+        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
+      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
+      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
+      end
+    end
+
+    describe "build tags" do
+      it "build date parsed correctly" do
+        v = Dr::PkgVersion.new('1.5-1.20150323')
+        expect(v.date).to eq 20150323
+      end
+
+      it "build number parsed correctly" do
+        v = Dr::PkgVersion.new('1.5-1.20150323build9')
+        expect(v.build).to eq 9
+      end
+
+      it "debian version parsed correctly with build tag" do
+        v = Dr::PkgVersion.new('1.5-7.20150323build9')
+        expect(v.debian).to eq "7"
+      end
+
+      it "debian version includes malformed build tag" do
+        v = Dr::PkgVersion.new('1.5-7.a20150323build9')
+        expect(v.debian).to eq "7.a20150323build9"
+      end
+    end
+
+    describe "comparison with build tags" do
+      it "smaller date" do
+        one = Dr::PkgVersion.new('1.5-7.20150320')
+        two = Dr::PkgVersion.new('1.5-7.20150323')
+
+        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
+      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
+      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
+      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
+      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
+      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
+      end
+    end
+  end
+end

metadata

@@ -1,105 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: tco
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-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.
+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."
 email:
 - radek@kano.me
 executables:
@@ -107,14 +118,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/dr
 - dr.conf-example
-- dr.spec
+- dr.gemspec
 - lib/dr.rb
 - lib/dr/build_environments.rb
 - lib/dr/buildroot.rb
@@ -129,31 +140,33 @@ files:
 - lib/dr/shellcmd.rb
 - lib/dr/utils.rb
 - lib/dr/version.rb
+- spec/pkgversion_spec.rb
 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: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 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.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/pkgversion_spec.rb

checksums.yaml

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