From f468420a290cf1b91c5b0f4c2307ab365b2747c8 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 14 Feb 2014 18:13:52 -0700 Subject: [PATCH 01/45] Add report-licenses task It logs a report about the licenses of all dependencies to standard out, including the license type, the source of the information, and the text of the source if it's not just an entry in the `package.json`. There are still some licenses that couldn't be automatically harvested that will need to be covered in the overrides. --- build/package.json | 1 + build/tasks/license-tasks.coffee | 63 ++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 build/tasks/license-tasks.coffee diff --git a/build/package.json b/build/package.json index 3d3c08cd9..1faa4b353 100644 --- a/build/package.json +++ b/build/package.json @@ -25,6 +25,7 @@ "grunt-shell": "~0.3.1", "harmony-collections": "~0.3.8", "json-front-matter": "~0.1.3", + "legal-eagle": "~0.1.0", "rcedit": "~0.1.2", "request": "~2.27.0", "rimraf": "~2.2.2", diff --git a/build/tasks/license-tasks.coffee b/build/tasks/license-tasks.coffee new file mode 100644 index 000000000..4064c54de --- /dev/null +++ b/build/tasks/license-tasks.coffee @@ -0,0 +1,63 @@ + +module.exports = (grunt) -> + grunt.registerTask 'report-licenses', 'Report the licenses of all dependencies', -> + legalEagle = require 'legal-eagle' + done = @async() + + options = + path: process.cwd() + overrides: ManualOverrides + + legalEagle options, (err, summary) -> + if err? + console.error(err) + exit 1 + console.log getSummaryText(summary) + done() + +getSummaryText = (summary) -> + {keys} = require 'underscore-plus' + text = "" + names = keys(summary).sort() + for name in names + {license, source, sourceText} = summary[name] + text += "## #{name}\n\n" + text += "* License: #{license}\n" + text += "* License Source: #{source}\n" if source? + if sourceText? + text += "* Source Text:\n" + for line in sourceText.split('\n') + text += "> #{line}\n" + text += '\n' + text + +ManualOverrides = + 'underscore@1.4.4': + repository: 'https://github.com/documentcloud/underscore' + license: 'MIT' + source: 'LICENSE' + sourceText: """ + Copyright (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative + Reporters & Editors + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + """ From 1bf98f5b8dd47b0d8df3f8169e00eab2790aa1cf Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 14 Feb 2014 18:54:00 -0700 Subject: [PATCH 02/45] Add check-licenses task and break license-overrides into their own file --- build/tasks/check-licenses-task.coffee | 25 +++++++++++++ ...-tasks.coffee => license-overrides.coffee} | 35 +------------------ build/tasks/report-licenses-task.coffee | 32 +++++++++++++++++ 3 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 build/tasks/check-licenses-task.coffee rename build/tasks/{license-tasks.coffee => license-overrides.coffee} (61%) create mode 100644 build/tasks/report-licenses-task.coffee diff --git a/build/tasks/check-licenses-task.coffee b/build/tasks/check-licenses-task.coffee new file mode 100644 index 000000000..87e1c3c70 --- /dev/null +++ b/build/tasks/check-licenses-task.coffee @@ -0,0 +1,25 @@ + +module.exports = (grunt) -> + grunt.registerTask 'check-licenses', 'Report the licenses of all dependencies', -> + legalEagle = require 'legal-eagle' + {size, keys} = require 'underscore-plus' + done = @async() + + options = + path: process.cwd() + omitPermissive: true + overrides: require './license-overrides' + + legalEagle options, (err, summary) -> + if err? + console.error(err) + exit 1 + + if size(summary) + console.error "Found dependencies without permissive licenses:" + for name in keys(summary).sort() + console.error "#{name}" + console.error " License: #{summary[name].license}" + console.error " Repository: #{summary[name].repository}" + exit 1 + done() diff --git a/build/tasks/license-tasks.coffee b/build/tasks/license-overrides.coffee similarity index 61% rename from build/tasks/license-tasks.coffee rename to build/tasks/license-overrides.coffee index 4064c54de..a34eb2fd9 100644 --- a/build/tasks/license-tasks.coffee +++ b/build/tasks/license-overrides.coffee @@ -1,37 +1,4 @@ - -module.exports = (grunt) -> - grunt.registerTask 'report-licenses', 'Report the licenses of all dependencies', -> - legalEagle = require 'legal-eagle' - done = @async() - - options = - path: process.cwd() - overrides: ManualOverrides - - legalEagle options, (err, summary) -> - if err? - console.error(err) - exit 1 - console.log getSummaryText(summary) - done() - -getSummaryText = (summary) -> - {keys} = require 'underscore-plus' - text = "" - names = keys(summary).sort() - for name in names - {license, source, sourceText} = summary[name] - text += "## #{name}\n\n" - text += "* License: #{license}\n" - text += "* License Source: #{source}\n" if source? - if sourceText? - text += "* Source Text:\n" - for line in sourceText.split('\n') - text += "> #{line}\n" - text += '\n' - text - -ManualOverrides = +module.exports = 'underscore@1.4.4': repository: 'https://github.com/documentcloud/underscore' license: 'MIT' diff --git a/build/tasks/report-licenses-task.coffee b/build/tasks/report-licenses-task.coffee new file mode 100644 index 000000000..02c65a3ee --- /dev/null +++ b/build/tasks/report-licenses-task.coffee @@ -0,0 +1,32 @@ + +module.exports = (grunt) -> + grunt.registerTask 'report-licenses', 'Report the licenses of all dependencies', -> + legalEagle = require 'legal-eagle' + done = @async() + + options = + path: process.cwd() + overrides: require './license-overrides' + + legalEagle options, (err, summary) -> + if err? + console.error(err) + exit 1 + console.log getSummaryText(summary) + done() + +getSummaryText = (summary) -> + {keys} = require 'underscore-plus' + text = "" + names = keys(summary).sort() + for name in names + {license, source, sourceText} = summary[name] + text += "## #{name}\n\n" + text += "* License: #{license}\n" + text += "* License Source: #{source}\n" if source? + if sourceText? + text += "* Source Text:\n" + for line in sourceText.split('\n') + text += "> #{line}\n" + text += '\n' + text From 6134d95bfd3559b27e04315b6f98f151841dc10e Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 10:54:53 -0700 Subject: [PATCH 03/45] WIP --- build/tasks/license-overrides.coffee | 47 +++++++++++++--------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/build/tasks/license-overrides.coffee b/build/tasks/license-overrides.coffee index a34eb2fd9..625f5164a 100644 --- a/build/tasks/license-overrides.coffee +++ b/build/tasks/license-overrides.coffee @@ -1,30 +1,25 @@ module.exports = - 'underscore@1.4.4': - repository: 'https://github.com/documentcloud/underscore' + 'aws-sign@0.3.0': + repository: 'https://github.com/mikeal/aws-sign' license: 'MIT' - source: 'LICENSE' + source: 'index.js' sourceText: """ - Copyright (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative - Reporters & Editors - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. + /*! + * knox - auth + * Copyright(c) 2010 LearnBoost + * MIT Licensed + */ + """ + 'bufferjs@2.0.0': + repository: 'https://github.com/coolaj86/node-bufferjs' + license: 'MIT' + source: 'LICENSE.MIT' + sourceText: """ + Copyright (c) 2010 AJ ONeal (and Contributors) + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ From 0872db3780a23862f7db153f1cd460167939bd3b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 13:01:19 -0700 Subject: [PATCH 04/45] Fix exit call in check licenses task --- build/tasks/check-licenses-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/check-licenses-task.coffee b/build/tasks/check-licenses-task.coffee index 87e1c3c70..27cef1709 100644 --- a/build/tasks/check-licenses-task.coffee +++ b/build/tasks/check-licenses-task.coffee @@ -21,5 +21,5 @@ module.exports = (grunt) -> console.error "#{name}" console.error " License: #{summary[name].license}" console.error " Repository: #{summary[name].repository}" - exit 1 + process.exit 1 done() From dca5fadeecc87799d7fe963d991db51654643282 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 13:01:29 -0700 Subject: [PATCH 05/45] Upgrade legal-eagle to 0.2.0 --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index 1faa4b353..7c0e92194 100644 --- a/build/package.json +++ b/build/package.json @@ -25,7 +25,7 @@ "grunt-shell": "~0.3.1", "harmony-collections": "~0.3.8", "json-front-matter": "~0.1.3", - "legal-eagle": "~0.1.0", + "legal-eagle": "~0.2.0", "rcedit": "~0.1.2", "request": "~2.27.0", "rimraf": "~2.2.2", From 12bc2a0a3997526a055ed5a8eeb06ca5ccfb33cd Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 13:03:20 -0700 Subject: [PATCH 06/45] Add license-check step to CI grunt task --- build/Gruntfile.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index 9e0f1b4eb..05c3899ee 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -227,6 +227,6 @@ module.exports = (grunt) -> grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg']) grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint']) grunt.registerTask('test', ['shell:kill-atom', 'run-specs']) - grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'set-version', 'lint', 'test', 'codesign', 'publish-build']) + grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build']) grunt.registerTask('docs', ['markdown:guides', 'build-docs']) grunt.registerTask('default', ['download-atom-shell', 'build', 'set-version', 'install']) From 59bd424e892de3cd13210efc4f0f81e803ae5f90 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 15:29:17 -0700 Subject: [PATCH 07/45] Note that content is omitted from aws-sign --- build/tasks/license-overrides.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/license-overrides.coffee b/build/tasks/license-overrides.coffee index 625f5164a..81c70418f 100644 --- a/build/tasks/license-overrides.coffee +++ b/build/tasks/license-overrides.coffee @@ -9,6 +9,7 @@ module.exports = * Copyright(c) 2010 LearnBoost * MIT Licensed */ + """ 'bufferjs@2.0.0': repository: 'https://github.com/coolaj86/node-bufferjs' From fac844c255cd3fcbd2bb587ef5281c00dfeb64a4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 15:32:02 -0700 Subject: [PATCH 08/45] Add license override for buffers@0.1.1 --- build/tasks/license-overrides.coffee | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/tasks/license-overrides.coffee b/build/tasks/license-overrides.coffee index 81c70418f..eb6a29785 100644 --- a/build/tasks/license-overrides.coffee +++ b/build/tasks/license-overrides.coffee @@ -24,3 +24,14 @@ module.exports = THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ + 'buffers@0.1.1': + repository: "http://github.com/substack/node-buffers" + license: 'MIT' + source: 'README.markdown' + sourceText: """ + + license + ======= + + MIT/X11 + """ From b176a246b39b67921c035aa747f08ea6c1deec34 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 15:38:14 -0700 Subject: [PATCH 09/45] Upgrade to clear-cut 0.4.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67040d151..ae7335f6e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "async": "0.2.6", "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372", - "clear-cut": "0.2.0", + "clear-cut": "0.4.0", "coffee-script": "1.7.0", "coffeestack": "0.7.0", "delegato": "1.x", From 9f2d6fd8b55a90967acdf46ef7ec994cfc3aebd1 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 15:57:21 -0700 Subject: [PATCH 10/45] Upgrade scandal to 0.15.0 for isbinaryfile license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae7335f6e..27c6aff89 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "q": "1.0.x", "random-words": "0.0.1", "runas": "0.5.x", - "scandal": "0.14.0", + "scandal": "0.15.0", "season": "1.x", "semver": "1.1.4", "serializable": "1.x", From 523f965791b08c8b5e30a7bc7f5a4d4020ba9651 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Feb 2014 16:18:13 -0700 Subject: [PATCH 11/45] Remove language-puppet because the source TextMate bundle is GPL'd --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 27c6aff89..6f586fde1 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,6 @@ "language-perl": "0.5.0", "language-php": "0.6.0", "language-property-list": "0.5.0", - "language-puppet": "0.5.0", "language-python": "0.5.0", "language-ruby": "0.11.0", "language-ruby-on-rails": "0.6.0", From d316b14c4d9b7c1291fd2be8b9d737300dfcb7e7 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 18 Feb 2014 10:29:46 -0700 Subject: [PATCH 12/45] Add license override for specificity@0.1.3 The author added a license to the repository --- build/tasks/license-overrides.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/tasks/license-overrides.coffee b/build/tasks/license-overrides.coffee index eb6a29785..60527130e 100644 --- a/build/tasks/license-overrides.coffee +++ b/build/tasks/license-overrides.coffee @@ -35,3 +35,7 @@ module.exports = MIT/X11 """ + 'specificity@0.1.3': + repository: 'https://github.com/keeganstreet/specificity' + license: 'MIT' + source: 'package.json in repository' From 76903a0b91b6128d055d039c5ce594d7aadf7858 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 18 Feb 2014 12:51:49 -0700 Subject: [PATCH 13/45] Upgrade release-notes to 0.21.0 for licensed roaster dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f586fde1..b5691e1f5 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "metrics": "0.26.0", "open-on-github": "0.20.0", "package-generator": "0.26.0", - "release-notes": "0.20.0", + "release-notes": "0.21.0", "settings-view": "0.74.0", "snippets": "0.29.0", "spell-check": "0.25.0", From a8f57ed2763cd970feb27e56128e8f4ad9d4b555 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:27:15 -0700 Subject: [PATCH 14/45] Upgrade language-c to 0.10.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5691e1f5..8739178ce 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "welcome": "0.4.0", "whitespace": "0.13.0", "wrap-guide": "0.14.0", - "language-c": "0.8.0", + "language-c": "0.10.0", "language-clojure": "0.2.0", "language-coffee-script": "0.9.0", "language-css": "0.7.0", From 91a1ce84d0013c8b7dcc51754f7c412a02e5d5cd Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:35:58 -0700 Subject: [PATCH 15/45] Upgrade language-git to 0.8.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8739178ce..8cff3c797 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "language-coffee-script": "0.9.0", "language-css": "0.7.0", "language-gfm": "0.17.0", - "language-git": "0.6.0", + "language-git": "0.8.0", "language-go": "0.4.0", "language-html": "0.5.0", "language-hyperlink": "0.5.0", From 23308625f67f847f32ca6be25679cfbe0789fbe1 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:44:59 -0700 Subject: [PATCH 16/45] Upgrade language-html to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cff3c797..ab272eb18 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "language-gfm": "0.17.0", "language-git": "0.8.0", "language-go": "0.4.0", - "language-html": "0.5.0", + "language-html": "0.7.0", "language-hyperlink": "0.5.0", "language-java": "0.5.0", "language-javascript": "0.8.0", From 668d3d36721d353d5ca2233d783f0d5c499a076c Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:47:53 -0700 Subject: [PATCH 17/45] Upgrade language-hyperlink to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab272eb18..6480d8fc5 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "language-git": "0.8.0", "language-go": "0.4.0", "language-html": "0.7.0", - "language-hyperlink": "0.5.0", + "language-hyperlink": "0.7.0", "language-java": "0.5.0", "language-javascript": "0.8.0", "language-json": "0.5.0", From 3e685d91a5f752deff0d22bf63ce363870c17b93 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:51:40 -0700 Subject: [PATCH 18/45] Upgrade language-java to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6480d8fc5..4705b984a 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "language-go": "0.4.0", "language-html": "0.7.0", "language-hyperlink": "0.7.0", - "language-java": "0.5.0", + "language-java": "0.7.0", "language-javascript": "0.8.0", "language-json": "0.5.0", "language-less": "0.4.0", From 761e96429db35fa74369a3f65078b8dc7180cdc2 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:56:31 -0700 Subject: [PATCH 19/45] Upgrade language-javascript to 0.10.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4705b984a..82accd956 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "language-html": "0.7.0", "language-hyperlink": "0.7.0", "language-java": "0.7.0", - "language-javascript": "0.8.0", + "language-javascript": "0.10.0", "language-json": "0.5.0", "language-less": "0.4.0", "language-make": "0.4.0", From 03a60561b72d9ad5a93add2bf47be930682ce8bb Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 09:59:17 -0700 Subject: [PATCH 20/45] Upgrade language-json to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82accd956..68e901e9b 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "language-hyperlink": "0.7.0", "language-java": "0.7.0", "language-javascript": "0.10.0", - "language-json": "0.5.0", + "language-json": "0.7.0", "language-less": "0.4.0", "language-make": "0.4.0", "language-mustache": "0.3.0", From 8aaa34b8fa4f03c4c077520f3a3ae38a5d4e7d95 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:01:48 -0700 Subject: [PATCH 21/45] Upgrade language-make to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68e901e9b..d529da806 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "language-javascript": "0.10.0", "language-json": "0.7.0", "language-less": "0.4.0", - "language-make": "0.4.0", + "language-make": "0.6.0", "language-mustache": "0.3.0", "language-objective-c": "0.5.0", "language-pegjs": "0.3.0", From bb03d6b83d3e7a158272589ff57c18f3b5a07415 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:04:41 -0700 Subject: [PATCH 22/45] Upgrade language-objective-c to 0.8.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d529da806..1923abab0 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "language-less": "0.4.0", "language-make": "0.6.0", "language-mustache": "0.3.0", - "language-objective-c": "0.5.0", + "language-objective-c": "0.8.0", "language-pegjs": "0.3.0", "language-perl": "0.5.0", "language-php": "0.6.0", From 4e62540a9b90d604a7101c715bd79e45a83dfb1b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:09:26 -0700 Subject: [PATCH 23/45] Upgrade language-perl to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1923abab0..38a7aab99 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "language-mustache": "0.3.0", "language-objective-c": "0.8.0", "language-pegjs": "0.3.0", - "language-perl": "0.5.0", + "language-perl": "0.7.0", "language-php": "0.6.0", "language-property-list": "0.5.0", "language-python": "0.5.0", From a6ffaff2a2e8abcd5874851e928bea3488d9b86a Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:29:13 -0700 Subject: [PATCH 24/45] Upgrade language-php to 0.7.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38a7aab99..d9fbb4c3a 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "language-objective-c": "0.8.0", "language-pegjs": "0.3.0", "language-perl": "0.7.0", - "language-php": "0.6.0", + "language-php": "0.7.0", "language-property-list": "0.5.0", "language-python": "0.5.0", "language-ruby": "0.11.0", From 69f0572f2a9229bc8c6b6696444a7155d50e16f7 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:32:03 -0700 Subject: [PATCH 25/45] Upgrade language-property-list to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9fbb4c3a..1a9268109 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "language-pegjs": "0.3.0", "language-perl": "0.7.0", "language-php": "0.7.0", - "language-property-list": "0.5.0", + "language-property-list": "0.6.0", "language-python": "0.5.0", "language-ruby": "0.11.0", "language-ruby-on-rails": "0.6.0", From 546351dd46622bcafc1a9302b0d57777fa198847 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:35:02 -0700 Subject: [PATCH 26/45] Upgrade language-python to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a9268109..fa8503e92 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "language-perl": "0.7.0", "language-php": "0.7.0", "language-property-list": "0.6.0", - "language-python": "0.5.0", + "language-python": "0.6.0", "language-ruby": "0.11.0", "language-ruby-on-rails": "0.6.0", "language-sass": "0.6.0", From 62b8ef7bb35bade5693e99825d00ca24c1e618e3 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:37:46 -0700 Subject: [PATCH 27/45] Upgrade language-ruby to 0.12.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa8503e92..69cc81f68 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-php": "0.7.0", "language-property-list": "0.6.0", "language-python": "0.6.0", - "language-ruby": "0.11.0", + "language-ruby": "0.12.0", "language-ruby-on-rails": "0.6.0", "language-sass": "0.6.0", "language-shellscript": "0.5.0", From a87036b5386b8c64f119e1aa63910d0ada881eb3 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:40:32 -0700 Subject: [PATCH 28/45] Upgrade language-shellscript to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 69cc81f68..e9060293e 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "language-ruby": "0.12.0", "language-ruby-on-rails": "0.6.0", "language-sass": "0.6.0", - "language-shellscript": "0.5.0", + "language-shellscript": "0.6.0", "language-source": "0.5.0", "language-sql": "0.5.0", "language-text": "0.4.0", From 66225736fe375ab0692308780e8994e5d98ae8e9 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:42:39 -0700 Subject: [PATCH 29/45] Upgrade language-source to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9060293e..3caa36edc 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "language-ruby-on-rails": "0.6.0", "language-sass": "0.6.0", "language-shellscript": "0.6.0", - "language-source": "0.5.0", + "language-source": "0.6.0", "language-sql": "0.5.0", "language-text": "0.4.0", "language-todo": "0.4.0", From 5fd0850f5b1b633f919ca6fad183a6e5d8f6397d Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:45:13 -0700 Subject: [PATCH 30/45] Upgrade language-sql to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3caa36edc..ea7b6054c 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "language-sass": "0.6.0", "language-shellscript": "0.6.0", "language-source": "0.6.0", - "language-sql": "0.5.0", + "language-sql": "0.6.0", "language-text": "0.4.0", "language-todo": "0.4.0", "language-toml": "0.9.0", From c18fa805f9670ae852c4b8c74cb12cd6d908b3ca Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:47:01 -0700 Subject: [PATCH 31/45] Upgrade language-text to 0.5.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea7b6054c..27308ec6d 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "language-shellscript": "0.6.0", "language-source": "0.6.0", "language-sql": "0.6.0", - "language-text": "0.4.0", + "language-text": "0.5.0", "language-todo": "0.4.0", "language-toml": "0.9.0", "language-xml": "0.5.0", From 357f158f8afe5f0950556e10457e000d8bccd886 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:50:09 -0700 Subject: [PATCH 32/45] Upgrade language-todo to 0.5.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27308ec6d..54490098a 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "language-source": "0.6.0", "language-sql": "0.6.0", "language-text": "0.5.0", - "language-todo": "0.4.0", + "language-todo": "0.5.0", "language-toml": "0.9.0", "language-xml": "0.5.0", "language-yaml": "0.4.0" From dea7fafee7c312c58e1a3924d4af986670c8d6a9 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:52:11 -0700 Subject: [PATCH 33/45] Upgrade language-xml to 0.6.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54490098a..4f0b649a1 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "language-text": "0.5.0", "language-todo": "0.5.0", "language-toml": "0.9.0", - "language-xml": "0.5.0", + "language-xml": "0.6.0", "language-yaml": "0.4.0" }, "private": true, From ff425261995dd81e6dbe727c469838e1de4d570f Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 10:54:09 -0700 Subject: [PATCH 34/45] Upgrade language-yaml to 0.5.0 for included license --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f0b649a1..43c06f6a4 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "language-todo": "0.5.0", "language-toml": "0.9.0", "language-xml": "0.6.0", - "language-yaml": "0.4.0" + "language-yaml": "0.5.0" }, "private": true, "scripts": { From 99f6b89b6ea1378b6fdc1d4a0406eca83c9d4edc Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 19 Feb 2014 11:05:08 -0700 Subject: [PATCH 35/45] Upgrade language-css to 0.8.0 for update license and readme --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43c06f6a4..1cda6b4b9 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "language-c": "0.10.0", "language-clojure": "0.2.0", "language-coffee-script": "0.9.0", - "language-css": "0.7.0", + "language-css": "0.8.0", "language-gfm": "0.17.0", "language-git": "0.8.0", "language-go": "0.4.0", From 324ae3fe3a37de420066bbb1f5140a89a46a5f95 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 11:53:32 -0700 Subject: [PATCH 36/45] Replace report-licenses with generate-license task. Output plain text. --- ...s-task.coffee => generate-license-task.coffee} | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) rename build/tasks/{report-licenses-task.coffee => generate-license-task.coffee} (58%) diff --git a/build/tasks/report-licenses-task.coffee b/build/tasks/generate-license-task.coffee similarity index 58% rename from build/tasks/report-licenses-task.coffee rename to build/tasks/generate-license-task.coffee index 02c65a3ee..6485791fd 100644 --- a/build/tasks/report-licenses-task.coffee +++ b/build/tasks/generate-license-task.coffee @@ -1,6 +1,6 @@ module.exports = (grunt) -> - grunt.registerTask 'report-licenses', 'Report the licenses of all dependencies', -> + grunt.registerTask 'generate-license', 'Generate the license, including the licenses of all dependencies', -> legalEagle = require 'legal-eagle' done = @async() @@ -21,12 +21,13 @@ getSummaryText = (summary) -> names = keys(summary).sort() for name in names {license, source, sourceText} = summary[name] - text += "## #{name}\n\n" - text += "* License: #{license}\n" - text += "* License Source: #{source}\n" if source? + + text += "-------------------------------------------------------------------------\n\n" + text += "Package: #{name}\n" + text += "License: #{license}\n" + text += "License Source: #{source}\n" if source? if sourceText? - text += "* Source Text:\n" - for line in sourceText.split('\n') - text += "> #{line}\n" + text += "Source Text:\n\n" + text += sourceText text += '\n' text From 878831bfc7fdcf730b5c4ceb1db6ad1f50f0d383 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 12:35:05 -0700 Subject: [PATCH 37/45] Write LICENSE to the appDir during build task --- build/tasks/build-task.coffee | 2 +- build/tasks/generate-license-task.coffee | 27 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index bcbcd47aa..5197f4cf4 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -74,7 +74,7 @@ module.exports = (grunt) -> unless /.+\.plist/.test(sourcePath) grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename)) - dependencies = ['compile'] + dependencies = ['compile', "generate-license:save"] dependencies.push('copy-info-plist') if process.platform is 'darwin' dependencies.push('set-exe-icon') if process.platform is 'win32' grunt.task.run(dependencies...) diff --git a/build/tasks/generate-license-task.coffee b/build/tasks/generate-license-task.coffee index 6485791fd..784efc470 100644 --- a/build/tasks/generate-license-task.coffee +++ b/build/tasks/generate-license-task.coffee @@ -1,6 +1,8 @@ +fs = require 'fs' +path = require 'path' module.exports = (grunt) -> - grunt.registerTask 'generate-license', 'Generate the license, including the licenses of all dependencies', -> + grunt.registerTask 'generate-license', 'Generate the license, including the licenses of all dependencies', (mode) -> legalEagle = require 'legal-eagle' done = @async() @@ -8,19 +10,30 @@ module.exports = (grunt) -> path: process.cwd() overrides: require './license-overrides' - legalEagle options, (err, summary) -> + legalEagle options, (err, dependencyLicenses) -> if err? console.error(err) exit 1 - console.log getSummaryText(summary) + + licenseText = getLicenseText(dependencyLicenses) + if mode is 'save' + targetPath = path.join(grunt.config.get('atom.appDir'), 'LICENSE') + fs.writeFileSync(targetPath, licenseText) + else + console.log licenseText done() -getSummaryText = (summary) -> +getLicenseText = (dependencyLicenses) -> {keys} = require 'underscore-plus' - text = "" - names = keys(summary).sort() + text = """ + Copyright 2014 GitHub, Inc. + + This application bundles the following third-party packages in accordance + with the following licenses:\n\n + """ + names = keys(dependencyLicenses).sort() for name in names - {license, source, sourceText} = summary[name] + {license, source, sourceText} = dependencyLicenses[name] text += "-------------------------------------------------------------------------\n\n" text += "Package: #{name}\n" From 4700eeb7e245a613f0f51c6ae9a0f16bd0f7dc8a Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 12:49:17 -0700 Subject: [PATCH 38/45] Remove Apache license and use plain-text, copyright-only license instead --- LICENSE | 1 + LICENSE.md | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..796e16c2a --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +Copyright 2014 GitHub, Inc. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 4d1c86e77..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2013 GitHub Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. From 0eaf3b63365abe1e85ad876cdcb60910d6a5a84d Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 13:08:26 -0700 Subject: [PATCH 39/45] Add an 'application:open-license' command It just opens the LICENSE file in a buffer --- spec/workspace-spec.coffee | 5 +++++ src/workspace-view.coffee | 1 + src/workspace.coffee | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee index be574cff6..66ab9229f 100644 --- a/spec/workspace-spec.coffee +++ b/spec/workspace-spec.coffee @@ -230,3 +230,8 @@ describe "Workspace", -> expect(atom.config.get('editor.fontSize')).toBe 1 workspace.decreaseFontSize() expect(atom.config.get('editor.fontSize')).toBe 1 + + describe "::openLicense()", -> + it "opens the license as plain-text in a buffer", -> + waitsForPromise -> workspace.openLicense() + runs -> expect(workspace.activePaneItem.getText()).toMatch /Copyright/ diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index bb7779b3e..7ded114ee 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -111,6 +111,7 @@ class WorkspaceView extends View @command 'application:open-your-keymap', -> ipc.sendChannel('command', 'application:open-your-keymap') @command 'application:open-your-snippets', -> ipc.sendChannel('command', 'application:open-your-snippets') @command 'application:open-your-stylesheet', -> ipc.sendChannel('command', 'application:open-your-stylesheet') + @command 'application:open-license', => @model.openLicense() @command 'window:install-shell-commands', => @installShellCommands() diff --git a/src/workspace.coffee b/src/workspace.coffee index 1a9b1d0ee..ceb6c9c48 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -1,4 +1,5 @@ {remove, last} = require 'underscore-plus' +{join} = require 'path' {Model} = require 'theorist' Q = require 'q' Serializable = require 'serializable' @@ -88,6 +89,9 @@ class Workspace extends Model @openUriInPane(uri, pane, options) + openLicense: -> + @open(join(atom.getLoadSettings().resourcePath, 'LICENSE')) + # Only used in specs openSync: (uri='', options={}) -> {initialLine} = options From ce34f758bd775ea191a364651622039f048178ee Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 13:10:27 -0700 Subject: [PATCH 40/45] Add "View License" item to the application menu --- menus/darwin.cson | 1 + menus/win32.cson | 1 + 2 files changed, 2 insertions(+) diff --git a/menus/darwin.cson b/menus/darwin.cson index 27f4b1a03..0b5838d35 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -3,6 +3,7 @@ label: 'Atom' submenu: [ { label: 'About Atom', command: 'application:about' } + { label: 'View License', command: 'application:open-license' } { label: "VERSION", enabled: false } { label: "Restart and Install Update", command: 'application:install-update', visible: false} { label: "Check for Update", command: 'application:check-for-update', visible: false} diff --git a/menus/win32.cson b/menus/win32.cson index 339da35a5..320c1841a 100644 --- a/menus/win32.cson +++ b/menus/win32.cson @@ -145,6 +145,7 @@ label: '&Help' submenu: [ { label: '&About Atom...', command: 'application:about' } + { label: 'View &License', command: 'application:open-license' } { label: "VERSION", enabled: false } { label: "Install &update", command: 'application:install-update', visible: false } { type: 'separator' } From 0e93a11850997a6efd99613469e5bfe3825ad033 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 13:30:07 -0700 Subject: [PATCH 41/45] Upgrade to legal-eagle 0.3.0 to check LICENSE file first --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index ff112b90d..2ec7a7141 100644 --- a/build/package.json +++ b/build/package.json @@ -25,7 +25,7 @@ "grunt-shell": "~0.3.1", "harmony-collections": "~0.3.8", "json-front-matter": "~0.1.3", - "legal-eagle": "~0.2.0", + "legal-eagle": "~0.3.0", "rcedit": "~0.1.2", "request": "~2.27.0", "rimraf": "~2.2.2", From 65a8c8d946654e0e900d195548cccc142576fe3c Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 14:16:45 -0700 Subject: [PATCH 42/45] Override license for promzard@0.2.0 It's a dependency of npm which makes it difficult to upgrade --- build/tasks/license-overrides.coffee | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build/tasks/license-overrides.coffee b/build/tasks/license-overrides.coffee index 60527130e..f21c7eee9 100644 --- a/build/tasks/license-overrides.coffee +++ b/build/tasks/license-overrides.coffee @@ -39,3 +39,24 @@ module.exports = repository: 'https://github.com/keeganstreet/specificity' license: 'MIT' source: 'package.json in repository' + + 'promzard@0.2.0': + license: 'ISC' + source: 'LICENSE in the repository' + sourceText: """ + The ISC License + + Copyright (c) Isaac Z. Schlueter + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + """ From ea43384244f0ca5f83e521991e5c8abc1cafbd8c Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 14:17:41 -0700 Subject: [PATCH 43/45] Remove mustache, pegs, and clojure because they aren't licensed --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index f259313b6..ce706d2e6 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,6 @@ "whitespace": "0.14.0", "wrap-guide": "0.14.0", "language-c": "0.10.0", - "language-clojure": "0.2.0", "language-coffee-script": "0.10.0", "language-css": "0.8.0", "language-gfm": "0.17.0", @@ -117,9 +116,7 @@ "language-json": "0.7.0", "language-less": "0.4.0", "language-make": "0.6.0", - "language-mustache": "0.3.0", "language-objective-c": "0.8.0", - "language-pegjs": "0.3.0", "language-perl": "0.7.0", "language-php": "0.7.0", "language-property-list": "0.6.0", From 458dea9780d6108757d1fdb815f67c1988b2ec3a Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 14:22:40 -0700 Subject: [PATCH 44/45] Allow language-coffee-script without a license for now --- build/tasks/check-licenses-task.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/tasks/check-licenses-task.coffee b/build/tasks/check-licenses-task.coffee index 27cef1709..685624abd 100644 --- a/build/tasks/check-licenses-task.coffee +++ b/build/tasks/check-licenses-task.coffee @@ -15,6 +15,12 @@ module.exports = (grunt) -> console.error(err) exit 1 + # Omit failure for coffee-script bundle for now. It seems to be intended + # to be open source but has no license. + for dependencyName in keys(summary) + if dependencyName.match /^language-coffee-script@/ + delete summary[dependencyName] + if size(summary) console.error "Found dependencies without permissive licenses:" for name in keys(summary).sort() From 91fffc08b939fad3678684b83ed6ef0d07aa2602 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 21 Feb 2014 14:38:43 -0700 Subject: [PATCH 45/45] Upgrade release-notes and markdown-preview for fully-licensed roaster --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ce706d2e6..3398c62ed 100644 --- a/package.json +++ b/package.json @@ -85,11 +85,11 @@ "image-view": "0.24.0", "keybinding-resolver": "0.10.0", "link": "0.17.0", - "markdown-preview": "0.33.0", + "markdown-preview": "0.34.0", "metrics": "0.26.0", "open-on-github": "0.20.0", "package-generator": "0.26.0", - "release-notes": "0.21.0", + "release-notes": "0.22.0", "settings-view": "0.77.0", "snippets": "0.30.0", "spell-check": "0.25.0",