From 96c77bab17da3af3d1fb5da34e2f55c3732a43e3 Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 18:58:38 +0200
Subject: [PATCH 01/10] New repository structure

---
 README.md                                     |  68 +++++++++---------
 behavioral/__init__.py                        |   0
 catalog.py => behavioral/catalog.py           |   0
 chain.py => behavioral/chain.py               |   0
 .../chaining_method.py                        |   0
 command.py => behavioral/command.py           |   0
 iterator.py => behavioral/iterator.py         |   0
 mediator.py => behavioral/mediator.py         |   0
 memento.py => behavioral/memento.py           |   0
 observer.py => behavioral/observer.py         |   0
 .../publish_subscribe.py                      |   0
 registry.py => behavioral/registry.py         |   0
 .../specification.py                          |   0
 state.py => behavioral/state.py               |   0
 strategy.py => behavioral/strategy.py         |   0
 template.py => behavioral/template.py         |   0
 test_command.py => behavioral/test_command.py |   0
 .../test_observer.py                          |   0
 .../test_publish_subscribe.py                 |   0
 test_state.py => behavioral/test_state.py     |   0
 .../test_strategy.py                          |   0
 visitor.py => behavioral/visitor.py           |   0
 creational/__init__.py                        |   0
 .../abstract_factory.py                       |   0
 borg.py => creational/borg.py                 |   0
 builder.py => creational/builder.py           |   0
 .../factory_method.py                         |   0
 .../lazy_evaluation.py                        |   0
 pool.py => creational/pool.py                 |   0
 prototype.py => creational/prototype.py       |   0
 .../test_abstract_factory.py                  |   0
 test_borg.py => creational/test_borg.py       |   0
 fundamental/__init__.py                       |   0
 .../delegation_pattern.py                     |   0
 other/__init__.py                             |   0
 blackboard.py => other/blackboard.py          |   0
 graph_search.py => other/graph_search.py      |   0
 other/hsm/__init__.py                         |   0
 classes_hsm.png => other/hsm/classes_hsm.png  | Bin
 .../hsm/classes_test_hsm.png                  | Bin
 hsm.py => other/hsm/hsm.py                    |   2 +-
 test_hsm.py => other/hsm/test_hsm.py          |   0
 3-tier.py => structural/3-tier.py             |   0
 structural/__init__.py                        |   0
 adapter.py => structural/adapter.py           |   0
 bridge.py => structural/bridge.py             |   0
 composite.py => structural/composite.py       |   0
 decorator.py => structural/decorator.py       |   0
 facade.py => structural/facade.py             |   0
 flyweight.py => structural/flyweight.py       |   0
 .../front_controller.py                       |   0
 mvc.py => structural/mvc.py                   |   0
 proxy.py => structural/proxy.py               |   0
 test_adapter.py => structural/test_adapter.py |   0
 test_bridge.py => structural/test_bridge.py   |   0
 .../test_flyweight.py                         |   0
 test_proxy.py => structural/test_proxy.py     |   0
 57 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 behavioral/__init__.py
 rename catalog.py => behavioral/catalog.py (100%)
 rename chain.py => behavioral/chain.py (100%)
 rename chaining_method.py => behavioral/chaining_method.py (100%)
 rename command.py => behavioral/command.py (100%)
 rename iterator.py => behavioral/iterator.py (100%)
 rename mediator.py => behavioral/mediator.py (100%)
 rename memento.py => behavioral/memento.py (100%)
 rename observer.py => behavioral/observer.py (100%)
 rename publish_subscribe.py => behavioral/publish_subscribe.py (100%)
 rename registry.py => behavioral/registry.py (100%)
 rename specification.py => behavioral/specification.py (100%)
 rename state.py => behavioral/state.py (100%)
 rename strategy.py => behavioral/strategy.py (100%)
 rename template.py => behavioral/template.py (100%)
 rename test_command.py => behavioral/test_command.py (100%)
 rename test_observer.py => behavioral/test_observer.py (100%)
 rename test_publish_subscribe.py => behavioral/test_publish_subscribe.py (100%)
 rename test_state.py => behavioral/test_state.py (100%)
 rename test_strategy.py => behavioral/test_strategy.py (100%)
 rename visitor.py => behavioral/visitor.py (100%)
 create mode 100644 creational/__init__.py
 rename abstract_factory.py => creational/abstract_factory.py (100%)
 rename borg.py => creational/borg.py (100%)
 rename builder.py => creational/builder.py (100%)
 rename factory_method.py => creational/factory_method.py (100%)
 rename lazy_evaluation.py => creational/lazy_evaluation.py (100%)
 rename pool.py => creational/pool.py (100%)
 rename prototype.py => creational/prototype.py (100%)
 rename test_abstract_factory.py => creational/test_abstract_factory.py (100%)
 rename test_borg.py => creational/test_borg.py (100%)
 create mode 100644 fundamental/__init__.py
 rename delegation_pattern.py => fundamental/delegation_pattern.py (100%)
 create mode 100644 other/__init__.py
 rename blackboard.py => other/blackboard.py (100%)
 rename graph_search.py => other/graph_search.py (100%)
 create mode 100644 other/hsm/__init__.py
 rename classes_hsm.png => other/hsm/classes_hsm.png (100%)
 rename classes_test_hsm.png => other/hsm/classes_test_hsm.png (100%)
 rename hsm.py => other/hsm/hsm.py (98%)
 rename test_hsm.py => other/hsm/test_hsm.py (100%)
 rename 3-tier.py => structural/3-tier.py (100%)
 create mode 100644 structural/__init__.py
 rename adapter.py => structural/adapter.py (100%)
 rename bridge.py => structural/bridge.py (100%)
 rename composite.py => structural/composite.py (100%)
 rename decorator.py => structural/decorator.py (100%)
 rename facade.py => structural/facade.py (100%)
 rename flyweight.py => structural/flyweight.py (100%)
 rename front_controller.py => structural/front_controller.py (100%)
 rename mvc.py => structural/mvc.py (100%)
 rename proxy.py => structural/proxy.py (100%)
 rename test_adapter.py => structural/test_adapter.py (100%)
 rename test_bridge.py => structural/test_bridge.py (100%)
 rename test_flyweight.py => structural/test_flyweight.py (100%)
 rename test_proxy.py => structural/test_proxy.py (100%)
 mode change 100755 => 100644

