Merge branch 'release/2.3.0'

alem0lars · Jun 8, 2017 · 581e384 · 581e384
2 parents a058af8 + c875226
commit 581e384
Show file tree

Hide file tree

Showing 22 changed files with 2,268 additions and 657 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,3 @@
 /website/source/docs/api
 /website/source/docs/coverage
 /website/source/docs/test-results.html
-
-Gemfile.lock
-
-target
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@
   [@alem0lars][@alem0lars]
 * Allow strict regex matching with '^'
   [@alem0lars][@alem0lars]
-* Enfore configuration elements to be inside `elems` directory.
+* Enforce configuration elements to be inside `elems` directory.
   [@alem0lars][@alem0lars]
 * Handle more than one feature `has_feature?` method.
   [@jak3][@jak3]
@@ -87,7 +87,10 @@
   [@alem0lars][@alem0lars]
 * Fix issue #46
   [@alem0lars][@alem0lars]
-
+* Fix sync issue, failing when both local and remote changed
+  [@alem0lars][@alem0lars]
+* Add `tree` data structure (based on the gem `evolve75/RubyTree`)
+  [@alem0lars][@alem0lars]
 
 ## Current and previous versions
 

diff --git a/COMMIT_MESSAGE_FORMAT.md b/COMMIT_MESSAGE_FORMAT.md
@@ -0,0 +1,63 @@
+# Commit Message Format
+
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
+to read on github as well as in various git tools.
+
+## Type
+
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug or adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing tests
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+
+## Scope
+
+The scope could be anything specifying place of the commit change.
+
+## Subject
+
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+## Body
+
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes"
+The body should include the motivation for the change and contrast this with previous behavior.
+
+## Footer
+
+The footer should contain any information about **Breaking Changes** and is also the place to
+reference GitHub issues that this commit **Closes**.
+
+**Breaking Changes** are detected as such if the footer contains a line starting with BREAKING CHANGE:
+(with optional newlines) The rest of the commit message is then used for this.
+
+A detailed explanation can be found in this [document][commit-message-format].
+
+Based on https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit
+
+<!-- Link declarations -->
+
+[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -68,6 +68,18 @@ Here are a few examples:
 * At the end of the entry, add an implicit link to your GitHub user page as `([@username][])`.
 * If this is your first contribution to fizzy project, add a link definition for the implicit link to the bottom of the changelog as `[@username]: https://github.com/username`.
 
+## FAQ
+
+### Q: Certificates errors on Windows
+
+If you're developing with Windows you may encounter errors about certificates
+that can't be verified.
+
+To fix:
+
+1. Download the pem file from: https://curl.haxx.se/ca/cacert.pem
+2. Set the environment variable `SSL_CERT_FILE` to point to the downloaded file
+
 ----
 
 **Thank you for your contribution!**
@@ -83,6 +95,6 @@ Here are a few examples:
 
 [houndci]: https://houndci.com
 
-[good_commit_message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[good_commit_message]: ./COMMIT_MESSAGE_FORMAT.md
 
 [markdown_syntax]: http://daringfireball.net/projects/markdown/syntax
diff --git a/Dockerfile b/Dockerfile
diff --git a/Gemfile b/Gemfile
@@ -9,20 +9,20 @@ group :development do
   gem "rake", require: false
 
   # Generate ruby code from the grammars definitions.
-  gem "racc", "~> 1.4", require: false
+  gem "racc", require: false
 
-  # Lint
-  gem "rubocop",       require: false
-  gem "rubocop-rspec", require: false
+  # Lint.
+  gem "rainbow", "=2.0", require: false # XXX workaround, see issue #44.
+  gem "rubocop",         require: false
+  gem "rubocop-rspec",   require: false
 
-  # Testing
+  # Testing.
   gem "rspec",    require: false
   gem "fuubar",   require: false
   gem "cucumber", require: false
 
   # Improve IRB, adding some features.
-  gem "irbtools",      require: false
-  gem "irbtools-more", require: false
+  gem "irbtools", require: "irbtools/binding"
 
   # Print inspected Ruby objects; useful when debugging.
   gem "awesome_print"
@@ -39,8 +39,6 @@ group :development do
 
 end
 
-gem "did_you_mean", "~> 0.9"
-
 group :website do
   # For faster file watcher updates on Windows.
   gem "wdm", "~> 0.1.0", platforms: [:mswin, :mingw]