sitefuel 0.0.0b → 0.1.0a

data/lib/sitefuel/License.rb

@@ -0,0 +1,292 @@
+#
+# File::      License.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
+#
+# Contains the GPL version 2 so we can print it when someone types
+# `sitefuel --license`
+#
+
+module SiteFuel
+  LICENSE = <<END
+  GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+END
+end

data/lib/sitefuel/SiteFuelLogger.rb

@@ -1,8 +1,8 @@
 #
 # File::      SiteFuelLogger.rb
 # Author::    wkm
-# Copyright:: 2009
-# License::   GPL
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 
 module SiteFuel
@@ -40,6 +40,7 @@ module SiteFuel
     # clean:: gives a clean logging output intended for human use
     attr_accessor :log_style
 
+
     def initialize(filename = STDOUT)
       super(filename)
       
@@ -54,31 +55,37 @@ module SiteFuel
       @progname = 'SiteFuel'
     end
 
+
     def fatal(*args)
       @fatal_count += 1
       super(*args)
     end
 
+
     def error(*args)
       @error_count += 1
       super(*args)
     end
 
+
     def warn(*args)
       @warn_count += 1
       super(*args)
     end
 
+
     def info(*args)
       @info_count += 1
       super(*args)
     end
 
+
     def debug(*args)
       @debug_count += 1
       super(*args)
     end
 
+
     # implement our own #add so we can have cleaner logs
     def format_message(severity, date_time, program_name, msg)
       case @log_style
@@ -94,14 +101,16 @@ module SiteFuel
             when 'WARN'
               string = yellow(string)
 
-            when 'DEBUG'
-              string = string
+            when 'INFO', 'DEBUG'
+              string = dark(string)
           end
           string
       end
     end
   end
 
+
+  
   # mixin for adding logging functionality to any class, typically included
   # by every SiteFuel class
   module Logging
@@ -110,19 +119,39 @@ module SiteFuel
       @logger = logger
     end
 
+
     # adds a fatal error to the log
     def fatal(*args) @logger.fatal(*args); end
-    
+
+
     # adds an error to the log
     def error(*args) @logger.error(*args); end
 
+
     # adds a warning to the log
     def warn(*args) @logger.warn(*args); end
 
+
     # adds an info message to the log
     def info(*args) @logger.info(*args); end
 
+    
     # adds a debugging message to the log
     def debug(*args) @logger.debug(*args); end
   end
+
+
+
+  # module for extending classes and thus giving class methods logging
+  # capability
+  module ClassLogging
+    @@logger = SiteFuelLogger.instance
+
+    def fatal(*args) @@logger.fatal(*args); end
+    def error(*args) @@logger.error(*args); end
+    def warn(*args) @@logger.warn(*args); end
+    def info(*args) @@logger.info(*args); end
+    def debug(*args) @@logger.debug(*args); end
+    
+  end
 end

data/lib/sitefuel/SiteFuelRuntime.rb

@@ -1,8 +1,8 @@
 #
 # File::      SiteFuelRuntime.rb
 # Author::    wkm
-# Copyright:: 2009
-# License::   GPL
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Defines the primary interface class used by sitefuel to do actual work.
 # Keeping this as a class let's us abstract away the command line interface
@@ -14,6 +14,7 @@
 module SiteFuel
 
   require 'optparse'
+
   require 'term/ansicolor'
 
   include Term::ANSIColor
@@ -22,15 +23,34 @@ module SiteFuel
 
   require 'sitefuel/extensions/StringFormatting'
   require 'sitefuel/extensions/FileComparison'
+  require 'sitefuel/extensions/TerminalInfo'
+  require 'sitefuel/extensions/ColumnPrinter'
+  require 'sitefuel/extensions/FileTree'
 
   # we need the AbstractProcessor symbol when we go child-class hunting
   require 'sitefuel/processors/AbstractProcessor'
 
+  require 'sitefuel/external/SVN'
+  require 'sitefuel/external/GIT'
+
   # version of SiteFuel
-  VERSION = [0, 0, 1].freeze
+  VERSION = [0, 1, '0a'].freeze
 
   # a human readable version
   VERSION_TEXT = VERSION.join('.').freeze
+
+
+  class UnknownVersioningSystem < StandardError
+    attr_reader :source
+    def initialize(source)
+      @source = source
+    end
+
+    def to_s
+      "Couldn't derive versioning system from #{source}\n"+
+      "Use --scm=(git|svn) option to force."
+    end
+  end
   
 
   class SiteFuelRuntime
@@ -43,6 +63,12 @@ module SiteFuel
     # what is the source *from* which we are deploying
     attr_accessor :deploy_from
 
+    # what is the staging directory
+    attr_reader :staging_directory
+
+    # what is the scm system
+    attr_accessor :scm_system
+
     # what is the source *to* which we are deploying
     attr_accessor :deploy_to
 
@@ -52,14 +78,27 @@ module SiteFuel
     # only lists file which have a known processor
     attr_accessor :only_list_recognized_files
 