diff --git a/README.md b/README.md
index 6d637eac..f69d8567 100644
--- a/README.md
+++ b/README.md
@@ -13,52 +13,54 @@ __Creational Patterns__:
 
 | Pattern | Description |
 |:-------:| ----------- |
-| [abstract_factory](abstract_factory.py) | use a generic function with specific factories |
-| [borg](borg.py) | a singleton with shared-state among instances |
-| [builder](builder.py) | instead of using multiple constructors, builder object receives parameters and returns constructed objects |
-| [factory_method](factory_method.py) | delegate a specialized function/method to create instances |
-| [lazy_evaluation](lazy_evaluation.py) | lazily-evaluated property pattern in Python |
-| [pool](pool.py) | preinstantiate and maintain a group of instances of the same type |
-| [prototype](prototype.py) | use a factory and clones of a prototype for new instances (if instantiation is expensive) |
+| [abstract_factory](creational/abstract_factory.py) | use a generic function with specific factories |
+| [borg](creational/borg.py) | a singleton with shared-state among instances |
+| [builder](creational/builder.py) | instead of using multiple constructors, builder object receives parameters and returns constructed objects |
+| [factory_method](creational/factory_method.py) | delegate a specialized function/method to create instances |
+| [lazy_evaluation](creational/lazy_evaluation.py) | lazily-evaluated property pattern in Python |
+| [pool](creational/pool.py) | preinstantiate and maintain a group of instances of the same type |
+| [prototype](creational/prototype.py) | use a factory and clones of a prototype for new instances (if instantiation is expensive) |
 
 __Structural Patterns__:
 
 | Pattern | Description |
 |:-------:| ----------- |
-| [3-tier](3-tier.py) | data<->business logic<->presentation separation (strict relationships) |
-| [adapter](adapter.py) | adapt one interface to another using a white-list |
-| [bridge](bridge.py) | a client-provider middleman to soften interface changes |
-| [composite](composite.py) | encapsulate and provide access to a number of different objects |
-| [decorator](decorator.py) | wrap functionality with other functionality in order to affect outputs |
-| [facade](facade.py) | use one class as an API to a number of others |
-| [flyweight](flyweight.py) | transparently reuse existing instances of objects with similar/identical state |
-| [front_controller](front_controller.py) | single handler requests coming to the application |
-| [mvc](mvc.py) | model<->view<->controller (non-strict relationships) |
-| [proxy](proxy.py) | an object funnels operations to something else |
+| [3-tier](structural/3-tier.py) | data<->business logic<->presentation separation (strict relationships) |
+| [adapter](structural/adapter.py) | adapt one interface to another using a white-list |
+| [bridge](structural/bridge.py) | a client-provider middleman to soften interface changes |
+| [composite](structural/composite.py) | encapsulate and provide access to a number of different objects |
+| [decorator](structural/decorator.py) | wrap functionality with other functionality in order to affect outputs |
+| [facade](structural/facade.py) | use one class as an API to a number of others |
+| [flyweight](structural/flyweight.py) | transparently reuse existing instances of objects with similar/identical state |
+| [front_controller](structural/front_controller.py) | single handler requests coming to the application |
+| [mvc](structural/mvc.py) | model<->view<->controller (non-strict relationships) |
+| [proxy](structural/proxy.py) | an object funnels operations to something else |
 
 __Behavioral Patterns__:
 
 | Pattern | Description |
 |:-------:| ----------- |
