licensee 8.8.4 → 8.8.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/licensee/license.rb +3 -1
- data/lib/licensee/rule.rb +3 -2
- data/lib/licensee/version.rb +1 -1
- data/spec/licensee/license_spec.rb +7 -0
- data/spec/licensee/{rule.rb → rule_spec.rb} +8 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: df6cb4b146e1145c45570486db954caccfa552b6
|
4
|
+
data.tar.gz: bf9255dd2536cc83a1a4f415a557d8e9c3578af3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: af41cfdf339dd0b50098f0c28b729ecb3a15f099cc2840c0ae02fdd3f2fdf47f53eaa3a849417e4374604e0167e2fd956c094402a10a368c4eff5b58a198f330
|
7
|
+
data.tar.gz: 955ff81195f0a39032bb35473e7f0985d5e1449799a04216f6b97178d2f1b7ff0741772978eb2f473e9cdf9551712878a6d0b96674e07421b029ffcc445e9a55
|
data/lib/licensee/license.rb
CHANGED
@@ -143,7 +143,9 @@ module Licensee
|
|
143
143
|
@rules = {}
|
144
144
|
|
145
145
|
Rule.groups.each do |group|
|
146
|
-
@rules[group] = meta[group].map
|
146
|
+
@rules[group] = meta[group].map do |tag|
|
147
|
+
Rule.find_by_tag_and_group(tag, group)
|
148
|
+
end
|
147
149
|
end
|
148
150
|
|
149
151
|
@rules
|
data/lib/licensee/rule.rb
CHANGED
@@ -27,9 +27,10 @@ module Licensee
|
|
27
27
|
end.flatten
|
28
28
|
end
|
29
29
|
|
30
|
-
def
|
31
|
-
Rule.all.find { |r| r.tag == tag }
|
30
|
+
def find_by_tag_and_group(tag, group = nil)
|
31
|
+
Rule.all.find { |r| r.tag == tag && (group.nil? || r.group == group) }
|
32
32
|
end
|
33
|
+
alias find_by_tag find_by_tag_and_group
|
33
34
|
|
34
35
|
def file_path
|
35
36
|
dir = File.dirname(__FILE__)
|
data/lib/licensee/version.rb
CHANGED
@@ -232,4 +232,11 @@ RSpec.describe Licensee::License do
|
|
232
232
|
expect(mit.rules['permissions'].first).to be_a(Licensee::Rule)
|
233
233
|
expect(mit.rules.flatten.count).to eql(6)
|
234
234
|
end
|
235
|
+
|
236
|
+
it 'returns rules by tag and group' do
|
237
|
+
expect(cc_by.rules).to have_key('limitations')
|
238
|
+
rule = cc_by.rules['limitations'].find { |r| r.tag == 'patent-use' }
|
239
|
+
expect(rule).to_not be_nil
|
240
|
+
expect(rule.description).to include('does NOT grant')
|
241
|
+
end
|
235
242
|
end
|
@@ -36,8 +36,15 @@ RSpec.describe Licensee::Rule do
|
|
36
36
|
expect(rule.tag).to eql('commercial-use')
|
37
37
|
end
|
38
38
|
|
39
|
+
it 'loads a rule by tag and group' do
|
40
|
+
rule = described_class.find_by_tag_and_group('patent-use', 'limitations')
|
41
|
+
expect(rule).to be_a(described_class)
|
42
|
+
expect(rule.tag).to eql('patent-use')
|
43
|
+
expect(rule.description).to include('does NOT grant')
|
44
|
+
end
|
45
|
+
|
39
46
|
it 'loads all rules' do
|
40
|
-
expect(described_class.all.count).to eql(
|
47
|
+
expect(described_class.all.count).to eql(16)
|
41
48
|
rule = described_class.all.first
|
42
49
|
expect(rule).to be_a(described_class)
|
43
50
|
expect(rule.tag).to eql('commercial-use')
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: licensee
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 8.8.
|
4
|
+
version: 8.8.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Balter
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-03-
|
11
|
+
date: 2017-03-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rugged
|
@@ -154,7 +154,7 @@ files:
|
|
154
154
|
- spec/licensee/project_files/package_info_spec.rb
|
155
155
|
- spec/licensee/project_files/readme_spec.rb
|
156
156
|
- spec/licensee/project_spec.rb
|
157
|
-
- spec/licensee/
|
157
|
+
- spec/licensee/rule_spec.rb
|
158
158
|
- spec/licensee_spec.rb
|
159
159
|
- spec/project_file_spec.rb
|
160
160
|
- spec/spec_helper.rb
|