massimo 0.6.8 → 0.7.0

data/bin/massimo

@@ -1,4 +1,20 @@
 #!/usr/bin/env ruby
 
 require 'massimo'
-Massimo::CLI.start
+
+case ARGV.shift
+when 'b', 'build'
+  Massimo::Commands::Build
+when 'g', 'generate'
+  Massimo::Commands::Generate
+when nil, '-h', '--help', 'help'
+  Massimo::Commands::Help
+when 's', 'server'
+  Massimo::Commands::Server
+when '-v', '--version', 'version'
+  Massimo::Commands::Version
+when 'w', 'watch'
+  Massimo::Commands::Watch
+else
+  Massimo::Commands::Help
+end.run

data/lib/massimo/commands/base.rb

@@ -0,0 +1,87 @@
+require 'optparse'
+require 'thor/actions'
+require 'thor/shell'
+
+module Massimo
+  module Commands
+    class Base
+      include Thor::Actions
+      include Thor::Shell
+      
+      attr_reader :options, :parser
+      
+      def self.run
+        command = self.new
+        command.parse
+        command.run
+      end
+      
+      def initialize()
+        @options = {}
+        @parser  = OptionParser.new
+        
+        parser.banner = "#{banner}\n" if respond_to?(:banner)
+        common_options
+        add_options if respond_to?(:add_options)
+        
+        # needed for Thor::Actions to work
+        self.destination_root = nil
+      end
+      
+      def common_options
+        parser.on('-c', '--config FILE', 'Path to the config file') do |config|
+          options[:config] = config
+        end
+        
+        parser.on('-s', '--source-path PATH', 'Path to the source dir') do |path|
+          options[:source_path] = path
+        end
+        
+        parser.on('-o', '--output-path PATH', 'Path to the output dir') do |path|
+          options[:output_path] = path
+        end
+        
+        parser.on('-e', '--environment ENV', 'Sets the Site environment') do |env|
+          options[:environment] = env
+        end
+        
+        parser.on('-p', '--production', "Sets the Site environment to 'production'") do |production|
+          options[:environment] = 'production'
+        end
+      end
+      
+      def parse
+        begin
+          parser.parse(ARGV)
+        rescue
+          say parser
+          exit
+        end
+      end
+      
+      def run
+      end
+      
+      def site
+        @site ||= begin
+          site = Massimo::Site.new config_file(:yml)
+          site.config.environment = options[:environment] if options[:environment]
+          site.config.source_path = options[:source_path] if options[:source_path]
+          site.config.output_path = options[:output_path] if options[:output_path]
+          if config_rb = config_file(:rb)
+            site.instance_eval File.read(config_rb)
+          end
+          site
+        end
+      end
+      
+      def config_file(ext)
+        if options[:config] && File.extname(options[:config]) == ".#{ext}"
+          options[:config]
+        elsif File.exist?("config.#{ext}")
+          "config.#{ext}"
+        end
+      end
+    end
+  end
+end

data/lib/massimo/commands/build.rb

@@ -0,0 +1,19 @@
+module Massimo
+  module Commands
+    class Build < Base
+      def banner
+%{
+#{Massimo::UI.color('massimo build', :cyan)}
+Builds the site from the source files.
+}
+      end
+      
+      def run
+        Massimo::UI.report_errors do
+          site.process
+          Massimo::UI.say 'massimo has built your site', :growl => true
+        end
+      end
+    end
+  end
+end

data/lib/massimo/commands/generate.rb

@@ -0,0 +1,63 @@
+require 'active_support/core_ext/string/starts_ends_with'
+require 'active_support/inflector'
+
+module Massimo
+  module Commands
+    class Generate < Base
+      def banner
+%{
+#{Massimo::UI.color('massimo generate SITE_OR_RESOURCE [FILE]', :cyan)}
+Generates a new site:
+  massimo generate myblog
+Within a massimo project, you can generate a new resource file:
+  massimo generate page contact.haml
+}
+      end
+      
+      def add_options
+        @site_or_resource = ARGV.shift
+        
+        if ARGV.first && !ARGV.first.starts_with?('-')
+          @file = ARGV.shift
+        end
+        
+        options.merge!(
+          :page_ext       => 'haml',
+          :javascript_ext => 'js',
+          :stylesheet_ext => 'sass'
+        )
+        
+        parser.on('--page', '--page-ext EXT', 'The extension used for generated Pages and Views') do |ext|
+          options[:page_ext] = ext
+        end
+        
+        parser.on('--js', '--javascript-ext EXT', 'The extension used for generated Javascripts') do |ext|
+          options[:javascript_ext] = ext
+        end
+        
+        parser.on('--css', '--stylesheet-ext EXT', 'The extension used for generated Stylesheets') do |ext|
+          options[:stylesheet_ext] = ext
+        end
+      end
+      
+      def run
+        if @file
+          create_file File.join(site.config.path_for(@site_or_resource.pluralize), @file)
+        else
+          empty_directory @site_or_resource
+          inside @site_or_resource do
+            site.resources.each do |resource|
+              empty_directory(resource.path)
+            end
+            create_file     File.join(Massimo::Page.path,       "index.#{options[:page_ext]}")
+            create_file     File.join(Massimo::Javascript.path, "main.#{options[:javascript_ext]}")
+            create_file     File.join(Massimo::Stylesheet.path, "main.#{options[:stylesheet_ext]}")
+            create_file     File.join(Massimo::View.path,       "layouts/main.#{options[:page_ext]}")
+            empty_directory site.config.output_path
+          end
+        end
+      end
+    end
+    
+  end
+end

