Merge branch 'release/1.8.0'

.circleci/config.yml

@@ -0,0 +1,123 @@
+version: 2
+jobs:
+  script_tests:
+    docker:
+      - image: clojure:lein
+    version: 2
+    steps:
+      - checkout
+      - run:
+          command: |
+            set -ex
+            lein uberjar
+            # Script tests
+            for i in test/resources/scripts/*
+            do
+                ./${i}
+            done
+  lein_tests:
+    docker:
+      - image: clojure:lein
+    version: 2
+    steps:
+      - checkout
+      - run:
+          command: |
+            set -ex
+            lein test2junit
+            ls target/test-results
+            ls target/test-results/html
+            lein uberjar
+            buildutils/generate-manifest
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/uberjar/degasolv-*-standalone.jar
+            - target/manifest
+      - store_artifacts:
+          path: target/test-results/xml/
+          destination: test-results/xml
+      - store_artifacts:
+          path: target/test-results/html/
+          destination: test-results/html
+      - store_test_results:
+          path: target/test-results/xml/
+
+  package_ubuntu:
+    docker:
+      - image: alanfranz/fpm-within-docker:ubuntu-zesty
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/tested-artifacts
+      - checkout
+      - run: cp -af /tmp/tested-artifacts/target ./
+      - run: buildutils/package deb
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/package/*.deb
+      - store_artifacts:
+          path: target/package/
+          destination: package/
+
+  test_ubuntu_package:
+    docker:
+      - image: everve/ubuntu-docker-sudo:v1
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - run: cp -af /tmp/workspace/target ./
+      - run: buildutils/test-install-package-ubuntu
+
+  package_centos:
+    docker:
+      - image: alanfranz/fpm-within-docker:centos-7
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/tested-artifacts
+      - checkout
+      - run: cp -af /tmp/tested-artifacts/target ./
+      - run: buildutils/package rpm
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/package/*.rpm
+      - store_artifacts:
+          path: target/package/
+          destination: package/
+
+  test_centos_package:
+    docker:
+      - image: bzohdy/centos-sudo:latest
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - run: cp -af /tmp/workspace/target ./
+      - run: buildutils/test-install-package-centos
+
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - script_tests
+      - lein_tests
+      - package_ubuntu:
+          requires:
+            - lein_tests
+      - test_ubuntu_package:
+          requires:
+            - package_ubuntu
+      - package_centos:
+          requires:
+            - lein_tests
+      - test_centos_package:
+          requires:
+            - package_centos

.gitignore

@@ -18,6 +18,8 @@
 /.nrepl-history
 /test-data/
 /test/resources/data/grill/
+/test/resources/data/test-search-strat/
+/test/resources/data/test-version-comparison/
 /test/resources/test-data/
 /buildutils/boot
 /*.dscard
@@ -28,12 +30,14 @@ pom.xml
 pom.xml.asc
 *.jar
 *.class
+*.deb
+*.rpm
 /.lein-*
 /.nrepl-port
 .hgignore
 .hg/
 /.ve/
-foo.edn
+build.xml
 
 *.zip
 cmake/

Makefile

@@ -1,4 +1,4 @@
 check:
 	lein test
 all:
-	lein uberjar
+	./package

README.md

@@ -1,5 +1,9 @@
 ![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)
+
+[ ![Download for CentOS](https://api.bintray.com/packages/degasolv/centos/degasolv/images/download.svg) ](https://bintray.com/degasolv/centos/degasolv/_latestVersion)
+
 Degasolv
 ========
 

TODO

@@ -1,13 +1,13 @@
-- [ ] Add ``--remove-from``
-- [ ] Options imply other options, but these can be turned off
-- [ ] Make display-config work with ALL cmdline options.
-- [ ] Disable alternatives option
-- [ ] Add docs URL to help page.
-- [ ] Term hoisting tests both for found packages and present packages
-- [ ] Add test for validation checking of present packages in config files
-- [ ] Do something about `:any` in APT pkgsystem
-- [ ] Docs for `--present-package`
-- [ ] Docs for `--package-system`
-- [ ] Add tree returned value when `fast` is used.
-- [ ] Add option to print said tree when fast is used.
-- [ ] package systems for query repo.
+- [ ] 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

Vagrantfile

@@ -0,0 +1,77 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end