Merge branch 'release/1.12.0'

.circleci/config.yml

@@ -2,19 +2,13 @@ version: 2
 jobs:
   script_tests:
     docker:
-      - image: clojure:lein
+      - image: djhaskin987/lein-script-tester:latest
     version: 2
     steps:
       - checkout
       - run:
           command: |
-            set -ex
-            lein uberjar
-            # Script tests
-            for i in test/resources/scripts/*
-            do
-                ./${i}
-            done
+            test/resources/scripts/test-all
   lein_tests:
     docker:
       - image: clojure:lein

.gitignore

@@ -22,6 +22,9 @@
 /test/resources/data/test-search-strat/
 /test/resources/data/test-version-comparison/
 /test/resources/test-data/
+/test/resources/data/test-option-packs/
+/test/resources/data/test-json-config/
+/test/resources/data/test-query-output-format/
 /buildutils/boot
 /*.dscard
 /*.dsrepo

AUTHORS.md

@@ -2,3 +2,6 @@ We thank everyone that has contributed to Degasolv!
 
 Authors:
   - Daniel Jay Haskin
+
+Contributions:
+  - Logo contributed to Degasolv by James Toney

README.md

@@ -1,11 +1,7 @@
 ![Degasolv Logo](https://github.com/djhaskin987/degasolv/raw/develop/Degasolv.png)
 
-Ubuntu: [ ![Download for Ubuntu](https://api.bintray.com/packages/degasolv/ubuntu/degasolv/images/download.svg) ](https://bintray.com/degasolv/ubuntu/degasolv/_latestVersion)
-
-CentOS: [ ![Download for CentOS](https://api.bintray.com/packages/degasolv/centos/degasolv/images/download.svg) ](https://bintray.com/degasolv/centos/degasolv/_latestVersion)
 
-Degasolv
-========
+# Degasolv
 
 Degasolv is a generic dependency resolver that will work across
 programming language boundaries, customizable to fit the needs of
@@ -15,6 +11,83 @@ build engineers who are just trying to get their software built.
 
 Named for *Degas* the painter, and it's a *Solv*er.
 
+
+## Download
+
+
+
+Ubuntu: [ ![Download for Ubuntu](https://api.bintray.com/packages/degasolv/ubuntu/degasolv/images/download.svg) ](https://bintray.com/degasolv/ubuntu/degasolv/_latestVersion)
+
+CentOS: [ ![Download for CentOS](https://api.bintray.com/packages/degasolv/centos/degasolv/images/download.svg) ](https://bintray.com/degasolv/centos/degasolv/_latestVersion)
+
+See the [releases](https://github.com/djhaskin987/degasolv/releases)
+tab for more (including the jar file).
+
+## Quick Start
+
+This quickstart is meant to be illustrative. For ideas on how to use
+degasolv in real life, have a look at
+[A Longer Example](http://degasolv.readthedocs.io/en/latest/longer-example.html).
+
+**Given these artifacts**:
+
+  - `http://example.com/repo/a-1.0.zip`
+  - `http://example.com/repo/b-2.0.zip`
+  - `http://example.com/repo/b-3.0.zip`
+
+1. Generate dscard files to represent them in a degasolv respository,
+   like this:
+
+```
+      $ java -jar degasolv-<version>-standalone.jar generate-card \
+          --id "a" \
+          --version "1.0" \
+          --location "https://example.com/repo/a-1.0.zip" \
+          --requirement "b>2.0" \
+          --card-file "$PWD/a-1.0.zip.dscard"
+
+      $ java -jar degasolv-<version>-standalone.jar generate-card \
+          --id "b" \
+          --version "2.0" \
+          --location "https://example.com/repo/b-2.0.zip" \
+          --card-file "$PWD/b-2.0.zip.dscard"
+
+      $ java -jar degasolv-<version>-standalone.jar generate-card \
+          --id "b" \
+          --version "3.0" \
+          --location "https://example.com/repo/b-3.0.zip" \
+          --card-file "$PWD/b-2.0.zip.dscard"
+```
+
+2. Generate a `dsrepo` file from the cards:
+
+```
+    $ java -jar degasolv-<version>-standalone.jar \
+          generate-repo-index \
+          --search-directory $PWD \
+          --index-file $PWD/index.dsrepo
+```
+
+3. Then use the `dsrepo` file to resolve dependencies:
+
+```
+      $ java -jar degasolv-<version>-standalone.jar \
+          resolve-locations \
+          --repository $PWD/index.dsrepo \
+          --requirement "b"
+```
+
+   This should return something like this:
+
+```
+      a==1.0 @ http://example.com/repo/a-1.0.zip
+      b==3.0 @ http://example.com/repo/b-3.0.zip
+```
+
+To see the help page, call degasolv or any of its subcommands with the
+`-h` option. If this is your first time using degasolv, it's
+recommended that you read [A Longer Example](http://degasolv.readthedocs.io/en/latest/longer-example.html).
+
 ## Installation, Quick Start, Tutorials, Reference?
 
 See [Read the Docs](http://degasolv.readthedocs.io/en/develop/).

TODO

@@ -1,5 +1,12 @@
+- [ ] Docs: common pitfall of subproc: "name" vs "id" in json or
+  strings vs keywords in EDN
+- [ ] Add plugin or backend / whatever repo thing command option
+- [ ] Fork process, get back information, parse it, use that as a map-repo. That's how
+      the plugins work.
+  - Do work on this for new plugin architecture
+- [ ] Deprecate backend in docs
+- [ ] Subcommand `search-repo`
 - [ ] Docs:
   - [ ] Set Up Guide
-  - [ ] Star me on GitHub
-  - [ ] Add new logo
+  - [ ] Use cases section
 - [ ] BOOT fix so that most of build is in it

docs/changelog.rst

@@ -1,3 +1,5 @@
+.. _Degasolv Changelog:
+
 Changelog
 =========
 
@@ -9,6 +11,35 @@ 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`_
+---------
+
+Added
++++++
+
+- Added the ``--{enable|disable}-error-format`` options to
+  :ref:`resolve-locations <enable-error-format-resolve>` and
+  :ref:`query-repo <enable-error-format-query>`.
+
+- Added the ``--package-system subproc`` option, together with its
+  :ref:`subproc-exe` and :ref:`subproc-output-format` options.
+
+- Added the ``--json-config`` :ref:`global option <json-config>` allowing users
+  to use JSON config files
+
+- Added the ``--list-strat`` option to :ref:`resolve-locations
+  <list-strategy>`, allowing users to have their dependencies listed in a sane
+  order.
+
+Changed
++++++++
+
+Fixed
++++++
+
+- JSON/EDN output for ``query-repo`` erroneously listed the subcommand as
+  ``resolve-locations``. Fixed.
+
 `1.11.0`_
 ---------
 
@@ -134,9 +165,9 @@ 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.
+  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
 +++++
@@ -201,7 +232,7 @@ Added
 - 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.11.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

CODE_OF_CONDUCT.md → docs/code-of-conduct.rst

@@ -1,15 +1,20 @@
-# Contributor Covenant Code of Conduct
+.. _Code of Conduct:
 
-## Our Pledge
+Contributor Covenant Code of Conduct
+====================================
+
+Our Pledge
+----------
 
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+our community a harassment-free experience for everyone, regardless of age,
+body size, disability, ethnicity, gender identity and expression, level of
+experience, nationality, personal appearance, race, religion, or sexual
+identity and orientation.
 
-## Our Standards
+Our Standards
+-------------
 
 Examples of behavior that contributes to creating a positive environment
 include:
@@ -23,15 +28,16 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
-advances
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
   address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+Our Responsibilities
+--------------------
 
 Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
@@ -43,7 +49,8 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-## Scope
+Scope
+-----
 
 This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
@@ -52,23 +59,26 @@ address, posting via an official social media account, or acting as an appointed
 representative at an online or offline event. Representation of a project may be
 further defined and clarified by project maintainers.
 
-## Enforcement
+Enforcement
+-----------
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at "djhaskin987 at gmail.com" . All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+obligated to maintain confidentiality with regard to the reporter of an
+incident.  Further details of specific enforcement policies may be posted
+separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 
-## Attribution
+Attribution
+-----------
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the `Contributor Covenant homepage`_,
+`version 1.4`_.
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+.. _Contributor Covenant homepage: http://contributor-covenant.org
+.. _version 1.4: http://contributor-covenant.org/version/1/4/