From 5e7133b8ff1f4d685e6cd0dda24c24e6764ac296 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 31 Jul 2012 15:43:19 +0000
Subject: Move init and minedir to branch_and_merge plugin

deduce_mine_directory is duplicated in the plugin and morphlib.app
until all the commands are moved into the plugin.
---
 morphlib/app.py                             | 28 ------------
 morphlib/plugins/branch_and_merge_plugin.py | 68 +++++++++++++++++++++++++++++
 without-test-modules                        |  1 +
 3 files changed, 69 insertions(+), 28 deletions(-)
 create mode 100644 morphlib/plugins/branch_and_merge_plugin.py

diff --git a/morphlib/app.py b/morphlib/app.py
index f3f10975..6992facb 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -579,26 +579,6 @@ class Morph(cliapp.Application):
                       category=DeprecationWarning)
         return self.cache_repo_and_submodules(*args)
 
-    def cmd_init(self, args):
-        '''Initialize a mine.'''
-
-        if not args:
-            args = ['.']
-        elif len(args) > 1:
-            raise cliapp.AppException('init must get at most one argument')
-
-        dirname = args[0]
-
-        if os.path.exists(dirname):
-            if os.listdir(dirname) != []:
-                raise cliapp.AppException('can only initialize empty '
-                                          'directory: %s' % dirname)
-        else:
-            raise cliapp.AppException('can only initialize an existing '
-                                      'empty directory: %s' % dirname)
-
-        os.mkdir(os.path.join(dirname, '.morph'))
-
     def _deduce_mine_directory(self):
         dirname = os.getcwd()
         while dirname != '/':
@@ -608,14 +588,6 @@ class Morph(cliapp.Application):
             dirname = os.path.dirname(dirname)
         return None
 
-    def cmd_minedir(self, args):
-        '''Find morph mine directory from current working directory.'''
-
-        dirname = self._deduce_mine_directory()
-        if dirname is None:
-            raise cliapp.AppException("Can't find the mine directory")
-        self.output.write('%s\n' % dirname)
-
     def _resolve_reponame(self, reponame):
         '''Return the full pull URL of a reponame.'''
 
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
new file mode 100644
index 00000000..ed49cba4
--- /dev/null
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -0,0 +1,68 @@
+# Copyright (C) 2012  Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+import cliapp
+import os
+
+import morphlib
+
+
+class BranchAndMergePlugin(cliapp.Plugin):
+
+    def enable(self):
+        self.app.add_subcommand('init', self.init, arg_synopsis='[DIR]')
+        self.app.add_subcommand('minedir', self.minedir, arg_synopsis='')
+
+    def disable(self):
+        pass
+
+    @staticmethod
+    def deduce_mine_directory():
+        dirname = os.getcwd()
+        while dirname != '/':
+            dot_morph = os.path.join(dirname, '.morph')
+            if os.path.isdir(dot_morph):
+                return dirname
+            dirname = os.path.dirname(dirname)
+        return None
+
+    def init(self, args):
+        '''Initialize a mine.'''
+
+        if not args:
+            args = ['.']
+        elif len(args) > 1:
+            raise cliapp.AppException('init must get at most one argument')
+
+        dirname = args[0]
+
+        if os.path.exists(dirname):
+            if os.listdir(dirname) != []:
+                raise cliapp.AppException('can only initialize empty '
+                                          'directory: %s' % dirname)
+        else:
+            raise cliapp.AppException('can only initialize an existing '
+                                      'empty directory: %s' % dirname)
+
+        os.mkdir(os.path.join(dirname, '.morph'))
+
+    def minedir(self, args):
+        '''Find morph mine directory from current working directory.'''
+
+        dirname = self.deduce_mine_directory()
+        if dirname is None:
+            raise cliapp.AppException("Can't find the mine directory")
+        self.app.output.write('%s\n' % dirname)
diff --git a/without-test-modules b/without-test-modules
index 4c3af81f..67a1e143 100644
--- a/without-test-modules
+++ b/without-test-modules
@@ -12,4 +12,5 @@ morphlib/plugins/tarball-systembuilder_plugin.py
 morphlib/plugins/show_dependencies_plugin.py
 morphlib/plugins/update_gits_plugin.py
 morphlib/plugins/trebuchet_plugin.py
+morphlib/plugins/branch_and_merge_plugin.py
 
-- 
cgit v1.2.1