fix version checking using packaging module

.gitignore

@@ -5,3 +5,4 @@
 *.pkg
 *.DS_Store
 local_tests/*
+pkg/jss_helper/payload/*

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [2.2.0b2] - 2020-02-13 - 2.2.0b2
+
+### Changed
+
+- Changed from distutils to packaging as `distutils.version.LooseVersion` was not working properly in python3.
+- `packaging` module is not included in the AutoPkg python distribution so it is now bundled into the 
+  jss_helper package.
+- Fixed output if running `jss_helper` without any arguments.
+
+
 ## [2.2.0b1] - 2020-02-13 - 2.2.0b1
 
 ### Changed
@@ -10,7 +21,7 @@ All notable changes to this project will be documented in this file. This projec
 	* AutoPkg 2.0.2
 	* JSSImporter 1.1.0
 	* python-jss 2.1.0
-	
+
 
 ## [2.1.0b2] - 2019-09-16 - 2.1.0b2
 

Makefile

@@ -4,7 +4,8 @@ PKG_ROOT := $(CURDIR)/pkg/jss_helper/payload
 PKG_BUILD := $(CURDIR)/pkg/jss_helper/build
 PKG_VERSION := $(shell defaults read $(CURDIR)/pkg/jss_helper/build-info.plist version)
 
-objects = $(PKG_ROOT)/usr/local/bin/jss_helper \
+objects = $(PKG_ROOT)/Library/AutoPkg/JSSImporter/packaging \
+	$(PKG_ROOT)/usr/local/bin/jss_helper \
 	$(PKG_ROOT)/usr/local/bin/jss_helper_lib
 
 
@@ -16,6 +17,12 @@ $(PKG_BUILD)/jss_helper-$(PKG_VERSION).pkg: $(objects)
 	cd $(CURDIR)/pkg && $(MUNKIPKG) jss_helper
 
 
+$(PKG_ROOT)/Library/AutoPkg/JSSImporter/packaging:
+	@echo "Installing packaging into JSSImporter support directory"
+	#pip install --install-option="--prefix=$(PKG_ROOT)/Library/AutoPkg/JSSImporter/packaging" --ignore-installed packaging
+	pip3 install --target "$(PKG_ROOT)/Library/AutoPkg/JSSImporter" --ignore-installed packaging
+
+
 $(PKG_ROOT)/usr/local/bin/jss_helper:
 	@echo "Copying jss_helper into /usr/local/bin"
 	mkdir -p "$(PKG_ROOT)/usr/local/bin"

jss_helper

@@ -88,7 +88,7 @@ sys.path.insert(0, '/Library/AutoPkg/JSSImporter')
 import jss
 
 
-__version__ = "2.2.0b1"
+__version__ = "2.2.0b2"
 
 
 def main():
@@ -103,7 +103,12 @@ def main():
     args = parser.parse_args()
 
     try:
-        args.func(args)
+        func = args.func
+    except AttributeError:
+        parser.error("too few arguments")
+
+    try:
+        func(args)
     except KeyboardInterrupt:
         # User wishes to bail.
         sys.exit(1)

jss_helper_lib/__init__.py

@@ -26,4 +26,4 @@
 from . import tools
 
 
-__version__ = "2.2.0b1"
+__version__ = "2.2.0b2"

jss_helper_lib/tools.py

@@ -23,7 +23,8 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
-from distutils.version import StrictVersion, LooseVersion
+from distutils.version import StrictVersion
+from packaging.version import parse as LooseVersion
 import fnmatch
 from operator import itemgetter
 import re
@@ -405,9 +406,12 @@ def get_updatable_policies(policies, packages):
         for package in packages_installed:
             pkg_name, pkg_version = get_package_info(package)
             if pkg_name in multiples:
-                if LooseVersion(pkg_version) < max(multiples[pkg_name]):
-                    updates_available.append(policy)
-                    break
+                try:
+                    if LooseVersion(pkg_version) < max(multiples[pkg_name]):
+                        updates_available.append(policy)
+                        break
+                except TypeError:
+                    pass
 
     # Make a new list of just names (rather than the full XML)
     updates_available_names = [policy.findtext("general/name") for policy in

pkg/jss_helper/build-info.plist

@@ -17,6 +17,6 @@
 	<key>suppress_bundle_relocation</key>
 	<true/>
 	<key>version</key>
-	<string>2.2.0b1</string>
+	<string>2.2.0b2</string>
 </dict>
 </plist>