autobuild 1.7.3 → 1.7.4.rc1

data/lib/autobuild/import/git.rb

@@ -117,6 +117,40 @@ module Autobuild
             end
         end
 
+        # Computes the merge status for this package between two existing tags
+        # Raises if a tag is unknown
+        def delta_between_tags(package, from_tag, to_tag)
+            Dir.chdir(package.importdir) do
+                pkg_tags = tags(package)
+                if not pkg_tags.has_key?(from_tag)
+                    raise ArgumentError, "tag '#{from_tag}' is unknown to #{package.name} -- known tags are: #{pkg_tags.keys}"
+                end
+                if not pkg_tags.has_key?(to_tag)
+                    raise ArgumentError, "tag '#{to_tag}' is unknown to #{package.name} -- known tags are: #{pkg_tags.keys}"
+                end
+
+                from_commit = pkg_tags[from_tag]
+                to_commit = pkg_tags[to_tag]
+
+                merge_status(package, to_commit, from_commit)
+           end
+        end
+
+        # Retrieve the tags of this packages as a hash mapping to the commit id
+        def tags(package)
+            Dir.chdir(package.importdir) do
+                `git fetch --tags -q`
+                tag_list = `git show-ref --tags`
+                tag_list = tag_list.split("\n")
+                @tags ||= Hash.new
+                tag_list.each do |entry|
+                    commit_to_tag = entry.split(" ")
+                    @tags[commit_to_tag[1].sub("refs/tags/","")] = commit_to_tag[0]
+                end
+                @tags
+            end
+        end
+
         # Fetches updates from the remote repository. Returns the remote commit
         # ID on success, nil on failure. Expects the current directory to be the
         # package's source directory.

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.3" unless defined? Autobuild::VERSION
+    VERSION = "1.7.4.rc1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,109 +1,111 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: autobuild
-version: !ruby/object:Gem::Version
-  version: 1.7.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 941199147
+  prerelease: 6
+  segments: 
+  - 1
+  - 7
+  - 4
+  - rc
+  - 1
+  version: 1.7.4.rc1
 platform: ruby
-authors:
+authors: 
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: utilrb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: utilrb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-description: Collection of classes to handle build systems (CMake, autotools, ...)
-  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
-  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
-  integrated software project management tool.
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 3
+        - 7
+        version: "3.7"
+  type: :development
+  version_requirements: *id005
+description: Collection of classes to handle build systems (CMake, autotools, ...) and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj) integrated software project management tool.
 email: rock-dev@dfki.de
-executables:
+executables: 
 - autobuild
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Changes.txt
 - Manifest.txt
 - README.txt
-files:
+files: 
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -149,34 +151,44 @@ files:
 - test/tools.rb
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
-licenses: []
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: autobuild
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files:
-- test/test_import_tar.rb
-- test/test_subcommand.rb
+test_files: 
 - test/test_reporting.rb
+- test/test_subcommand.rb
 - test/test_import_svn.rb
 - test/test_import_cvs.rb
+- test/test_import_tar.rb