autobuild 1.10.0.rc17 → 1.10.0.rc18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/autobuild/environment.rb +0 -1
- data/lib/autobuild/import/git.rb +8 -2
- data/lib/autobuild/package.rb +2 -1
- data/lib/autobuild/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 52f1d923600298a1c3621c8890b973016f4fba2a
|
4
|
+
data.tar.gz: e7211091342f3b9a539bfca6cdffa415d21fb467
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eb75a3b8715e4228940e56d368c06164cef2433bae14b17acca6ce4c891609e39680b1a46aea2c83ecabfb1784f8ac990c62b9ced127f7edee38783b5e0b7175
|
7
|
+
data.tar.gz: 2463a6273e9bcec3b3333da86c0522e1319e193553eabb01dea53d1cea0834dfaf8e3a5818e1c4e294f3a29381e5c3036a37d19c9a1e8c4454d1fac5810e59e5
|
@@ -658,7 +658,6 @@ def add_prefix(newprefix, includes = nil)
|
|
658
658
|
add_path('RUBYLIB', new_rubylib)
|
659
659
|
end
|
660
660
|
|
661
|
-
require 'rbconfig'
|
662
661
|
%w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
|
663
662
|
map { |key| RbConfig::CONFIG[key] }.
|
664
663
|
map { |path| path.gsub(/.*lib(?:32|64)?\//, '\\1') }.
|
data/lib/autobuild/import/git.rb
CHANGED
@@ -392,7 +392,7 @@ def self.run_git(package, *args)
|
|
392
392
|
|
393
393
|
working_directory = File.dirname(git_dir(package, true))
|
394
394
|
package.run(:import, Autobuild.tool(:git), *args,
|
395
|
-
Hash[working_directory: working_directory].merge(options))
|
395
|
+
Hash[resolved_env: Hash.new, working_directory: working_directory].merge(options))
|
396
396
|
end
|
397
397
|
|
398
398
|
# @api private
|
@@ -408,7 +408,13 @@ def run_git_bare(package, *args)
|
|
408
408
|
#
|
409
409
|
# (see Git#run_git_bare)
|
410
410
|
def self.run_git_bare(package, *args)
|
411
|
-
|
411
|
+
options = Hash.new
|
412
|
+
if args.last.kind_of?(Hash)
|
413
|
+
options = args.pop
|
414
|
+
end
|
415
|
+
package.run(:import, Autobuild.tool(:git),
|
416
|
+
'--git-dir', git_dir(package, false),
|
417
|
+
*args, Hash[resolved_env: Hash.new].merge(options))
|
412
418
|
end
|
413
419
|
|
414
420
|
# @api private
|
data/lib/autobuild/package.rb
CHANGED
@@ -535,7 +535,8 @@ def run(*args, &block)
|
|
535
535
|
else
|
536
536
|
options = Hash.new
|
537
537
|
end
|
538
|
-
options[:env] =
|
538
|
+
options[:env] = options.delete(:resolved_env) ||
|
539
|
+
(options[:env] || Hash.new).merge(resolved_env)
|
539
540
|
Autobuild::Subprocess.run(self, *args, options, &block)
|
540
541
|
end
|
541
542
|
|
data/lib/autobuild/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autobuild
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.10.0.
|
4
|
+
version: 1.10.0.rc18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sylvain Joyeux
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-10-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -229,3 +229,4 @@ signing_key:
|
|
229
229
|
specification_version: 4
|
230
230
|
summary: Library to handle build systems and import mechanisms
|
231
231
|
test_files: []
|
232
|
+
has_rdoc:
|