gumdrop 0.2.13 → 0.2.14

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.2.14
+- Added new template type: twitter
+- Added cli option -t / --template to specify default|twitter template when creating a new project
+
 # v0.2.13
 - Adding content_filters for altering rendered output -- BUILD ONLY!
 - Tweaks to template site

data/lib/gumdrop.rb

@@ -7,7 +7,14 @@ DEFAULT_OPTIONS= {
   :relative_paths => true,
   :auto_run => false,
   :force_reload => false,
-  :root => "."
+  :root => ".",
+  :log_level => :info
+}
+
+LOG_LEVELS = {
+  :info => 0,
+  :warning => 1,
+  :error => 2
 }
 
 module Gumdrop
@@ -15,9 +22,9 @@ module Gumdrop
   autoload :Context, "gumdrop/context"
   autoload :Content, "gumdrop/content"
   autoload :DeferredLoader, "gumdrop/deferred_loader"
+  autoload :DSL, "gumdrop/dsl"
   autoload :Generator, "gumdrop/generator"
   autoload :GeneratedrContent, "gumdrop/generator"
-  autoload :GenerationDSL, "gumdrop/generator"
   autoload :HashObject, "gumdrop/hash_object"
   autoload :Pager, "gumdrop/pager"
   autoload :Server, "gumdrop/server"
@@ -27,7 +34,7 @@ module Gumdrop
   
   class << self
     
-    attr_accessor :root_path, :source_path, :site, :layouts, :generators, :partials, :config, :data, :content_filters
+    attr_accessor :root_path, :source_path, :site, :layouts, :generators, :partials, :config, :data, :content_filters, :blacklist
     
     def run(opts={})
       # Opts
@@ -39,7 +46,6 @@ module Gumdrop
       if File.exists? "#{root}/lib/view_helpers.rb"
         # In server mode, we want to reload it every time... right?
         load "#{root}/lib/view_helpers.rb"
-        #require 'view_helpers'
       end
 
       @site        = Hash.new {|h,k| h[k]= nil }
@@ -51,13 +57,12 @@ module Gumdrop
       @data        = Gumdrop::DeferredLoader.new()
 
       @content_filters= []
+      @blacklist      = []
       
       if File.exists? "#{root}/lib/site.rb"
         # In server mode, we want to reload it every time... right?
         source= IO.readlines("#{root}/lib/site.rb").join('')
-        GenerationDSL.class_eval source
-        #load "#{root}/lib/site.rb" 
-        # require 'site' 
+        DSL.class_eval source
       end
       
       # Scan
@@ -89,20 +94,44 @@ module Gumdrop
         generator.execute()
       end
       
+      @blacklist.each do |skip_path|
+        @site.keys.each do |source_path|
+          if source_path.starts_with? skip_path
+            Gumdrop.report " -ignoring: #{source_path}", :info
+            @site.delete source_path
+          end
+        end
+      end
       
       # Render
       unless opts[:dry_run]
         site.keys.sort.each do |path|
-          node= site[path]
-          output_path= "output/#{node.to_s}"
-          FileUtils.mkdir_p File.dirname(output_path)
-          node.renderTo output_path, @content_filters
+          #unless @blacklist.detect {|p| path.starts_with?(p) }
+            node= site[path]
+            output_path= "output/#{node.to_s}"
+            FileUtils.mkdir_p File.dirname(output_path)
+            node.renderTo output_path, @content_filters
+          # else
+          #   Gumdrop.report " -ignoring: #{path}", :info
+          # end
         end
         puts "Done."
       end
       
     end
 
+    # levels: info, warning, error
+    def report(msg, level=:info)
+      ll= Gumdrop.config.log_level
+      case level
+      when :info
+        puts msg if ll == :info
+      when :warning
+        puts msg if ll == :info or ll == :warning
+      else
+        puts msg
+      end
+    end
   end
 
   Gumdrop.config= Gumdrop::HashObject.new(DEFAULT_OPTIONS)

data/lib/gumdrop/cli.rb

@@ -6,6 +6,7 @@ opts = Trollop::options do
   opt :debug,  "Enable debugging output"
   opt :quiet,  "No output"
   opt :create, "Create a gumdrop project", :type=>String
+    opt :template, "Specify template to use for new project (default || twitter)", :type=>String, :default=>'default'
   opt :build,  "Build HTML output"
   opt :server, "Runs development server"
     opt :port, "Specifies port to run server on", :type=>:int
@@ -22,17 +23,23 @@ end
 if opts[:create_given]
   require 'fileutils'
   here= File.dirname(__FILE__)
-  there= File.expand_path(opts[:create])
-
+  there= File.expand_path( opts[:create] )
+  template_name = opts[:template]
+  
   if File.file? there
     puts "You cannot specify a file as the target!" 
   elsif !File.directory? there
     FileUtils.mkdir_p there
   end
   
-  FileUtils.cp_r Dir[File.join(here, "template", "*")], there
-
-  puts "Done."
+  if File.directory? File.join(here, 'template', template_name)
+    # FileUtils.cp_r Dir[File.join(here, "template", template_name, "*")], there
+    puts "Creating gumdrop project based on #{template_name} template at #{there}"
+    FileUtils.cp_r File.join(here, "template", template_name, "."), there
+    puts "Done."
+  else
+    puts "Invalid template '#{template_name}'!"
+  end
   
 elsif opts[:build_given]
   Gumdrop.run(opts)

data/lib/gumdrop/content.rb

@@ -45,10 +45,10 @@ module Gumdrop
     
     def renderTo(output_path, filters=[], opts={})
       return copyTo(output_path, opts) unless useLayout?
+      Gumdrop.report " Rendering: #{@uri}", :warning
       output= render()
       filters.each {|f| output= f.call(output, self) }
       File.open output_path, 'w' do |f|
-        puts " Rendering: #{@uri}"
         f.write output
       end
     end
@@ -60,10 +60,10 @@ module Gumdrop
         true
       end
       if do_copy
-        puts "   Copying: #{@uri}"
+        Gumdrop.report "   Copying: #{@uri}", :warning
         FileUtils.cp_r @path, output, opts
       else
-        puts "    (same): #{@uri}"
+        Gumdrop.report "    (same): #{@uri}", :info
       end
     end
     

data/lib/gumdrop/dsl.rb

@@ -0,0 +1,19 @@
+module Gumdrop
+  module DSL
+  
+    def self.generate(&block)
+      # Auto-generated, numerical, key for a site-level generator
+      Gumdrop.generators[Gumdrop.generators.keys.length] = Generator.new(block)
+    end
+  
+    def self.content_filter(&block)
+      Gumdrop.content_filters << block
+    end
+  
+    def self.skip(path)
+      Gumdrop.report " blacklist: #{path}", :info
+      Gumdrop.blacklist << path
+    end
+  
+  end
+end

data/lib/gumdrop/generator.rb

@@ -66,21 +66,4 @@ module Gumdrop
     # Nothing special, per se...
   end
   
-  module GenerationDSL
-    
-    # attr_accessor :generators
-    # @generators=[]
-    
-    def self.generate(&block)
-      
-      # Auto-generated, numerical, key for a site-level generator
-      Gumdrop.generators[Gumdrop.generators.keys.length] = Generator.new(block)
-    end
-    
-    def self.content_filter(&block)
-      Gumdrop.content_filters << block
-    end
-    
-  end
-
 end

data/lib/gumdrop/template/twitter/Gemfile

@@ -0,0 +1,28 @@
+source "http://rubygems.org"
+
+gem "i18n"
+gem "sinatra"
+gem "active_support"
+gem "rake"
+gem "gumdrop", :path=>File.expand_path("~/Projects/OpenSource/gumdrop")
+
+# Add your dependencies here:
+
+gem "slim"
+gem "sass"
+gem "less"
+gem "coffee-script"
+
+
+# For markdown support, a couple of options:
+# gem "rdiscount"
+gem 'maruku'
+
+# For template support:
+# gem "less"
+# gem "haml"
+
+# For xml generation support:
+# gem 'builder'
+
+# gem 'jsmin'

data/lib/gumdrop/template/twitter/Rakefile

@@ -0,0 +1,35 @@
+require 'rubygems'
+require "bundler/setup"
+require 'gumdrop'
+
+# For the SYNC task
+USER='user'
+SERVER='server.com'
+FOLDER="~/#{SERVER}"
+
+desc "Build source files into output"
+task :build do
+  system("bundle exec gumdrop -b")
+end
+
+desc "Run development server"
+task :serve do
+  system("bundle exec gumdrop -s")
+end
+
+desc "Syncs with public server using rsync (if configured)"
+task :sync do
+  cmd= "rsync -avz --delete output/ #{USER}@#{SERVER}:#{FOLDER}"
+  puts "Running:\n#{cmd}\n"
+  system(cmd)
+  puts "Done."
+end
+
+desc "Outputs the Gumdrop version"
+task :version do
+  puts Gumdrop::VERSION
+end
+
+task :default do
+  puts `rake -T`
+end

data/lib/gumdrop/template/twitter/config.ru

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+require 'gumdrop'
+
+Gumdrop.config.auto_run= false
+Gumdrop.config.force_reload= false
+Gumdrop.run :dry_run=>true 
+
+run Gumdrop::Server

data/lib/gumdrop/template/twitter/data/config.yml

@@ -0,0 +1,4 @@
+title: My Site
+tagline: My home on thar intarwebs!
+author: Matt McCray
+url: http://www.mysite.com

data/lib/gumdrop/template/twitter/lib/site.rb

@@ -0,0 +1,43 @@
+# Any specialized code for your site goes here...
+
+puts "Build: #{Gumdrop.data.config.title} (gumdrop v#{Gumdrop::VERSION})"
+
+if defined? Encoding
+  Encoding.default_internal = Encoding.default_external = "UTF-8"
+else
+  $KCODE = "UTF-8"
+end
+
+require 'slim'
+Slim::Engine.set_default_options :pretty => true
+
+skip "theme/twitter/lib"
+skip "theme/twitter/docs"
+skip "theme/twitter/examples"
+skip "theme/twitter/Makefile"
+skip "theme/twitter/README"
+
+# Example of using a content filter to compress CoffeeScript/JS output
+# require 'jsmin'
+# content_filter do |content, info|
+#   if info.ext == '.js'
+#     puts "  Compress: #{info.filename}"
+#     JSMin.minify content
+#   else
+#     content
+#   end
+# end
+
+
+# Example site-level generator
+# generate do
+#
+#   page "about.html", :template=>'about', :passthru=>'Available in the template' # requires a about.template.XX file
+#   
+#   # Maybe for a tumblr-like pager
+#   pager= Gumdrop.data.pager_for :posts, :base_path=>'posts/page', :page_size=>5
+#   pager.each do |page|
+#     page "#{page.uri}.html", :template=>'post_page', :posts=>page.items, :pager=>pager, :current_page=>pager.current_page
+#   end
+#   
+# end

data/lib/gumdrop/template/twitter/lib/view_helpers.rb

@@ -0,0 +1,17 @@
+module Gumdrop::ViewHelpers
+  
+  # Calculate the years for a copyright
+  def copyright_years(start_year, divider="–")
+    end_year = Date.today.year
+    if start_year == end_year
+      "#{start_year}"
+    else
+      "#{start_year}#{divider}#{end_year}"
+    end
+  end
+  
+  #
+  # Your custom helpers go here!
+  #
+  
+end

data/lib/gumdrop/template/twitter/source/_sidebar.html.slim

@@ -0,0 +1 @@
+p I'm the SIDEBAR!

data/lib/gumdrop/template/twitter/source/container-app.html.slim

@@ -0,0 +1,89 @@
+css:
+  /* Override some defaults */
+  html, body {
+    background-color: #eee;
+  }
+  body {
+    padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
+  }
+  .container > footer p {
+    text-align: center; /* center align it with the container */
+  }
+  .container {
+    width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
+  }
+
+  /* The white background content wrapper */
+  .content {
+    background-color: #fff;
+    padding: 20px;
+    margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+    -webkit-border-radius: 0 0 6px 6px;
+       -moz-border-radius: 0 0 6px 6px;
+            border-radius: 0 0 6px 6px;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+            box-shadow: 0 1px 2px rgba(0,0,0,.15);
+  }
+
+  /* Page header tweaks */
+  .page-header {
+    background-color: #f5f5f5;
+    padding: 20px 20px 10px;
+    margin: -20px -20px 20px;
+  }
+
+  /* Styles you shouldn't keep as they are for displaying this base example only */
+  .content .span10,
+  .content .span4 {
+    min-height: 500px;
+  }
+  /* Give a quick and non-cross-browser friendly divider */
+  .content .span4 {
+    margin-left: 0;
+    padding-left: 19px;
+    border-left: 1px solid #eee;
+  }
+
+  .topbar .btn {
+    border: 0;
+  }
+
+
+.topbar
+  .fill
+    .container
+      a.brand[href="#"]
+        | Project name
+      ul.nav
+        li.active
+          a[href="#"]
+            | Home
+        li
+          a[href="#about"]
+            | About
+        li
+          a[href="#contact"]
+            | Contact
+      form.pull-right[action=""]
+        input.input-small[type="text" placeholder="Username"]
+        input.input-small[type="password" placeholder="Password"]
+        button.btn[type="submit"]
+          | Sign in
+.container
+  .content
+    .page-header
+      h1
+        | Page name 
+        small
+          | Supporting text or tagline
+    .row
+      .span10
+        h2
+          | Main content
+      .span4
+        h3
+          | Secondary content
+  footer
+    p
+      | © Company 2011