Set Apache-2.0 headers flush, within 72 columns

Author: kemitchell

licensor

@@ -146,20 +146,21 @@ if (license === 'Apache-2.0') {
 
   var licenseURL = 'http://www.apache.org/licenses/LICENSE-2.0'
   var header = [
-    '/* Copyright ' + year + ' ' + owners,
-    ' *',
-    ' * 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',
-    ' *', (
-    ' *     ' + licenseURL ),
-    ' *',
-    ' * 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.',
-    ' */'
+    '/*',
+    'Copyright ' + year + ' ' + owners,
+    '',
+    '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',
+    '',
+    ('    ' + licenseURL),
+    '',
+    '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.',
+    '*/'
   ].join('\n')
 
   var probablyHasHeader = function (fileContent) {

tests/apache-2.0/test.js

@@ -41,20 +41,21 @@ tap.equal(
 
 var text = readFileSync('index.js')
 tap.equal(text, [
-  '/* Copyright ' + year + ' John Doe',
-  ' *',
-  ' * 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.',
-  ' */'
+  '/*',
+  'Copyright ' + year + ' John Doe',
+  '',
+  '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.',
+  '*/'
 ].join('\n') + '\n\n' + indexBefore)
 
 fs.writeFileSync(path.join(__dirname, 'index.js'), indexBefore)