spdx 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3722d9a95644e5dacec325e91b865e3152ca8122
-  data.tar.gz: 27de120fd9e07e549281a69c643ec4e5514dc8d6
+  metadata.gz: f5e9db777ba544a7b8d7b860f1b4dfd888aff7a7
+  data.tar.gz: 5dc0536e865b5e7afb69555b4a7274634e8ff7c0
 SHA512:
-  metadata.gz: 5c91b00dc039b796ef6c88dd315a395021f6649958c5459f8d6b8231bc1f633f70e7a31fd38d3851c0aa722350d1ff769dca725572921d8b4866eb8693f256d4
-  data.tar.gz: 906b593a89ef4ac9b426b2d5ae31312d0e70853293e90be819b4ef03c70a187b68860986b932ee53b8ca79e907f5345dc6fb23c8afc698b4b356d271bb8357b0
+  metadata.gz: 4c9f9f80031affe550184f7f107d7d712e11995eddf6b644b52558affa5a9b3e6778654176ee5b4c540967dbbf43536c854d8d0fd9251cb21726803d862539b9
+  data.tar.gz: ccc0a21928b7f598eb68a65bad34e8be0e52449ed65ef3fd9b8795d2876de549ae1e83c690909965cbf04c199451fe5d8adb6a83c820d85dcf2924b29633ac09

data/.github/CONTRIBUTING.md

