CLI refactoring

bin/dandelion

@@ -2,6 +2,6 @@
 
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
-require 'dandelion/cli'
+require 'dandelion/application'
 
-Dandelion::Cli::Main.execute(ARGV.dup)
+Dandelion::Application.execute(ARGV.dup)

lib/dandelion/application.rb

@@ -0,0 +1,73 @@
+require 'dandelion/command'
+
+module Dandelion
+  class Application
+    class << self
+      def execute(args)
+        new(args).execute
+      end
+    end
+
+    def initialize(args)
+      @args = args
+      @options = {}
+      @parser = OptionParser.new
+    end
+
+    def execute
+      global = Command::Base.parser(@options)
+      parse(global)
+
+      begin
+        name = @args.shift
+        command = Command::Base.create(name)
+        parse(command.parser(@options))
+      rescue Command::InvalidCommandError
+        log.fatal("Invalid command: #{name}")
+        log.fatal(global.help)
+        log.fatal("Available commands:")
+        log.fatal(Command::Base.commands.map { |name| "    #{name}" }.join("\n"))
+        exit 1
+      end
+
+      prepare
+      validate
+
+      command.new(@options) do |cmd|
+        cmd.setup(@args) if cmd.respond_to?(:setup)
+        cmd.execute
+      end
+    end
+
+    def log
+      Dandelion.logger
+    end
+
+    private
+
+    def parse(parser)
+      begin
+        parser.order!(@args)
+      rescue OptionParser::InvalidOption => e
+        log.fatal(e.to_s.capitalize)
+        log.fatal(parser.help)
+        exit 1
+      end
+    end
+
+    def prepare
+      @options[:config] ||= File.join(@options[:repo], 'dandelion.yml')
+    end
+
+    def validate
+      unless File.exists?(File.expand_path(File.join(@options[:repo], '.git')))
+        log.fatal("Not a git repository: #{@options[:repo]}")
+        exit 1
+      end
+      unless File.exists?(File.expand_path(@options[:config]))
+        log.fatal("Could not find file: #{@options[:config]}")
+        exit 1
+      end
+    end
+  end
+end

lib/dandelion/backend.rb

@@ -13,7 +13,7 @@ def initialize(gems)
       end
     end
 
-    class Backend
+    class Base
       class << self
         @@backends = {}
 

lib/dandelion/backend/ftp.rb

@@ -2,7 +2,7 @@
 
 module Dandelion
   module Backend
-    class FTP < Backend
+    class FTP < Backend::Base
       scheme 'ftp'
 
       def initialize(config)

lib/dandelion/backend/s3.rb

@@ -2,7 +2,7 @@
 
 module Dandelion
   module Backend
-    class S3 < Backend
+    class S3 < Backend::Base
       scheme 's3'
       gems 'aws-s3'
 

lib/dandelion/backend/sftp.rb

@@ -3,7 +3,7 @@
 
 module Dandelion
   module Backend
-    class SFTP < Backend
+    class SFTP < Backend::Base
       scheme 'sftp'
       gems 'net-sftp'