Merge branch 'master' into website

.noserc

@@ -7,7 +7,7 @@ with-doctest=1
 with-coverage=1
 cover-package=doorstop.common,doorstop.core,
     doorstop.cli.main,doorstop.cli.utilities,
-    doorstop.gui
+    doorstop.gui,doorstop.server
 cover-erase=1
 cover-min-percentage=100
 

.pylintrc

@@ -1,18 +1,18 @@
 [MESSAGES CONTROL]
 
-# I0011: Locally disabling %s
-# W0142: Used * or ** magic
+# I0011: locally disabling %s
+# W0142: used * or ** magic
 # W0511: TODO in comments
-disable=I0011,W0142,W0511
-
+# C0103: invalid constant name
+# RO904: too many public methods
+disable=I0011,W0142,W0511,C0103,R0904
 
 [REPORTS]
 
 reports=no
 
 msg-template={msg_id}:{line:3d},{column}:{msg}
 
-
 [FORMAT]
 
 max-line-length=79

CHANGES.md

@@ -9,6 +9,10 @@ Changelog
 - Added `Item.clear()` to save stamps (hashes) of linked items.
 - Added `Item.review()` to save stamps (hashes) of reviewed items.
 - Added `doorstop reorder ...` to organize a document's structure.
+- Renamed `Item.id` and `identifer` arguments to `uid`
+- Added '--no-body-levels' to `doorstop publish` to hide levels on non-headings.
+- Added `doorstop-server` to launch a REST API for UID reservation.
+- Added '--server' argument to `doorstop add` to specify the server address.
 
 0.7 (2014/07/08)
 ----------------

Makefile

@@ -30,6 +30,7 @@ else
 		OPEN := cygstart
 	else
 		OPEN := open
+		SUDO := sudo
 	endif
 endif
 
@@ -47,10 +48,10 @@ NOSE := $(BIN)/nosetests
 # Main Targets ###############################################################
 
 .PHONY: all
-all: doc $(ALL)
+all: $(ALL)
 $(ALL): $(SOURCES)
-	$(MAKE) check
-	touch $(ALL)  # flag to indicate all setup steps were succesful
+	$(MAKE) doc pep8 pep257
+	touch $(ALL)  # flag to indicate all setup steps were successful
 
 .PHONY: ci
 ci: doorstop pep8 pep257 test tests tutorial
@@ -87,18 +88,22 @@ $(DEPENDS_DEV): Makefile
 
 .PHONY: doorstop
 doorstop: env
-	$(BIN)/doorstop
+	$(BIN)/doorstop --quiet
 
 .PHONY: gui
 gui: env
 	$(BIN)/doorstop-gui
 
+.PHONY: serve
+serve: env
+	$(SUDO) $(BIN)/doorstop-server --debug --launch --port 80
+
 # Documentation ##############################################################
 
 .PHONY: doc
 doc: readme reqs uml apidocs sphinx
 
-.PHONY: pages 
+.PHONY: pages
 pages: reqs-html sphinx
 	cp -r docs/gen/ pages/reqs/
 	cp -r docs/sphinx/_build pages/docs/

README.md

@@ -80,7 +80,7 @@ Items can be added to the document and edited:
 
 Additional documents can be created that link to other documents:
 
-    $ doorstop new TST ./reqs/tests --parent REQ
+    $ doorstop create TST ./reqs/tests --parent REQ
     created document: TST (@/reqs/tests)
 
 Items can be added and linked to parent items:

docs/reqs/REQ002.yml

@@ -4,6 +4,6 @@ level: 1.0
 links: []
 normative: false
 ref: ''
-reviewed: 7d7b262d890f123a05e06cbdd7a223c9
+reviewed: 3b3afc2a86ebf8477a1f38abc53c2d61
 text: |
-  **Composition Features**
+  Composition Features

docs/reqs/REQ006.yml

@@ -4,6 +4,6 @@ level: 2.0
 links: []
 normative: false
 ref: ''
-reviewed: 0792a829c7fef72e30a3e00fb674d136
+reviewed: 4037bbff982c36941d587f224e9236f7
 text: |
-  **Presentation Features**
+  Presentation Features

docs/reqs/REQ010.yml

@@ -4,6 +4,6 @@ level: 3.0
 links: []
 normative: false
 ref: ''
-reviewed: 982ebee9fb9a59e91ad4acde59eda1d9
+reviewed: 9d5b3c0ab0e0d1c6759f173435d31bd7
 text: |
-  **Administration Features**
+  Administration Features

docs/sphinx/conf.py

@@ -15,8 +15,6 @@
 serve to show the default.
 """
 
-# pylint:disable=C0103
-
 from doorstop import __version__
 
 # If extensions (or modules to document with autodoc) are in another directory,

doorstop/__init__.py

@@ -5,6 +5,7 @@
 
 CLI = 'doorstop'
 GUI = 'doorstop-gui'
+SERVER = 'doorstop-server'
 VERSION = __project__ + '-' + __version__
 DESCRIPTION = "Requirements management using version control."
 
@@ -14,18 +15,6 @@
 if not sys.version_info >= MIN_PYTHON_VERSION:  # pragma: no cover (manual test)
     exit("Python {}.{}+ is required.".format(*MIN_PYTHON_VERSION))
 
-
-def _trace(self, message, *args, **kws):  # pragma: no cover (manual test)
-    """New logging level, TRACE."""
-    if self.isEnabledFor(logging.DEBUG - 1):
-        self._log(logging.DEBUG - 1, message, args, **kws)  # pylint: disable=W0212
-
-import logging
-logging.addLevelName(logging.DEBUG - 1, "TRACE")
-logging.Logger.trace = _trace
-
-log = logging.getLogger(__name__)  # pylint: disable=C0103
-
 try:
     from doorstop.common import DoorstopError, DoorstopWarning, DoorstopInfo
     from doorstop.core import Item, Document, Tree

doorstop/cli/__init__.py

@@ -1,5 +1 @@
 """Command-line interface for Doorstop."""
-
-import logging
-
-log = logging.getLogger(__name__)  # pylint: disable=C0103