added "--this" to mineos_console.py

+ "mineos_console.py --this start"
"--this" substitutes for -d and -s by extracting them from the present
working directory
+ added command_debug to aid in command line debugging of java errors

Author: hexparrot

mineos.py

@@ -944,6 +944,38 @@ def command_start(self):
                '%(java)s -server %(java_tweaks)s -Xmx%(java_xmx)sM -Xms%(java_xms)sM ' \
                '-jar %(jar_file)s %(jar_args)s' % required_arguments
 
+    @property
+    @sanitize
+    def command_debug(self):
+        """Returns the command used to test starting up a minecraft server."""
+        required_arguments = {
+            'java': self.BINARY_PATHS['java'],
+            'java_xmx': self.server_config['java':'java_xmx'],
+            'java_xms': self.server_config['java':'java_xmx'],
+            'java_tweaks': self.server_config['java':'java_tweaks':''],
+            'jar_args': '-nogui'
+            }
+
+        try:
+            jar_file = self.valid_filename(self.profile_config[self.profile:'run_as'])
+            required_arguments['jar_file'] = os.path.join(self.env['cwd'], jar_file)
+            required_arguments['jar_args'] = self.profile_config[self.profile:'jar_args':'']
+        except (TypeError,ValueError):
+            required_arguments['jar_file'] = None
+            required_arguments['jar_args'] = None        
+
+        try:
+            java_xms = self.server_config['java':'java_xms']
+        except KeyError:
+            pass
+        else:
+            if java_xms.strip():
+                self.server_config['java':'java_xms'] = java_xms.strip()                
+
+        self._previous_arguments = required_arguments
+        return '%(java)s -server %(java_tweaks)s -Xmx%(java_xmx)sM -Xms%(java_xms)sM ' \
+               '-jar %(jar_file)s %(jar_args)s' % required_arguments
+
     @property
     @sanitize
     def command_archive(self):

mineos_console.py

@@ -25,6 +25,10 @@
                         dest='base_directory',
                         help='the base of the mc file structure',
                         default=None)
+    parser.add_argument('--this',
+                        action='store_true',
+                        default=False,
+                        help='use pwd to determine -d and -s values')
     parser.add_argument('argv',
                         nargs='*',
                         help='additional arguments to pass to the command() function',
@@ -41,8 +45,12 @@
     import pprint, types
     pp = pprint.PrettyPrinter(indent=4)
 
-    args.base_directory = args.base_directory or os.path.expanduser("~")
-    mc._make_skeleton(args.base_directory)
+    if args.this:
+        args.server_name = os.path.basename(os.getcwd())
+        args.base_directory = os.path.dirname(os.path.dirname(os.getcwd()))
+    else:
+        args.base_directory = args.base_directory or os.path.expanduser("~")
+        mc._make_skeleton(args.base_directory)
 
     if args.server_name:
         owner = mc.has_server_rights(getuser(), args.server_name, args.base_directory)