Merge branch 'release/1.11.0'

.gitignore

@@ -18,6 +18,7 @@
 /.nrepl-history
 /test-data/
 /test/resources/data/grill/
+/test/resources/data/meta/
 /test/resources/data/test-search-strat/
 /test/resources/data/test-version-comparison/
 /test/resources/test-data/

TODO

@@ -1,13 +1,5 @@
-- [ ] When making more package systems, pass `options` to the thing
-      so that e.g. the helm chart package system can make smart decisions
-      about what repo to present based on conflict strategy.
-- [ ] Docs: package-system implies a *default* version comparison
-      algorithm consistent with what package system is used
-- [ ] Docs: generate-repo-index version comparison
-- [ ] Docs: resolve-locations version comparison
-- [ ] Docs: query-repo version comparison
-- [ ] Merge rpm/debian branch into develop, make it work
-- [ ] Create bintray repos for degasolv rpm and deb
-- [ ] Update docs to match for release
-- [ ] Release
-- [ ] With RPM/DEB, set up release
+- [ ] Docs:
+  - [ ] Set Up Guide
+  - [ ] Star me on GitHub
+  - [ ] Add new logo
+- [ ] BOOT fix so that most of build is in it

docs/changelog.rst

@@ -9,27 +9,28 @@ and this project adheres to `Semantic Versioning`_.
 .. _Semantic Versioning: http://semver.org/spec/v2.0.0.html
 .. _Keep a Changelog: http://keepachangelog.com/en/1.0.0/
 
-
-`Unreleased`_
--------------
+`1.11.0`_
+---------
 
 Added
 +++++
-
-Changed
-+++++++
-
-Fixed
-+++++
-
+- Added the ``--meta`` :ref:`option <meta-data>` to
+  :ref:`generate-card <generate-card-options>`
+- Added metadata a la ``--meta`` to the ``apt`` :ref:`package system
+  <package-system>` (experimental)
+- Added the ``edn`` :ref:`output format option <output-format>` for
+  the ``resolve-locations`` :ref:`subcommand <resolve-locations>`
+- Added the ``--output-format`` :ref:`option
+  <output-format-query-repo>` to the :ref:`query-repo <query-repo>`
+  command
 
 `1.10.0`_
 -------------
 
 Added
 +++++
-- Added the ``--output-format`` option to :ref:`resolve-locations
-  <resolve-locations-options>` 
+- Added the ``--output-format`` :ref:`option <output-format>` to
+  :ref:`resolve-locations <resolve-locations>`
 
 `1.9.0`_
 --------
@@ -38,9 +39,6 @@ Added
 +++++
 - Added the :ref:`pessimistic greater-than <pess-greater>` comparison operator ``><``.
 
-Changed
-+++++++
-
 Fixed
 +++++
 - Removed validation from the config file option, allowing it to be a URL or
@@ -54,12 +52,16 @@ Fixed
 
 Added
 +++++
