7 files changed, 16 insertions, 34 deletions
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
index 3cd7598bb..3f3b2e10e 100644
--- a/lib/puppet/application.rb
+++ b/lib/puppet/application.rb
@@ -175,6 +175,17 @@ class Puppet::Application
 
         name = symbolize(name)
 
+        init_default
+
+        @options = {}
+
+        instance_eval(&block) if block_given?
+
+        @@applications[name] = self
+    end
+
+    # initialize default application behaviour
+    def init_default
         setup do 
             default_setup
         end
@@ -187,15 +198,14 @@ class Puppet::Application
         preinit do
         end
 
+        option("--version", "-V") do |arg|
+            puts "%s" % Puppet.version
+            exit
+        end
+
         option("--help", "-h") do |v|
             help
         end
-
-        @options = {}
-
-        instance_eval(&block) if block_given?
-
-        @@applications[name] = self
     end
 
     # This is the main application entry point
diff --git a/lib/puppet/application/filebucket.rb b/lib/puppet/application/filebucket.rb
index f456e0dcc..0723054df 100644
--- a/lib/puppet/application/filebucket.rb
+++ b/lib/puppet/application/filebucket.rb
@@ -6,11 +6,6 @@ Puppet::Application.new(:filebucket) do
 
     should_not_parse_config
 
-    option("--version", "-V") do |arg|
-        puts "%s" % Puppet.version
-        exit
-    end
-
     option("--bucket BUCKET","-b")
     option("--debug","-d")
     option("--local","-l")
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/puppet.rb
index c8ca81975..5b4386e8c 100644
--- a/lib/puppet/application/puppet.rb
+++ b/lib/puppet/application/puppet.rb
@@ -23,11 +23,6 @@ Puppet::Application.new(:puppet) do
         end
     end
 
-    option("--version",  "-V") do |arg|
-        puts "%s" % Puppet.version
-        exit
-    end
-
     dispatch do
         return Puppet[:parseonly] ? :parseonly : :main
     end
diff --git a/lib/puppet/application/puppetca.rb b/lib/puppet/application/puppetca.rb
index 17ff38a2b..09de6c302 100644
--- a/lib/puppet/application/puppetca.rb
+++ b/lib/puppet/application/puppetca.rb
@@ -32,13 +32,10 @@ Puppet::Application.new(:puppetca) do
         end
     end
 
-    option("--version","-V")
-
     option("--verbose", "-v") do
         Puppet::Util::Log.level = :info
     end
 
-
     command(:main) do
         if @all
             hosts = :all
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 4c050c7a8..3efb0ef0a 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -56,11 +56,6 @@ Puppet::Application.new(:puppetd) do
         end
     end
 
-    option("--version", "-V") do |arg|
-        puts "%s" % Puppet.version
-        exit
-    end
-
     option("--no-client") do |arg|
         options[:client] = false
     end
diff --git a/lib/puppet/application/puppetmasterd.rb b/lib/puppet/application/puppetmasterd.rb
index b563c0992..15426ad96 100644
--- a/lib/puppet/application/puppetmasterd.rb
+++ b/lib/puppet/application/puppetmasterd.rb
@@ -22,11 +22,6 @@ Puppet::Application.new(:puppetmasterd) do
         end
     end
 
-    option("--version",  "-V") do |arg|
-        puts "%s" % Puppet.version
-        exit
-    end
-
     preinit do
         trap(:INT) do
             $stderr.puts "Cancelling startup"
diff --git a/lib/puppet/application/puppetrun.rb b/lib/puppet/application/puppetrun.rb
index 9e9d2b81f..42f02c796 100644
--- a/lib/puppet/application/puppetrun.rb
+++ b/lib/puppet/application/puppetrun.rb
@@ -25,11 +25,6 @@ Puppet::Application.new(:puppetrun) do
     option("--ping","-P")
     option("--test")
 
-    option("--version", "-V") do |arg|
-        puts "%s" % Puppet.version
-        exit
-    end
-
     option("--host HOST") do |arg|
         @hosts << arg
     end