@@ -0,0 +1,191 @@
+## Contributing to Libraries.io :heart:
+Thanks for considering contributing. These guidelines outline how to contribute to the [Libraries.io](http://github.com/librariesio) project.
+
+## Table of Contents
+[What is Libraries.io all about?](#whats-librariesio-about)
+
+[What should I know Before I get started?](#what-should-i-know-before-i-get-started)
+* [Code of conduct](#code-of-conduct)
+* [Langauge](#langauge)
+* [Installation and setup](#setup)
+
+[How can I contribute?](#how-can-i-contribute)
+* [Reporting bugs](#reporting-bugs)
+* [Suggesting enhancements](#suggesting-enhancements)
+* [Suggesting a new feature](#suggesting-new-features)
+* [Your first contribution](#your-first-contribution)
+* [Tackling something meatier](#tackling-something-meatier)
+
+[How can I talk to other contributors?](#how-can-i-talk-to-other-contributors)
+* [Chat](#chat)
+* [Video](#video)
+* [Social media](#twitter)
+
+[Who Are Libraries.io's Users?](#who-are-librariesios-users)
+
+[Our workflow](#workflow)
+
+
+## What's Libraries.io About?
+_Our goal is to raise the quality of all software._
+
+By outlining our [mission and strategy](/strategy.md) we hope to give you more power to make decisions and determine how best to spend your time. Specifically we tackle three distinct problems:
+
+* Discovery: _Helping developers make faster, more informed decisions about the software that they use._
+* Maintainability: _Helping maintainers understand more about the software they depend upon and the consumers of their software._
+* Sustainability: _Supporting undervalued software by highlighting shortfalls in contribution and funneling support to them._
+
+## What Should I Know Before I Get Started?
+
+### Code of Conduct
+Libraries.io is an open and inclusive [community of people](https://github.com/orgs/librariesio/people) working together. We expect contributors to abide by our [contributor code of conduct](CODE_OF_CONDUCT.md) which basically say 'be excellent to each other'. Please report unacceptable behavior to conduct@libraries.io
+
+### Language
+We communicate predominately in English. Contributions to the project should be made with English as the first language. We are happy for members of the community to communicate in a language other than English in chat, email and video but be aware that this might be considered exclusive by other members of the community.
+
+### Documentation
+Documentation for the project as a whole is available at [docs.libraries.io](https://docs.libraries.io). These pages are generated from the [documentation](https://github.com/librariesio/documentation) repo. Documentation that needs to be in every repo is replicated in [required-files](https://github.com/librariesio/required-files) (currently limited to [GitHub templates](https://github.com/blog/2111-issue-and-pull-request-templates)). Otherwise documentation will be specific to that repo. For example the main [Libraries.io](https://github.com/librariesio/libraries.io) `README.md` contains information about installing and running the main rails application.
+
+### Setup
+If you wish to make contributions to Libraries.io then you'll need a local version of the site to test. You can find instructions to install the correct Ruby version, Postgres, and to set up the database in our [README](https://github.com/librariesio/libraries.io/blob/master/README.md#getting-started).
+
+## How Can I Contribute?
+
+### Reporting Bugs
+
+The simplest thing that you can do to help us is by filing good bug reports, so here we go:
+
+#### Before Submitting a Bug Report
+
+* Double-check that the bug is persistent. The site is still in it's infancy and sometimes artifacts may appear and disappear.
+* Double-check the bug hasn't already been reported [on our issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio), they *should* be labelled `bug` or `bugsnag`.
+
+If something hasn't been raised, you can go ahead and create a new issue using [the template](/issue_template.md). If you'd like to help investigate further or fix the bug just mention it in your issue and check out our [workflow](#workflow).
+
+### Suggesting Enhancements
+
+The next simplest thing you can do to help us is by telling us how we can improve the features we already support, here we go:
+
+#### Before Submitting an Enhancement
+
+* Check that the enhancement is not already [in our issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio), they should be labelled 'enhancement'.
+
+If there isn't already an issue for feature then go ahead and create a new issue for it using the [template](/issue_template.md). If you'd like to work on the enhancement then just mention it in a comment and check out our [workflow](#workflow).
+
+### Suggesting New Features
+
+If you're into this zone then you need to understand a little more about what we're trying to achieve:
+
+#### Before Suggesting a Feature
+
+* Check that it aligns with [our strategy](strategy.md) and is specifically not in line with something we have said we will not do (for the moment this is anything to do with ranking *people*).
+* Check that the feature is not already [in our issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio), they should be tagged 'feature'.
+* Specifically check that it is not already a [funded commitment](https://github.com/librariesio/supporters/issues).
+
+If you're still thinking about that killer feature that no one else is thinking about then *please* create an issue for it using the [template](/issue_template.md).
+
+### Your First Contribution
+You're in luck! We label issues that are ideal for first time contributors with [`first-pr`](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Alibrariesio+label%3A%22first-pr%22). For someone who wants something a little more meaty you might find an issue that needs some assistance with [`help wanted`](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Alibrariesio+label%3A%22help+wanted%22). Next you'll want to read our [workflow](#workflow).
+
+### Tackling Something Meatier
+
+Tickets are labeled by size, skills required and to indicate workflow. Details can be found in our [labelling policy](/labelling.md).
+
+To get you started you might want to check out issues concerning [documentation](https://github.com/librariesio/documentation/issues/), [user experience](https://github.com/librariesio/libraries.io/labels/ux), [visual design](https://github.com/librariesio/libraries.io/issues/labels/visual%20design) or perhaps something already [awaiting help](https://github.com/librariesio/libraries.io/labels/help%20wanted). You may find the following useful:
+
+* Our [strategy](/strategy.md) which outlines what our goals are, how we are going to achieve those goals and what we are specifically going to avoid.
+* A [techncial overview](/overview.md) of the components that make up the Libraries.io project and run the [https://libraries.io](https://libraries.io) site.
+
+## How Can I Talk To Other Contributors?
+
+### Chat
+We use [Slack](http://slack.io) for chat. There's an open invitation available to anyone who wishes to join the conversation at [http://slack.libraries.io](http://slack.libraries.io).
+
+We try to use the following channels accordingly:
+
+* `#general` channel is used for general, water cooler-type conversation, contributor updates and issue discussion.
+* `#events` is used to share and discuss events that may be of interest to or attended by members of the community
+* `#activity` contains notifications from the various platforms that we use to keep the Libraries.io project turning. Including notifications from GitHub, Twitter and our servers.
+
+Members are encouraged to openly discuss their work, their lives, share views and ask for help using chat. It should be considered a *safe space* in which there is *no such thing as a stupid question*. Conversely no one contributor should ever be expected to have read something said in a chat. If someone should know something then it should be written down as an issue and/or documented in an obvious place for others to find.  
+
+### Video
+[Google Hangouts](http://hangouts.google.com) is our preferred tool for video chat. We operate an [open hangout](http://bit.ly/2kWtYak) for anyone to jump into at any time to discuss issues face to face.
+
+### Regular updates
+Contributors are encouraged to share what they're working on. We do this through daily or weekly updates in the `#general` channel on Slack. Updates should take the format 'currently working on X, expecting to move onto Y, blocked on Z' where x, y and z are issues in our [issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio).
+
+Additionally we host an [open hangout](http://bit.ly/2kWtYak) for any contributor to join at *5pm UTC on a Tuesday* to discuss their work, the next week's priorities and to ask questions of other contributors regarding any aspect of the project. Again this is considered a *safe space* in which *there is no such thing as a stupid question*.
+
+### Mail
+The [core team](https://github.com/orgs/librariesio/teams/core) operate a mailing list for project updates. If you'd like to subscribe you'll find a form in the footer on [Libraries.io](http://libraries.io).
+
+### Twitter
+We have an account on Twitter at [@librariesio](http://twitter.com/librariesio). This is predominately used to retweet news, events and musings by contributors rather than as a direct method of communication. Contributors are encouraged to use @librariesio in a tweet when talking about the project, so that we may retweet if appropriate. The account is moderated and protected by the [core team](https://github.com/orgs/librariesio/teams/core).
+
+### Facebook
+We have a Facebook page at [@libraries.io](https://www.facebook.com/libraries.io). Again this is predominantly used to gather and reflect news, events and musings by contributors rather than as a direct method of communication. Contributors are encouraged to reference Libraries.io in a post when talking about the project, so that we may reflect this if appropriate. Again the account is moderated and protected by the [core team](https://github.com/orgs/librariesio/teams/core).
+
+### Medium
+We have a Medium account at [@librariesio](https://medium.com/@librariesio) and once again it is used to reflect news, events and musings by contributors rather than a direct method of communication. Contributors are encouraged to reference @librariesio in a post when talking about the project, so that we may recommend it if appropriate. Again the account is moderated and protected by the [core team](https://github.com/orgs/librariesio/teams/core).
+
+## Who Are Libraries.io's Users?
+Libraries.io focusses on the following personas:
+
+### Google 
+_Is hungry for linked data so she can serve you up search traffic_
+
+### 'Searcher' 
+_Is a developer with a problem, she is looking for something to help solve it._ 
+
+### 'Producer' 
+_Has a product or products that incorporates some free/open source dependencies. She needs to ensure the product(s) are well maintained, free of vulnerabilities and licence compatible._
+
+### 'Maintainer'
+_Is a developer with a successful free/open source project. She's looking to understand more about those who use her project, attract more contributors and manage their contributions well._
+
+### 'Extender'
+_Has her own ideas. She wants access to the raw data so that she can mash up her own service and offer it to the world._
+
+### 'Overlord'
+_Has a vast empire of people, products and projects. Some of which she publishes as open source, some are proprietary. She wants to ensure that her policies regarding the use of dependencies are adhered to and that her team are as efficient as possible._
+
+## Workflow
+In general we use [GitHub](https://help.github.com/) and [Git](https://git-scm.com/docs/gittutorial) to support our workflow. If you are unfamiliar with those tools then you should check them out until you feel you have a basic understanding of GitHub and a working understanding of Git. Specifically you should understand how forking, branching, committing, PRing and merging works.
+
+#### Forking
+We prefer that contributors fork the project in order to contribute.
+
+#### Branching
+We *try* to use principles of [GitHub-flow](https://lucamezzalira.com/2014/03/10/git-flow-vs-github-flow/) in our branching model. That is the `master` branch will always be deployable to the live site, and that every branch from that will be used to add a feature, fix a bug, improve something or otherwise represent an atomic unit of work.
+
+#### Ticketing
+We *try* to create an issue for everything. That is any bug, feature or enhancement that is worth an open, focussed and documented discussion.
+
+#### Labelling
+We constrain labels as they are a key part of our workflow. Tickets will be labeled according to our [labelling policy](/labelling.md).
+
+#### Templates
+We use templates to guide contributors toward good practice in [filing bugs, requesting enhancements and features](/issue_template.md) and in [issuing pull-requests](/pull_request_template.md).
+
+#### Commenting
+If it possible to comment your contribution — for instance if you are contributing code — then do so in a way that is simple, clear, concise and lowers the level of understanding necessary for others to comprehend what comes afterward does or achieves. If you are contributing code it is very likely it will be rejected if it does not contain sufficient comments.
+
+#### Committing
+When committing to a branch be sure to use plain, simple language that describes the incremental changes made on the branch toward the overall goal. Avoid unnecessary complexity. Simplify whenever possible. Assume a reasonable but not comprehensive knowledge of the tools, techniques and context of your work.
+
+#### Testing
+When adding or fixing functionality, tests should be added to help reduce future regressions and breakage. All tests are ran automatically when new commits are pushed to a branch. Pull requests with broken/missing tests are not likely to be merged.
+
+#### Submitting for Review
+Once a piece of work (in a branch) is complete it should be readied for review. This is your last chance to ensure that your contribution is [properly tested](#testing). If you are contributing code it is likely your contribution will be rejected if it would lower the test-coverage. Once this is done you can submit a pull-request following the [template](/pull_request_template.md).
+
+It is likely that your contributions will need to be checked by at least one member of the [core team](https://github.com/orgs/librariesio/teams/core) prior to merging. It is also incredibly likely that your contribution may need some re-work in order to be accepted. Particularly if it lacks an appropriate level of comments, tests or it is difficult to understand your commits. Please do not take offense if this is the case. We understand that contributors give their time because they want to improve the project but please understand it is another's responsibility to ensure that the project is maintainable, and good practices like these are key to ensuring that is possible.
+
+#### Reviewing a PR
+We appreciate that it may be difficult to offer constructive criticism, but it is a necessary part of ensuring the project is maintainable and successful. If it is difficult to understand something, request it is better commented. If you do not feel assured of the robustness of a contribution, request it is better tested. If it is unclear what the goal of the piece of work is and how it relates to the [strategy](/strategy.md), request a clarification in the corresponding issue. If a pull-request has no corresponding issue, decreases code coverage or otherwise decreases the quality of the project. Reject it. Otherwise, merge it.
+
+#### Merging
+As we keep the `master` branch in a permanent state of 'deployment ready' once-merged your contribution will be live on the next deployment.
+#### Deploying
+Any member of the [deployers](https://github.com/orgs/librariesio/teams/deployers) team are able to redeploy the site. If you require a deployment then you might find one of them in our `#general` [chat channel on Slack](slack.libraries.io).

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+Thanks for taking the time to raise an issue. This template should guide you through the process of submitting a bug, enhancement or feature request. Please erase any part of this template that is not relevant to your issue. 
+
+## Bugs
+Before submitting a bug report:
+
+- [ ] Double-check that the bug is persistent,
+- [ ] Double-check the bug hasn't already been reported [on our issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio), they *should* be labelled `bug` or `bugsnag`.
+
+If you have completed those steps then please replace this section with a description of the steps taken to recreate the bug, the expected behavior and the observed behavior.
+
+## Enhancements and Features
+
+Before submitting an enhancement or feature request:
+
+- [ ] Check that the enhancement is not already [in our issue tracker](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+org%3Alibrariesio), they should be labelled 'enhancement'., 
+- [ ] For large feature requests, check that your request aligns with our strategy http://docs.libraries.io/strategy.
+ 
+If you have complete the above step then please replace this section with a description of your proposed enhancement or feature, the motivation for it, an approach and any alternative approaches considered, and whether you are willing and able to create a pull request for it. Note that we may close this issue if it's not something we're planning on working on.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+Thanks taking the time to contribute. This template should help guide you through the process of creating a pull request for review. Please erase any part of this template that is not relevant to your pull request:
+
+
+- [ ] Have you followed the guidelines for [contributors](http://docs.libraries.io/contributorshandbook)?
+- [ ] Have you checked to ensure there aren't other open pull requests on the repository for a similar change?
+- [ ] Is there a corresponding ticket for your pull request?
+- [ ] Have you written new tests for your changes?
+- [ ] Have you successfully run the project with your changes locally?
+
+If so then please replace this section with a link to the ticket(s) it addressed, an explanation of your change and why you think we should include it. Thanks again! 

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.4
+  - 2.4.0
 cache: bundler
 sudo: false

data/lib/spdx.rb

@@ -4,20 +4,19 @@ require "fuzzy_match"
 
 module Spdx
   def self.find(name)
-    name = name.downcase
-    lookup(name) || find_by_special_case(name) || closest(name)
+    lookup(name.strip) || find_by_special_case(name.strip) || closest(name.strip)
   end
 
   def self.lookup(name)
     return false if name.nil?
-    return SpdxLicenses[name] if SpdxLicenses[name]
+    return SpdxLicenses[name] if SpdxLicenses.exist?(name)
     lowercase = SpdxLicenses.data.keys.find{|k| k.downcase == name.downcase }
     SpdxLicenses[lowercase] if lowercase
   end
 
   def self.closest(name)
-    name = name.gsub(/#{stop_words.join('|')}/i, '')
-    name = name.gsub(/(\d)/, ' \1 ')
+    name.gsub!(/#{stop_words.join('|')}/i, '')
+    name.gsub!(/(\d)/, ' \1 ')
     best_match = fuzzy_match(name)
     return nil unless best_match
     lookup(best_match) || find_by_name(best_match)
@@ -116,7 +115,11 @@ module Spdx
       '2-clause bsdl' => 'BSD-2-clause',
       '3-clause bsdl' => 'BSD-3-clause',
       '2-clause bsd' => 'BSD-2-clause',
-      '3-clause bsd' => 'BSD-3-clause'
+      '3-clause bsd' => 'BSD-3-clause',
+      "bsd 3-clause" => 'BSD-3-clause',
+      "bsd 2-clause" => 'BSD-2-clause',
+      "two-clause bsd-style license" => 'BSD-2-clause',
+      "bsd style" => 'BSD-3-clause'
     }
   end
 

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spdx.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "spdx-licenses", "~> 1.0"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 11.1"
-  spec.add_development_dependency "rspec", "~> 3.4.0"
+  spec.add_development_dependency "rake", "~> 12"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
 end

data/spec/spdx_spec.rb

@@ -32,6 +32,10 @@ describe Spdx do
       expect(Spdx.find('UNLICENSE').name).to eq("The Unlicense")
     end
 
+    it "should strip whitespace from strings before lookups" do
+      expect(Spdx.find(" BSD-3-Clause").id).to eq("BSD-3-Clause")
+    end
+
     it "should return know licenses for special cases" do
       expect(Spdx.find('MPL1').name).to eq('Mozilla Public License 1.0')
       expect(Spdx.find('MPL1.0').name).to eq('Mozilla Public License 1.0')
@@ -84,6 +88,12 @@ describe Spdx do
       expect(Spdx.find('apache_v2').name).to eq('Apache License 2.0')
       expect(Spdx.find('lgpl_2_1').name).to eq('GNU Lesser General Public License v2.1 only')
       expect(Spdx.find('lgpl_v2_1').name).to eq('GNU Lesser General Public License v2.1 only')
+
+      expect(Spdx.find("BSD 3-Clause").name).to eq("BSD 3-clause \"New\" or \"Revised\" License")
+      expect(Spdx.find("BSD 3-clause").name).to eq("BSD 3-clause \"New\" or \"Revised\" License")
+      expect(Spdx.find("BSD 2-Clause").name).to eq("BSD 2-clause \"Simplified\" License")
+      expect(Spdx.find("BSD 2-clause").name).to eq("BSD 2-clause \"Simplified\" License")
+      expect(Spdx.find("BSD Style").name).to eq("BSD 3-clause \"New\" or \"Revised\" License")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spdx-licenses
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 description: 
 email:
 - andrewnez@gmail.com
@@ -87,11 +87,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md

data/CONTRIBUTING.md

@@ -1,10 +0,0 @@
-# Contributing
-
- * Fork the project.
- * Make your feature addition or bug fix.
- * Add tests for it. This is important so I don't break it in a future version unintentionally.
- * Send a pull request. Bonus points for topic branches.
-
-## Code of Conduct
-
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.