Merge pull request #79 from jacebrowning/release/v1.4

Release v1.4

.travis.yml

@@ -1,8 +1,6 @@
 language: python
 python:
-  - 3.3
-  - 3.4
-  - 3.5
+  - 3.6
 
 cache:
   pip: true
@@ -15,7 +13,7 @@ env:
     - PIPENV_NOSPIN=true
 
 before_install:
-  - pip install pipenv
+  - make setup
   - make doctor
 
 install:

.verchew.ini

@@ -9,7 +9,7 @@ version = GNU Make
 
 cli = python
 
-version = Python 3.5.
+version = Python 3.6.
 
 
 [pipenv]

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Revision History
 
+## 1.4 (2017/04/18)
+
+- Added color to display the state of running applications.
+- Dropped support for Python 3.3, 3.4, and 3.5.
+
 ## 1.3 (2017/03/13)
 
 - Ignored conflicting program name ("iTunes Helper.app").

Makefile

@@ -11,7 +11,7 @@ MODULES := $(wildcard $(PACKAGE)/*.py)
 # Python settings
 ifndef TRAVIS
 	PYTHON_MAJOR ?= 3
-	PYTHON_MINOR ?= 5
+	PYTHON_MINOR ?= 6
 endif
 
 # System paths
@@ -74,8 +74,7 @@ run: install
 
 .PHONY: setup
 setup:
-	pip install pipenv==3.5.0
-	pipenv lock
+	pip install pipenv==3.5.6
 	touch Pipfile
 
 .PHONY: doctor
@@ -104,7 +103,7 @@ else ifdef LINUX
 endif
 	@ touch $@
 
-$(METADATA): $(PIP)
+$(METADATA): $(PIP) setup.py
 	$(PYTHON) setup.py develop
 	@ touch $@
 
@@ -150,7 +149,7 @@ PYTEST_OPTIONS := $(PYTEST_CORE_OPTIONS) $(PYTEST_RANDOM_OPTIONS)
 ifndef DISABLE_COVERAGE
 PYTEST_OPTIONS += $(PYTEST_COV_OPTIONS)
 endif
-PYTEST_RURUN_OPTIONS := $(PYTEST_CORE_OPTIONS) --last-failed --exitfirst
+PYTEST_RERUN_OPTIONS := $(PYTEST_CORE_OPTIONS) --last-failed --exitfirst
 
 .PHONY: test
 test: test-all ## Run unit and integration tests
@@ -164,14 +163,14 @@ test-unit: install
 
 .PHONY: test-int
 test-int: install
-	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_OPTIONS_FAILFAST) tests; fi
+	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_RERUN_OPTIONS) tests; fi
 	@ rm -rf $(FAILURES)
 	$(PYTEST) $(PYTEST_OPTIONS) tests --junitxml=$(REPORTS)/integration.xml
 	$(COVERAGE_SPACE) $(REPOSITORY) integration
 
 .PHONY: test-all
 test-all: install
-	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_OPTIONS_FAILFAST) $(PACKAGES); fi
+	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_RERUN_OPTIONS) $(PACKAGES); fi
 	@ rm -rf $(FAILURES)
 	$(PYTEST) $(PYTEST_OPTIONS) $(PACKAGES) --junitxml=$(REPORTS)/overall.xml
 	$(COVERAGE_SPACE) $(REPOSITORY) overall

Pipfile

@@ -6,27 +6,20 @@ verify_ssl = true
 testpackage = "*"
 
 [dev-packages]
+pylint = "~=1.7.0"
 pycodestyle = "*"
 pydocstyle = "*"
-pytest = "*"
-pytest-describe = "*"
-pytest-expecter = "*"
+pytest = "~=3.0.7"
+pytest-describe = "==0.11.0"
+pytest-expecter = "==0.2.2.post6"
 pytest-cov = "*"
 pytest-random = "*"
-coverage = "*"
-"coverage.space" = ">=0.7.2"
+coverage = "~=4.0"
+"coverage.space" = "~=0.8"
 mkdocs = "*"
 docutils = "*"
 wheel = "*"
 twine = "*"
 sniffer = "*"
 Pygments = "*"
 PyInstaller = "*"
-
-[dev-packages.pylint]
-git = "https://github.com/PyCQA/pylint.git"
-ref = "e0fdd25c214e60bef10fbaa46252f4aaa74de8c2"
-
-[dev-packages.astroid]
-git = "https://github.com/PyCQA/astroid.git"
-ref = "4e7d9fee4080d2e0db67a3e0463be8b196e56a95"

README.md

@@ -32,7 +32,7 @@ and some just don't make sense to keep running on all your computers:
 
 ## Requirements
 
-* Python 3.3+
+* Python 3.6+
 
 ## Installation
 

mine/__init__.py

@@ -1,7 +1,7 @@
 """Package for mine."""
 
 __project__ = 'mine'
-__version__ = '1.3'
+__version__ = '1.4'
 
 CLI = 'mine'
 VERSION = '{0} v{1}'.format(__project__, __version__)

mine/cli.py

@@ -140,8 +140,6 @@ def run(path=None, cleanup=True, delay=None,
         return manager.launch(path)
     if delete:
         return services.delete_conflicts(root, force=force)
-    if log.getEffectiveLevel() >= logging.WARNING:
-        print("Updating application state...")
 
     if switch is True:
         switch = computer

mine/manager.py

@@ -28,11 +28,11 @@ def wrapped(self, application):
         log.debug("Determining if %s is running...", application)
         running = func(self, application)
         if running is None:
-            status = "Untracked"
+            status = "Application untracked"
         elif running:
-            status = "Running"
+            status = "Application running on current machine"
         else:
-            status = "Not running"
+            status = "Application not running on current machine"
         log.info("%s: %s", status, application)
         return running
     return wrapped

mine/models/application.py

@@ -29,7 +29,8 @@ class Properties(yorm.types.AttributeDictionary):
 class Application(NameMixin, yorm.types.AttributeDictionary):
     """Dictionary of application information."""
 
-    def __init__(self, name, properties=None, filename=None, versions=None):
+    def __init__(self, name=None, properties=None, versions=None,
+                 filename=None):
         super().__init__()
         self.name = name
         self.properties = properties or Properties()

mine/models/computer.py

@@ -18,7 +18,7 @@
 class Computer(NameMixin, yorm.types.AttributeDictionary):
     """A dictionary of identifying computer information."""
 
-    def __init__(self, name, hostname=None, address=None):
+    def __init__(self, name=None, hostname=None, address=None):
         super().__init__()
         self.name = name
         self.address = address or self.get_address()