+    # whether a deployment should be aborted due to errors
+    attr_accessor :abort_on_errors
+
+    # whether a deployment should be aborted due to warnings
+    attr_accessor :abort_on_warnings
+
+
     def initialize
       @processors = SiteFuelRuntime.find_processors
       self.logger = SiteFuelLogger.instance
       SiteFuelLogger.instance.log_style = :clean
 
       @only_list_recognized_files = false
+
+      @abort_on_errors = true
+      @abort_on_warnings = false
+
+      @scm_system = nil
     end
 
+
     # gives true if the given file (typically a processor) has already been
     # loaded (by looking into $"). Unfortunately #require is easily tricked,
     # so this function uses some heuristics to prevent processors from being
@@ -74,6 +113,7 @@ module SiteFuel
       return false
     end
 
+
     # finds all processors under processors/ and loads them. Any file matching
     # *Processor.rb will be loaded
     def self.load_processors
@@ -112,14 +152,17 @@ module SiteFuel
       Processor::AbstractProcessor.find_processors
     end
 
+
     # lists the actions which are possible with this runtime.
     def actions
       [ :deploy, :stage ]
     end
 
+
     # gives the array of processors available to this runtime
     attr_reader :processors
 
+
     # adds a processor or an array of processors to the runtime
     def add_processor(proc)
       case proc
@@ -132,21 +175,23 @@ module SiteFuel
       end
     end
 
+
     # gives the processor to use for a given file
     def choose_processor(filename)
-      matchingprocs = processors.clone.delete_if {|proc| not proc.processes_file?(filename) }
+      matching = processors.clone.delete_if {|proc| not proc.processes_file?(filename) }
 
       case
-        when matchingprocs.length > 1
-          chosen = matchingprocs.first
-          raise Processor::MultipleApplicableProcessors.new(filename, matchingprocs, chosen)
-        when matchingprocs.length == 1
-          return matchingprocs.first
+        when matching.length > 1
+          chosen = matching.first
+          raise Processor::MultipleApplicableProcessors.new(filename, matching, chosen)
+        when matching.length == 1
+          return matching.first
         else
           return nil
       end
     end
 
+
     # like #choose_processor but prints a message if there are clashing
     # processors and returns the first of the clashing processors.
     # (effectively alerting the user, but continuing to work)
@@ -160,6 +205,79 @@ module SiteFuel
       end
     end
 
+    def section_divider(name)
+      puts "== #{name} ".ljust(TerminalInfo.width, '=')
+    end
+
+
+    # decides what repository system to use (SVN or Git) based on the
+    # pull source given (eg. ssh://... is typically git; svn+ssh://... is SVN,
+    # etc.)
+    def classify_repository_system(pull_source)
+
+      # note that http:// and https:// repositories, in general could be
+      # anything.
+      case pull_source
+        when /^git:\/\/.*$/i,
+             /^ssh:\/\/.*$/i,
+             /^rsync:\/\/.*$/i,
+             /^.*\.git$/i
+          :git
+
+        when /^svn:\/\/.*$/i,
+             /^svn\+ssh:\/\/.*$/i,
+             /^file:\/\/.*$/i
+          :svn
+
+        when /^([-.a-zA-Z0-9\/])*$/i
+          :filesystem
+
+        else
+          raise UnknownVersioningSystem.new(pull_source)
+      end
+    end                               
+
+    def classify_repository_system!(pull_source)
+      classify_repository_system(pull_source)
+    rescue UnknownVersioningSystem => exception
+      fatal(exception.to_s)
+      exit(-1)
+    end
+
+
+    # pulls files out of a given repository or file system
+    def pull
+      if @scm_system == nil
+        @scm_system = classify_repository_system!(@deploy_from)
+        info "Using #{@scm_system} version control to access #{@deploy_from}"
+      end
+
+      # TODO this should be modularized; but in general there should be a
+      # 'discoverable' class that automates creation of plugins
+
+      case @scm_system.to_sym
+        when :svn
+          @staging_directory = External::SVN.export(@deploy_from)
+
+        when :git
+          @staging_directory = External::GIT.shallow_clone(@deploy_from)
+
+        when :filesystem
+          # kind of dangerous because it can override the source files; it's
+          # assumed every processor will not override the original.
+          @staging_directory = @deploy_from
+
+        else
+          fatal "Unknown SCM system: #{@scm_system}"
+          exit(-1)
+      end
+
+      info "Pulled files for staging into #{@staging_directory}"
+
+    rescue External::ProgramExitedWithFailure => exception
+      fatal "Couldn't pull files from SCM:\n#{exception}"
+    end
+
 
     # implements the stage command. Staging, by itself, will give statistics on
     # the deployment; how many bytes were saved by minification; etc.
@@ -167,12 +285,15 @@ module SiteFuel
     # However, #stage when part of #deploy will go and create the requisite files
     # in a temporary directory
     def stage
-      return nil if @deploy_from == nil
+      pull
+
+      return nil if @staging_directory == nil
 
-      puts '== %s '.format('Staging').ljust(80, '=')
+      section_divider('Staging')
+      printer = ColumnPrinter.new([5, :span, 6])
 
       # find all files under deploy_from
-      files = find_all_files @deploy_from
+      files = find_all_files @staging_directory
 
       total_original_size = 0
       total_processed_size = 0
