pgxn_utils 0.1.3 → 0.1.4

data/LICENSE

@@ -0,0 +1,9 @@
+Copyright (c) 2011-2012 Dickson S. Guedes.
+
+This module is free software; you can redistribute it and/or modify it under the PostgreSQL License.
+
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
+
+In no event shall Dickson S. Guedes be liable to any party for direct, indirect, special, incidental, or consequential damages, including lost profits, arising out of the use of this software and its documentation, even if Dickson S. Guedes has been advised of the possibility of such damage.
+
+Dickson S. Guedes specifically disclaims any warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The software provided hereunder is on an "as is" basis, and Dickson S. Guedes has no obligations to provide maintenance, support, updates, enhancements, or modifications.

data/META.json

@@ -1,12 +1,34 @@
 {
-    "name": "pgxn_utils",
-    "abstract": "pgxn_utils is a development tool to create PostgreSQL extensions",
-    "version": "0.1.3",
-    "maintainer": "Dickson S. Guedes <guedes@guedesoft.net>",
-    "license": "postgres",
-    "release_status": "stable",
-    "repository": {
-		"url": "git://github.com/guedes/pgxn-utils.git",
-        "type": "git"
-    }
+	"name": "pgxn_utils",
+	"abstract": "pgxn-utils is a development tool to create PostgreSQL extensions",
+	"description": "pgxn-utils provides a set of tasks that help developers to create PostgreSQL extensions, putting the extension's files in the recomended places and helping to bundle and release them to PGXN.",
+	"version": "0.1.4",
+	"maintainer": "Dickson S. Guedes <guedes@guedesoft.net>",
+	"license": "postgresql",
+	"release_status": "stable",
+	"resources": {
+		"repository": {
+			"url": "git://github.com/guedes/pgxn-utils.git",
+			"web": "https://github.com/guedes/pgxn-utils",
+			"type": "git"
+		},
+		"bugtracker": {
+			"web": "https://github.com/guedes/pgxn-utils/issues"
+		}
+	},
+	"provides": {
+		"pgxn_utils": {
+			"file": "pgxn_utils",
+			"version": "0.1.4"
+		}
+	},
+	"meta-spec": {
+		"version": "1.0.0",
+		"url": "http://pgxn.org/meta/spec.txt"
+	},
+	"tags": [
+		"automation",
+		"tools",
+		"extension tools"
+	]
 }

data/Makefile

@@ -1,3 +1,3 @@
 all:
 install:
-	gem install --no-rdoc --no-ri -v=0.1.3 pgxn_utils
+	gem install --no-rdoc --no-ri -v=0.1.4 pgxn_utils

data/README.md

@@ -2,39 +2,44 @@ pgxn utils
 ==========
 
 What is it?
---------
+-----------
 
-It aims to be a set of task to help PostgreSQL extension's developers to focus more on the problem that they wants to solve than in all structure and files and control files need to PGXS to build the extension.
+PGXN Utils are a set of tasks that help developers to create PostgreSQL
+extensions, putting the extension's files in the recomended places and helping
+to bundle and release them to PGXN.
 
 How to install it?
 ------------------
 
