dr 0.1.0 → 0.1.1

data/bin/dr

@@ -320,9 +320,10 @@ class RepoCLI < ExtendedThor
         next
       end
 
-      log :info, ""
       repo.push pkg.name, version, suite if version
       updated += 1
+
+      log :info, ""
     end
 
     log :info, "Updated #{updated.to_s.fg "blue"} packages in #{suite.fg "blue"}"

data/lib/dr/gitpackage.rb

@@ -79,10 +79,7 @@ module Dr
         src_dir = "#{tmp}/src"
         FileUtils.mkdir_p src_dir
 
-        log :info, "Extracting the sources"
-        git_cmd ="git --git-dir #{@git_dir} --bare archive " +
-                 "--format tar #{@default_branch} | tar x -C #{src_dir}"
-        ShellCmd.new git_cmd, :tag => "git", :show_out => true
+        checkout @default_branch, src_dir
 
         unless File.exists? "#{tmp}/src/debian/control"
           log :err, "The debian packaging files not found in the repository"
@@ -123,18 +120,15 @@ module Dr
       orig_rev, curr_rev = update_from_origin branch
       if curr_rev != orig_rev || force
         Dir.mktmpdir do |src_dir|
-          log :info, "Extracting the sources"
-          git_cmd ="git --git-dir #{@git_dir} --bare archive " +
-                   "--format tar #{branch} | tar x -C #{src_dir}"
-          ShellCmd.new git_cmd, :tag => "git", :show_out => true
+          checkout branch, src_dir
 
           version = PkgVersion.new get_version "#{src_dir}/debian/changelog"
-          log :info, "Source version: #{version.to_s.style "version"}"
+          log :info, "Source version: #{version.source.style "version"}"
 
           while build_exists? version
             version.increment!
           end
-          log :info, "Building version: #{version.to_s.style "version"}"
+          log :info, "Build version: #{version.to_s.style "version"}"
 
           log :info, "Updating changelog"
           now = Time.new.strftime("%a, %-d %b %Y %T %z")
@@ -245,28 +239,17 @@ EOS
     def update_from_origin(branch)
       log :info, "Pulling changes from origin"
 
-      git_cmd = "git --git-dir #{@git_dir} --bare rev-parse #{branch} 2>/dev/null"
-      git = ShellCmd.new git_cmd, :tag => "git"
-
-      original_rev = git.out.chomp
-      original_rev = nil if original_rev == branch
+      original_rev = get_rev branch
 
       begin
-        #if @default_branch == branch
-          git_cmd = "git --git-dir #{@git_dir} --bare fetch origin"
-          ShellCmd.new git_cmd, :tag => "git", :show_out => true
-        #else
-        #  git_cmd = "git --git-dir #{@git_dir} --bare fetch origin #{branch}:#{branch}"
-        #  ShellCmd.new git_cmd, :tag => "git", :show_out => true
-        #end
+        git_cmd = "git --git-dir #{@git_dir} --bare fetch origin"
+        ShellCmd.new git_cmd, :tag => "git", :show_out => true
       rescue Exception => e
         log :err, "Unable to pull from origin"
         raise e
       end
 
-      git_cmd = "git --git-dir #{@git_dir} --bare rev-parse #{branch} 2>/dev/null"
-      git = ShellCmd.new git_cmd, :tag => "git"
-      current_rev = git.out.chomp
+      current_rev = get_rev branch
 
       [original_rev, current_rev]
     end
@@ -319,5 +302,23 @@ EOS
       }
       git_cmd.out.chomp.lines.grep(/^\*/)[0][2..-1].chomp
     end
+
+    def get_rev(branch)
+      git_cmd = "git --git-dir #{@git_dir} --bare rev-parse #{branch} 2>/dev/null"
+      git = ShellCmd.new git_cmd, :tag => "git", :expect => [0, 128]
+
+      if git.status.exitstatus == 0
+        git.out.chomp
+      else
+        nil
+      end
+    end
+
+    def checkout(branch, dir)
+      log :info, "Extracting the sources"
+      git_cmd ="git --git-dir #{@git_dir} --bare archive " +
+               "--format tar #{branch} | tar x -C #{dir}"
+      ShellCmd.new git_cmd, :tag => "git", :show_out => true
+    end
   end
 end

data/lib/dr/pkgversion.rb

@@ -68,6 +68,12 @@ module Dr
       v
     end
 
+    def source
+      v = "#{upstream}"
+      v << "-#{debian}" if @debian
+      v
+    end
+
     private
     def today
       Time.now.strftime "%Y%m%d"

data/lib/dr/shellcmd.rb

@@ -50,7 +50,8 @@ module Dr
         @status = wait_thr.value
       end
 
-      if @status.exitstatus != @expect
+      if (@expect.is_a?(Array) && !@expect.include?(@status.exitstatus)) ||
+         (@expect.is_a?(Integer) && @status.exitstatus != @expect)
         out_lines = @out.split "\n"
         if out_lines.length > 10
           out_lines = out_lines[-10..-1]

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor