dr 1.0.3 → 1.0.4

data/lib/dr/gitpackage.rb

@@ -78,16 +78,16 @@ module Dr
       log :info, "Re-downloading the source repository of " +
                  "#{@name.style "pkg-name"}"
       Dir.mktmpdir do |tmp|
-        git_cmd = "git clone --mirror --branch #{@default_branch} " +
+        git_cmd = "git clone --mirror --branch #{branch} " +
                   "#{git_addr} #{tmp}/git"
         ShellCmd.new git_cmd, :tag => "git", :show_out => true
 
         src_dir = "#{tmp}/src"
         FileUtils.mkdir_p src_dir
 
-        checkout branch, src_dir
+        checkout branch, src_dir, "#{tmp}/git"
 
-        unless File.exists? "#{tmp}/src/debian/control"
+        unless File.exists? "#{src_dir}/debian/control"
           log :err, "The debian packaging files not found in the repository"
           raise "Adding a package from #{git_addr} failed"
         end
@@ -143,6 +143,11 @@ module Dr
 
       version = nil
 
+      unless get_rev branch
+        log :err,  "Branch #{branch.fg "blue"} not found in #{@name.style "pkg-name"}"
+        raise "The requested branch doesn't exist in the repository!"
+      end
+
       orig_rev, curr_rev = update_from_origin branch
       log :info, "Branch #{branch.fg "blue"}, revision #{curr_rev[0..7].fg "blue"}"
       unless force
@@ -205,7 +210,7 @@ module Dr
           end
 
         if repo_arches.length == 0
-          log :error, "#{@name.style "pkg-name"} cannot be build for any of " +
+          log :err, "#{@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
@@ -424,9 +429,9 @@ EOS
       end
     end
 
-    def checkout(branch, dir)
+    def checkout(branch, dir, override_git_dir=@git_dir)
       log :info, "Extracting the sources"
-      git_cmd ="git --git-dir #{@git_dir} --bare archive " +
+      git_cmd ="git --git-dir #{override_git_dir} --bare archive " +
                "--format tar #{branch} | tar x -C #{dir}"
       ShellCmd.new git_cmd, :tag => "git", :show_out => true
     end

data/lib/dr/pkgversion.rb

@@ -12,6 +12,9 @@ module Dr
       @date = 0        # integer
       @build = 0       # integer
 
+      # Make sure the version is string
+      version_string = version_string.to_s
+
       v = version_string.split ":"
       if v.length > 1
         @epoch = v[0].to_i

data/lib/dr/repo.rb

@@ -9,6 +9,7 @@ require "dr/logger"
 require "dr/gnupg"
 require "dr/buildroot"
 require "dr/utils"
+require "dr/pkgversion"
 
 require "fileutils"
 require "yaml"
@@ -251,7 +252,8 @@ module Dr
 
       is_of_higher_version = true
       names.each do |name|
-        if used_versions.has_key?(name) && version <= used_versions[name]
+        if used_versions.has_key?(name) && 
+           PkgVersion.new(version) <= PkgVersion.new(used_versions[name])
           is_of_higher_version = false
         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.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor