gumdrop 0.7.5 → 0.8.0

data/ChangeLog.md

@@ -1,3 +1,13 @@
+# v0.8.0
+- Leveraging Thor for new CLI support.
+- Added watch command to watch filesystem and auto-compile.
+- You can now add commands to the gumdrop command for your site. Use `tasks` block in Gumdrop file.
+- Report rendering errors better.
+- Code cleanup and reorganization.
+- Generators keep track of generated content.
+- Bugfix: Files without layouts won't throw an exception.
+- New subdued output mode, cli '-s' flag
+
 # v0.7.5
 - Gumdrop dev server will serve up files from output_dir if the file isn't found in the source tree.
 - Added new template: blank

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    gumdrop (0.7.5)
+      active_support
+      bundle
+      i18n
+      sinatra
+      thor
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    active_support (3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    bundle (0.0.1)
+      bundler
+    i18n (0.6.0)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    thor (0.15.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gumdrop!

data/bin/gumdrop

@@ -1,13 +1,22 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-
 #  Copyright (c) 2011 M@ McCray. All rights reserved.
 
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
+# $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'rubygems'
+require 'bundler/setup'
+require 'gumdrop'
+Bundler.require if File.exists?('Gemfile')
 
-# require 'bundler/setup'
-
-require "gumdrop"
-require "gumdrop/cli"
+begin
+  if Gumdrop.in_site_folder?
+    Gumdrop::CLI::Internal.start
+  else
+    Gumdrop::CLI::External.start
+  end
+rescue Interrupt => e
+  puts "\nQuitting..."
+  exit 1
+rescue SystemExit => e
+  exit e.status
+end

data/gumdrop.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
    s.add_dependency 'sinatra'
    s.add_dependency 'tilt'
    s.add_dependency 'active_support'
-   s.add_dependency 'trollop'
+   s.add_dependency 'listen'
+   s.add_dependency 'thor'
    s.add_dependency 'i18n'
    s.add_dependency 'bundle'
 

data/lib/gumdrop.rb

@@ -6,24 +6,33 @@ require 'active_support/all'
 
 module Gumdrop
 
-  autoload :Callbacks, "gumdrop/callbacks"
-  autoload :Context, "gumdrop/context"
-  autoload :Content, "gumdrop/content"
+  autoload :Context,     "gumdrop/context"
+  autoload :Content,     "gumdrop/content"
   autoload :DataManager, "gumdrop/data_manager"
-  autoload :Generator, "gumdrop/generator"
-  autoload :HashObject, "gumdrop/hash_object"
-  autoload :Pager, "gumdrop/data_manager"
-  autoload :Server, "gumdrop/server"
-  autoload :VERSION, "gumdrop/version"
+  autoload :Generator,   "gumdrop/generator"
+  autoload :HashObject,  "gumdrop/support/hash_object"
+  autoload :Pager,       "gumdrop/data_manager"
+  autoload :Server,      "gumdrop/server"
+  autoload :VERSION,     "gumdrop/version"
   autoload :ViewHelpers, "gumdrop/view_helpers"
+
+  module CLI
+    autoload :External,  "gumdrop/cli/external"    
+    autoload :Internal,  "gumdrop/cli/internal"    
+  end
+
+  module Support
+    autoload :BasePackager, "gumdrop/support/base_packager"    
+    autoload :Callbacks,    "gumdrop/support/callbacks"
+    autoload :Stitch,       "gumdrop/support/stitch"    
+    autoload :Sprockets,    "gumdrop/support/sprockets"    
+  end
   
   class << self
 
     def run(opts={})
-      site_file= Gumdrop.fetch_site_file
-      unless site_file.nil?
-        site= Site.new site_file, opts
-  
+      site= fetch_site opts
+      unless site.nil?
         old= Dir.pwd
         Dir.chdir site.root_path
   
@@ -31,7 +40,8 @@ module Gumdrop
         
         Dir.chdir old
   
-        puts "Done." unless opts[:quiet] or opts[:quiet_given]
+        puts "\n" if opts[:subdued]
+
       else
         puts "Not in a valid Gumdrop site directory."
       end
@@ -41,9 +51,24 @@ module Gumdrop
       !fetch_site_file(filename).nil?
     end
 
+    def fetch_site(opts={}, prefer_existing=true)
+      if defined?(SITE) and prefer_existing
+        SITE.opts= opts unless opts.empty?
+        SITE
+      else
+        site_file= Gumdrop.fetch_site_file
+        unless site_file.nil?
+          Site.new site_file, opts
+        else
+          nil
+        end
+      end
+    end
+
     def fetch_site_file(filename="Gumdrop")
       here= Dir.pwd
       found= File.file? File.join( here, filename )
+      # TODO: Should be smarter -- This is a hack for Windows support "C:\"
       while !found and File.directory?(here) and File.dirname(here).length > 3
         here= File.expand_path File.join(here, '../')
         found= File.file? File.join( here, filename )

data/lib/gumdrop/cli/external.rb

@@ -0,0 +1,55 @@
+require 'fileutils'
+require 'thor'
+
+module Gumdrop::CLI
+  class External < Thor
+    include Thor::Actions
+
+    def self.source_root
+      File.expand_path('../../../..', __FILE__)
+    end
+
+    desc 'new [NAME]', 'Create new gumdrop project'
+    method_option :template, aliases:'-t', desc:'Template to start from', required:true
+    def new(name)
+      template= options[:template] || 'default'
+
+      if File.directory? gem_template_path(template)
+        say "New site from template: #{template} (gem)"
+        directory(gem_template_path(template), name)
+
+      elsif File.directory? home_template_path(template)
+        say "New site from template:  #{template} (local)"
+        directory(home_template_path(template), name)
+
+      else
+        say "Unknown template!!\n"
+        say "Please select from one of the following:\n\n"
+        self.templates
+      end
+    end
+
+    desc 'templates', 'List templates'
+    def templates
+      say  "Gem templates:"
+      Dir[ gem_template_path ].each do |name|
+        say " - #{File.basename name}" if File.directory?(name)
+      end
+      say  "Local templates:"
+      Dir[ home_template_path t].each do |name|
+        say " - #{File.basename name}" if File.directory?(name)
+      end
+    end
+
+    private
+
+      def gem_template_path(template='*')
+        File.join(self.class.source_root, 'templates', template)
+      end
+
+      def home_template_path(template='*')
+        File.expand_path File.join( "~", ".gumdrop", 'templates', template)
+      end
+
+  end
+end

data/lib/gumdrop/cli/internal.rb

@@ -0,0 +1,75 @@
+require 'fileutils'
+require 'listen'
+require 'thor'
+
+module Gumdrop::CLI
+  class Internal < Thor
+    include Thor::Actions
+
+    def self.source_root
+      File.expand_path('../../..', __FILE__)
+    end
+
+    desc 'build', 'Build project'
+    method_option :env, default:'production', aliases:'-e'
+    method_option :assets, aliases:'-a', type: :array, desc:"List of assets to render."
+    method_option :quiet, default:false, aliases:'-q', type: :boolean
+    method_option :subdued, default:false, aliases:'-s', type: :boolean, desc:"Subdued output (....)"
+    method_option :resume, default:false, aliases:'-r', type: :boolean, desc:"Auto resume rendering after any errors"
+    def build()
+      Gumdrop.run(options)
+    end
+
+    desc 'server', 'Run development server'
+    method_option :env, default:'production', aliases:'-e'
+    def server
+      Gumdrop::Server
+    end
+
+    desc 'watch', "Watch filesystem for changes and recompile"
+    method_option :env, default:'production', aliases:'-e'
+    method_option :quiet, default:false, aliases:'-q', type: :boolean
+    method_option :subdued, default:false, aliases:'-s', type: :boolean, desc:"Subdued output (....)"
+    method_option :resume, default:false, aliases:'-r', type: :boolean, desc:"Auto resume rendering after any errors"
+    def watch
+      Gumdrop.run options
+      paths= [SITE.src_path]
+      paths << SITE.data_path if File.directory? SITE.data_path
+      Listen.to(*paths, :latency => 0.5) do |m, a, r|
+        SITE.rebuild
+      end
+    end
+
+    desc 'template [NAME]', "Create local template from this project"
+    def template(name)
+      template= name
+      template_path = home_template_path name
+      if File.exists? template_path
+        say "A template named '#{name}' already exists!"
+      
+      else
+        say "Creating template:  #{name}"
+        say "  ~/.gumdrop/templates/#{name}"
+        site_root= Gumdrop.site_dirname
+        FileUtils.mkdir_p File.dirname(template_path)
+        FileUtils.cp_r File.join(site_root, "."), template_path
+      end
+    end
+
+    private
+      
+      def home_path(name="")
+        File.expand_path File.join("~", ".gumdrop", name)
+      end
+
+      def home_template_path(template)
+        home_path 'tempaltes', template
+      end
+
+      def local_path(name="")
+        File.join( ".", name ) # ?
+      end
+  end
+end
+
+SITE= Gumdrop::Site.new Gumdrop.fetch_site_file unless defined?( SITE )

data/lib/gumdrop/content.rb

@@ -76,18 +76,24 @@ module Gumdrop
       end
       context.set_content self, locals
       content= render_all(context)
-      return content if ignore_layout
-      layout= context.get_template()
-      while !layout.nil?
-        content = layout.template.render(context, content:content) { content }
+      return relativize content, context if ignore_layout
+      begin
         layout= context.get_template()
+        while !layout.nil? and !layout.template.nil?
+          content = layout.template.render(context, content:content) { content }
+          layout= context.get_template()
+        end
+      rescue => ex
+        raise StandardError, "Layout: #{ex.to_s}", ex.backtrace
       end
       relativize content, context
+    rescue => ex
+      raise StandardError, "Rendering exception: #{ex.to_s}", ex.backtrace
     end
     
     def renderTo(context, output_path, filters=[], opts={})
       return copyTo(output_path, opts) unless useLayout?
-      site.report " rendering: #{uri}", :warning
+      site.report " rendering: #{uri}"
       output= render(context)
       filters.each {|f| output= f.call(output, self) }
       File.open output_path, 'w' do |f|
@@ -103,10 +109,10 @@ module Gumdrop
         true
       end
       if do_copy
-        site.report "   copying: #{uri}", :warning
+        site.report "   copying: #{uri}"
         FileUtils.cp_r @full_path, output, opts
       else
-        site.report "    (same): #{uri}", :info
+        site.report "    (same): #{uri}"
       end
     end
     

data/lib/gumdrop/generator.rb

@@ -1,6 +1,11 @@
 module Gumdrop
 
   class Generator
+
+    include Support::Stitch
+    include Support::Sprockets
+
+
     attr_reader :filename, :base_path, :params, :pages
     
     def initialize(content, site, opts={})
@@ -41,6 +46,12 @@ module Gumdrop
     def set(var_name, value)
       params[var_name]= value
     end
+
+    def unload
+      @pages.each do |content|
+        @site.content_hash.delete content.uri
+      end
+    end
     
     def page(name, opts={}, &block)
       name= name[1..-1] if name.starts_with?('/')
@@ -50,7 +61,7 @@ module Gumdrop
       else
         File.join @site.src_path, @base_path, @name
       end
-      content= GeneratedContent.new(filepath, block, @site, opts)
+      content= GeneratedContent.new(filepath, block, @site, self, opts)
       if opts.has_key? :template and !opts[:template].nil?
         content.template = if @site.layouts.has_key?( opts[:template] )
           @site.layouts[ opts[:template] ]
@@ -64,6 +75,8 @@ module Gumdrop
       end      
       @site.report " generated: #{content.uri}", :info
       @site.content_hash[content.uri]= content
+      @pages << content
+      content
     end
 
     # FIXME: Does redirect require abs-paths?
@@ -82,98 +95,16 @@ module Gumdrop
       end
     end
     
-    def sprockets(name, opts)
-      require 'gumdrop/sprockets_support'
-      # require 'pp'
-      env = Sprockets::Environment.new @site.root_path
-      env.append_path @site.src_path
-      opts[:paths].each do |path|
-        env.append_path(path)
-      end
-      
-      content= env[ opts[:src] ].to_s
-      page name do
-        compress_output(content, opts)
-      end
-      keep_src(name, content, opts)
-      prune_src(name, opts)
-    end
-    
-    def stitch(name, opts)
-      require 'gumdrop/stitch_support'
-      content= Stitch::Package.new(opts).compile
-      page name do
-        compress_output(content, opts)
-      end
-      keep_src(name, content, opts)
-      prune_src(name, opts)
-    end
-    
-    
-  private
-  
-    def compress_output(content, opts)
-      case opts[:compress]
-
-      when true, :jsmin
-        require 'jsmin'
-        JSMin.minify content
-
-      when :yuic
-        require "yui/compressor"
-        compressor = YUI::JavaScriptCompressor.new(:munge => opts[:obfuscate])
-        compressor.compress(content)
-
-      when :uglify
-        require "uglifier"
-        Uglifier.compile( content, :mangle=>opts[:obfuscate])
-
-      when :packr
-        require 'packr'
-        Packr.pack(content, :shrink_vars => true, :base62 => false, :private=>false)
-
-      when false
-        content
-
-      else
-        # UNKNOWN Compressor type!
-        @site.report "Unknown javascript compressor type! (#{ opts[:compressor] })", :warning
-        content
-      end
-    end
-    
-    def keep_src(name, content, opts)
-      if opts[:keep_src] or opts[:keep_source]
-        ext= File.extname name
-        page name.gsub(ext, "#{opts.fetch(:source_postfix, '-src')}#{ext}") do
-          content
-        end
-      end
-    end
-    
-    def prune_src(name, opts)
-      if opts[:prune] and opts[:root]
-        sp = File.expand_path( @site.config.source_dir )
-        rp = File.expand_path(opts[:root])
-        relative_root = rp.gsub(sp, '')[1..-1]
-        rrlen= relative_root.length - 1
-        @site.content_hash.keys.each do |path|
-          if path[0..rrlen] == relative_root and name != path
-            @site.content_hash.delete path
-          end
-        end
-      end
-    end
-    
   end
   
   class GeneratedContent < Content
     # Nothing special, per se...
 
-    def initialize(path, block, site, params={})
+    def initialize(path, block, site, generator, params={})
       super(path, site, params)
       @content_block= block
       @generated= true
+      @generator= generator
     end
 
     def render(context=nil, ignore_layout=false,  reset_context=true, locals={})