autobuild 1.7.12.rc6 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2adc58accd29a554c2853a23fe117ea15e021263
-  data.tar.gz: f5c20d74ad6ab876b0f20e0edd3f4a6137cac1c3
+  metadata.gz: 02fbd561a58e387234abbd68df3dcc0cfdad031d
+  data.tar.gz: 4a64a4a2c63cd4d91782577167c92e31f863e14c
 SHA512:
-  metadata.gz: cb1d9df085fee0ee0e9b1fcf89497d57c09b2be06ef3559725f54135b367f9b468a2332078fb0246969218b2e533af7ef824cb9fd9354009055eeb22f212369e
-  data.tar.gz: c01f8ded6b0a6ab6a5bb15e7c96c5515ddf6802ec9c1b1c9f99a8a16310ed06203d160a1e6d5ae24cd4adbc743e377dc4f57150e61ccbff19d3ad75902dca511
+  metadata.gz: 843b80f0b1e84fbf70f687ba6ec597bafa249b14b0dba06c4886d8e6b5874f315a3ba4055df40360f6279f6f3c5eaedf8cd662c0778f9e211c25b98acccbb181
+  data.tar.gz: c018435f7acc876f5c9d0e4e0aa9acbb97c0842d7646eaabf62e64520765bff3e623ccca22a3dbedfb3fb1bc9bf3d9fc25a8c2e0e5c7df9d777816187482e941

data/lib/autobuild/import/git.rb

@@ -196,7 +196,7 @@ module Autobuild
                 dir = path
             end
 
-            result = `#{Autobuild.tool(:git)} --git-dir="#{dir}" rev-parse --is-bare-repository`
+            result = `#{Autobuild.tool(:git)} --git-dir="#{dir}" rev-parse --is-bare-repository 2>&1`
             if $?.success?
                 if result.strip == "true"
                     return dir, :bare
@@ -326,6 +326,17 @@ module Autobuild
             commit_id
         end
 
+        def self.has_uncommitted_changes?(package, with_untracked_files = false)
+            Dir.chdir(package.importdir) do
+                status = `git status --porcelain`.split("\n").map(&:strip)
+                if with_untracked_files
+                    !status.empty?
+                else
+                    status.any? { |l| l[0, 2] !~ /^\?\?|^  / }
+                end
+            end
+        end
+
         # Returns a Importer::Status object that represents the status of this
         # package w.r.t. the root repository
         def status(package, only_local = false)
@@ -347,10 +358,7 @@ module Autobuild
                 end
 
                 status = merge_status(package, remote_commit)
-                `git diff --quiet`
-                if $?.exitstatus != 0
-                    status.uncommitted_code = true
-                end
+                status.uncommitted_code = self.class.has_uncommitted_changes?(package)
                 status
             end
 
@@ -648,7 +656,7 @@ module Autobuild
         # based on the information contained in the git configuration
         #
         # @raise [ArgumentError] if the path does not point to a git repository
-        def self.vcs_definition_for(path)
+        def self.vcs_definition_for(path, remote_name = 'autobuild')
             if !can_handle?(path)
                 raise ArgumentError, "#{path} is either not a git repository, or a bare git repository"
             end

data/lib/autobuild/importer.rb

@@ -284,14 +284,14 @@ class Importer
     def apply(package, path, patch_level = 0);   call_patch(package, false, path, patch_level) end
     def unapply(package, path, patch_level = 0); call_patch(package, true, path, patch_level)   end
 
-    def parse_patch_list(patches_file)
+    def parse_patch_list(package, patches_file)
         File.readlines(patches_file).map do |line| 
             line = line.rstrip
             if line =~ /^(.*)\s+(\d+)$/
-                path = $1
+                path = File.expand_path($1, package.srcdir)
                 level = Integer($2)
             else
-                path = line
+                path = File.expand_path(line, package.srcdir)
                 level = 0
             end
             [path, level, File.read(path)]
@@ -301,12 +301,12 @@ class Importer
     def currently_applied_patches(package)
         patches_file = patchlist(package)
         if File.exists?(patches_file)
-            return parse_patch_list(patches_file)
+            return parse_patch_list(package, patches_file)
         end
 
         patches_file = File.join(package.importdir, "patches-autobuild-stamp")
         if File.exists?(patches_file)
-            cur_patches = parse_patch_list(patches_file)
+            cur_patches = parse_patch_list(package, patches_file)
             save_patch_state(package, cur_patches)
             FileUtils.rm_f patches_file
             return currently_applied_patches(package)
@@ -319,7 +319,9 @@ class Importer
         # Get the list of already applied patches
         cur_patches = currently_applied_patches(package)
 
-        if cur_patches.map(&:last) == patches.map(&:last)
+        cur_patches_state = cur_patches.map { |_, level, content| [level, content] }
+        patches_state     = patches.map { |_, level, content| [level, content] }
+        if cur_patches_state == patches_state
             return false
         end
 
@@ -357,14 +359,18 @@ class Importer
         patch_dir = patchdir(package)
         FileUtils.mkdir_p patch_dir
         cur_patches = cur_patches.each_with_index.map do |(path, level, content), idx|
-        path = File.join(patch_dir, idx.to_s)
-        File.open(path, 'w') do |patch_io|
-            patch_io.write content
-        end
-        [path, level]
+            path = File.join(patch_dir, idx.to_s)
+            File.open(path, 'w') do |patch_io|
+                patch_io.write content
+            end
+            [path, level]
         end
         File.open(patchlist(package), 'w') do |f|
-            f.write(cur_patches.map { |p, l| "#{p} #{l}" }.join("\n"))
+            patch_state = cur_patches.map do |path, level|
+                path = Pathname.new(path).relative_path_from(package.srcdir).to_s
+                "#{path} #{level}"
+            end
+            f.write(patch_state.join("\n"))
         end
     end
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.12.rc6" unless defined? Autobuild::VERSION
+    VERSION = "1.8.0" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.12.rc6
+  version: 1.8.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -171,9 +171,9 @@ signing_key:
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
 test_files:
-- test/test_import_tar.rb
 - test/test_config.rb
-- test/test_subcommand.rb
-- test/test_reporting.rb
-- test/test_import_svn.rb
 - test/test_import_cvs.rb
+- test/test_import_svn.rb
+- test/test_import_tar.rb
+- test/test_reporting.rb
+- test/test_subcommand.rb