hydeweb 0.0.1.pre4 → 0.0.1.pre5

data/VERSION

@@ -1 +1 @@
-0.0.1.pre4
+0.0.1.pre5

data/bin/hyde

@@ -6,66 +6,12 @@ require 'optparse'
 require 'rubygems'
 require 'hyde'
 
-options = {
-}
-
-opts = OptionParser.new do |o|
-  o.banner = "usage: hyde <action> [<options>]"
-  o.separator ""
-
-  #o.on("-w", "--watch", "watch for changes") do
-  #  options[:watch] = true
-  #end
-
-  o.separator "Actions:"
-  o.separator "    start           - Starts a server"
-  o.separator "    build           - Creates HTML files"
-  o.separator "    create <name>   - Starts a project"
-  o.separator ""
-  o.separator "Options:"
-
-  # Help
-  o.on_tail("-h", "--help", "show this message") do
-    puts opts
-    exit
-  end
+if ARGV.size == 0
+  Hyde::CLICommands::Help.run
+  exit
 end
 
-opts.parse!
-options[:action] = ARGV[0]
-options[:params] = []
-(1...ARGV.size).each { |i| options[:params] << ARGV[i] }
-
-ostream = STDERR
-
-if options[:action] == 'start'
-  system "ruby #{lib_path}/hyde/init.rb"
-
-elsif options[:action] == 'build'
-  Hyde::Project.new.build ostream
-
-elsif options[:action] == 'create'
-  unless options[:params].size == 1
-    puts opts
-
-  else
-    site_name = options[:params][0]
-    if File.directory? site_name
-      ostream << "This directory already exists!\n"
-      exit
-    end
-
-    from = File.join(File.dirname(__FILE__), '..', 'data', 'new_site')
-    to   = File.expand_path(File.join(Dir.pwd, site_name))
-
-    require 'fileutils'
-    FileUtils.cp_r from, to
-
-    Dir[File.join(to, '**/*')].each do |file|
-      ostream << " * " << file.gsub(Dir.pwd, '') << "\n"
-    end
-  end
-
-else
-  puts opts
-end
+# Can error
+controller = Hyde::CLICommands.get_controller ARGV[0]
+params = ARGV[1..-1]
+controller.run(*params)

data/lib/hyde/clicommand.rb

@@ -0,0 +1,42 @@
+module Hyde
+  class CLICommand
+    @@description = nil
+
+    def self.ostream
+      STDERR
+    end
+
+    def self.log(str)
+      ostream << str << "\n"
+    end
+
+    def self.help
+      log "No help for this command."
+    end
+
+    def self.lib_path
+      @@lib_path ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    end
+
+    def self.project
+      begin
+        Hyde::Project.new
+      rescue NoRootError
+        ostream << "No Hyde config file found. (looking for: hyde.conf, _config.yml)\n"
+        exit
+      end
+    end
+
+    def self.desc(str)
+      class_eval %{
+        def self.description
+          "#{str.gsub('\"','\\\"')}"
+        end
+      }
+    end
+
+    def self.description
+      ""
+    end
+  end
+end

data/lib/hyde/clicommands.rb

@@ -0,0 +1,87 @@
+module Hyde
+  module CLICommands
+    extend self
+
+    def get_controller(str)
+      begin
+        class_name = str.downcase.capitalize.to_sym
+        controller = Hyde::CLICommands.const_get(class_name)
+      rescue NameError
+        STDERR << "Unknown command: #{str}\n"
+        STDERR << "Type `hyde` for a list of commands.\n"
+        exit
+      end
+      controller
+    end
+
+    class Help < CLICommand
+      desc "Shows help"
+
+      def self.run(*a)
+        if a.size == 0
+          general_help
+          exit
+        end
+
+        controller = CLICommands::get_controller a[0]
+        controller.help
+      end
+
+      def self.general_help
+        log "Usage: hyde <command> [arguments]"
+        log ""
+        log "Commands:"
+        CLICommands.constants.each do |class_name|
+          klass = CLICommands.const_get(class_name)
+          name  = class_name.to_s.downcase
+          puts "  #{name}%s#{klass.description}" % [' ' * (20-name.size)]
+        end
+
+        log ""
+        log "For more info on a command, type `hyde help <command>`."
+      end
+    end
+
+    class Build < CLICommand
+      desc "Builds the HTML files"
+      def self.run(*a)
+        project.build ostream
+      end
+    end
+
+    class Start < CLICommand
+      desc "Starts the server"
+      def self.run(*a)
+        project
+        system "ruby \"%s\"" % [File.join(lib_path, 'hyde', 'init.rb')]
+      end
+    end
+
+    class Create < CLICommand
+      desc "Starts a new Hyde project"
+      def self.run(*a)
+        unless a.size == 1
+          log "Usage: hyde create <sitename>"
+          exit
+
+        else
+          site_name = a[0]
+          if File.directory? site_name
+            log "Directory `#{site_name}` already exists!"
+            exit
+          end
+
+          from = File.join(lib_path, '..', 'data', 'new_site')
+          to   = File.expand_path(File.join(Dir.pwd, site_name))
+
+          require 'fileutils'
+          FileUtils.cp_r from, to
+
+          Dir[File.join(to, '**/*')].each do |file|
+            log " * %s" % [file.gsub(/^#{Regexp.escape(Dir.pwd)}\/?/, '')]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyde/init.rb

@@ -1,17 +1,25 @@
 require 'rubygems'
-require 'sinatra/base'
-require "logger"
+begin
+  require 'sinatra/base'
+rescue LoadError
+  STDERR << "You need the sinatra gem to use `hyde start`. Type: `gem install sinatra`\n"
+  exit
+end
 
 $:.unshift File.dirname(__FILE__) + "/.."
 require 'hyde'
 
-puts "Starting server..."
-puts "  http://127.0.0.1:4567      Homepage"
-puts "  http://127.0.0.1:4567/-    File list"
-puts ""
+$project = Hyde::Project.new
 
 class Main < Sinatra::Base
-  @@project ||= Hyde::Project.new
+  @@project ||= $project
+
+  def self.show_start
+    puts "Starting server..."
+    puts "  http://127.0.0.1:4567      Homepage"
+    puts "  http://127.0.0.1:4567/-    File list"
+    puts ""
+  end
 
   get '/-' do
     @@project.files.inject("") do |a, path|
@@ -26,10 +34,15 @@ class Main < Sinatra::Base
       type = File.extname(path)[1..-1]
       content_type type.to_sym  if type.is_a? String
       @@project.render path
+    rescue Hyde::RenderError => e
+      puts " * `#{path}` error"
+      puts " *** #{e.message}".gsub("\n","\n *** ")
+      e.message
     rescue Hyde::NotFound
       raise Sinatra::NotFound
     end
   end
 end
 
+Main.show_start
 Main.run!

data/lib/hyde/project.rb

@@ -19,14 +19,29 @@ module Hyde
     # The configuration k/v storage (Hash)
     attr_accessor :config
 
+    # Can raise a NoRootError
     def initialize( root = Dir.pwd )
       @config = OStruct.new defaults
+      @root, @config_file = find_root_from root
+      @config.merge! YAML::load_file(@config_file)  if File.exists? @config_file
+    end
 
-      # find_root
-      @root = root
-      @config_file ||= "#{@root}/_config.yml"
+    def find_root_from(start)
+      root = File.expand_path(start)
+      ret = nil
+      while ret.nil?
+        # See if any of these files exist
+        ['_config.yml', 'hyde.conf'].each do |config_name|
+          config_file = File.join(root, config_name)
+          ret ||= [root, config_file]  if File.exists? config_file
+        end
 
-      @config.merge! YAML::load_file(@config_file)  if File.exists? @config_file
+        # Traverse back (die if we reach the root)
+        old_root = root
+        root = File.expand_path(File.join(root, '..'))
+        raise NoRootError  if root == old_root
+      end
+      ret
     end
 
     def method_missing(meth, *args, &blk)
@@ -58,11 +73,17 @@ module Hyde
       Dir.mkdir root(:output)  unless File.directory? root(:output)
 
       begin
+        continue = true
         files.each do |path|
           ostream << " * #{output_path}/#{path}\n"  if ostream
-          mfile = force_file_open(root(:output, path))
-          mfile << render(path)
-          mfile.close
+          begin
+            rendered = render(path)
+            mfile = force_file_open(root(:output, path))
+            mfile << rendered
+            mfile.close
+          rescue RenderError => e
+            ostream << " *** Error: #{e.message}".gsub("\n", "\n *** ") << "\n"
+          end
         end
       rescue NoGemError => e
         ostream << "Error: #{e.message}\n"
@@ -71,7 +92,7 @@ module Hyde
 
     # Returns a list of all URL paths
     def files
-      @file_list ||= Dir[File.join(root(:site), '**', '*')].inject([]) do |a, match|
+      @file_list = Dir[File.join(root(:site), '**', '*')].inject([]) do |a, match|
         # Make sure its the canonical name
         path = File.expand_path(match)
         file = path.gsub /^#{Regexp.escape root(:site)}\/?/, ''

data/lib/hyde/renderers.rb

@@ -20,8 +20,12 @@ module Hyde
     class Less < Renderer::Base
       def evaluate(scope, data={}, &block)
         require_lib 'less'
-        @engine = ::Less::Engine.new(File.open(filename))
-        @engine.to_css
+        begin
+          @engine = ::Less::Engine.new(File.open(filename))
+          @engine.to_css
+        rescue ::Less::SyntaxError => e
+          raise Hyde::RenderError, e.message
+        end
       end
     end
 

data/lib/hyde.rb

@@ -10,14 +10,13 @@ module Hyde
   autoload :Renderers,  "#{prefix}/hyde/renderers"
   autoload :Utils,      "#{prefix}/hyde/utils"
   autoload :Scope,      "#{prefix}/hyde/scope"
+  autoload :CLICommand, "#{prefix}/hyde/clicommand"
+  autoload :CLICommands,"#{prefix}/hyde/clicommands"
   autoload :TemplateHelpers,"#{prefix}/hyde/template_helpers"
 
-  class Exception < ::Exception
-  end
-
-  class NotFound < Exception
-  end
-
-  class NoGemError < Exception
-  end
+  Error = Class.new(::StandardError)
+  RenderError = Class.new(Error)
+  NoGemError  = Class.new(Error)
+  NotFound    = Class.new(Error)
+  NoRootError = Class.new(Error) 
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - pre4
-  version: 0.0.1.pre4
+  - pre5
+  version: 0.0.1.pre5
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -84,6 +84,8 @@ files:
 - data/new_site/layouts/default.haml
 - data/new_site/site/index.html.haml
 - lib/hyde.rb
+- lib/hyde/clicommand.rb
+- lib/hyde/clicommands.rb
 - lib/hyde/init.rb
 - lib/hyde/layout.rb
 - lib/hyde/ostruct.rb