bakery 0.5.1 → 0.5.2

data/bin/bake

@@ -24,31 +24,56 @@ EOS
   opt :recipe, "Set recipe file to bake from.", { :type => String, :default => File.join(Bakery::ROOT_DIR, '.recipe') }
   opt :ingredients, "Set which ingredients to use when baking.", { :type => String, :default => File.join(Bakery::ROOT_DIR, '.ingredients') }
   opt :destination, "Set the destination location.", { :type => String }
+  opt :verbose, "Verbose output.", { :default => false, :short => 'e' }
+  opt :debug, "Debug output.", { :default => false, :short => 'b' }
+  opt :quiet, "Ignore warnings.", { :default => false, :short => 'q' }
 end
 
-Trollop::die :recipe, ": '#{opts[:recipe]}' must exist" unless File.exist?(opts[:recipe]) || !opts[:recipe]
+Trollop::die :recipe, ": '#{opts[:recipe]}' must exist" unless File.exist?(opts[:recipe])
+
+Bakery::Log::VERBOSE = opts[:verbose]
+Bakery::Log::QUIET = opts[:quiet]
+Bakery::Log::DEBUG = opts[:debug]
 
 bake_init = Proc.new do
   Bakery.addCake
 
   # use default ingredients if an ingredients file is not provided
   if File.exists? opts[:ingredients]
+    Bakery::Log.debug "loading ingredients: #{opts[:ingredients]}"
+
     load opts[:ingredients]
   else
-    $stdout.puts "[WARNING] Using default ingredients."
+    Bakery::Log.warning "using default ingredients"
+
     use_defaults
   end
 
-  load opts[:recipe]
+  Bakery::Log.debug "loading recipe: #{opts[:recipe]}"
+
+  begin
+    load opts[:recipe]
+
+    Bakery::Log.puts "success"
+  rescue Exception => e
+    puts e
+    Bakery::Log.error "failure"
+  end
 end
 
 if opts[:destination]
   if !Dir.exists? opts[:destination]
+    Bakery::Log.info "creating destination directory: #{opts[:destination]}"
+
     FileUtils.mkdir_p opts[:destination]
+  else
+    Bakery::Log.debug "using destination directory: #{opts[:destination]}"
   end
 
   Dir.chdir opts[:destination], &bake_init
 else
+  Bakery::Log.debug "destination set to current directory"
+
   bake_init.call
 end
 

data/lib/bakery.rb

@@ -13,6 +13,7 @@ require 'bakery/bakery'
 require 'bakery/cake'
 require 'bakery/detail/global_function'
 require 'bakery/detail/load'
+require 'bakery/detail/log'
 require 'bakery/detail/dispatcher'
 require 'bakery/detail/search'
 require 'bakery/icing'

data/lib/bakery/bakery.rb

@@ -19,10 +19,18 @@ module Bakery
     def removeMarkerLayerFromStack path
       # remove all markers that are in the current directory
       @markers.select! { |marker|
-        !marker.getPath.start_with? path
+        removed = !marker.getPath.start_with?(path)
+
+        if removed
+          Bakery::Log.debug "unset #{marker.class}: #{marker.getPath}"
+        end
+
+        removed
       }
 
       if @currentCake.root == path
+        Bakery::Log.debug "leaving project: #{@currentCake.root}"
+
         @currentCake = @currentCake.parent
       end
     end
@@ -60,6 +68,8 @@ module Bakery
     def addCake
       cake = Cake.new @currentCake
 
+      Bakery::Log.debug "entering project: #{cake.root}"
+
       @cakes.push cake
       @currentCake = cake
     end

data/lib/bakery/detail/global_function.rb

@@ -11,6 +11,8 @@
 
 class Object
   def global_function name, &block
+    Bakery::Log.debug "create global function: #{name.to_s}"
+
     self.class.send :define_method, name, &block
   end
 end

data/lib/bakery/detail/load.rb

@@ -12,6 +12,8 @@
 def load_if_exists name
   if File.exists? name
     load name
+  else
+    Bakery::Log.debug "could not load file: #{name}"
   end
 end
 

data/lib/bakery/detail/log.rb

@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2013
+# Nathan Currier
+#
+# Use, modification, and distribution are all subject to the
+# Boost Software License, Version 1.0. (See the accompanying
+# file LICENSE.md or at http://rideliner.tk/LICENSE.html).
+#
+# <description>
+#
+
+module Bakery
+  module Log
+    class << self
+    private
+      def print tag, msg
+        puts "[#{tag}] #{msg}"
+      end
+    public
+      def puts msg
+        $stderr.puts msg
+      end
+
+      # output if not quiet
+      def warning msg
+        print 'WARNING', msg unless QUIET
+      end
+
+      # output all the time
+      def error msg
+        print 'ERROR', msg
+      end
+
+      # output if verbose
+      def info msg
+        print 'INFO', msg if VERBOSE
+      end
+
+      # output if debugging
+      def debug msg
+        print 'DEBUG', msg if DEBUG
+      end
+    end
+  end
+end
+

data/lib/bakery/detail/search.rb

@@ -54,7 +54,8 @@ public
       if file != nil
         yield file
       else
-        stderr.puts "[WARNING] #{filename} was not found while searching in #{paths}."
+        Bakery::Log.warning "no results found in search: #{filename}"
+        Bakery::Log.debug "search path: #{paths}"
       end
     end
 
@@ -67,7 +68,11 @@ public
 
   def addSearchDirectory dir
     if File.exist?(dir) && File.directory?(dir) && !@paths.include?(dir)
