Move puppetca to the Application Controller paradigm

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>

3 files changed, 210 insertions, 101 deletions

diff --git a/bin/puppetca b/bin/puppetca
index 81e14396e..771e31b71 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -96,104 +96,5 @@
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'puppet'
-require 'puppet/ssl/certificate_authority'
-require 'getoptlong'
-
-options = [
-    [ "--all",      "-a",  GetoptLong::NO_ARGUMENT ],
-    [ "--clean",    "-c",  GetoptLong::NO_ARGUMENT ],
-    [ "--debug",    "-d",  GetoptLong::NO_ARGUMENT ],
-    [ "--generate", "-g",  GetoptLong::NO_ARGUMENT ],
-    [ "--help",     "-h",  GetoptLong::NO_ARGUMENT ],
-    [ "--list",     "-l",  GetoptLong::NO_ARGUMENT ],
-    [ "--print",    "-p",  GetoptLong::NO_ARGUMENT ],
-    [ "--revoke",   "-r",  GetoptLong::NO_ARGUMENT ],
-    [ "--sign",     "-s",  GetoptLong::NO_ARGUMENT ],
-    [ "--verify",          GetoptLong::NO_ARGUMENT ],
-	[ "--version",	"-V",  GetoptLong::NO_ARGUMENT ],
-    [ "--verbose",  "-v",  GetoptLong::NO_ARGUMENT ]
-]
-
-# Add all of the config parameters as valid options.
-Puppet.settings.addargs(options)
-
-result = GetoptLong.new(*options)
-
-modes = Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS
-
-all = false
-mode = nil
-
-begin
-    result.each { |opt,arg|
-        case opt
-            when "--clean"
-                mode = :destroy
-            when "--all"
-                all = true
-            when "--debug"
-                Puppet::Util::Log.level = :debug
-            when "--help"
-                if Puppet.features.usage?
-                    RDoc::usage && exit
-                else
-                    puts "No help available unless you have RDoc::usage installed"
-                    exit
-                end
-            when "--version"
-                puts "%s" % Puppet.version
-                exit
-            when "--verbose"
-                Puppet::Util::Log.level = :info
-            else
-                tmp = opt.sub("--", '').to_sym
-                if modes.include?(tmp)
-                    mode = tmp
-                else
-                    Puppet.settings.handlearg(opt, arg)
-                end
-        end
-    }
-rescue GetoptLong::InvalidOption => detail
-    $stderr.puts "Try '#{$0} --help'"
-    exit(1)
-end
-
-# Now parse the config
-Puppet.parse_config
-
-if Puppet.settings.print_configs?
-    exit(Puppet.settings.print_configs ? 0 : 1)
-end
-
-Puppet::Util::Log.newdestination :console
-
-Puppet::SSL::Host.ca_location = :local
-
-begin
-    ca = Puppet::SSL::CertificateAuthority.new
-rescue => detail
-    puts detail.backtrace if Puppet[:trace]
-    puts detail.to_s
-    exit(23)
-end
-
-unless mode
-    $stderr.puts "You must specify a mode; see the output from --help"
-    exit(12)
-end
-
-if all
-    hosts = :all
-else
-    hosts = ARGV.collect { |h| h.downcase }
-end
-
-begin
-    ca.apply(mode, :to => hosts)
-rescue => detail
-    puts detail.backtrace if Puppet[:trace]
-    puts detail.to_s
-    exit(24)
-end
+require 'puppet/application/puppetca'
+Puppet::Application[:puppetca].run
\ No newline at end of file
diff --git a/lib/puppet/application/puppetca.rb b/lib/puppet/application/puppetca.rb
new file mode 100644
index 000000000..17ff38a2b
--- /dev/null
+++ b/lib/puppet/application/puppetca.rb
@@ -0,0 +1,74 @@
+require 'puppet'
+require 'puppet/application'
+require 'puppet/ssl/certificate_authority'
+
+Puppet::Application.new(:puppetca) do
+
+    should_parse_config
+
+    attr_accessor :mode, :all, :ca
+
+    def find_mode(opt)
+        modes = Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS
+        tmp = opt.sub("--", '').to_sym
+        @mode = modes.include?(tmp) ? tmp : nil
+    end
+
+    option("--clean", "-c") do
+        @mode = :destroy
+    end
+
+    option("--all", "-a") do
+        @all = true
+    end
+
+    option("--debug", "-d") do |arg|
+        Puppet::Util::Log.level = :debug
+    end
+
+    Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject {|m| m == :destroy }.each do |method|
+        option("--#{method}", "-%s" % method.to_s[0,1] ) do
+            find_mode("--#{method}")
+        end
+    end
+
+    option("--version","-V")
+
+    option("--verbose", "-v") do
+        Puppet::Util::Log.level = :info
+    end
+
+
+    command(:main) do
+        if @all
+            hosts = :all
+        else
+            hosts = ARGV.collect { |h| puts h; h.downcase }
+        end
+        begin
+            @ca.apply(@mode, :to => hosts)
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            puts detail.to_s
+            exit(24)
+        end
+    end
+
+    setup do
+        if Puppet.settings.print_configs?
+            exit(Puppet.settings.print_configs ? 0 : 1)
+        end
+
+        Puppet::Util::Log.newdestination :console
+
+        Puppet::SSL::Host.ca_location = :local
+
+        begin
+            @ca = Puppet::SSL::CertificateAuthority.new
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            puts detail.to_s
+            exit(23)
+        end
+    end
+end
diff --git a/spec/unit/application/puppetca.rb b/spec/unit/application/puppetca.rb
new file mode 100644
index 000000000..effe0fb9a
--- /dev/null
+++ b/spec/unit/application/puppetca.rb
@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/application/puppetca'
+
+describe "PuppetCA" do
+    before :each do
+        @puppetca = Puppet::Application[:puppetca]
+    end
+
+    it "should ask Puppet::Application to parse Puppet configuration file" do
+        @puppetca.should_parse_config?.should be_true
+    end
+
+    it "should declare a main command" do
+        @puppetca.should respond_to(:main)
+    end
+
+    Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject{ |m| m == :destroy }.each do |method|
+        it "should declare option --#{method}" do
+            @puppetca.should respond_to("handle_#{method}".to_sym)
+        end
+    end
+
+    it "should set log level to info with the --verbose option" do
+
+        Puppet::Log.expects(:level=).with(:info)
+
+        @puppetca.handle_verbose(0)
+    end
+
+    it "should set log level to debug with the --debug option" do
+
+        Puppet::Log.expects(:level=).with(:debug)
+
+        @puppetca.handle_debug(0)
+    end
+
+    it "should set mode to :destroy for --clean" do
+        @puppetca.handle_clean(0)
+        @puppetca.mode.should == :destroy
+    end
+
+    it "should set all to true for --all" do
+        @puppetca.handle_all(0)
+        @puppetca.all.should be_true
+    end
+
+    Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject { |m| m == :destroy }.each do |method|
+        it "should set mode to #{method} with option --#{method}" do
+            @puppetca.send("handle_#{method}".to_sym, nil)
+
+            @puppetca.mode.should == method
+        end
+    end
+
+    describe "during setup" do
+
+        before :each do
+            Puppet::Log.stubs(:newdestination)
+            Puppet::SSL::Host.stubs(:ca_location=)
+            Puppet::SSL::CertificateAuthority.stubs(:new)
+        end
+
+        it "should set console as the log destination" do
+            Puppet::Log.expects(:newdestination).with(:console)
+
+            @puppetca.run_setup
+        end
+
+        it "should print puppet config if asked to in Puppet config" do
+            @puppetca.stubs(:exit)
+            Puppet.settings.stubs(:print_configs?).returns(true)
+
+            Puppet.settings.expects(:print_configs)
+
+            @puppetca.run_setup
+        end
+
+        it "should exit after printing puppet config if asked to in Puppet config" do
+            Puppet.settings.stubs(:print_configs?).returns(true)
+
+            lambda { @puppetca.run_setup }.should raise_error(SystemExit)
+        end
+
+        it "should create a new certificate authority" do
+            Puppet::SSL::CertificateAuthority.expects(:new)
+
+            @puppetca.run_setup
+        end
+    end
+
+    describe "when running" do
+        before :each do
+            @puppetca.all = false
+            @ca = stub_everything 'ca'
+            @puppetca.ca = @ca
+            ARGV.stubs(:collect).returns([])
+        end
+
+        it "should delegate to the CertificateAuthority" do
+            @ca.expects(:apply)
+
+            @puppetca.main
+        end
+
+        it "should delegate with :all if option --all was given" do
+            @puppetca.handle_all(0)
+
+            @ca.expects(:apply).with { |mode,to| to[:to] == :all }
+
+            @puppetca.main
+        end
+
+        it "should delegate to ca.apply with the hosts given on command line" do
+            ARGV.stubs(:collect).returns(["host"])
+
+            @ca.expects(:apply).with { |mode,to| to[:to] == ["host"]}
+
+            @puppetca.main
+        end
+
+        it "should delegate to ca.apply with current set mode" do
+            @puppetca.mode = "currentmode"
+            ARGV.stubs(:collect).returns(["host"])
+
+            @ca.expects(:apply).with { |mode,to| mode == "currentmode" }
+
+            @puppetca.main
+        end
+
+    end
+end
\ No newline at end of file