lock_jar 0.10.3 → 0.10.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lock_jar/domain/dsl_helper.rb +12 -12
- data/lib/lock_jar/version.rb +1 -1
- metadata +22 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b54dd0ce6208d614ccf7c7c00170b88e7acc8873
|
4
|
+
data.tar.gz: 2ef0adc0a3cfd9e45f98c91af70cb372da822f95
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0187742b48938f36aac927008bd3e144b26b8282416082f48d07fe590da4fe2c3fcf91ea32b6e8ec8f76e5907dda99e0b801d4949cd46654ee1e49b9b8ec97d2
|
7
|
+
data.tar.gz: 8338498fae4777108642af1be9e2040a06cca25989bf3c631cb4f326888f57ae00b7df19472ac7080a58f2b097af6f2fd430c5971a7348aca2edb4387a5d2853
|
@@ -16,18 +16,18 @@
|
|
16
16
|
module LockJar
|
17
17
|
module Domain
|
18
18
|
class DslHelper
|
19
|
-
|
19
|
+
|
20
20
|
class << self
|
21
|
-
|
21
|
+
|
22
22
|
#
|
23
23
|
# Merge LockJar::Domain::Dsl
|
24
24
|
# @param [LockJar::Domain::Dsl] into_dsl dsl that is merged into
|
25
25
|
# @param [LockJar::Domain::Dsl] from_dsl dsl that is merged from
|
26
26
|
# @param [String] into_group force only runtime and default groups to be loaded into this group
|
27
|
-
# @return [LockJar::Domain::Dsl]
|
27
|
+
# @return [LockJar::Domain::Dsl]
|
28
28
|
def merge( into_dsl, from_dsl, into_group = nil )
|
29
29
|
into_dsl.remote_repositories = (into_dsl.remote_repositories + from_dsl.remote_repositories).uniq
|
30
|
-
|
30
|
+
|
31
31
|
# merge default and runtime group into specific group
|
32
32
|
if into_group
|
33
33
|
group_artifacts = into_dsl.artifacts[into_group] || []
|
@@ -39,7 +39,7 @@ module LockJar
|
|
39
39
|
end
|
40
40
|
end
|
41
41
|
into_dsl.artifacts[into_group] = group_artifacts
|
42
|
-
|
42
|
+
|
43
43
|
# one to one merging of groups
|
44
44
|
else
|
45
45
|
from_dsl.artifacts.each do |group, artifacts|
|
@@ -52,7 +52,7 @@ module LockJar
|
|
52
52
|
into_dsl.artifacts[group] = group_artifacts
|
53
53
|
end
|
54
54
|
end
|
55
|
-
|
55
|
+
|
56
56
|
from_dsl.maps.each do |artifact,paths|
|
57
57
|
existing_map = into_dsl.maps[artifact]
|
58
58
|
if existing_map
|
@@ -61,24 +61,24 @@ module LockJar
|
|
61
61
|
into_dsl.maps[artifact] = paths
|
62
62
|
end
|
63
63
|
end
|
64
|
-
|
64
|
+
|
65
65
|
from_dsl.excludes.each do |exclude|
|
66
|
-
unless into_dsl.include? exclude
|
66
|
+
unless into_dsl.excludes.include? exclude
|
67
67
|
into_dsl.excludes << exclude
|
68
68
|
end
|
69
69
|
end
|
70
|
-
|
70
|
+
|
71
71
|
if from_dsl.file_path
|
72
72
|
into_dsl.merged << from_dsl.file_path
|
73
73
|
end
|
74
|
-
|
74
|
+
|
75
75
|
into_dsl
|
76
76
|
end
|
77
|
-
|
77
|
+
|
78
78
|
def read_file(file)
|
79
79
|
File.open(file, "rb") { |f| f.read }
|
80
80
|
end
|
81
81
|
end
|
82
82
|
end
|
83
83
|
end
|
84
|
-
end
|
84
|
+
end
|
data/lib/lock_jar/version.rb
CHANGED
metadata
CHANGED
@@ -1,44 +1,46 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lock_jar
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Guymon
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
date: 2014-03-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
+
name: naether
|
14
15
|
requirement: !ruby/object:Gem::Requirement
|
15
16
|
requirements:
|
16
|
-
- - ~>
|
17
|
+
- - "~>"
|
17
18
|
- !ruby/object:Gem::Version
|
18
19
|
version: 0.13.8
|
19
|
-
name: naether
|
20
|
-
prerelease: false
|
21
20
|
type: :runtime
|
21
|
+
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 0.13.8
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
+
name: thor
|
28
29
|
requirement: !ruby/object:Gem::Requirement
|
29
30
|
requirements:
|
30
|
-
- -
|
31
|
+
- - ">="
|
31
32
|
- !ruby/object:Gem::Version
|
32
33
|
version: 0.18.1
|
33
|
-
name: thor
|
34
|
-
prerelease: false
|
35
34
|
type: :runtime
|
35
|
+
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: 0.18.1
|
41
|
-
description: Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile is used
|
41
|
+
description: Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile is used
|
42
|
+
to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes
|
43
|
+
runtime, compile, and test. The Jarfile.lock can be used to populate the classpath
|
42
44
|
email: michael@tobedevoured.com
|
43
45
|
executables:
|
44
46
|
- lockjar
|
@@ -47,8 +49,8 @@ extra_rdoc_files:
|
|
47
49
|
- LICENSE
|
48
50
|
- README.md
|
49
51
|
files:
|
50
|
-
- .gitignore
|
51
|
-
- .travis.yml
|
52
|
+
- ".gitignore"
|
53
|
+
- ".travis.yml"
|
52
54
|
- CHANGELOG.md
|
53
55
|
- Gemfile
|
54
56
|
- Guardfile
|
@@ -107,24 +109,24 @@ homepage: http://github.com/mguymon/lock_jar
|
|
107
109
|
licenses:
|
108
110
|
- Apache
|
109
111
|
metadata: {}
|
110
|
-
post_install_message:
|
112
|
+
post_install_message:
|
111
113
|
rdoc_options: []
|
112
114
|
require_paths:
|
113
115
|
- lib
|
114
116
|
required_ruby_version: !ruby/object:Gem::Requirement
|
115
117
|
requirements:
|
116
|
-
- -
|
118
|
+
- - ">="
|
117
119
|
- !ruby/object:Gem::Version
|
118
120
|
version: '0'
|
119
121
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
120
122
|
requirements:
|
121
|
-
- -
|
123
|
+
- - ">="
|
122
124
|
- !ruby/object:Gem::Version
|
123
125
|
version: '0'
|
124
126
|
requirements: []
|
125
|
-
rubyforge_project:
|
126
|
-
rubygems_version: 2.
|
127
|
-
signing_key:
|
127
|
+
rubyforge_project:
|
128
|
+
rubygems_version: 2.2.2
|
129
|
+
signing_key:
|
128
130
|
specification_version: 4
|
129
131
|
summary: Manage Jar files for Ruby
|
130
132
|
test_files:
|
@@ -143,4 +145,4 @@ test_files:
|
|
143
145
|
- spec/spec_helper.rb
|
144
146
|
- spec/support/Jarfile
|
145
147
|
- spec/support/helper.rb
|
146
|
-
has_rdoc:
|
148
|
+
has_rdoc:
|