-| [chain](chain.py) | apply a chain of successive handlers to try and process the data |
-| [catalog](catalog.py) | general methods will call different specialized methods based on construction parameter |
-| [chaining_method](chaining_method.py) | continue callback next object method |
-| [command](command.py) | bundle a command and arguments to call later |
-| [mediator](mediator.py) | an object that knows how to connect other objects and act as a proxy |
-| [memento](memento.py) | generate an opaque token that can be used to go back to a previous state |
-| [observer](observer.py) | provide a callback for notification of events/changes to data |
-| [publish_subscribe](publish_subscribe.py) | a source syndicates events/data to 0+ registered listeners |
-| [registry](registry.py) | keep track of all subclasses of a given class |
-| [specification](specification.py) |  business rules can be recombined by chaining the business rules together using boolean logic |
-| [state](state.py) | logic is organized into a discrete number of potential states and the next state that can be transitioned to |
-| [strategy](strategy.py) | selectable operations over the same data |
-| [template](template.py) | an object imposes a structure but takes pluggable components |
-| [visitor](visitor.py) | invoke a callback for all items of a collection |
+| [chain](behavioral/chain.py) | apply a chain of successive handlers to try and process the data |
+| [catalog](behavioral/catalog.py) | general methods will call different specialized methods based on construction parameter |
+| [chaining_method](behavioral/chaining_method.py) | continue callback next object method |
+| [command](behavioral/command.py) | bundle a command and arguments to call later |
+| [iterator](behavioral/iterator.py) | traverse a container and access the container's elements |
+| [mediator](behavioral/mediator.py) | an object that knows how to connect other objects and act as a proxy |
+| [memento](behavioral/memento.py) | generate an opaque token that can be used to go back to a previous state |
+| [observer](behavioral/observer.py) | provide a callback for notification of events/changes to data |
+| [publish_subscribe](behavioral/publish_subscribe.py) | a source syndicates events/data to 0+ registered listeners |
+| [registry](behavioral/registry.py) | keep track of all subclasses of a given class |
+| [specification](behavioral/specification.py) |  business rules can be recombined by chaining the business rules together using boolean logic |
+| [state](behavioral/state.py) | logic is organized into a discrete number of potential states and the next state that can be transitioned to |
+| [strategy](behavioral/strategy.py) | selectable operations over the same data |
+| [template](behavioral/template.py) | an object imposes a structure but takes pluggable components |
+| [visitor](behavioral/visitor.py) | invoke a callback for all items of a collection |
 
 
 __Others__:
 
 | Pattern | Description |
 |:-------:| ----------- |