data/lib/massimo/commands/help.rb

@@ -0,0 +1,35 @@
+require 'active_support/core_ext/string/conversions'
+
+module Massimo
+  module Commands
+    class Help < Base
+      def add_options
+        command_name = ARGV.shift
+        unless command_name.nil? or %w( help version ).include?(command_name)
+          @command = "Massimo::Commands::#{command_name.camelize}".constantize rescue nil
+        end
+      end
+      
+      def run
+        if @command
+          puts @command.new.parser
+        else
+          puts %{
+#{Massimo::UI.color('massimo', :cyan)}
+a static website builder
+
+Commands:
+  massimo build                             # Builds the site
+  massimo generate SITE_OR_RESOURCE [FILE]  # Generates a new site
+                                              Optionally generates a resource file
+  massimo help [COMMAND]                    # Shows info about a specific command
+  massimo server [PORT]                     # Runs a local web server
+  massimo version                           # Displays current version
+  massimo watch                             # Watches your files for changes
+}
+        end
+      end
+    end
+    
+  end
+end

data/lib/massimo/commands/server.rb

@@ -0,0 +1,24 @@
+require 'active_support/core_ext/string/starts_ends_with'
+
+module Massimo
+  module Commands
+    class Server < Base
+      def banner
+%{
+#{Massimo::UI.color('massimo server [PORT]', :cyan)}
+Runs a local Rack based web server on the given port.
+}
+      end
+      
+      def add_options
+        if ARGV.first && !ARGV.first.starts_with?('-')
+          @port = ARGV.shift
+        end
+      end
+      
+      def run
+        Massimo::Server.start(site, (@port || 3000).to_i)
+      end
+    end
+  end
+end

data/lib/massimo/commands/version.rb

@@ -0,0 +1,9 @@
+module Massimo
+  module Commands
+    class Version < Base
+      def run
+        puts Massimo::VERSION
+      end
+    end
+  end
+end

data/lib/massimo/commands/watch.rb

@@ -0,0 +1,16 @@
+module Massimo
+  module Commands
+    class Watch < Base
+      def banner
+%{
+#{Massimo::UI.color('massimo watch', :cyan)}
+Watches your files for changes and automatically builds the site.
+}
+      end
+      
+      def run
+        Massimo::Watcher.start(site)
+      end
+    end
+  end
+end

data/lib/massimo/server.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/string/starts_ends_with'
 require 'rack'
 
 module Massimo
@@ -5,6 +6,11 @@ module Massimo
     class << self
       def start(site, port = 3000)
         Massimo::UI.say "massimo is serving your site at http://localhost:#{port}", :growl => true
+        trap('INT') do
+          Massimo::UI.say 'massimo is shutting down your server', :growl => true
+          Rack::Handler::WEBrick.shutdown
+        end
+        
         app = Rack::Builder.new do
           use Rack::ShowExceptions
           run Massimo::Server.new(site)
@@ -21,7 +27,7 @@ module Massimo
     
     def call(env)
       @watcher.process
-      env['PATH_INFO'] << 'index.html' if env['PATH_INFO'] =~ /\/$/
+      env['PATH_INFO'] << 'index.html' if env['PATH_INFO'].ends_with? '/'
       @file_server.call(env)
     end
   end

data/lib/massimo.rb

@@ -1,5 +1,4 @@
 module Massimo
-  autoload :CLI,        'massimo/cli'
   autoload :Config,     'massimo/config'
   autoload :Helpers,    'massimo/helpers'
   autoload :Javascript, 'massimo/javascript'
@@ -12,7 +11,17 @@ module Massimo
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
-  VERSION = '0.6.8'
+  module Commands
+    autoload :Base,     'massimo/commands/base'
+    autoload :Build,    'massimo/commands/build'
+    autoload :Generate, 'massimo/commands/generate'
+    autoload :Help,     'massimo/commands/help'
+    autoload :Server,   'massimo/commands/server'
+    autoload :Version,  'massimo/commands/version'
+    autoload :Watch,    'massimo/commands/watch'
+  end
+  
+  VERSION = '0.7.0'
   
   class << self
     def site

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: massimo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 8
-  version: 0.6.8
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -05:00
+date: 2010-07-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -321,8 +321,14 @@ files:
 - lib/massimo/server.rb
 - lib/massimo/view.rb
 - lib/massimo/page.rb
+- lib/massimo/commands/build.rb
+- lib/massimo/commands/server.rb
+- lib/massimo/commands/generate.rb
+- lib/massimo/commands/help.rb
+- lib/massimo/commands/watch.rb
+- lib/massimo/commands/version.rb
+- lib/massimo/commands/base.rb
 - lib/massimo/resource.rb
-- lib/massimo/cli.rb
 - lib/massimo/config.rb
 - lib/massimo/ui.rb
 - lib/massimo/watcher.rb

data/lib/massimo/cli.rb

@@ -1,99 +0,0 @@
-require 'thor'
-
-module Massimo
-  class CLI < Thor
-    include Thor::Actions
-    
-    default_task :build
-    class_option 'config',      :desc => 'Path to the config file',                   :aliases => '-c'
-    class_option 'source_path', :desc => 'Path to the source dir',                    :aliases => '-s'
-    class_option 'output_path', :desc => 'Path to the output dir',                    :aliases => '-o'
-    class_option 'environment', :desc => 'Sets the Site environment',                 :aliases => '-e'
-    class_option 'production',  :desc => "Sets the Site environment to 'production'", :aliases => '-p', :type => :boolean
-    
-    desc 'build', 'Builds the site'
-    def build
-      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
-      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)
-      Massimo::Server.start(site, port.to_i)
-    end
-    map 's' => :server
-    
-    desc 'generate SITE_OR_RESOURCE [FILE]', 'Generates a new site. Optionally generates a resource file.'
-    method_option 'page_ext',
-      :desc    => 'The extension used for generated Pages and Views',
-      :default => 'haml',
-      :aliases => '--page'
-    method_option 'javascript_ext',
-      :desc    => 'The extension used for generated Javascripts',
-      :default => 'js',
-      :aliases => '--js'
-    method_option 'stylesheet_ext',
-      :desc    => 'The extension used for generated Stylesheets',
-      :default => 'sass',
-      :aliases => '--css'
-    def generate(site_or_resource, file = nil)
-      require 'active_support/inflector'
-      
-      if file
-        create_file File.join(site.config.path_for(site_or_resource.pluralize), file)
-      else
-        empty_directory site_or_resource
-        inside site_or_resource do
-          site.resources.each do |resource|
-            empty_directory(resource.path)
-          end
-          create_file     File.join(Massimo::Page.path,       "index.#{options[:page_ext]}")
-          create_file     File.join(Massimo::Javascript.path, "main.#{options[:javascript_ext]}")
-          create_file     File.join(Massimo::Stylesheet.path, "main.#{options[:stylesheet_ext]}")
-          create_file     File.join(Massimo::View.path,       "layouts/main.#{options[:page_ext]}")
-          empty_directory site.config.output_path
-        end
-      end
-    end
-    map 'g' => :generate
-    
-    desc 'version', 'Displays current version'
-    def version
-      Massimo::UI.say Massimo::VERSION
-    end
-    map %w( -v --version ) => :version
-    
-    protected
-    
-      def site
-        @site ||= begin
-          site = Massimo::Site.new config_file(:yml)
-          site.config.environment = 'production'          if options[:production] 
-          site.config.environment = options[:environment] if options[:environment]
-          site.config.source_path = options[:source_path] if options[:source_path]
-          site.config.output_path = options[:output_path] if options[:output_path]
-          if config_rb = config_file(:rb)
-            site.instance_eval File.read(config_rb)
-          end
-          site
-        end
-      end
-      
-      def config_file(ext)
-        if options[:config] && File.extname(options[:config]) == ".#{ext}"
-          options[:config]
-        elsif File.exist?("config.#{ext}")
-          "config.#{ext}"
-        end
-      end
-  end
-end