-If you have pgxn client installed you can do:
+If you have the [PGXN client](http://pgxnclient.projects.postgresql.org/)
+installed you can do:
 
     pgxn install pgxn_utils
 
-Or you can install it by rubygems:
+Or you can install it with rubygems:
 
     gem install pgxn_utils
 
-How it works?
--------------
+How does it work?
+-----------------
 
-It is all about tasks. Let's see what tasks we have:
+It is all about tasks. Let's see them:
 
-    $ pgxn_utils help
+    $ pgxn-utils help
     Tasks:
-      pgxn_utils bundle [extension_name]  # Bundles an extension.
-      pgxn_utils change [extension_name]  # Change META's attributes in current extension.
-      pgxn_utils help [TASK]              # Describe available tasks or one specific task
-      pgxn_utils release filename         # Release a extension
-      pgxn_utils skeleton extension_name  # Creates an extension skeleton in current directory.
+      pgxn-utils bundle [extension_name]  # Bundle the extension in a zip file
+      pgxn-utils change [extension_name]  # Change META.json attributes
+      pgxn-utils help [TASK]              # Describe available tasks or one specific task
+      pgxn-utils release filename         # Release an extension to PGXN
+      pgxn-utils skeleton extension_name  # Create an extension skeleton in current directory
 
 # Creating a new extension
 
-    $ pgxn_utils skeleton my_cool_extension
+    $ pgxn-utils skeleton my_cool_extension
           create  my_cool_extension
           create  my_cool_extension/my_cool_extension.control
+          create  my_cool_extension/.gitignore
+          create  my_cool_extension/.template
           create  my_cool_extension/META.json
           create  my_cool_extension/Makefile
           create  my_cool_extension/README.md
@@ -44,16 +49,102 @@ It is all about tasks. Let's see what tasks we have:
           create  my_cool_extension/test/expected/base.out
           create  my_cool_extension/test/sql/base.sql
 
+
 Thats it! Just start coding! ":)
 
+## Git support
+
+You can start a new extension with or without version control. By default `pgxn-utils`
+supports [git](http://git-scm.org) but it will not create a repository unless you
+use `--git` option in the skeleton task.
+
+    $ pgxn-utils skeleton my_cool_versioned_extension --git
+          create  my_cool_versioned_extension
+          create  my_cool_versioned_extension/my_cool_versioned_extension.control
+          create  my_cool_versioned_extension/.gitignore
+          create  my_cool_versioned_extension/.template
+          create  my_cool_versioned_extension/META.json
+          create  my_cool_versioned_extension/Makefile
+          create  my_cool_versioned_extension/README.md
+          create  my_cool_versioned_extension/doc/my_cool_versioned_extension.md
+          create  my_cool_versioned_extension/sql/my_cool_versioned_extension.sql
+          create  my_cool_versioned_extension/sql/uninstall_my_cool_versioned_extension.sql
+          create  my_cool_versioned_extension/test/expected/base.out
+          create  my_cool_versioned_extension/test/sql/base.sql
+            init  /tmp/my_cool_versioned_extension
+          commit  initial commit
+
+When you create a new extension with git support in addition to creating the skeleton,
+`pgxn-utils` will initialize a git repository and create the initial commit.
+
+Once you have your extension in a git repository your `bundle` will use only the
+committed files to create the archive, but if your repository is dirty then `pgxn-utils`
+will suggest that you to commit or stash your changes before bundling.
+
+You must be careful with new files not added to repository, because they will **not**
+be archived.
+
+## Default templates
+
+`pgxn-utils` has three templates: `sql`, `c` and `fdw`. If you call `skeleton` without
+specifying a template, `sql` is the default. But if your extension will supply some C
+modules or you will create a FDW, you can create the extension calling `skeleton` with a
+`--template` option.
+
+    $ pgxn-utils skeleton my_cool_c_extension --template=c
+          create  my_cool_c_extension
+          create  my_cool_c_extension/my_cool_c_extension.control
+          create  my_cool_c_extension/.gitignore
+          create  my_cool_c_extension/.template
+          create  my_cool_c_extension/META.json
+          create  my_cool_c_extension/Makefile
+          create  my_cool_c_extension/README.md
+          create  my_cool_c_extension/doc/my_cool_c_extension.md
+          create  my_cool_c_extension/sql/my_cool_c_extension.sql
+          create  my_cool_c_extension/sql/uninstall_my_cool_c_extension.sql
+          create  my_cool_c_extension/src/my_cool_c_extension.c
+          create  my_cool_c_extension/test/expected/base.out
+          create  my_cool_c_extension/test/sql/base.sql
+
+    $ pgxn-utils skeleton my_cool_fdw_extension --template=fdw
+          create  my_cool_fdw_extension
+          create  my_cool_fdw_extension/my_cool_fdw_extension.control
+          create  my_cool_fdw_extension/.gitignore
+          create  my_cool_fdw_extension/.template
+          create  my_cool_fdw_extension/META.json
+          create  my_cool_fdw_extension/Makefile
+          create  my_cool_fdw_extension/README.md
+          create  my_cool_fdw_extension/doc/my_cool_fdw_extension.md
+          create  my_cool_fdw_extension/sql/my_cool_fdw_extension.sql
+          create  my_cool_fdw_extension/sql/uninstall_my_cool_fdw_extension.sql
+          create  my_cool_fdw_extension/src/my_cool_fdw_extension_fdw.c
+          create  my_cool_fdw_extension/test/expected/base.out
+          create  my_cool_fdw_extension/test/sql/base.sql
+
+The templates contain example code and some links to PostgreSQL documentation
+that will try to help you to start coding. SQL and C templates contains some test
+examples, and the example code will compile and pass `make installcheck`.
+However, this code is intended to be an example, and you must write your own
+tests and code.
+
+## Custom templates
+
+If you don't like the templates provided by `pgxn-utils` you can create you own.
+Just create a directory with at least a `META.json` or
+`META.json.tt` file and then use your directory as argument to the `--template`
+option.
+
+To know how create your own template, see the examples in the
+[templates directory](https://github.com/guedes/pgxn-utils/tree/master/lib/pgxn_utils/templates).
+
 # Changing something
 
-Well suppose you want to change the default maintainer's name and the license, well just do:
+Suppose you want to change the default maintainer's name and the license, just do:
 
-    $ pgxn_utils change my_cool_extension --maintainer "Dickson Guedes" --license bsd
+    $ pgxn-utils change my_cool_extension --maintainer "Dickson Guedes" --license bsd
         conflict  META.json
-    Overwrite /tmp/my_cool_extension/META.json? (enter "h" for help) [Ynaqdh] d
-    {
+    Overwrite /tmp/my_cool_extension/META.json? (enter "h" for help) [Ynaqdh]
+	{
          "name": "my_cool_extension",
          "abstract": "A short description",
          "description": "A long description",
@@ -71,28 +162,25 @@ Well suppose you want to change the default maintainer's name and the license, w
             }
          },
          "release_status": "unstable",
-      
          "generated_by": "The maintainer's name",
-      
-      
          "meta-spec": {
             "version": "1.0.0",
             "url": "http://pgxn.org/meta/spec.txt"
          }
       }
     Retrying...
-    Overwrite /tmp/my_cool_extension/META.json? (enter "h" for help) [Ynaqdh] Y
-           force  META.json
+    Overwrite /tmp/my_cool_extension/META.json? (enter "h" for help) [Ynaqdh]
+	       force  META.json
        identical  my_cool_extension.control
 
-It will wait you decide what to do.
+It will wait until you decide what to do.
 
 For all switches that you can use with *change*, type:
 
-    $ pgxn_utils help change
+    $ pgxn-utils help change
     Usage:
-      pgxn_utils change [extension_name]
-    
+      pgxn-utils change [extension_name]
+
     Options:
       -p, [--target=TARGET]                  # Define the target directory
                                              # Default: .
@@ -104,39 +192,91 @@ For all switches that you can use with *change*, type:
       -b, [--generated-by=GENERATED_BY]      # Name of extension's generator
       -t, [--tags=one two three]             # Defines extension's tags
       -r, [--release-status=RELEASE_STATUS]  # Initial extension's release status
-    
-    Change META's attributes in current extension.
+
+    Changes META's attributes in current extension
 
 # Bundling and Releasing!
 
-Well, since you finished your work you can bundle it to send to [PGXN](http://pgxn.org).
+Assuming you've created a [PGXN Manager](http://manager.pgxn.org/) account,
+once you've finished your work you can bundle it to send to [PGXN](http://pgxn.org).
+Note that if your extension is in a git repository, `bundle` will use only the
+committed files to create the archive, and if your repository is dirty, `pgxn-utils`
+will suggest that you commit or stash your changes before bundling.
 
-Bundle it:
+Let's bundle it:
 
-    $ pgxn_utils bundle my_cool_extension
-    Extension generated at: /home/guedes/extensions/my_cool_extension-0.0.1.zip
+    $ pgxn-utils bundle my_cool_extension
+             create /home/guedes/extensions/my_cool_extension-0.0.1.zip
 
 and release it:
 
-    $ pgxn_utils release my_cool_extension-0.0.1.zip
+    $ pgxn-utils release my_cool_extension-0.0.1.zip
     Enter your PGXN username: guedes
     Enter your PGXN password: ******
     Trying to release my_cool_extension-0.0.1.zip ... released successfully!
     Visit: https://manager.pgxn.org/distributions/my_cool_extension/0.0.1
 
-You can export `PGXN_USER` and `PGXN_PASSWORD` environment variables to avoid
-type username and password everytime.
+You can export the `PGXN_USER` and `PGXN_PASSWORD` environment variables to avoid
+typing your username and password every time.
+
+# PGXN Client integration
+
+If you have [PGXN client](http://pgxnclient.projects.postgresql.org/) installed you
+can change the command line from `pgxn-utils some_task` to `pgxn some_task` and this
+will save you some typing. See:
+
+    $ cd /tmp
+    $ pgxn skeleton --help
+    PGXN Utils version: 0.1.4
+    Usage:
+      pgxn skeleton extension_name
+
+    Options:
+          [--git]                            # Initialize a git repository after create the extension
+      -a, [--abstract=ABSTRACT]              # Defines a short description to abstract
+      -p, [--target=TARGET]                  # Define the target directory
+                                             # Default: .
+          [--template=TEMPLATE]              # The template that will be used to create the extension. Expected values are: sql, c, fdw
+                                             # Default: sql
+      -r, [--release-status=RELEASE_STATUS]  # Initial extension's release status
+      -d, [--description=DESCRIPTION]        # A long text that contains more information about extension
+      -b, [--generated-by=GENERATED_BY]      # Name of extension's generator
+      -l, [--license=LICENSE]                # The extension license
+      -t, [--tags=one two three]             # Defines extension's tags
+      -v, [--version=VERSION]                # Initial version
+      -m, [--maintainer=MAINTAINER]          # Maintainer's name <maintainer@email>
+
+    Creates an extension skeleton in current directory
+
+    $ pgxn skeleton test
+          create  test
+          create  test/test.control
+          create  test/.gitignore
+          create  test/.template
+          create  test/META.json
+          create  test/Makefile
+          create  test/README.md
+          create  test/doc/test.md
+          create  test/sql/test.sql
+          create  test/sql/uninstall_test.sql
+          create  test/test/expected/base.out
+          create  test/test/sql/base.sql
+
+    $ cd test/
+    $ pgxn bundle
+             run  make distclean from "."
+          create  /tmp/test-0.0.1.zip
 
 # Working in progress
 
-* [git](http://git-scm.org) support
 * proxy support
-* custom templates
+* improve [git](http://git-scm.org) support
+* improve custom templates
 
 Copyright and License
 ---------------------
 
-Copyright (c) 2011 Dickson S. Guedes.
+Copyright (c) 2011-2012 Dickson S. Guedes.
 
 This module is free software; you can redistribute it and/or modify it under
 the [PostgreSQL License](http://www.opensource.org/licenses/postgresql).

data/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 
 def format_cmd_output(cmd)
-  `./bin/pgxn_utils #{cmd} | sed 's/^/    /' | sed 's/\[[0-9]*m//g'`
+  `./bin/pgxn-utils #{cmd} | sed 's/^/    /' | sed 's/\[[0-9]*m//g'`
 end
 
 desc "Run RSpec"
@@ -22,6 +22,9 @@ end
 desc "Generate README.md"
 task :generate_readme do
   rm_r "/tmp/my_cool_extension" if File.exist?("/tmp/my_cool_extension")
+  rm_r "/tmp/my_cool_c_extension" if File.exist?("/tmp/my_cool_c_extension")
+  rm_r "/tmp/my_cool_fdw_extension" if File.exist?("/tmp/my_cool_fdw_extension")
+  rm_r "/tmp/my_cool_versioned_extension" if File.exist?("/tmp/my_cool_versioned_extension")
   readme = File.new("README.md.new", 'w')
   readme.puts <<-README
 pgxn utils
@@ -30,54 +33,114 @@ pgxn utils
 What is it?
 --------
 
-It aims to be a set of task to help PostgreSQL extension's developers to focus more on the problem that they wants to solve than in the all structure and files and control files need to PGXS to build the extension.
+It is a set of task that help developers to create PostgreSQL's extensions, putting
+the extension's files in the recomended places and supplying tasks to help bundle
+and release your extension to PGXN.
 
 How to install it?
 ------------------
 
+If you have pgxn client installed you can do:
+
+    pgxn install pgxn_utils
+
+Or you can install it by rubygems:
+
     gem install pgxn_utils
 
 How it works?
 -------------
 
-It is all about tasks. Let's see what tasks we have:
+It is all about tasks. Let's see them:
 
-    $ pgxn_utils help
+    $ pgxn-utils help
 #{format_cmd_output("help")}
 
 # Creating a new extension
 
-    $ pgxn_utils skeleton my_cool_extension
+    $ pgxn-utils skeleton my_cool_extension
 #{format_cmd_output("skeleton my_cool_extension -p /tmp")}
 
 Thats it! Just start coding! ":)
 
+## Git support
+
+You can start a new extension with or without version control. By default `pgxn-utils`
+supports [git](http://git-scm.org) but it will not create a repository unless you
+use `--git` option in the skeleton task.
+
+    $ pgxn-utils skeleton my_cool_versioned_extension --git
+#{format_cmd_output("skeleton my_cool_versioned_extension --git -p /tmp")}
+
+
+When you create a new extension with git support in addition to create skeleton,
+`pgxn-utils` will initialize a git repository and create the initial commit.
+
+Once you have your extension in a git repository your `bundle` will use only the
+commited files to create the archive, but if your repository is dirty then `pgxn-utils`
+will hint you to commit or stash your changes, before bundle.
+
+You must be careful with new files not added to repository, because they will NOT
+be archived.
+
+## Default templates
+
+`pgxn-utils` has three templates: `sql`, `c` and `fdw`. If you call `skeleton` without
+specifying a template the `sql` is the default. But if your extension will supply some C
+modules or you will create a FDW, you can create the extension calling `skeleton` with a
+`--template` option.
+
+    $ pgxn-utils skeleton my_cool_c_extension --template=c
+#{format_cmd_output("skeleton my_cool_c_extension --template=c -p /tmp")}
+
+
+    $ pgxn-utils skeleton my_cool_fdw_extension --template=fdw
+#{format_cmd_output("skeleton my_cool_fdw_extension --template=fdw -p /tmp")}
+
+The templates contains examples codes and some links to PostgreSQL documentation
+that will try to help you to start coding. SQL and C templates contains some tests
+examples, and the example code will compiles and pass `make installcheck`, but they
+are examples and you must write your own tests and code.
+
+## Custom templates
+
+If you don't like the templates provided by `pgxn-utils` you can create you own
+templates. Just create a directory where you want with at least a META.json or
+META.json.tt file then you can use your directory as argument to the `--template`
+option.
+
+To see how create your own template, you can use, as example, the
+[templates directory](https://github.com/guedes/pgxn-utils/tree/master/lib/pgxn_utils/templates).
+
 # Changing something
 
-Well suppose you want to change the default maintainer's name and the license, well just do:
+Well suppose you want to change the default maintainer's name and the license, just do:
 
-    $ pgxn_utils change my_cool_extension --maintainer "Dickson Guedes" --license bsd
+    $ pgxn-utils change my_cool_extension --maintainer "Dickson Guedes" --license bsd
 #{format_cmd_output("change my_cool_extension -p /tmp --maintainer 'Dickson Guedes' --license bsd")}
 
-It will wait you decide what to do.
+It will wait until you decide what to do.
 
 For all switches that you can use with *change*, type:
 
-    $ pgxn_utils help change
+    $ pgxn-utils help change
 #{format_cmd_output("help change")}
 
 # Bundling and Releasing!
 
 Well, since you finished your work you can bundle it to send to [PGXN](http://pgxn.org).
+Note that if you have your extension in a git repository `bundle` will use only the
+commited files to create the archive, but if your repository is dirty then `pgxn-utils`
+will hint you to commit or stash your changes, before bundle.
 
-Bundle it:
+Let's bundle it:
 
-    $ pgxn_utils bundle my_cool_extension
-    Extension generated at: /home/guedes/extensions/my_cool_extension-0.0.1.zip
+    $ pgxn-utils bundle my_cool_extension
+             create /home/guedes/extensions/my_cool_extension-0.0.1.zip
 
 and release it:
 
-    $ pgxn_utils release my_cool_extension-0.0.1.zip
+    $ pgxn-utils release my_cool_extension-0.0.1.zip
     Enter your PGXN username: guedes
     Enter your PGXN password: ******
     Trying to release my_cool_extension-0.0.1.zip ... released successfully!
@@ -88,7 +151,7 @@ type username and password everytime.
 
 # Working in progress
 
-* [git](http://git-scm.org) support
+* improve [git](http://git-scm.org) support
 * proxy support
 * custom templates
 

data/bin/pgxn-bundle

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'pgxn_utils'
+
+command_args = []
+
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
+PgxnUtils::CLI.start( command_args || ARGV )

data/bin/pgxn-change

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'pgxn_utils'
+
+command_args = []
+
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
+PgxnUtils::CLI.start( command_args || ARGV )

data/bin/pgxn-release

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'pgxn_utils'
+
+command_args = []
+
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
+PgxnUtils::CLI.start( command_args || ARGV )

data/bin/pgxn-skeleton

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'pgxn_utils'
+
+command_args = []
+
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
+PgxnUtils::CLI.start( command_args || ARGV )

data/bin/pgxn-utils

@@ -3,8 +3,20 @@ $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'pgxn_utils'
 
-task = __FILE__.gsub(/pgxn-utils-/,'').gsub(/-/,'_') if File.basename(__FILE__) =~ /^pgxn-utils-/
-command_args = [ task ] + ARGV if task
+command_args = []
 
-puts "PGXN Utils version: #{PgxnUtils::VERSION}" if ARGV.empty?
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
 PgxnUtils::CLI.start( command_args || ARGV )