-- Distribution is now done via RPM and Debian package as well as JAR file
-- Added the ``--version-comparison`` option :ref:`resolve-locations
-  <resolve-locations-options>` and :ref:`query-repo <query-repo-options>`,
-  allowing the user to specify which version comparison algorithm is used.
+- Distribution is now done via RPM and Debian package as well as JAR fil
+- Added the ``--version-comparison`` option to
+  :ref:`generate-repo-index <generate-repo-index>` (option :ref:`here
+  <version-comparison-generate>`), :ref:`resolve-locations
+  <resolve-locations>` (option :ref:`here <version-comparison-resolve>`)
+  and :ref:`query-repo <query-repo>` (option :ref:`here
+  <version-comparison-query>`), allowing the user to specify which
+  version comparison algorithm is used.
 - Added the ``--search-strat`` option to :ref:`resolve-locations
-  <resolve-locations-options>`, allowing users to select breadth first
+  <resolve-locations>`, allowing users to select breadth first
   search or depth first search during resolution
 - Added the :ref:`matches <matches>` operator (``<>REGEX``) which
   matches a version against a regex
@@ -94,7 +96,8 @@ Fixed
 
 Added
 +++++
-- Added ``--option-pack``, the ability to specify multiple options
+- Added ``--option-pack``, the ability to :ref:`specify multiple
+  options at once <option-pack>`
 
 Fixed
 +++++
@@ -108,7 +111,8 @@ Fixed
 Added
 +++++
 - Formatted docs better on the front page for PDF purposes
-- Add ability to use any (long) option on the command line in display-config
+- Add ability to use any (long) option on the command line in
+  :ref:`display-config <display-config-cli>`
 
 Improved
 ++++++++
@@ -117,9 +121,89 @@ Improved
 - Changed apt reop function from filtering a list to lookup in a map,
   increasing its speed
 
-.. _Unreleased: https://github.com/djhaskin987/degasolv/compare/1.10.0...HEAD
+`1.5.1`_
+--------
+
+Added
++++++
+
+- In just ~15 seconds, it slurps in a rather large apt repository
+Packages.gz file.  In another ~45 seconds, it resolves the
+ubuntu-desktop package, spitting out a grand total of 797 packages
+with their locations.
+
+Fixed
++++++
+
+- While using the apt data and package system to profile degasolv, I
+  found some rather nasty bugs. This release fixes them. This tool is
+  now ready for prime time.
+
+`1.5.0`_
+--------
+
+Added
++++++
+- Added the ``--disable-alternatives`` :ref:`option
+  <disable-alternatives>` and the ``--enable-alternatives``
+  :ref:`option <enable-alternatives>` for debugging purposes.
+
+`1.4.0`_
+--------
+
+Added
++++++
+
+- Added the ``--present-package`` :ref:`option <present-package>` and
+  the ``--package-system`` :ref:`option <package-system>` to the
+  :ref:`resolve-locations <resolve-locations>` subcommand.  This was so
+  that degasolv could be profiled using apt package repos
+  (real-world data) and thereby have its performance optimized.
+
+`1.3.0`_
+--------
+
+Added
++++++
+
+- Add standard input as a file type. All options which take a file name may now
+  have ``-`` given as the filename, to specify that standard in should be used.
+
+`1.2.0`_
+--------
+
+Added
++++++
+
+- Added the ability to specify multiple configuration files,
+  thus allowing for site-wide configuration.
+
+`1.1.0`_
+--------
+
+Added
++++++
+
+- Added the ``--conflict-strat`` :ref:`option <conflict-strat>` to the
+  :ref:`resolve-locations <resolve-locations>` subcommand.
+
+- Added docs and tests.
+
+1.0.2
+-----
+
+- This isn't the first release, but for the purposes of these docs, it is :D
+
+.. _Unreleased: https://github.com/djhaskin987/degasolv/compare/1.11.0...HEAD
+.. _1.10.0: https://github.com/djhaskin987/degasolv/compare/1.10.0...1.11.0
 .. _1.10.0: https://github.com/djhaskin987/degasolv/compare/1.9.0...1.10.0
 .. _1.9.0: https://github.com/djhaskin987/degasolv/compare/1.8.0...1.9.0
 .. _1.8.0: https://github.com/djhaskin987/degasolv/compare/1.7.0...1.8.0
 .. _1.7.0: https://github.com/djhaskin987/degasolv/compare/1.6.0...1.7.0
 .. _1.6.0: https://github.com/djhaskin987/degasolv/compare/1.5.1...1.6.0
+.. _1.5.1: https://github.com/djhaskin987/degasolv/compare/1.5.0...1.5.1
+.. _1.5.0: https://github.com/djhaskin987/degasolv/compare/1.4.0...1.5.0
+.. _1.4.0: https://github.com/djhaskin987/degasolv/compare/1.3.0...1.4.0
+.. _1.3.0: https://github.com/djhaskin987/degasolv/compare/1.2.0...1.3.0
+.. _1.2.0: https://github.com/djhaskin987/degasolv/compare/1.1.0...1.2.0
+.. _1.1.0: https://github.com/djhaskin987/degasolv/compare/1.0.2...1.1.0