-| [blackboard](blackboard.py) | (architectural model, assemble different sub-system knowledge to build a solution, AI approach - non gang of four pattern) |
-| [graph_search](graph_search.py) | (graphing algorithms, not design patterns) |
+| [blackboard](other/blackboard.py) | architectural model, assemble different sub-system knowledge to build a solution, AI approach - non gang of four pattern |
+| [graph_search](other/graph_search.py) | graphing algorithms - non gang of four pattern |
+| [hsm](other/hsm/hsm.py) | hierarchical state machine - non gang of four pattern |
diff --git a/behavioral/__init__.py b/behavioral/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/catalog.py b/behavioral/catalog.py
similarity index 100%
rename from catalog.py
rename to behavioral/catalog.py
diff --git a/chain.py b/behavioral/chain.py
similarity index 100%
rename from chain.py
rename to behavioral/chain.py
diff --git a/chaining_method.py b/behavioral/chaining_method.py
similarity index 100%
rename from chaining_method.py
rename to behavioral/chaining_method.py
diff --git a/command.py b/behavioral/command.py
similarity index 100%
rename from command.py
rename to behavioral/command.py
diff --git a/iterator.py b/behavioral/iterator.py
similarity index 100%
rename from iterator.py
rename to behavioral/iterator.py
diff --git a/mediator.py b/behavioral/mediator.py
similarity index 100%
rename from mediator.py
rename to behavioral/mediator.py
diff --git a/memento.py b/behavioral/memento.py
similarity index 100%
rename from memento.py
rename to behavioral/memento.py
diff --git a/observer.py b/behavioral/observer.py
similarity index 100%
rename from observer.py
rename to behavioral/observer.py
diff --git a/publish_subscribe.py b/behavioral/publish_subscribe.py
similarity index 100%
rename from publish_subscribe.py
rename to behavioral/publish_subscribe.py
diff --git a/registry.py b/behavioral/registry.py
similarity index 100%
rename from registry.py
rename to behavioral/registry.py
diff --git a/specification.py b/behavioral/specification.py
similarity index 100%
rename from specification.py
rename to behavioral/specification.py
diff --git a/state.py b/behavioral/state.py
similarity index 100%
rename from state.py
rename to behavioral/state.py
diff --git a/strategy.py b/behavioral/strategy.py
similarity index 100%
rename from strategy.py
rename to behavioral/strategy.py
diff --git a/template.py b/behavioral/template.py
similarity index 100%
rename from template.py
rename to behavioral/template.py
diff --git a/test_command.py b/behavioral/test_command.py
similarity index 100%
rename from test_command.py
rename to behavioral/test_command.py
diff --git a/test_observer.py b/behavioral/test_observer.py
similarity index 100%
rename from test_observer.py
rename to behavioral/test_observer.py
diff --git a/test_publish_subscribe.py b/behavioral/test_publish_subscribe.py
similarity index 100%
rename from test_publish_subscribe.py
rename to behavioral/test_publish_subscribe.py
diff --git a/test_state.py b/behavioral/test_state.py
similarity index 100%
rename from test_state.py
rename to behavioral/test_state.py
diff --git a/test_strategy.py b/behavioral/test_strategy.py
similarity index 100%
rename from test_strategy.py
rename to behavioral/test_strategy.py
diff --git a/visitor.py b/behavioral/visitor.py
similarity index 100%
rename from visitor.py
rename to behavioral/visitor.py
diff --git a/creational/__init__.py b/creational/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/abstract_factory.py b/creational/abstract_factory.py
similarity index 100%
rename from abstract_factory.py
rename to creational/abstract_factory.py
diff --git a/borg.py b/creational/borg.py
similarity index 100%
rename from borg.py
rename to creational/borg.py
diff --git a/builder.py b/creational/builder.py
similarity index 100%
rename from builder.py
rename to creational/builder.py
diff --git a/factory_method.py b/creational/factory_method.py
similarity index 100%
rename from factory_method.py
rename to creational/factory_method.py
diff --git a/lazy_evaluation.py b/creational/lazy_evaluation.py
similarity index 100%
rename from lazy_evaluation.py
rename to creational/lazy_evaluation.py
diff --git a/pool.py b/creational/pool.py
similarity index 100%
rename from pool.py
rename to creational/pool.py
diff --git a/prototype.py b/creational/prototype.py
similarity index 100%
rename from prototype.py
rename to creational/prototype.py
diff --git a/test_abstract_factory.py b/creational/test_abstract_factory.py
similarity index 100%
rename from test_abstract_factory.py
rename to creational/test_abstract_factory.py
diff --git a/test_borg.py b/creational/test_borg.py
similarity index 100%
rename from test_borg.py
rename to creational/test_borg.py
diff --git a/fundamental/__init__.py b/fundamental/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/delegation_pattern.py b/fundamental/delegation_pattern.py
similarity index 100%
rename from delegation_pattern.py
rename to fundamental/delegation_pattern.py
diff --git a/other/__init__.py b/other/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/blackboard.py b/other/blackboard.py
similarity index 100%
rename from blackboard.py
rename to other/blackboard.py
diff --git a/graph_search.py b/other/graph_search.py
similarity index 100%
rename from graph_search.py
rename to other/graph_search.py
diff --git a/other/hsm/__init__.py b/other/hsm/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/classes_hsm.png b/other/hsm/classes_hsm.png
similarity index 100%
rename from classes_hsm.png
rename to other/hsm/classes_hsm.png
diff --git a/classes_test_hsm.png b/other/hsm/classes_test_hsm.png
similarity index 100%
rename from classes_test_hsm.png
rename to other/hsm/classes_test_hsm.png
diff --git a/hsm.py b/other/hsm/hsm.py
similarity index 98%
rename from hsm.py
rename to other/hsm/hsm.py
index 13c5a657..e40d88c4 100644
--- a/hsm.py
+++ b/other/hsm/hsm.py
@@ -1,5 +1,5 @@
 """
-Implementation of the HSM (hierachrical state machine) or
+Implementation of the HSM (hierarchical state machine) or
 NFSM (nested finite state machine) C++ example from
 http://www.eventhelix.com/RealtimeMantra/HierarchicalStateMachine.htm#.VwqLVEL950w
 in Python
diff --git a/test_hsm.py b/other/hsm/test_hsm.py
similarity index 100%
rename from test_hsm.py
rename to other/hsm/test_hsm.py
diff --git a/3-tier.py b/structural/3-tier.py
similarity index 100%
rename from 3-tier.py
rename to structural/3-tier.py
diff --git a/structural/__init__.py b/structural/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/adapter.py b/structural/adapter.py
similarity index 100%
rename from adapter.py
rename to structural/adapter.py
diff --git a/bridge.py b/structural/bridge.py
similarity index 100%
rename from bridge.py
rename to structural/bridge.py
diff --git a/composite.py b/structural/composite.py
similarity index 100%
rename from composite.py
rename to structural/composite.py
diff --git a/decorator.py b/structural/decorator.py
similarity index 100%
rename from decorator.py
rename to structural/decorator.py
diff --git a/facade.py b/structural/facade.py
similarity index 100%
rename from facade.py
rename to structural/facade.py
diff --git a/flyweight.py b/structural/flyweight.py
similarity index 100%
rename from flyweight.py
rename to structural/flyweight.py
diff --git a/front_controller.py b/structural/front_controller.py
similarity index 100%
rename from front_controller.py
rename to structural/front_controller.py
diff --git a/mvc.py b/structural/mvc.py
similarity index 100%
rename from mvc.py
rename to structural/mvc.py
diff --git a/proxy.py b/structural/proxy.py
similarity index 100%
rename from proxy.py
rename to structural/proxy.py
diff --git a/test_adapter.py b/structural/test_adapter.py
similarity index 100%
rename from test_adapter.py
rename to structural/test_adapter.py
diff --git a/test_bridge.py b/structural/test_bridge.py
similarity index 100%
rename from test_bridge.py
rename to structural/test_bridge.py
diff --git a/test_flyweight.py b/structural/test_flyweight.py
similarity index 100%
rename from test_flyweight.py
rename to structural/test_flyweight.py
diff --git a/test_proxy.py b/structural/test_proxy.py
old mode 100755
new mode 100644
similarity index 100%
rename from test_proxy.py
rename to structural/test_proxy.py

From 3fb570dff06a966ef68929a94dd045b73138044a Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:05:36 +0200
Subject: [PATCH 02/10] Fix command test new folder paths

---
 behavioral/test_command.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/behavioral/test_command.py b/behavioral/test_command.py
index 584b273b..4873a0fd 100644
--- a/behavioral/test_command.py
+++ b/behavioral/test_command.py
@@ -25,8 +25,8 @@ def setUpClass(self):
         - get the temporary test directory
         - and initializes the command stack.
         """
