Merge lp:~serapophis/quickly/Fixes into lp:~shanepatrickfagan/quickly/Quickly-vala

[Harald Wartig]

 * Added support for the quickly help command
 * edit does now make use of $VISUAL and $EDITOR variables
 * run now produces a binary with the same name as the project
 * run now supports passing of commandline args to the created binary

[Shane Fagan (shanepatrickfagan)]

Looks good to me awesome work thanks

review: Approve

=== modified file 'design'
--- design	2010-09-27 20:16:46 +0000
+++ design	2010-09-28 10:12:44 +0000
@@ -1,3 +1,19 @@
-#!/bin/sh
+#!/bin/bash
+
+usage(){
+	cat<<EOUSAGE
+Usage:
+	quickly `basename $0`
+
+Opens Glade UI editor so that you can edit the UI for dialogs
+and windows in your project. 
+EOUSAGE
+	exit 0
+}
+
+# invoke  usage
+# call usage() function if any argument was supplied
+[[ $# -ne 0 ]] && usage
+
 cd data/ui
 glade *.ui

=== modified file 'edit'
--- edit	2010-09-25 18:07:02 +0000
+++ edit	2010-09-28 10:12:44 +0000
@@ -1,2 +1,32 @@
-#!/bin/sh
-gedit bin/*.vala
+#!/bin/bash
+
+usage(){
+	cat<<EOUSAGE
+Usage: 
+	quickly `basename $0`
+
+A convenience command to open all of your vala files in your project 
+directory in your default editor, ready for editing.
+
+If you put yourself VISUAL or EDITOR environment variable, this latter will
+be used. 
+EOUSAGE
+	exit 0
+}
+
+# invoke  usage
+# call usage() function if any argument was supplied
+[[ $# -ne 0 ]] && usage
+
+# if $VISUAL is defined we use that
+if test -n "$VISUAL"
+then
+	EDITOR=$VISUAL
+fi
+
+# if $EDITOR is not defined we set gedit as default
+if test -z "$EDITOR"
+then
+	EDITOR="gedit"
+fi
+eval $EDITOR bin/*.vala

=== modified file 'edit_run'
--- edit_run	2010-09-25 13:28:26 +0000
+++ edit_run	2010-09-28 10:12:44 +0000
@@ -1,2 +1,19 @@
-#!/bin/sh
+#!/bin/bash
+
+usage(){
+	cat<<EOUSAGE
+Usage:
+	quickly `basename $0`
+
+Opens your default text editor for the .run script. This script is uset to 
+build and run your application. In most cases you only want to edit it when 
+you have to change the build process. When you add a new source file or 
+pkg dependency for example.
+EOUSAGE
+	exit 0
+}
+
+# invoke  usage
+# call usage() function if any argument was supplied
+[[ $# -ne 0 ]] && usage
 xdg-open .run

=== modified file 'project_root/.run'
--- project_root/.run	2010-09-25 13:28:26 +0000
+++ project_root/.run	2010-09-28 10:12:44 +0000
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd bin
+# Get the name of the project. We use that as name for the binary.
+PRJNAME=$(basename $(dirname $PWD))
+
 #feel free to change the next line to add bindings you are using and other classes you want to compile
-valac --pkg gtk+-2.0 --pkg gmodule-2.0 *.vala
+valac -o $PRJNAME --pkg gtk+-2.0 --pkg gmodule-2.0 *.vala
 #dont change below here if you want it to run
-./*
+./$PRJNAME $@

=== modified file 'run'
--- run	2010-09-20 21:56:10 +0000
+++ run	2010-09-28 10:12:44 +0000
@@ -1,3 +1,32 @@
 #!/bin/sh
+
+usage(){
+	cat<<EOUSAGE
+Usage:
+	quickly run
+
+Runs your application. This is the best way to try test it out
+while you are developing it. It starts up the main project window.
+
+	quickly run -- values -<whathever>
+to pass "-whatever" and "values" to the executed program. Without that
+if you use for instance --help, it would be Quickly help and not your
+program one.
+
+EOUSAGE
+	exit 0
+}
+
+# handle commandline arguments befor -- and keep everything else
+while [ $# -gt 0 ]
+do
+	case "$1" in
+		--)	shift; break;;
+		*) usage break;;
+	esac
+	shift
+done
+
 chmod +x .run
-./.run
+# run ".run" and pass all commandline arguments that where found after --
+./.run $@