1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-24 13:50:09 +01:00

1341 Commits

Author SHA1 Message Date
Mike Linksvayer
f9f84734ce
Merge branch 'gh-pages' into projecturl 2018-01-03 12:01:10 -08:00
Mike Linksvayer
3174c978cf
Merge pull request #567 from wking/check-approval-license-ids
check-approval: Fix missing license_ids variable
2018-01-03 12:00:49 -08:00
W. Trevor King
45369acf79 check-approval: Fix missing license_ids variable
Avoid:

   $ ./script/check-approval MIT
   ./script/check-approval:55:in `<main>': undefined local variable or method `license_ids' for main:Object (NameError)

The license_ids line was added in e505eb8f (check if license is aleady
a license, 2016-01-18, #318), but license_ids was removed from the
helper in b99e7ab0 (replace 'id' variables with 'spdx_lcase' to
minimize confusion, 2016-06-01, #424).  This commit restores the old
code locally, since this script is the only consumer.
2018-01-03 11:58:21 -08:00
Mike Linksvayer
156babeadf
Merge pull request #569 from wking/fsf-api
spec_helper: Extract FSF approval from wking.github.io/fsf-api
2018-01-03 11:57:21 -08:00
W. Trevor King
84a7bbbf96 spec_helper: Extract FSF approval from wking.github.io/fsf-api
Ideally the FSF would be maintaining the API (or any API), but until
someone can talk them into that I think we can save work by
collaborating on the mock API.  Using a JSON API also allows us to
drop the Nokogiri dependency.

The parens feel excessive, and I'm not familiar with Ruby, so they
might be.  However, removing the parens from the libre check resulted
in:

  $ ./script/check-approval ISC
  ./script/check-approval:8:in `require_relative': /.../choosealicense.com/spec/spec_helper.rb:108: syntax error, unexpected tSTRING_BEG, expecting keyword_then or ';' or '\n' (SyntaxError)
  ...gs') && meta['tags'].include? 'libre'
  ...                               ^
  /.../choosealicense.com/spec/spec_helper.rb:116: syntax error, unexpected keyword_end, expecting end-of-input
          from ./script/check-approval:8:in `<main>'
2018-01-03 11:53:36 -08:00
Mike Linksvayer
3ad9bf7f0f
Merge pull request #568 from wking/case-insensitive-spdx-lookup
spec_helper: Restore case-insensitive matching in find_spdx
2018-01-03 11:34:13 -08:00
W. Trevor King
af78adb4fe spec_helper: Restore case-insensitive matching in find_spdx
The previous case-insensitive matching was removed in e5f46faa (test
required spdx-ids against data from spdx, 2016-05-25, #418).  That
commit was designed [1] to allow case-sensitive matching as discussed
in [2].  But while I'm in favor of case-sensitive keys in spdx_list,
the case-sensitive match breaks script/check-approval which downcases
its argument since it was added in 8e56bb83 (add
script/check-approval, 2016-01-18, #318).

There are more notes on SPDX's plans for case sensitivity in [3], so
we should see a clearer policy there soon.  I'm arguing for
case-sensitive *display* with optional case-insensitive matching.  I
am optimistic that the SPDX will at least agree not to register short
IDs that only differ by case, which is all we need to make this
case-insensitive match safe here.

[1]: https://github.com/github/choosealicense.com/pull/418#issuecomment-221404630
[2]: https://github.com/benbalter/licensee/issues/72
[3]: https://github.com/spdx/spdx-spec/issues/63
2018-01-03 11:13:08 -08:00
Sheel Bedi
c51d2e956e
Update License year to 2018 2018-01-03 03:37:33 -06:00
Mike Linksvayer
1e715f44b1 project_url -> projecturl 2018-01-02 18:09:38 -08:00
Mike Linksvayer
5f83952a41
Merge pull request #564 from github/project_url
Document project_url field
2018-01-02 16:06:32 -08:00
Mike Linksvayer
316bd0b828 match _ fields, require preceding space (ex CECILL-2.1) 2018-01-02 14:35:04 -08:00
Mike Linksvayer
d7bf3ac98a Revert "rm no longer relevant test"
This reverts commit 5e7b07f998e9264092b8e1274f99605ead412138.
2018-01-02 14:25:04 -08:00
Mike Linksvayer
e630ac7f29 project_url field 2018-01-02 14:24:52 -08:00
Mike Linksvayer
f3988a7faa SPDX license list 3.0 uses -or-later and -only over + and no modifier
Reflect that in sidebar instructions for *GPL as seen e.g. at
https://choosealicense.com/licenses/agpl-3.0/
2017-12-31 10:03:56 -08:00
Mike Linksvayer
47920250b2
Merge pull request #562 from github/self-test
Test this project's license
2017-12-31 09:43:53 -08:00
Mike Linksvayer
a093c99d3c rubocop 2017-12-30 15:48:07 -08:00
Mike Linksvayer
c3f9bea852 change no-license internal links 2017-12-30 15:46:13 -08:00
Mike Linksvayer
28fa8ca521 rename and redirect no-license to no-permission avodiing licensee false negative 2017-12-30 15:42:15 -08:00
Mike Linksvayer
2459e4ff99 add test that this project's license detected as MIT 2017-12-30 15:38:31 -08:00
Mike Linksvayer
8cac9c3d8e
Merge pull request #554 from github/epl-2.0
Add EPL-2.0
2017-12-29 15:22:34 -08:00
Mike Linksvayer
f2aabb8057
2 more examples 2017-12-29 15:18:11 -08:00
Mike Linksvayer
7b6067ed2c
Merge branch 'gh-pages' into epl-2.0 2017-12-29 14:58:54 -08:00
Mike Linksvayer
cd7b21ab7e
Merge branch 'gh-pages' into patch-1 2017-12-29 14:54:59 -08:00
Mike Linksvayer
5ad0a4374a
Merge pull request #560 from github/spdx-3.0
Test against SPDX-provided list
2017-12-29 14:54:34 -08:00
Mike Linksvayer
102887fbeb use SPDX license list 3.0 2017-12-29 14:30:08 -08:00
Mike Linksvayer
43d7e40bc2 update ruby to current pages version 2017-12-29 13:15:57 -08:00
Mike Linksvayer
88c7c763cb
Merge pull request #559 from github/ncsa-ordering
NCSA "developed by" ordering
2017-12-27 10:54:21 -08:00
Mike Linksvayer
6d535b774a
NCSA "developed by" ordering
"Development Group" comes before "Name of Institution", so `project` should come before `fullname` as these most closely correspond.

As noted in https://github.com/spdx/license-list-XML/pull/556
2017-12-26 13:15:29 -08:00
Mike Linksvayer
f589670554
Merge branch 'gh-pages' into patch-1 2017-12-06 09:35:55 -08:00
Mike Linksvayer
5c75a337d5
Merge branch 'gh-pages' into epl-2.0 2017-11-27 13:20:23 -08:00
Mike Linksvayer
7213ccf8ac
Merge pull request #555 from github/test-using-examples
Test examples provided in 'using:' would be detected by licensee
2017-11-27 13:19:35 -08:00
Mike Linksvayer
8630a017f8 @benbalter review suggestions 2017-11-27 12:56:25 -08:00
Mike Linksvayer
2c9fa4907e don't attempt heavily templated NCSA and PostgreSQL for now 2017-11-25 20:57:24 -08:00
Mike Linksvayer
1cca51a128 MIT 2017-11-25 20:44:51 -08:00
Mike Linksvayer
d0caabb71e ISC examples 2017-11-25 20:38:49 -08:00
Mike Linksvayer
1a841848b3 ECL-2.0 examples 2017-11-25 20:32:19 -08:00
Mike Linksvayer
5130f12df1 Update GPLv3 examples 2017-11-25 20:27:20 -08:00
Mike Linksvayer
642783cf4b GPLv2 examples that can be detected 2017-11-25 20:15:01 -08:00
Mike Linksvayer
0e2a2653bd path item can include - 2017-11-25 19:56:20 -08:00
Mike Linksvayer
7649067151 Test examples provided in 'using:' would be detected by licensee 2017-11-25 16:16:11 -08:00
Mike Linksvayer
940131ee05
Merge branch 'gh-pages' into patch-1 2017-11-24 15:47:54 -08:00
Mike Linksvayer
3532d9cbed Add EPL-2.0 2017-11-24 14:15:52 -08:00
Mike Linksvayer
7c25006fca
Merge pull request #552 from github/wrap
Wrap license text at ~78 columns
2017-11-20 13:09:27 -08:00
Mike Linksvayer
f4b5e20cba @benbalter review comments 2017-11-20 12:56:03 -08:00
Mike Linksvayer
775a2f2920 rm spurious indent, unnecessary field 2017-11-20 12:20:33 -08:00
Mike Linksvayer
48b00a5a6b update license texts from #489, avoid EPL-1.0 skip 2017-11-20 12:02:53 -08:00
Mike Linksvayer
644782b550 clearbsd from f4c8baf535 2017-11-19 19:29:02 -08:00
Mike Linksvayer
29a3b153e3 wrapped AFL-3.0, MS-PL, MS-RL taken from 8332159157 2017-11-19 14:21:19 -08:00
Mike Linksvayer
dc00fc0ae5 rubocop 2017-11-19 12:33:01 -08:00
Mike Linksvayer
dc4c7215ca don't count newline 2017-11-19 12:23:28 -08:00