massimo 0.5.6 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/massimo/cli.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-require 'ostruct'
 require 'thor'
 
 module Massimo
@@ -13,25 +11,21 @@ module Massimo
     
     desc 'build', 'Builds the site'
     def build
-      site.process
-      say 'massimo has built your site'
+      Massimo::UI.report_errors do
+        site.process
+        Massimo::UI.say 'massimo has built your site', :growl => true
+      end
     end
     map 'b' => :build
     
     desc 'watch', 'Watches your files for changes and rebuilds'
     def watch
-      begin
-        say 'massimo is watching your files for changes'
-        Massimo::Watcher.start(site)
-      rescue Interrupt
-        exit
-      end
+      Massimo::Watcher.start(site)
     end
     map 'w' => :watch
     
     desc 'server [PORT]', 'Runs a local web server and processes the site on save'
     def server(port = 3000)
-      say "massimo is serving your site at http://localhost:#{port}"
       Massimo::Server.start(site, port.to_i)
     end
     map 's' => :server
@@ -72,7 +66,7 @@ module Massimo
     
     desc 'version', 'Displays current version'
     def version
-      say Massimo::VERSION
+      Massimo::UI.say Massimo::VERSION
     end
     map %w( -v --version ) => :version
     

data/lib/massimo/page.rb

@@ -9,8 +9,8 @@ module Massimo
     def render
       output = content
       
-      if template_type = Tilt[source_path.basename.to_s]
-        template  = template_type.new(nil, @line || 1) { output }
+      if template_type = Tilt[filename]
+        template  = template_type.new(source_path.to_s, @line || 1) { output }
         meta_data = @meta_data.merge(self.class.resource_name.singularize.to_sym => self)
         output    = template.render(Massimo.site.template_scope, meta_data)
       end
@@ -23,7 +23,7 @@ module Massimo
     end
     
     def title
-      @meta_data[:title] ||= source_path.basename.to_s.chomp(source_path.extname.to_s).titleize
+      @meta_data[:title] ||= filename.chomp(source_path.extname.to_s).titleize
     end
     
     def extension
@@ -31,12 +31,7 @@ module Massimo
     end
     
     def url
-      @meta_data[:url] ||= begin
-        url = super
-        url.chomp!('index.html')
-        url.sub!(/\.html$/, '/')
-        url
-      end
+      @meta_data[:url] ||= super.chomp('index.html').sub(/\.html$/, '/')
     end
     
     def layout

data/lib/massimo/server.rb

@@ -4,6 +4,7 @@ module Massimo
   class Server
     class << self
       def start(site, port = 3000)
+        Massimo::UI.say "massimo is serving your site at http://localhost:#{port}", :growl => true
         app = Rack::Builder.new do
           use Rack::ShowExceptions
           run Massimo::Server.new(site)

data/lib/massimo/ui.rb

@@ -0,0 +1,70 @@
+require 'active_support/core_ext/array/extract_options'
+
+module Massimo
+  module UI
+    extend self
+    
+    COLOR_CODES = {
+      :black   => 30,
+      :red     => 31,
+      :green   => 32,
+      :yellow  => 33,
+      :blue    => 34,
+      :magenta => 35,
+      :cyan    => 36
+    }.freeze
+    
+    # Say (print) something to the user.
+    def say(message, *args)
+      options = args.extract_options!
+      color   = args.first
+      
+      growl(message) if options[:growl]
+      message = (' ' * padding) + message.to_s
+      message = self.color(message, color) if color
+
+      $stdout.puts(message)
+    end
+    
+    # Color the given message with the given color
+    def color(message, color)
+      "\e[#{COLOR_CODES[color.to_sym]}m#{message}\e[0m"
+    end
+    
+    # Run the given block and cleanly report any errors
+    def report_errors
+      begin
+        yield
+      rescue Exception => error
+        say 'massimo had a problem', :red
+        indent do
+          say error.message, :magenta
+          say error.backtrace.first, :magenta
+        end
+        growl "#{error.message}\n#{error.backtrace.first}", 'massimo problem'
+      end
+    end
+    
+    # Indents the messages within the block by the given amount.
+    def indent(amount = 2)
+      self.padding += amount
+      yield
+      self.padding -= amount
+    end
+    
+    protected
+    
+      def growl(message, title = 'massimo')
+        Growl.notify(message, :title => title) if defined?(Growl)
+      end
+    
+      def padding
+        @padding ||= 0
+      end
+      
+      def padding=(value)
+        @padding = [ 0, value.to_i ].max
+      end
+      
+  end
+end

data/lib/massimo/view.rb

@@ -5,7 +5,7 @@ module Massimo
     unprocessable
     
     def render(locals = {}, &block)
-      template = Tilt.new(source_path.basename.to_s) { content }
+      template = Tilt.new(source_path.to_s) { content }
       template.render(Massimo.site.template_scope, locals, &block)
     end
   end

data/lib/massimo/watcher.rb

@@ -2,6 +2,7 @@ module Massimo
   class Watcher
     class << self
       def start(site)
+        Massimo::UI.say 'massimo is watching your files for changes', :growl => true
         self.new(site).run
       end
     end
@@ -11,24 +12,25 @@ module Massimo
       @files = []
     end
     
-    # Runs a loop, processing the whenever files have changed.
+    # Runs a loop, processing the Site whenever files have changed.
     def run
-      loop do
-        process
-        sleep 0.5
+      begin
+        loop do
+          process
+          sleep 0.5
+        end
+      rescue Interrupt
+        exit
       end
     end
     
     # Processes the Site if any of the files have changed.
     def process
       if changed?
-        begin
-          puts 'massimo has noticed a change'
+        Massimo::UI.report_errors do
+          Massimo::UI.say 'massimo has noticed a change'
           @site.process
-          puts 'massimo has built your site'
-        rescue Exception => e
-          puts e.message
-          puts e.backtrace
+          Massimo::UI.say 'massimo has built your site', :growl => true
         end
       end
     end

data/lib/massimo.rb

@@ -8,6 +8,7 @@ module Massimo
   autoload :Server,     'massimo/server'
   autoload :Site,       'massimo/site'
   autoload :Stylesheet, 'massimo/stylesheet'
+  autoload :UI,         'massimo/ui'
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -05:00
+date: 2010-04-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -229,6 +229,20 @@ dependencies:
         version: 0.9.0
   type: :development
   version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id016
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
 executables: 
@@ -239,17 +253,18 @@ extra_rdoc_files: []
 
 files: 
 - bin/massimo
-- lib/massimo/stylesheet.rb
-- lib/massimo/server.rb
-- lib/massimo/view.rb
-- lib/massimo/page.rb
-- lib/massimo/resource.rb
 - lib/massimo/cli.rb
 - lib/massimo/config.rb
-- lib/massimo/watcher.rb
-- lib/massimo/site.rb
-- lib/massimo/javascript.rb
 - lib/massimo/helpers.rb
+- lib/massimo/javascript.rb
+- lib/massimo/page.rb
+- lib/massimo/resource.rb
+- lib/massimo/server.rb
+- lib/massimo/site.rb
+- lib/massimo/stylesheet.rb
+- lib/massimo/ui.rb
+- lib/massimo/view.rb
+- lib/massimo/watcher.rb
 - lib/massimo.rb
 - LICENSE
 - README.md