@@ -189,7 +310,7 @@ module SiteFuel
         processor = @resource_processors[filename]
         if processor == nil
           if only_list_recognized_files == false
-            puts '%s %s' %['--'.ljust(8), filename.cabbrev(65)]
+            printer.row('--', filename)
           end
         else
           total_original_size += processor.original_size
@@ -201,16 +322,16 @@ module SiteFuel
           stats[2] += processor.processed_size
           @processor_statistics[processor.class.processor_name] = stats
 
-          puts '%s %s %4.3f' %
-               [
-                 cyan(processor.class.processor_name.ljust(8)),
-                 filename.cabbrev(65).ljust(65),
-                 processor.processed_size.prec_f/processor.original_size.prec_f
-               ]
+          printer.row(
+            cyan(processor.class.processor_name),
+            filename,
+            '%4.3f'%(processor.processed_size.prec_f/processor.original_size.prec_f)
+          )
         end
       end
 
-      puts '='*80
+      printer.divider
+      
       puts 'Size delta:         %+5d bytes; %4.3f' %
               [
                 total_processed_size - total_original_size,
@@ -220,69 +341,121 @@ module SiteFuel
       staging_statistics
     end
 
+
     # outputs a little grid showing the number of files of each processor
     # and the total savings
     #
     # todo: this should be computed in the staging step
     def staging_statistics
+
       puts ''
-      puts '     %s | %s  |    %s    | %s' %
-           ['processor', '# files', 'delta', 'ratio'].map{|v| bold(v)}
-      puts '    -----------+----------+-------------+-------'
+
+      printer = ColumnPrinter.new([12, 8, :span, 6], [TerminalInfo.width, 50].min)
+      printer.alignment([:left, :right, :right, :right])
+      printer.mode(:divided)
+
+      headers = %w{processor files delta ratio}.map{|v| bold(v)}
+      printer.row(*headers)
+      printer.divider
       
       @processor_statistics.keys.sort.each do |key|
-        puts '     %s|%9d |%+12d | %4.3f' %
-             [
-               key.ljust(10),
-               @processor_statistics[key][0],
-               @processor_statistics[key][2] - @processor_statistics[key][1],
-               @processor_statistics[key][2].prec_f / @processor_statistics[key][1].prec_f
-             ]
+        printer.row(
+          key,
+          @processor_statistics[key][0],
+          '%+12d'%(@processor_statistics[key][2] - @processor_statistics[key][1]),
+          '%4.3f'%(@processor_statistics[key][2].prec_f / @processor_statistics[key][1].prec_f)
+        )
       end
-      puts '    -----------+----------+-------------+-------'
+      printer.divider
       puts ''
     end
 
+
+    def check_messages
+      error_count = SiteFuelLogger.instance.error_count
+      if @abort_on_errors and error_count > 0
+        fatal "Aborting due to errors. Use --force to deploy anyway."
+        exit(-1)
+      end
+
+      warn_count = SiteFuelLogger.instance.error_count
+      if @abort_on_warnings and warn_count > 0
+        fatal "Aborting due to warnings. Use --ignore-warnings to deploy anyway."
+        exit(-1)
+      end
+    end
+
+
     # create a deployment
     def deploy
       # first we have to stage the files
       stage
 
-      files = find_all_files @deploy_from
+      check_messages
 
       return if @deploy_to == nil
-      puts
-      puts bold('Deploying:')
 
-      unless File.exists?(@deploy_to)
-        Dir.mkdir(@deploy_to)
-      end
+      section_divider('Deploying')
+
+      file_tree = FileTree.new(@deploy_to)
+      
       # write out content
-      files.each do |filename|
+      @resource_processors.each_key do |filename|
         results = @resource_processors[filename]
         if results == nil
-          putc 'I'
-        else
           putc '.'
-          results.save(@deploy_to)
+        else
+          putc results.processor_symbol
+          results.save(file_tree)
         end
         STDOUT.flush
       end
-      puts
+
+
+      finish
+    end
+
+    def finish
+      puts ''
+      puts ''
+      section_divider('Finishing')
     end
 
+
     # gives an array listing of all files on a given path
     #
     # This is a very lightweight wrapper around Dir.
     def find_all_files(path)
-      Dir[File.join(path, "**/*")]
+      if File.directory?(path)
+        Dir[File.join(path, "**/*")]
+      elsif File.file?(path)
+        return path
+      else
+        return []
+      end
     end
 
+    
     # changes the verbosity of the runtime by adjusting the log level
     def verbosity(level = 1)
       case level
-      when 1
+        when 0
+          SiteFuelLogger.instance.level = Logger::FATAL
 
+        when 1
+          SiteFuelLogger.instance.level = Logger::ERROR
+
+        when 2
+          SiteFuelLogger.instance.level = Logger::WARN
+
+        when 3
+          SiteFuelLogger.instance.level = Logger::INFO
+
+        when 4
+          SiteFuelLogger.instance.level = Logger::DEBUG
+
+        else
+          warn "Unknown verbosity level: #{level}; ignoring."
       end
     end
   end