-        os.mkdir('test_command')
-        open('test_command/foo.txt', 'w').close()
+        os.mkdir('behavioral/test_command')
+        open('behavioral/test_command/foo.txt', 'w').close()
         self.__get_test_directory()
         self.command_stack = []
         self.command_stack.append(MoveFileCommand(os.path.join(self.test_dir, 'foo.txt'), os.path.join(self.test_dir, 'bar.txt')))
@@ -54,7 +54,7 @@ def tearDownClass(self):
         """
         Remove the temporary directory /test_command and its content.
         """
-        shutil.rmtree('test_command')
+        shutil.rmtree('behavioral/test_command')
 
 if __name__ == "__main__":
     unittest.main()

From 7507dc38c88c3af068b2a53fbbbd9b91c75746f4 Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:07:33 +0200
Subject: [PATCH 03/10] Fix strategy test new folder paths

---
 behavioral/test_strategy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/behavioral/test_strategy.py b/behavioral/test_strategy.py
index 22bfe43d..d569c5c5 100644
--- a/behavioral/test_strategy.py
+++ b/behavioral/test_strategy.py
@@ -21,7 +21,7 @@ def test_print_output(self):
         The expected_output is equivalent to the output on the command
         line when running 'python strategy.py'.
         """
-        output = subprocess.check_output(["python", "strategy.py"])
+        output = subprocess.check_output(["python", "behavioral/strategy.py"])
         expected_output = os.linesep.join([
             'Strategy Example 0',
             'Strategy Example 1 from execute 1',

From f6eb4a5fd5c506c46dd771b4a9570d1022206078 Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:31:03 +0200
Subject: [PATCH 04/10] Fix subdirectories coverage run

---
 run_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_all.sh b/run_all.sh
index 1a90150d..0b962bdf 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -11,7 +11,7 @@ if which coverage > /dev/null; then
 else
     COVERAGE=''
 fi
-for f in [^_]*py; do
+for f in */[^_]*py; do
     python $COVERAGE $f || failed+=" $f"
     echo "I: done $f. Exit code $?"
 done;

From fead507520544e01e96900dadc30685cb8dfd5ca Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:38:34 +0200
Subject: [PATCH 05/10] Fix relative imports in tests for 3x python versions
 proper test run

---
 behavioral/test_command.py           | 2 +-
 behavioral/test_observer.py          | 2 +-
 behavioral/test_publish_subscribe.py | 2 +-
 behavioral/test_state.py             | 2 +-
 creational/test_abstract_factory.py  | 2 +-
 creational/test_borg.py              | 2 +-
 structural/test_adapter.py           | 2 +-
 structural/test_bridge.py            | 2 +-
 structural/test_flyweight.py         | 2 +-
 structural/test_proxy.py             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/behavioral/test_command.py b/behavioral/test_command.py
index 4873a0fd..cee5dd67 100644
--- a/behavioral/test_command.py
+++ b/behavioral/test_command.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from command import MoveFileCommand
+from .command import MoveFileCommand
 import os, shutil, subprocess, sys
 
 if sys.version_info < (2, 7):
diff --git a/behavioral/test_observer.py b/behavioral/test_observer.py
index 733ee633..0efa8049 100644
--- a/behavioral/test_observer.py
+++ b/behavioral/test_observer.py
@@ -3,7 +3,7 @@
 
 import sys
 from io import StringIO
-from observer import Subject, Data, DecimalViewer, HexViewer
+from .observer import Subject, Data, DecimalViewer, HexViewer
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest
diff --git a/behavioral/test_publish_subscribe.py b/behavioral/test_publish_subscribe.py
index 962a1299..2636df9b 100644
--- a/behavioral/test_publish_subscribe.py
+++ b/behavioral/test_publish_subscribe.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from sys import version_info
-from publish_subscribe import Provider, Publisher, Subscriber
+from .publish_subscribe import Provider, Publisher, Subscriber
 
 if version_info < (2, 7):  # pragma: no cover
     import unittest2 as unittest
diff --git a/behavioral/test_state.py b/behavioral/test_state.py
index e96f8fbe..d4754880 100644
--- a/behavioral/test_state.py
+++ b/behavioral/test_state.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from state import Radio
+from .state import Radio
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/creational/test_abstract_factory.py b/creational/test_abstract_factory.py
index c43b655a..449bbb12 100644
--- a/creational/test_abstract_factory.py
+++ b/creational/test_abstract_factory.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
+from .abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/creational/test_borg.py b/creational/test_borg.py
index 97470eaf..bfe38666 100644
--- a/creational/test_borg.py
+++ b/creational/test_borg.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from borg import Borg, YourBorg
+from .borg import Borg, YourBorg
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/structural/test_adapter.py b/structural/test_adapter.py
index 1961127d..26614b04 100644
--- a/structural/test_adapter.py
+++ b/structural/test_adapter.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from adapter import Dog, Cat, Human, Car, Adapter
+from .adapter import Dog, Cat, Human, Car, Adapter
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/structural/test_bridge.py b/structural/test_bridge.py
index c4db5e8c..21180d79 100644
--- a/structural/test_bridge.py
+++ b/structural/test_bridge.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from bridge import DrawingAPI1, DrawingAPI2, CircleShape
+from .bridge import DrawingAPI1, DrawingAPI2, CircleShape
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/structural/test_flyweight.py b/structural/test_flyweight.py
index 11017ad5..3f6afee6 100644
--- a/structural/test_flyweight.py
+++ b/structural/test_flyweight.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from flyweight import Card
+from .flyweight import Card
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/structural/test_proxy.py b/structural/test_proxy.py
index 839b4130..5b27970e 100644
--- a/structural/test_proxy.py
+++ b/structural/test_proxy.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from proxy import Proxy, NoTalkProxy
+from .proxy import Proxy, NoTalkProxy
 import sys
 from time import time
 

From 61ec45da8ab0b5b35d23956c9127875d7f8555de Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:51:37 +0200
Subject: [PATCH 06/10] Add separate tests directory

---
 tests/__init__.py                               | 0
 {creational => tests}/test_abstract_factory.py  | 2 +-
 {structural => tests}/test_adapter.py           | 2 +-
 {creational => tests}/test_borg.py              | 2 +-
 {structural => tests}/test_bridge.py            | 2 +-
 {behavioral => tests}/test_command.py           | 2 +-
 {structural => tests}/test_flyweight.py         | 2 +-
 {other/hsm => tests}/test_hsm.py                | 2 +-
 {behavioral => tests}/test_observer.py          | 2 +-
 {structural => tests}/test_proxy.py             | 2 +-
 {behavioral => tests}/test_publish_subscribe.py | 2 +-
 {behavioral => tests}/test_state.py             | 2 +-
 {behavioral => tests}/test_strategy.py          | 0
 13 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 tests/__init__.py
 rename {creational => tests}/test_abstract_factory.py (95%)
 rename {structural => tests}/test_adapter.py (97%)
 rename {creational => tests}/test_borg.py (94%)
 rename {structural => tests}/test_bridge.py (96%)
 rename {behavioral => tests}/test_command.py (97%)
 rename {structural => tests}/test_flyweight.py (96%)
 rename {other/hsm => tests}/test_hsm.py (98%)
 rename {behavioral => tests}/test_observer.py (96%)
 rename {structural => tests}/test_proxy.py (98%)
 rename {behavioral => tests}/test_publish_subscribe.py (97%)
 rename {behavioral => tests}/test_state.py (98%)
 rename {behavioral => tests}/test_strategy.py (100%)

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/creational/test_abstract_factory.py b/tests/test_abstract_factory.py
similarity index 95%
rename from creational/test_abstract_factory.py
rename to tests/test_abstract_factory.py
index 449bbb12..86fd3cd1 100644
--- a/creational/test_abstract_factory.py
+++ b/tests/test_abstract_factory.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from .abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
+from ..creational.abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/structural/test_adapter.py b/tests/test_adapter.py
similarity index 97%
rename from structural/test_adapter.py
rename to tests/test_adapter.py
index 26614b04..dec916ac 100644
--- a/structural/test_adapter.py
+++ b/tests/test_adapter.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from .adapter import Dog, Cat, Human, Car, Adapter
+from ..structural.adapter import Dog, Cat, Human, Car, Adapter
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/creational/test_borg.py b/tests/test_borg.py
similarity index 94%
rename from creational/test_borg.py
rename to tests/test_borg.py
index bfe38666..1c6ba8ea 100644
--- a/creational/test_borg.py
+++ b/tests/test_borg.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from .borg import Borg, YourBorg
+from ..creational.borg import Borg, YourBorg
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/structural/test_bridge.py b/tests/test_bridge.py
similarity index 96%
rename from structural/test_bridge.py
rename to tests/test_bridge.py
index 21180d79..a9ad23b7 100644
--- a/structural/test_bridge.py
+++ b/tests/test_bridge.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from .bridge import DrawingAPI1, DrawingAPI2, CircleShape
+from ..structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/behavioral/test_command.py b/tests/test_command.py
similarity index 97%
rename from behavioral/test_command.py
rename to tests/test_command.py
index cee5dd67..ac7b30bd 100644
--- a/behavioral/test_command.py
+++ b/tests/test_command.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from .command import MoveFileCommand
+from ..behavioral.command import MoveFileCommand
 import os, shutil, subprocess, sys
 
 if sys.version_info < (2, 7):
diff --git a/structural/test_flyweight.py b/tests/test_flyweight.py
similarity index 96%
rename from structural/test_flyweight.py
rename to tests/test_flyweight.py
index 3f6afee6..d7013a51 100644
--- a/structural/test_flyweight.py
+++ b/tests/test_flyweight.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from .flyweight import Card
+from ..structural.flyweight import Card
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/other/hsm/test_hsm.py b/tests/test_hsm.py
similarity index 98%
rename from other/hsm/test_hsm.py
rename to tests/test_hsm.py
index 79e38440..99369b7e 100644
--- a/other/hsm/test_hsm.py
+++ b/tests/test_hsm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from hsm import HierachicalStateMachine, UnsupportedMessageType,\
+from ..other.hsm.hsm import HierachicalStateMachine, UnsupportedMessageType,\
     UnsupportedState, UnsupportedTransition, Active, Standby, Suspect, Failed
 from sys import version_info
 
diff --git a/behavioral/test_observer.py b/tests/test_observer.py
similarity index 96%
rename from behavioral/test_observer.py
rename to tests/test_observer.py
index 0efa8049..88029f77 100644
--- a/behavioral/test_observer.py
+++ b/tests/test_observer.py
@@ -3,7 +3,7 @@
 
 import sys
 from io import StringIO
-from .observer import Subject, Data, DecimalViewer, HexViewer
+from ..behavioral.observer import Subject, Data, DecimalViewer, HexViewer
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest
diff --git a/structural/test_proxy.py b/tests/test_proxy.py
similarity index 98%
rename from structural/test_proxy.py
rename to tests/test_proxy.py
index 5b27970e..fe37dccd 100644
--- a/structural/test_proxy.py
+++ b/tests/test_proxy.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from .proxy import Proxy, NoTalkProxy
+from ..structural.proxy import Proxy, NoTalkProxy
 import sys
 from time import time
 
diff --git a/behavioral/test_publish_subscribe.py b/tests/test_publish_subscribe.py
similarity index 97%
rename from behavioral/test_publish_subscribe.py
rename to tests/test_publish_subscribe.py
index 2636df9b..f63c67a4 100644
--- a/behavioral/test_publish_subscribe.py
+++ b/tests/test_publish_subscribe.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from sys import version_info
-from .publish_subscribe import Provider, Publisher, Subscriber
+from ..behavioral.publish_subscribe import Provider, Publisher, Subscriber
 
 if version_info < (2, 7):  # pragma: no cover
     import unittest2 as unittest
diff --git a/behavioral/test_state.py b/tests/test_state.py
similarity index 98%
rename from behavioral/test_state.py
rename to tests/test_state.py
index d4754880..71083e82 100644
--- a/behavioral/test_state.py
+++ b/tests/test_state.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from .state import Radio
+from ..behavioral.state import Radio
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/behavioral/test_strategy.py b/tests/test_strategy.py
similarity index 100%
rename from behavioral/test_strategy.py
rename to tests/test_strategy.py

From 0ceb25c7387a6c26ea641271f3d301dcb90dae5a Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 19:55:13 +0200
Subject: [PATCH 07/10] Fix relative import beyond toplevel package in tests

---
 tests/test_abstract_factory.py  | 2 +-
 tests/test_adapter.py           | 2 +-
 tests/test_borg.py              | 2 +-
 tests/test_bridge.py            | 2 +-
 tests/test_command.py           | 2 +-
 tests/test_flyweight.py         | 2 +-
 tests/test_hsm.py               | 2 +-
 tests/test_observer.py          | 2 +-
 tests/test_proxy.py             | 2 +-
 tests/test_publish_subscribe.py | 2 +-
 tests/test_state.py             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/test_abstract_factory.py b/tests/test_abstract_factory.py
index 86fd3cd1..095b2fa9 100644
--- a/tests/test_abstract_factory.py
+++ b/tests/test_abstract_factory.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from ..creational.abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
+from creational.abstract_factory import PetShop, Dog, Cat, DogFactory, CatFactory
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/tests/test_adapter.py b/tests/test_adapter.py
index dec916ac..da3fdc38 100644
--- a/tests/test_adapter.py
+++ b/tests/test_adapter.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ..structural.adapter import Dog, Cat, Human, Car, Adapter
+from structural.adapter import Dog, Cat, Human, Car, Adapter
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/tests/test_borg.py b/tests/test_borg.py
index 1c6ba8ea..66af05dc 100644
--- a/tests/test_borg.py
+++ b/tests/test_borg.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ..creational.borg import Borg, YourBorg
+from creational.borg import Borg, YourBorg
 import sys
 
 if sys.version_info < (2, 7):
diff --git a/tests/test_bridge.py b/tests/test_bridge.py
index a9ad23b7..7a1f44f0 100644
--- a/tests/test_bridge.py
+++ b/tests/test_bridge.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from ..structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
+from structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/tests/test_command.py b/tests/test_command.py
index ac7b30bd..e0fd6ec1 100644
--- a/tests/test_command.py
+++ b/tests/test_command.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ..behavioral.command import MoveFileCommand
+from behavioral.command import MoveFileCommand
 import os, shutil, subprocess, sys
 
 if sys.version_info < (2, 7):
diff --git a/tests/test_flyweight.py b/tests/test_flyweight.py
index d7013a51..dfb9c635 100644
--- a/tests/test_flyweight.py
+++ b/tests/test_flyweight.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from ..structural.flyweight import Card
+from structural.flyweight import Card
 from sys import version_info
 
 if version_info < (2, 7):  # pragma: no cover
diff --git a/tests/test_hsm.py b/tests/test_hsm.py
index 99369b7e..c9cff983 100644
--- a/tests/test_hsm.py
+++ b/tests/test_hsm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ..other.hsm.hsm import HierachicalStateMachine, UnsupportedMessageType,\
+from other.hsm.hsm import HierachicalStateMachine, UnsupportedMessageType,\
     UnsupportedState, UnsupportedTransition, Active, Standby, Suspect, Failed
 from sys import version_info
 
diff --git a/tests/test_observer.py b/tests/test_observer.py
index 88029f77..25456041 100644
--- a/tests/test_observer.py
+++ b/tests/test_observer.py
@@ -3,7 +3,7 @@
 
 import sys
 from io import StringIO
-from ..behavioral.observer import Subject, Data, DecimalViewer, HexViewer
+from behavioral.observer import Subject, Data, DecimalViewer, HexViewer
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest
diff --git a/tests/test_proxy.py b/tests/test_proxy.py
index fe37dccd..8df407e3 100644
--- a/tests/test_proxy.py
+++ b/tests/test_proxy.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from ..structural.proxy import Proxy, NoTalkProxy
+from structural.proxy import Proxy, NoTalkProxy
 import sys
 from time import time
 
diff --git a/tests/test_publish_subscribe.py b/tests/test_publish_subscribe.py
index f63c67a4..8b30a0f1 100644
--- a/tests/test_publish_subscribe.py
+++ b/tests/test_publish_subscribe.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from sys import version_info
-from ..behavioral.publish_subscribe import Provider, Publisher, Subscriber
+from behavioral.publish_subscribe import Provider, Publisher, Subscriber
 
 if version_info < (2, 7):  # pragma: no cover
     import unittest2 as unittest
diff --git a/tests/test_state.py b/tests/test_state.py
index 71083e82..49167032 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ..behavioral.state import Radio
+from behavioral.state import Radio
 import sys
 
 if sys.version_info < (2, 7):

From 7ba8d8229e2c0b9509131141c90e90cfaca5837b Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 20:10:34 +0200
Subject: [PATCH 08/10] Fix command test new folder paths and relative import
 beyond toplevel package in tests

---
 __init__.py           | 0
 tests/test_command.py | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 __init__.py

diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/test_command.py b/tests/test_command.py
index e0fd6ec1..4c2adeae 100644
--- a/tests/test_command.py
+++ b/tests/test_command.py
@@ -25,8 +25,8 @@ def setUpClass(self):
         - get the temporary test directory
         - and initializes the command stack.
         """
