some stuff on documentation

9 files changed, 195 insertions, 331 deletions

diff --git a/.version b/.version
index d690dc0..77d6f4c 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.0.0.0
+0.0.0
diff --git a/Makefile b/Makefile
index d454316..e9bc7dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 NAME=japi
-all: version docs build
+all: version documentation build
 
 # THIS IS NEEDED BY THE DEBIAN TOOLS
 
 # Builds the project. Since this is only a fake project, it just copies a script.
 build:
 	cp -p ./src/$(NAME) bin/$(NAME)
+	sed -i "s/VERSION_DEVEL/$$(cat .version)/" bin/$(NAME)
 	echo "echo This is version $$(cat .version)" >> bin/$(NAME)
 	
 # 'install' installes a fake-root, which will be used to build the Debian package
@@ -14,7 +15,6 @@ install:
 	test ! -d $(DESTDIR)/usr/bin && mkdir -p $(DESTDIR)/usr/bin || exit 0
 	test ! -d $(DESTDIR)/usr/share/$(NAME) && mkdir -p $(DESTDIR)/usr/share/$(NAME) || exit 0
 	cp ./bin/* $(DESTDIR)/usr/bin
-	#cp -r ./lib $(DESTDIR)/usr/share/$(NAME)/lib
 
 deinstall:
 	test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/usr/bin/$(NAME) && rm $(DESTDIR)/usr/bin/$(NAME) || exit 0
@@ -29,15 +29,16 @@ clean:
 version:
 	cut -d' ' -f2 debian/changelog | head -n 1 | sed 's/(//;s/)//' > .version
 
-# Builds the docs into a manpage
-docs:
+# Builds the documentation into a manpage
+documentation:
 	pod2man --release="$(NAME) $$(cat .version)" \
 		--center="User Commands" ./docs/$(NAME).pod > ./docs/$(NAME).1
-	pod2text ./docs/$(NAME).pod > ./docs/$(NAME).txt
+	# Also write README.txt for Github.
+	pod2text ./docs/$(NAME).pod | tee ./docs/$(NAME).txt > README.txt
 
 # Build a debian package (don't sign it, modify the arguments if you want to sign it)
 deb: all
-	dpkg-buildpackage -uc -us
+	dpkg-buildpackage
 
 dch: 
 	dch -i
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..9096b46
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,53 @@
+NAME
+    japi - A Humble Jira API Tool
+
+SYNOPSIS
+    Synopsis: japi [--debug] [--help] [--version] [--passfile]
+    [--jira_apiversion <STRING>] [--jira_query <STRING>] [--jira_uribase
+    <STRING>] [--jira_user <STRING>]
+
+  Options:
+    --debug
+        Prints out extra debugging infos during execution.
+
+    --help
+        Prints out the help.
+
+    --version
+        Prints out the version.
+
+    --passfile <STRING>
+        Specifies the path to an optional file which includes the Jira API
+        password but Base64 encoded. The default value is "~/.japipass".
+
+        If the file is not present, Japi will prompt for the password.
+
+    --jira_apiversion <STRING>
+        Specifies the Jira API version to use. The default value is
+        "rest/api/2".
+
+    --jira_query <STRING>
+        Specifies the Jira search string (e.q. a JQL string). The default
+        value is "search?jql=project=MT and status not in
+        (Resolved,Closed)'".
+
+    --jira_uribase <STRING>
+        Specifies the Jira URI base. The default value is
+        "https://your-jira.example.com". This has to be changed.
+
+    --jira_user <STRING>
+        Specifies the Jira user. The default value is your current
+        Linux/UNIX user.
+
+CONFIG
+    Almost all options have to be passed the Japi tool via command line. One
+    exception is the password file containing your Jira password Base64
+    encoded.
+
+    It can be created like this:
+
+      bash -c 'read -s PASSWORD; tr -d "\n" <<< "$PASSWORD" | base64' | tee ~/.japipass
+
+AUTHOR
+    Paul C. Buetow - <paul@buetow.org>
+
diff --git a/debian/files b/debian/files
index 9c5fa47..165d997 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-japi_0.0.0.0_all.deb utils optional
+japi_0.0.0_all.deb utils optional
diff --git a/debian/japi.substvars b/debian/japi.substvars
index abd3ebe..bcb0957 100644
--- a/debian/japi.substvars
+++ b/debian/japi.substvars
@@ -1 +1,2 @@
+perl:Depends=perl
 misc:Depends=
diff --git a/docs/japi.1 b/docs/japi.1
index e3ffd80..c7d4a7a 100644
--- a/docs/japi.1
+++ b/docs/japi.1
@@ -123,146 +123,62 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "FOO 1"
-.TH FOO 1 "2014-02-03" "japi 0.0.0.0" "User Commands"
+.IX Title "JAPI 1"
+.TH JAPI 1 "2014-03-16" "japi 0.0.0" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-japi \- A template project
-.SH "WTF?"
-.IX Header "WTF?"
-You may use this project in order to build your own Debian package for your own project. This has been tested with Debian GNU/Linux Squeeze and Debian GNU/Linux Wheezy.
-.PP
-Feel free to modify any aspects. This project is just an empty example japi.
-.PP
-Follow these steps:
-.SS "Install required packages"
-.IX Subsection "Install required packages"
-Run the following:
-.PP
-.Vb 1
-\&    sudo aptitude install lintian devscripts dpkg\-dev make perl
-.Ve
-.PP
-Todo: Ensure this are the correct packages. In order to test that I would have to setup a blank Debian system.
-.SS "Compile the project"
-.IX Subsection "Compile the project"
-Go to the to level directory and run
-.PP
-.Vb 1
-\&    make
-.Ve
-.PP
-To test run
-.PP
-.Vb 1
-\&    ./bin/japi
-.Ve
-.PP
-It should print out the version number of the project.
-.SS "Create a Debian package"
-.IX Subsection "Create a Debian package"
-Go to the to level directory and run
-.PP
-.Vb 1
-\&    make deb
-.Ve
-.PP
-It will create the files like:
-.PP
-.Vb 4
-\&    ../japi_0.0.0.0_all.deb
-\&    ../japi_0.0.0.0.dsc
-\&    ../japi_0.0.0.0_amd64.changes
-\&    ../japi_0.0.0.0.tar.gz
-.Ve
-.PP
-It should create a debian package in ../. Check and install it, e.g:
-.PP
-.Vb 2
-\&    lintian \-\-pedantic ../japi_0.0.0.0_all.deb 
-\&    sudo dpkg \-i ../japi_0.0.0.0_all.deb
-.Ve
-.PP
-Run
-.PP
-.Vb 1
-\&    dpkg \-L japi
-.Ve
-.PP
-to see whats in there. You can now run
-.PP
-.Vb 1
-\&    /usr/bin/japi
-.Ve
-.PP
-or for example
-.PP
-.Vb 1
-\&    man japi
-.Ve
-.SS "Read the Makefile"
-.IX Subsection "Read the Makefile"
-Read the Makefile in order to understand what's going on.
-.SH "Customize"
-.IX Header "Customize"
-Now, since you understood everything feel free to customize everything the way you want it. E.g.:
-.PP
-.Vb 1
-\&    Don\*(Aqt use POD for documentation but LaTeX
-\&
-\&    Compile a C program
-\&
-\&    Include a ./lib dir, add it to the \*(Aqinstall\*(Aq Makefile rule
-\&
-\&    etc etc.
-.Ve
-.PP
-You should also consider the following:
-.SS "Manual page"
-.IX Subsection "Manual page"
-This template is using \s-1POD\s0 for creating manual pages. Edit ./docs/japi.pod and run
-.PP
-.Vb 1
-\&    make documentation
-.Ve
-.PP
-in order to build ./docs/japi.1. The page will be included in the resulting debian package automatically. You can review the page with
-.PP
-.Vb 1
-\&    man ./docs/japi.1
-.Ve
-.SS "Renaming japi into your project name"
-.IX Subsection "Renaming japi into your project name"
-Rename all files which have *japi* included into your own new package name. You can do that with:
-.PP
-.Vb 3
-\&    PROJECTNAME=yourproject
-\&    find . \-name \e*japi\e* | 
-\&    while read japi; do git mv $japi ${japi/japi/$PROJECTNAME}; done
-.Ve
-.PP
-Search all content and rename *japi* into your own new package name. You can do that with:
-.PP
-.Vb 2
-\&    grep \-R japi . | grep \-v .git | 
-\&    cut \-d: \-f1 | uniq | xargs sed \-i "s/japi/$PROJECTNAME/g"
-.Ve
-.SS "Updating ./debian"
-.IX Subsection "Updating ./debian"
-Edit the following files accordingly to your new project (e.g. with vim):
-.PP
-.Vb 3
-\&    ./debian/control
-\&    ./debian/copyright
-\&    ./debian/README
-.Ve
-.SS "Update changelog"
-.IX Subsection "Update changelog"
-Go to the to level directory and run
+japi \- A Humble Jira API Tool
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+Synopsis: japi
+  [\-\-debug]
+  [\-\-help]
+  [\-\-version]
+  [\-\-passfile]
+  [\-\-jira_apiversion <\s-1STRING\s0>]
+  [\-\-jira_query <\s-1STRING\s0>]
+  [\-\-jira_uribase <\s-1STRING\s0>]
+  [\-\-jira_user <\s-1STRING\s0>]
+.SS "Options:"
+.IX Subsection "Options:"
+.IP "\-\-debug" 4
+.IX Item "--debug"
+Prints out extra debugging infos during execution.
+.IP "\-\-help" 4
+.IX Item "--help"
+Prints out the help.
+.IP "\-\-version" 4
+.IX Item "--version"
+Prints out the version.
+.IP "\-\-passfile <\s-1STRING\s0>" 4
+.IX Item "--passfile <STRING>"
+Specifies the path to an optional file which includes the Jira \s-1API\s0 password but Base64 encoded. The default value is \f(CW\*(C`~/.japipass\*(C'\fR.
+.Sp
+If the file is not present, Japi will prompt for the password.
+.IP "\-\-jira_apiversion <\s-1STRING\s0>" 4
+.IX Item "--jira_apiversion <STRING>"
+Specifies the Jira \s-1API\s0 version to use. The default value is \f(CW\*(C`rest/api/2\*(C'\fR.
+.IP "\-\-jira_query <\s-1STRING\s0>" 4
+.IX Item "--jira_query <STRING>"
+Specifies the Jira search string (e.q. a \s-1JQL\s0 string). The default value is \f(CW\*(C`search?jql=project=MT and status not in (Resolved,Closed)\*(Aq\*(C'\fR.
+.IP "\-\-jira_uribase <\s-1STRING\s0>" 4
+.IX Item "--jira_uribase <STRING>"
+Specifies the Jira \s-1URI\s0 base. The default value is \f(CW\*(C`https://your\-jira.example.com\*(C'\fR. This has to be changed.
+.IP "\-\-jira_user <\s-1STRING\s0>" 4
+.IX Item "--jira_user <STRING>"
+Specifies the Jira user. The default value is your current Linux/UNIX user.
+.SH "CONFIG"
+.IX Header "CONFIG"
+Almost all options have to be passed the Japi tool via command line. One exception is the password file containing your Jira password Base64 encoded.
+.PP
+It can be created like this:
 .PP
 .Vb 1
-\&    dch \-i
+\&  bash \-c \*(Aqread \-s PASSWORD; tr \-d "\en" <<< "$PASSWORD" | base64\*(Aq | tee ~/.japipass
 .Ve
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Paul C. Buetow \- <paul@buetow.org>
diff --git a/docs/japi.pod b/docs/japi.pod
index 71e6819..b38fd45 100644
--- a/docs/japi.pod
+++ b/docs/japi.pod
@@ -1,116 +1,69 @@
 =head1 NAME
 
-japi - A template project
+japi - A Humble Jira API Tool
 
-=head1 WTF?
+=head1 SYNOPSIS
 
-You may use this project in order to build your own Debian package for your own project. This has been tested with Debian GNU/Linux Squeeze and Debian GNU/Linux Wheezy. 
+Synopsis: japi
+  [--debug]
+  [--help]
+  [--version]
+  [--passfile]
+  [--jira_apiversion <STRING>]
+  [--jira_query <STRING>]
+  [--jira_uribase <STRING>]
+  [--jira_user <STRING>]
 
-Feel free to modify any aspects. This project is just an empty example japi.
+=head2 Options:
 
-Follow these steps:
+=over 
 
-=head2 Install required packages
+=item --debug
 
-Run the following:
+Prints out extra debugging infos during execution. 
 
-    sudo aptitude install lintian devscripts dpkg-dev make perl
+=item --help
 
-Todo: Ensure this are the correct packages. In order to test that I would have to setup a blank Debian system.
+Prints out the help.
 
-=head2 Compile the project
+=item --version
 
-Go to the to level directory and run
+Prints out the version.
 
-    make
+=item --passfile <STRING>
 
-To test run
+Specifies the path to an optional file which includes the Jira API password but Base64 encoded. The default value is C<~/.japipass>.
 
-    ./bin/japi
+If the file is not present, Japi will prompt for the password. 
 
-It should print out the version number of the project.
+=item --jira_apiversion <STRING>
 
-=head2 Create a Debian package
+Specifies the Jira API version to use. The default value is C<rest/api/2>.
 
-Go to the to level directory and run
+=item --jira_query <STRING>
 
-    make deb
+Specifies the Jira search string (e.q. a JQL string). The default value is C<search?jql=project=MT and status not in (Resolved,Closed)'>.
 
-It will create the files like:
+=item --jira_uribase <STRING>
 
-    ../japi_0.0.0.0_all.deb
-    ../japi_0.0.0.0.dsc
-    ../japi_0.0.0.0_amd64.changes
-    ../japi_0.0.0.0.tar.gz
+Specifies the Jira URI base. The default value is C<https://your-jira.example.com>. This has to be changed.
 
-It should create a debian package in ../. Check and install it, e.g:
+=item --jira_user <STRING>
 
-    lintian --pedantic ../japi_0.0.0.0_all.deb 
-    sudo dpkg -i ../japi_0.0.0.0_all.deb 
+Specifies the Jira user. The default value is your current Linux/UNIX user.
 
-Run 
+=back
 
-    dpkg -L japi
+=head1 CONFIG
 
-to see whats in there. You can now run
+Almost all options have to be passed the Japi tool via command line. One exception is the password file containing your Jira password Base64 encoded.
 
-    /usr/bin/japi
+It can be created like this:
 
-or for example
+  bash -c 'read -s PASSWORD; tr -d "\n" <<< "$PASSWORD" | base64' | tee ~/.japipass
 
-    man japi
+=head1 AUTHOR
 
-=head2 Read the Makefile
+Paul C. Buetow - <paul@buetow.org>
 
-Read the Makefile in order to understand what's going on.
-
-=head1 Customize
-
-Now, since you understood everything feel free to customize everything the way you want it. E.g.: 
-
-    Don't use POD for documentation but LaTeX
-
-    Compile a C program
-
-    Include a ./lib dir, add it to the 'install' Makefile rule
-
-    etc etc.
-
-You should also consider the following:
-
-=head2 Manual page
-
-This template is using POD for creating manual pages. Edit ./docs/japi.pod and run 
-
-    make documentation
-
-in order to build ./docs/japi.1. The page will be included in the resulting debian package automatically. You can review the page with
-
-    man ./docs/japi.1
-
-=head2 Renaming japi into your project name 
-
-Rename all files which have *japi* included into your own new package name. You can do that with:
-
-    PROJECTNAME=yourproject
-    find . -name \*japi\* | 
-    while read japi; do git mv $japi ${japi/japi/$PROJECTNAME}; done
-
-Search all content and rename *japi* into your own new package name. You can do that with:
-
-    grep -R japi . | grep -v .git | 
-    cut -d: -f1 | uniq | xargs sed -i "s/japi/$PROJECTNAME/g"  
-
-=head2 Updating ./debian
-
-Edit the following files accordingly to your new project (e.g. with vim):
-
-    ./debian/control
-    ./debian/copyright
-    ./debian/README
-
-=head2 Update changelog
-
-Go to the to level directory and run
-
-    dch -i
+=cut
diff --git a/docs/japi.txt b/docs/japi.txt
index 7cfd093..9096b46 100644
--- a/docs/japi.txt
+++ b/docs/japi.txt
@@ -1,116 +1,53 @@
 NAME
-    japi - A template project
+    japi - A Humble Jira API Tool
 
-WTF?
-    You may use this project in order to build your own Debian package for
-    your own project. This has been tested with Debian GNU/Linux Squeeze and
-    Debian GNU/Linux Wheezy.
+SYNOPSIS
+    Synopsis: japi [--debug] [--help] [--version] [--passfile]
+    [--jira_apiversion <STRING>] [--jira_query <STRING>] [--jira_uribase
+    <STRING>] [--jira_user <STRING>]
 
-    Feel free to modify any aspects. This project is just an empty example
-    japi.
+  Options:
+    --debug
+        Prints out extra debugging infos during execution.
 
-    Follow these steps:
+    --help
+        Prints out the help.
 
-  Install required packages
-    Run the following:
+    --version
+        Prints out the version.
 
-        sudo aptitude install lintian devscripts dpkg-dev make perl
+    --passfile <STRING>
+        Specifies the path to an optional file which includes the Jira API
+        password but Base64 encoded. The default value is "~/.japipass".
 
-    Todo: Ensure this are the correct packages. In order to test that I
-    would have to setup a blank Debian system.
+        If the file is not present, Japi will prompt for the password.
 
-  Compile the project
-    Go to the to level directory and run
+    --jira_apiversion <STRING>
+        Specifies the Jira API version to use. The default value is
+        "rest/api/2".
 
-        make
+    --jira_query <STRING>
+        Specifies the Jira search string (e.q. a JQL string). The default
+        value is "search?jql=project=MT and status not in
+        (Resolved,Closed)'".
 
-    To test run
+    --jira_uribase <STRING>
+        Specifies the Jira URI base. The default value is
+        "https://your-jira.example.com". This has to be changed.
 
-        ./bin/japi
+    --jira_user <STRING>
+        Specifies the Jira user. The default value is your current
+        Linux/UNIX user.
 
-    It should print out the version number of the project.
+CONFIG
+    Almost all options have to be passed the Japi tool via command line. One
+    exception is the password file containing your Jira password Base64
+    encoded.
 
-  Create a Debian package
-    Go to the to level directory and run
+    It can be created like this:
 
-        make deb
+      bash -c 'read -s PASSWORD; tr -d "\n" <<< "$PASSWORD" | base64' | tee ~/.japipass
 
-    It will create the files like:
-
-        ../japi_0.0.0.0_all.deb
-        ../japi_0.0.0.0.dsc
-        ../japi_0.0.0.0_amd64.changes
-        ../japi_0.0.0.0.tar.gz
-
-    It should create a debian package in ../. Check and install it, e.g:
-
-        lintian --pedantic ../japi_0.0.0.0_all.deb 
-        sudo dpkg -i ../japi_0.0.0.0_all.deb
-
-    Run
-
-        dpkg -L japi
-
-    to see whats in there. You can now run
-
-        /usr/bin/japi
-
-    or for example
-
-        man japi
-
-  Read the Makefile
-    Read the Makefile in order to understand what's going on.
-
-Customize
-    Now, since you understood everything feel free to customize everything
-    the way you want it. E.g.:
-
-        Don't use POD for documentation but LaTeX
-
-        Compile a C program
-
-        Include a ./lib dir, add it to the 'install' Makefile rule
-
-        etc etc.
-
-    You should also consider the following:
-
-  Manual page
-    This template is using POD for creating manual pages. Edit
-    ./docs/japi.pod and run
-
-        make documentation
-
-    in order to build ./docs/japi.1. The page will be included in the
-    resulting debian package automatically. You can review the page with
-
-        man ./docs/japi.1
-
-  Renaming japi into your project name
-    Rename all files which have *japi* included into your own new package
-    name. You can do that with:
-
-        PROJECTNAME=yourproject
-        find . -name \*japi\* | 
-        while read japi; do git mv $japi ${japi/japi/$PROJECTNAME}; done
-
-    Search all content and rename *japi* into your own new package name. You
-    can do that with:
-
-        grep -R japi . | grep -v .git | 
-        cut -d: -f1 | uniq | xargs sed -i "s/japi/$PROJECTNAME/g"
-
-  Updating ./debian
-    Edit the following files accordingly to your new project (e.g. with
-    vim):
-
-        ./debian/control
-        ./debian/copyright
-        ./debian/README
-
-  Update changelog
-    Go to the to level directory and run
-
-        dch -i
+AUTHOR
+    Paul C. Buetow - <paul@buetow.org>
 
diff --git a/src/japi b/src/japi
index 15bdc68..644ef42 100755
--- a/src/japi
+++ b/src/japi
@@ -87,14 +87,17 @@ package Japi::Japi {
   sub say_synopsis {
     my ($self, $ec) = @_;
     my $opts = $self->opts;
-    my %tstr = ( '=s' => 'STRING', '' => 'BOOL' );
+    my %tstr = ( '=s' => 'STRING', '' => '' );
     $ec //= 0;
 
     say "Synopsis: $0";
     for (sort keys %$opts) {
       my $tstr = $tstr{$opts->{$_}{type}} // '';
-      my $value = $opts->{$_}{value} // '';
-      say "\t[--$_ <$tstr:$value>]";
+      if ($tstr ne '') {
+        my $value = $opts->{$_}{value} // '';
+        $tstr = " <$tstr:$value>";
+      }
+      say "\t[--$_$tstr]";
     }
     say 'You may also read the manual page';
     exit $ec;