+      Bakery::Log.debug "directory added to search path: #{dir}"
+
       @paths << dir
+    else
+      Bakery::Log.warning "directory not added to search path: #{dir}"
     end
   end
 

data/lib/bakery/icing.rb

@@ -10,12 +10,22 @@
 #
 
 def name n
+  if Bakery.getCake.icing[:name] == nil
+    Bakery::Log.debug "name set: #{n}"
+  else
+    Bakery::Log.debug "name overwritten: #{n}"
+  end
+
   Bakery.getCake.icing[:name] = n
 end
 
 def authors *names
   if Bakery.getCake.icing[:authors] == nil
+    Bakery::Log.debug "authors set: #{names}"
+
     Bakery.getCake.icing[:authors] = Array.new
+  else
+    Bakery::Log.debug "authors concatenated: #{names}"
   end
 
   Bakery.getCake.icing[:authors].concat names
@@ -25,7 +35,11 @@ alias :author :authors
 
 def description *desc
   if Bakery.getCake.icing[:description] == nil
+    Bakery::Log.debug "description set: #{desc}"
+
     Bakery.getCake.icing[:description] = Array.new
+  else
+    Bakery::Log.debug "description concatenated: #{desc}"
   end
 
   Bakery.getCake.icing[:description].concat desc
@@ -33,32 +47,61 @@ end
 
 def summary *sum
   if Bakery.getCake.icing[:summary] == nil
+    Bakery::Log.debug "summary set: #{sum}"
+
     Bakery.getCake.icing[:summary] = Array.new
+  else
+    Bakery::Log.debug "summary concatenated: #{sum}"
   end
 
   Bakery.getCake.icing[:summary].concat sum
 end
 
 def copyright *lines
+  if Bakery.icing[:copyright] == nil
+    Bakery::Log.debug "copyright set: #{lines}"
+  else
+    Bakery::Log.debug "copyright overwritten: #{lines}"
+  end
+
   Bakery.getCake.icing[:copyright] = lines
 end
 
 def defaultAuthors *names
+  if Bakery.icing[:authors] == nil
+    Bakery::Log.debug "default author set: #{names}"
+  else
+    Bakery::Log.debug "default author overwritten: #{names}"
+  end
+
   Bakery.icing[:authors] = names
 end
 
 alias :defaultAuthor :defaultAuthors
 
 def defaultCopyright *lines
+  if Bakery.icing[:copyright] == nil
+    Bakery::Log.debug "default copyright set: #{lines}"
+  else
+    Bakery::Log.debug "default copyright overwritten: #{lines}"
+  end
+
   Bakery.icing[:copyright] = lines
 end
 
 def defaultDescription *desc
+  if Bakery.icing[:description] == nil
+    Bakery::Log.debug "default description set: #{desc}"
+  else
+    Bakery::Log.debug "default description overwritten: #{desc}"
+  end
+
   Bakery.icing[:description] = desc
 end
 
 def loadIcing filename
   Bakery::ICING_SEARCH.search(filename) { |file|
+    Bakery::Log.info "loading icing: #{file}"
     load file
   }
 end

data/lib/bakery/ingredients/detail/dir.ingredient

@@ -19,8 +19,12 @@ module Bakery
       def initialize path, *args, &block
         if !Dir.exists? path
           if args.include? :create_recursive
+            Bakery::Log.info "creating directories: #{path}"
+
             FileUtils.mkdir_p path
           else
+            Bakery::Log.info "creating directory: #{path}"
+
             FileUtils.mkdir path
           end
         end
@@ -28,9 +32,13 @@ module Bakery
         super path
 
         Dir.chdir path do
+          Bakery::Log.debug "entering directory: #{path}"
+
           dispatch &block
 
           Bakery.removeMarkerLayerFromStack Dir.pwd
+
+          Bakery::Log.debug "leaving directory: #{path}"
         end
       end
     end

data/lib/bakery/ingredients/detail/file.ingredient

@@ -40,6 +40,12 @@ module Bakery
         already_exists = File.exist? filename
         
         if !already_exists || args.include?(:always_overwrite)
+          if !already_exists
+            Bakery::Log.info "#{self.class} creating: #{filename}"
+          else
+            Bakery::Log.info "#{self.class} overwriting: #{filename}"
+          end
+
           super filename, 'w+'
 
           dispatch &block
@@ -47,13 +53,19 @@ module Bakery
           super filename, 'a+'
 
           if args.include?(:always_append)
+            Bakery::Log.info "#{self.class} appending: #{filename}"
+
             dispatch &block
+          else
+            Bakery::Log.info "#{self.class} opening: #{filename}"
           end
         end
       end
 
       def from filename
         ICING_SEARCH.search(filename) { |file|
+          Bakery::Log.info "copying '#{file}' to '#{path}'"
+
           FileUtils.cp file, path
         }
       end

data/lib/bakery/ingredients/detail/marker.ingredient

@@ -15,6 +15,8 @@ module Bakery
       def initialize *args, &block
         @wd = Dir.pwd
 
+        Bakery::Log.debug "set #{self.class}: #{@wd}"
+
         Bakery.markers << self
       end
 

data/lib/bakery/version.rb

@@ -10,6 +10,6 @@
 #
 
 module Bakery
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bakery
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -49,6 +49,7 @@ files:
 - lib/bakery/detail/global_function.rb
 - lib/bakery/detail/search.rb
 - lib/bakery/detail/dispatcher.rb
+- lib/bakery/detail/log.rb
 - lib/bakery/ingredient.rb
 - lib/bakery/icing.rb
 - lib/bakery/bakery.rb