-        os.mkdir('behavioral/test_command')
-        open('behavioral/test_command/foo.txt', 'w').close()
+        os.mkdir('tests/test_command')
+        open('tests/test_command/foo.txt', 'w').close()
         self.__get_test_directory()
         self.command_stack = []
         self.command_stack.append(MoveFileCommand(os.path.join(self.test_dir, 'foo.txt'), os.path.join(self.test_dir, 'bar.txt')))
@@ -54,7 +54,7 @@ def tearDownClass(self):
         """
         Remove the temporary directory /test_command and its content.
         """
-        shutil.rmtree('behavioral/test_command')
+        shutil.rmtree('tests/test_command')
 
 if __name__ == "__main__":
     unittest.main()

From 27600e829d94b3ea79fe3893a108fb4ef3b75815 Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 20:15:16 +0200
Subject: [PATCH 09/10] Fix relative import in tests

---
 .travis.yml | 2 +-
 __init__.py | 0
 run_all.sh  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 __init__.py

diff --git a/.travis.yml b/.travis.yml
index 3e4d7015..95984110 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ script:
   # Run tests
   - PYTHONPATH=. nosetests -s -v --with-doctest --with-cov --cover-package . --logging-level=INFO -v .
   # Actually run all the scripts, contributing to coverage
-  - ./run_all.sh
+  - PYTHONPATH=. ./run_all.sh
   # for now failure in flaking is ignored
   - flake8 *py || echo "PEP8 the code"
 
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/run_all.sh b/run_all.sh
index 0b962bdf..50922f3d 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -12,7 +12,7 @@ else
     COVERAGE=''
 fi
 for f in */[^_]*py; do
-    python $COVERAGE $f || failed+=" $f"
+    PYTHONPATH=. python $COVERAGE $f || failed+=" $f"
     echo "I: done $f. Exit code $?"
 done;
 

From 492bbc64f2ea8974e155995b5a15673d0383ea8d Mon Sep 17 00:00:00 2001
From: Eugene Dubovoy <eugene.dubovoy@gmail.com>
Date: Mon, 2 Jan 2017 20:21:00 +0200
Subject: [PATCH 10/10] Add Fundamental Patterns section

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index f69d8567..2c12ab47 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,11 @@ __Behavioral Patterns__:
 | [template](behavioral/template.py) | an object imposes a structure but takes pluggable components |
 | [visitor](behavioral/visitor.py) | invoke a callback for all items of a collection |
 
+__Fundamental Patterns__:
+
+| Pattern | Description |
+|:-------:| ----------- |
+| [delegation_pattern](fundamental/delegation_pattern.py) | an object handles a request by delegating to a second object (the delegate) |
 
 __Others__: