autobuild 1.7.8 → 1.7.9

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/autobuild/import/archive.rb
 lib/autobuild/import/cvs.rb
 lib/autobuild/import/darcs.rb
 lib/autobuild/import/git.rb
+lib/autobuild/import/hg.rb
 lib/autobuild/import/svn.rb
 lib/autobuild/import/tar.rb
 lib/autobuild/importer.rb

data/lib/autobuild.rb

@@ -13,6 +13,7 @@ require 'autobuild/import/cvs'
 require 'autobuild/import/darcs'
 require 'autobuild/importer'
 require 'autobuild/import/git'
+require 'autobuild/import/hg'
 require 'autobuild/import/svn'
 require 'autobuild/import/archive'
 require 'autobuild/import/tar'

data/lib/autobuild/environment.rb

@@ -206,11 +206,27 @@ module Autobuild
         env_update_var(name)
     end
 
-    def self.env_update_var(name)
+    def self.env_value(name)
         if !environment[name] && !inherited_environment[name] && !SYSTEM_ENV[name]
-            ENV.delete(name)
+            nil
+        else
+            value = []
+            [environment[name], inherited_environment[name], SYSTEM_ENV[name]].each do |paths|
+                (paths || []).each do |p|
+                    if !value.include?(p)
+                        value << p
+                    end
+                end
+            end
+            value
+        end
+    end
+
+    def self.env_update_var(name)
+        if value = env_value(name)
+            ENV[name] = value.join(ENV_LIST_SEPARATOR)
         else
-            ENV[name] = ((environment[name] || []) + (inherited_environment[name] || []) + (SYSTEM_ENV[name] || [])).join(ENV_LIST_SEPARATOR)
+            ENV.delete(name)
         end
     end
 
@@ -274,8 +290,10 @@ module Autobuild
         end
 
         variables = []
-        Autobuild.environment.each do |name, value|
+        Autobuild.environment.each do |name, _|
             variables << name
+            value = env_value(name)
+
             if value
                 shell_line = SHELL_SET_COMMAND % [name, value.join(ENV_LIST_SEPARATOR)]
             else

data/lib/autobuild/import/hg.rb

@@ -0,0 +1,79 @@
+require 'fileutils'
+require 'autobuild/subcommand'
+require 'autobuild/importer'
+require 'utilrb/kernel/options'
+
+module Autobuild
+    class Hg < Importer
+        # Creates an importer which tracks the given repository
+        # and (optionally) a branch.
+        #
+        # This importer uses the 'hg' tool to perform the
+        # import. It defaults to 'hg' and can be configured by
+        # doing 
+	#   Autobuild.programs['hg'] = 'my_git_tool'
+        #
+        # @param [String] repository the repository URL
+        # @option options [String] :branch (default) the branch to track
+        def initialize(repository, options = {})
+            @repository = repository.to_str
+
+            hgopts, common = Kernel.filter_options options, :branch => 'default'
+            @branch = hgopts[:branch]
+            super(common)
+        end
+
+        # Returns a string that identifies the remote repository uniquely
+        #
+        # This is meant for display purposes
+        def repository_id
+            "hg:#{repository}"
+        end
+
+        # The remote repository URL.
+        attr_accessor :repository
+
+        # The tip this importer is tracking
+        attr_accessor :branch
+
+        # Raises ConfigException if the current directory is not a hg
+        # repository
+        def validate_importdir(package)
+            if !File.directory?(File.join(package.importdir, '.hg'))
+                raise ConfigException.new(package, 'import'), "while importing #{package.name}, #{package.importdir} is not a hg repository"
+            end
+        end
+
+        def update(package)
+            validate_importdir(package)
+            Dir.chdir(package.importdir) do
+                Subprocess.run(package, :import, Autobuild.tool('hg'), 'pull', repository)
+                Subprocess.run(package, :import, Autobuild.tool('hg'), 'update', branch)
+            end
+        end
+
+        def checkout(package)
+            base_dir = File.expand_path('..', package.importdir)
+            if !File.directory?(base_dir)
+                FileUtils.mkdir_p base_dir
+            end
+
+            Subprocess.run(package, :import,
+                Autobuild.tool('hg'), 'clone', '-u', branch, repository, package.importdir)
+        end
+
+        # Changes the repository this importer is pointing to
+        def relocate(repository)
+            @repository = repository
+        end
+    end
+
+    # Creates a hg importer which gets the source for the given repository and branch
+    # URL +source+.
+    #
+    # @param (see Hg#initialize)
+    def self.hg(repository, options = {})
+        Hg.new(repository, options)
+    end
+end
+

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.8" unless defined? Autobuild::VERSION
+    VERSION = "1.7.9" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,6 +120,7 @@ files:
 - lib/autobuild/import/cvs.rb
 - lib/autobuild/import/darcs.rb
 - lib/autobuild/import/git.rb
+- lib/autobuild/import/hg.rb
 - lib/autobuild/import/svn.rb
 - lib/autobuild/import/tar.rb
 - lib/autobuild/importer.rb
@@ -177,8 +178,8 @@ signing_key:
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
 test_files:
-- test/test_import_cvs.rb
-- test/test_reporting.rb
+- test/test_import_tar.rb
 - test/test_subcommand.rb
+- test/test_reporting.rb
 - test/test_import_svn.rb
-- test/test_import_tar.rb
+- test/test_import_cvs.rb