lock_jar 0.14.1 → 0.14.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/lock_jar/bundler.rb +6 -6
- data/lib/lock_jar/runtime/lock.rb +1 -2
- data/lib/lock_jar/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 89e8000e6eabfa436d403adf58c2df66c89f2939
|
|
4
|
+
data.tar.gz: de15e6014fadc83bee21a403ca80cb25d595849d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f6a3d83e53fa5759b2b0099e9325e87a183f46e37047d6b92741f169f2f46fadc5890c481014da4a7140f4a8555d9c55ca4d941728e3a4f45c1415fd549ceda7
|
|
7
|
+
data.tar.gz: 65d1ea5290e981d89f32066d37fbac6a91626744d130e58c1cb1ca96d9e7227555130ceca93927b3a06c58615599a98010a21fdbcb7605fe6ddb31c6364df1c2
|
data/lib/lock_jar/bundler.rb
CHANGED
|
@@ -71,12 +71,12 @@ module LockJar
|
|
|
71
71
|
puts "[LockJar] Group #{group}:" if ENV['DEBUG']
|
|
72
72
|
|
|
73
73
|
definition.specs_for([group]).each do |spec|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
74
|
+
next unless File.exist? File.join(spec.gem_dir, 'Jarfile')
|
|
75
|
+
|
|
76
|
+
merged_dsl = merge_gem_dsl(dsl, spec, group)
|
|
77
|
+
if merged_dsl
|
|
78
|
+
gems_with_jars << "gem:#{spec.name}"
|
|
79
|
+
dsl = merged_dsl
|
|
80
80
|
end
|
|
81
81
|
end
|
|
82
82
|
end
|
|
@@ -14,7 +14,6 @@ module LockJar
|
|
|
14
14
|
end
|
|
15
15
|
|
|
16
16
|
def lock(jarfile_or_dsl, opts = {}, &blk)
|
|
17
|
-
|
|
18
17
|
@opts = { download: true }.merge(opts)
|
|
19
18
|
|
|
20
19
|
create_dsl!(jarfile_or_dsl, &blk)
|
|
@@ -105,7 +104,7 @@ module LockJar
|
|
|
105
104
|
end
|
|
106
105
|
|
|
107
106
|
def apply_repositories!
|
|
108
|
-
lockfile.local_repository = opts[:local_repo]
|
|
107
|
+
lockfile.local_repository = opts[:local_repo] ||= jarfile.local_repository
|
|
109
108
|
|
|
110
109
|
if jarfile.clear_repositories
|
|
111
110
|
resolver(opts).clear_remote_repositories
|
data/lib/lock_jar/version.rb
CHANGED