autobuild 1.6.2.b7 → 1.6.2.b8

data/lib/autobuild/environment.rb

@@ -2,8 +2,7 @@ require 'set'
 module Autobuild
     @inherited_environment = Hash.new
     @environment = Hash.new
-    @env_source_before = Set.new
-    @env_source_after = Set.new
+    @env_source_files = Set.new
 
     class << self
         # List of the environment that should be set before calling a subcommand
@@ -28,11 +27,7 @@ module Autobuild
 
         # List of files that should be sourced in the generated environment
         # variable setting shell scripts
-        attr_reader :env_source_before
-
-        # List of files that should be sourced in the generated environment
-        # variable setting shell scripts
-        attr_reader :env_source_after
+        attr_reader :env_source_files
     end
 
     # Removes any settings related to the environment varialbe +name+, or for
@@ -97,19 +92,7 @@ module Autobuild
     # Require that generated environment variable scripts source the given shell
     # script
     def self.env_source_file(file)
-        env_source_after(file)
-    end
-
-    # Require that generated environment variable scripts source the given shell
-    # script
-    def self.env_source_before(file)
-        @env_source_before << file
-    end
-
-    # Require that generated environment variable scripts source the given shell
-    # script
-    def self.env_source_after(file)
-        @env_source_after << file
+        @env_source_files << file
     end
 
     # Generates a shell script that sets the environment variable listed in
@@ -118,10 +101,6 @@ module Autobuild
     #
     # It also sources the files added by Autobuild.env_source_file
     def self.export_env_sh(io)
-        env_source_before.each do |path|
-            io.puts ". \"#{path}\""
-        end
-
         variables = []
         Autobuild.environment.each do |name, value|
             variables << name
@@ -138,7 +117,7 @@ module Autobuild
         variables.each do |var|
             io.puts "export #{var}"
         end
-        env_source_after.each do |path|
+        env_source_files.each do |path|
             io.puts ". \"#{path}\""
         end
     end

data/lib/autobuild/import/git.rb

@@ -47,13 +47,7 @@ module Autobuild
         #
         # This is meant for display purposes
         def repository_id
-            result = "git:#{repository} branch=#{branch}"
-            if commit
-                result << " commit=#{commit}"
-            elsif tag
-                result << " tag=#{tag}"
-            end
-            result
+            "git:#{repository}"
         end
 
         # The remote repository URL.

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.2.b7" unless defined? Autobuild::VERSION
+    VERSION = "1.6.2.b8" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,97 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autobuild
-version: !ruby/object:Gem::Version 
-  hash: 1810697955
+version: !ruby/object:Gem::Version
+  version: 1.6.2.b8
   prerelease: 6
-  segments: 
-  - 1
-  - 6
-  - 2
-  - b
-  - 7
-  version: 1.6.2.b7
 platform: ruby
-authors: 
+authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10655240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10655240
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &10652940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *10652940
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &10651860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *10651860
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &10650040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-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.
+  prerelease: false
+  version_requirements: *10650040
+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
@@ -137,42 +113,32 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
-
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files: 
+test_files:
+- test/test_import_cvs.rb
+- test/test_subcommand.rb
 - test/test_import_svn.rb
 - test/test_import_tar.rb
-- test/test_subcommand.rb
-- test/test_import_cvs.rb