Merge branch 'release/1.9.0'

djha-skin · Sep 15, 2017 · fb065b4 · fb065b4
2 parents d521c91 + 6dfabba
commit fb065b4
Show file tree

Hide file tree

Showing 26 changed files with 15,709 additions and 189 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,8 +39,8 @@ jobs:
           path: target/test-results/xml/
           destination: test-results/xml
       - store_artifacts:
-          path: target/test-results/html/
-          destination: test-results/html
+          path: target/uberjar/
+          destination: uberjar/
       - store_test_results:
           path: target/test-results/xml/
 

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# 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 Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+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
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+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
+
+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
+representing a project or community include using an official project e-mail
+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
+
+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.
+
+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
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ![Degasolv Logo](https://github.com/djhaskin987/degasolv/raw/develop/Degasolv.png)
 
-[ ![Download for Ubuntu](https://api.bintray.com/packages/degasolv/ubuntu/degasolv/images/download.svg) ](https://bintray.com/degasolv/ubuntu/degasolv/_latestVersion)
+Ubuntu: [ ![Download for Ubuntu](https://api.bintray.com/packages/degasolv/ubuntu/degasolv/images/download.svg) ](https://bintray.com/degasolv/ubuntu/degasolv/_latestVersion)
 
-[ ![Download for CentOS](https://api.bintray.com/packages/degasolv/centos/degasolv/images/download.svg) ](https://bintray.com/degasolv/centos/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
 ========

diff --git a/ROADMAP.md b/ROADMAP.md
diff --git a/apt-depends-strings b/apt-depends-strings
diff --git a/buildutils/test-install-package-centos b/buildutils/test-install-package-centos
@@ -5,8 +5,8 @@ set -exuo
 . target/manifest
 
 find /tmp
-java -version
 sudo yum install -y /tmp/workspace/target/package/*.rpm
+java -version
 rpm -qi degasolv
 rpm -q --list degasolv
 degasolv --help
diff --git a/buildutils/test-install-package-ubuntu b/buildutils/test-install-package-ubuntu
@@ -5,10 +5,10 @@ set -exuo
 . target/manifest
 
 find /tmp
-java -version
 sudo apt-get update
 sudo dpkg -i /tmp/workspace/target/package/*.deb || :
 sudo apt-get install -y -f
+java -version
 dpkg-query -l degasolv
 dpkg-query -L degasolv
 degasolv --help
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -9,9 +9,27 @@ 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/
 
-`1.8.0`_
+`Unreleased`_
 -------------
 
+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
+  anything else.
+
+- If no arguments are given, the help screen is now printed instead of a wierd
+  error.
+
+`1.8.0`_
+--------
+
 Added
 +++++
 - Distribution is now done via RPM and Debian package as well as JAR file

diff --git a/docs/command-reference.rst b/docs/command-reference.rst
@@ -277,7 +277,7 @@ Explanation of options:
 
 - ``-v VERSION``, ``--version VERSION``, ``:version "VERSION"``:
   **Required**. Specify the name of the package described in the card
-  file. Version comparison is done via `version-clj`_.
+  file.
 
 - ``-l LOCATION``, ``--location LOCATION``, ``:location "LOCATION"``:
   **Required**. Specify the location of the file associated with the
@@ -891,6 +891,7 @@ This is interpreted as::
 
 .. _matches:
 .. _in-range:
+.. _pess-greater:
 
 Comparison Operators
 ++++++++++++++++++++
@@ -899,13 +900,13 @@ Each version predicate is composed of a comparison operator and a valid version
 against which to compare a package's fversion. The character sequences ``<``,
 ``<=``, ``!=``, ``==``, ``>=``, and ``>`` represent the comparisons "older
 than", "older than or equal to", "not equal to", "equal to", "newer than or
-equal to", and "newer than", respectively. In the current implementation,
-versions are compared using `version-clj`_ rules.
+equal to", and "newer than", respectively, using whatever version comparison
+algorithm was specified using the CLI, or using the maven version comparison
+algorithm by default.
 
 In addition to the above operators, two other version spec operators are
 provided:
 
-
   * The "matches" operator: ``<>``. This operator is given in a version spec
     as ``<>REGEX``. The version of any package found during the resolution
     process must match the given `java regular expression`_. Examples:
@@ -945,7 +946,27 @@ provided:
         version string as computed in the previous step, are
         considered for dependency resolution.
 
-.. _version-clj: https://github.com/xsc/version-clj#version-comparison
+  * The "pessimistic greater-than" operator: ``><``. This operator is given in
+    a version spec as ``><VERS``. The version of any package found during the
+    resolution process must be greater or equal to the given version but less
+    than the next major version. Examples:
+
+      * The expression ``><3.2.1`` matches the versions ``3.2.1``, ``3.4.3``
+        but not ``4.0.0`` or higher, nor does it match ``3.2.0``.
+      * The expression ``><3.3.3`` matches the versions ``3.3.3``, ``3.3.8``
+        and ``3.9.8`` but not ``4.0.0``.
+
+    "The next major version" is calculated similarly to how ranges are
+    calculated:
+
+      * The first found set of digit characters found in the ``VERS``
+        string are converted into a number and incremented. The
+        remainder of the version string after the incremented number
+        is discarded.
+      * Any versions comparing greater than or equal to the
+        original ``VERS`` string, but less this new "incremented"
+        version string as computed in the previous step, are
+        considered for dependency resolution.
 
 Examples
 ++++++++
@@ -961,6 +982,10 @@ interpretations:
 | ``"pine>1.0"``               | Find package ``pine`` of version newer than  |
 |                              | ``1.0``                                      |
 +------------------------------+----------------------------------------------+
+| ``"pine><3.4.1-alpha8"``     | Find package ``pine`` of version newer than  |
+|                              | or equal to ``3.4.1-alpha8`` but less than   |
+|                              | ``4``.                                       |
++------------------------------+----------------------------------------------+
 | ``"fir<>\\d+\\.8"``          | Find package ``fir`` containing "<digits>.8" |
 |                              | somewhere in the version string              |
 +------------------------------+----------------------------------------------+

diff --git a/docs/conf.py b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.8'
+version = '1.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.8.0'
+release = '1.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/get-degasolv.rst b/docs/get-degasolv.rst
@@ -8,14 +8,14 @@ Degasolv comes in the form of a ``.jar`` file, `downloadable from GitHub`_.
 
 As of version 1.8.0, it also comes in the form of an RPM or Debian package.
 
-To get the RPM, add the CentOS repository::
+To get the RPM, add the `CentOS bintray`_ repository::
 
   wget https://bintray.com/degasolv/centos/rpm -O bintray-degasolv-centos.repo
   sudo mv bintray-degasolv-centos.repo /etc/yum.repos.d/
   yum clean all
   yum makecache
 
-To get the debian package, add the Ubuntu repository::
+To get the debian package, add the `Ubuntu bintray`_ repository::
 
   echo "deb https://dl.bintray.com/degasolv/ubuntu stable main" | \
       sudo tee -a /etc/apt/sources.list.d/bintray-degasolv-ubuntu.list
@@ -29,6 +29,8 @@ Or, if you are using an OS package, it can be run simply like this::
   degasolv
 
 .. _downloadable from GitHub: https://github.com/djhaskin987/degasolv/releases
+.. _CentOS bintray: https://bintray.com/degasolv/centos/degasolv
+.. _Ubuntu bintray: https://bintray.com/degasolv/ubuntu/degasolv
 
 Code
 ----

diff --git a/example-degasolv.edn b/example-degasolv.edn
diff --git a/example-degasolvconfig.edn b/example-degasolvconfig.edn
diff --git a/generate-test-data b/generate-test-data
diff --git a/notes b/notes
diff --git a/project-config.edn b/project-config.edn
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject degasolv/degasolv "1.8.0"
+(defproject degasolv/degasolv "1.9.0"
   :description "Dependency tracker with an eye toward building and shipping software."
   :url "http://github.com/djhaskin987/degasolv"
   :license {:name "Eclipse Public License"

diff --git a/run-test-data b/run-test-data