textigniter 0.0.35 → 0.0.36

data/README.textile

@@ -22,8 +22,16 @@ Passing the init option initializes a new textigniter environment in your curren
 
 Passing the build option will make textigniter parse the _.textigniter_ directory and output the static html alongside the _.textigniter_ directory.
 
+Passing the build option also creates a manifest _(.textigniter/manifest/)_ for the system to key off of in the future. The manifest tells textigniter only to rebuild modified or new files.
+
+@textigniter list (directory)@
+
+This will print out a list all textigniter files unless you specify a directory. Passing the directory option will list only that directory (Duh?) This is the only textigniter command that requires you to be in the textigniter environment to work.  
+
 @textignier scrub (directory)@
 
+*WARNING: essentially an rm -r unix command at this point. If you run it with directory specified, it will remove the entire directory and not just textigniter content*
+
 When you pass the scrub option, all textigniter related files and folders will be removed (I'm rethinking the use of this. It will probably "scrub" the base folder of anything not found in the textigniter environment instead).
 
 @textigniter help@

data/lib/textigniter.rb

@@ -13,7 +13,6 @@ class Textigniter
 
   # Contains a switch for arguments passed via the command line
   def initialize
-    
     # Globals being created
     # 
     # $beginning    Time script began to run
@@ -42,7 +41,7 @@ class Textigniter
     end
     
     # Store textigniter enviornment path in a global
-    $twd = "#{$base_path}.textigniter"
+    $twd = "#{$base_path}/.textigniter"
               
     # Store configuration information into a global
     if File.exists?("#{$twd}/config.yml")
@@ -78,6 +77,8 @@ class Textigniter
         Textigniter.help(args)
       when "init"
         Textigniter.init(args)
+      when "list"
+        Textigniter.list(args)
       when "scrub"
         Textigniter.scrub(args)
       when "view"
@@ -118,6 +119,16 @@ class Textigniter
     end
   end
   
+  # Initialize a new list object
+  def self.list(args=nil)
+    # create a new list instance
+    @list = List.new
+    # get a file list
+    files = @list.get_directory_listing(args)
+    # print the file list
+    @list.print_directory_listing(files)
+  end
+  
   # Initialize a new scrub object
   def self.scrub(args=nil)
     # Check for an existing environment
@@ -144,5 +155,6 @@ require 'colored'
 require 'textigniter/build'
 require 'textigniter/help'
 require 'textigniter/init'
+require 'textigniter/list'
 require 'textigniter/scrub'
 require 'yaml'

data/lib/textigniter/build.rb

@@ -15,47 +15,51 @@ class Textigniter::Build
       STDOUT.puts "\r\nHint: ".white_on_black + "textigniter init ".bold.white_on_black + " creates a new environment\r\n".white_on_black
       exit
     end
-    # Parse the text
-    text_items = TextParser.new.process(build_list('html'))
-    # Parse the template
-    template_items = TemplateParser.new.process(text_items)
-    # Parse the styles
-    style_items = StyleParser.new.process(build_list('styles'))
-    # Parse the scripts
-    script_items = ScriptParser.new.process(build_list('scripts'))
-    # Render html to file
-    RenderFiles.new.render(template_items, 'html')
-    # Render styles to file
-    RenderFiles.new.render(style_items, 'css')
-    # Render scripts to file
-    RenderFiles.new.render(script_items, 'js')
-  end
-
-  # Create a build list to pass to parsers
-  def build_list(format)
-    # switch on format
-    case format
-      when 'html'
-        # Create the html list
-        build_list = Dir.glob("#{$twd}/content/**/*")
-      when 'styles'
-        # Create the style list
-        build_list = Dir.glob("#{$twd}/styles/**/*")
-      when 'scripts'
-        # Create the script list
-        build_list = Dir.glob("#{$twd}/scripts/**/*")
+    # get the content list
+    content = list.get_build_list('content')
+    # process and render unless nil
+    unless content.nil?
+      # Parse the text
+      text_items = Textigniter::Parsers::TextParser.new.process(content)
+      # Parse the template
+      template_items = Textigniter::Parsers::TemplateParser.new.process(text_items)
+      # Render html to file
+      RenderFiles.new.render(template_items, 'content')
+    end
+    # get the styles list
+    styles = list.get_build_list('styles')
+    # process and render unless nil
+    unless styles.nil?
+      # Parse the styles
+      style_items = Textigniter::Parsers::StyleParser.new.process(styles)
+      # Render styles to file
+      RenderFiles.new.render(style_items, 'styles')
     end
-    # create an array to store the new build list in
-    cleaned_build_list = Array.new
-    # Clean up the build list
-    build_list.each do |l|
-      # if not a directory keep the file
-      unless File.directory?(l)
-        cleaned_build_list.push l
-      end
-    end    
-    # Return the list
-    return cleaned_build_list
+    # get the scripts list
+    scripts = list.get_build_list('scripts')
+    # process and render unless nil
+    unless scripts.nil?
+      # Parse the scripts
+      script_items = Textigniter::Parsers::ScriptParser.new.process(scripts)
+      # Render scripts to file
+      RenderFiles.new.render(script_items, 'scripts')
+    end
+    # write files to .content.yml
+    manifest.write_manifest('content')
+    # write files to .styles.yml
+    manifest.write_manifest('styles')
+    # write files to .scripts.yml
+    manifest.write_manifest('scripts')
+  end
+  
+  # manifest parser
+  def manifest
+    @manifest = Textigniter::Parsers::ManifestParser.new
+  end
+  
+  # Textigniter::List object
+  def list
+    @list = Textigniter::List.new
   end
 
 end
@@ -63,8 +67,9 @@ end
 # Requirements needed
 require 'fileutils'
 require 'textigniter/build/render_files'
-require 'textigniter/build/script_parser'
-require 'textigniter/build/style_parser'
-require 'textigniter/build/template_parser'
-require 'textigniter/build/text_parser'
-require 'yaml'
+require 'textigniter/parsers'
+require 'textigniter/parsers/manifest_parser'
+require 'textigniter/parsers/script_parser'
+require 'textigniter/parsers/style_parser'
+require 'textigniter/parsers/template_parser'
+require 'textigniter/parsers/text_parser'

data/lib/textigniter/build/render_files.rb

@@ -8,19 +8,17 @@ class Textigniter::Build::RenderFiles
   
   # Renders static content to file
   def render(items, format)
-    # Output start message
-    STDOUT.puts "Rendering #{format} to file ".yellow_on_black + "[OK]".green_on_black
     # Render each item
     items.each do |item|
       # Recursively create directory if it doesn't exist
       FileUtils.mkpath item['directory']
       # Switch based on format and build a filename
       case format
-        when 'html'
+        when 'content'
           filename = item['directory'] + '/index.html'
-        when 'css'
+        when 'styles'
           filename = item['directory'] + '/' + item['filename'] + '.css'
-        when 'js'
+        when 'scripts'
           filename = item['directory'] + '/' + item['filename'] + '.js'          
       end
       # Write the output to file

data/lib/textigniter/list.rb

@@ -0,0 +1,85 @@
+# lists files
+class Textigniter::List
+  
+  def initialize
+    
+  end
+  
+  # manifest parser
+  def manifest
+    @manifest = Textigniter::Parsers::ManifestParser.new
+  end
+  
+  # generates a build list
+  def get_build_list(format)
+    # Create the html list
+    build_list1 = Dir.glob("#{$twd}/#{format}/**/*")
+    # build the manifest
+    manifest_build_list = manifest.get_manifest("#{format}")
+    # create an array to store the new build list in
+    build_list2 = Array.new
+    # Clean up the build list
+    build_list1.each do |l|
+      # if not a directory keep the file
+      unless File.directory?(l)
+        build_list2.push({ filename: l, modified_at: File.mtime(l) })
+      end
+    end      
+    # create the cleaned list
+    cleaned_build_list = build_list2 - manifest_build_list
+
+    unless cleaned_build_list.count == 0
+      # perfect_build_list
+      perfect_build_list = Array.new
+      # do some final pruning
+      cleaned_build_list.each do |item|
+        perfect_build_list.push item[:filename]
+      end
+      # Return the list
+      return perfect_build_list
+    else
+      return nil
+    end
+  end
+  
+  # print requested list to the command line
+  def get_directory_listing(format=nil)
+    # get the keyword for message output
+    unless format.nil?
+      keyword = format
+    else
+      keyword = "everything"
+    end    
+    # output message
+    STDOUT.puts "Building a directory listing for ".yellow_on_black + "[#{keyword}]".blue_on_black
+    # files hash
+    files = Hash.new
+    # check for format
+    unless format.nil?
+      files[format] = Dir.glob("#{$twd}/#{format}/**/*")
+    # get everything if format not specified
+    else
+      files['content'] = Dir.glob("#{$twd}/content/**/*")
+      files['layouts'] = Dir.glob("#{$twd}/layouts/**/*")
+      files['styles'] = Dir.glob("#{$twd}/styles/**/*")
+      files['scripts'] = Dir.glob("#{$twd}/scripts/**/*")
+    end
+    # return files
+    return files
+  end
+  
+  def print_directory_listing(files)
+    # break files apart by key, value
+    files.each do |key, values|
+      # print the containing directory
+      STDOUT.puts ".textigniter/#{key}".blue_on_black
+      # print the files
+      values.each do |file|
+        unless File.directory?(file)
+          STDOUT.puts "--#{file.gsub("#{$twd}/#{key}/", '')}".yellow_on_black
+        end
+      end
+    end
+  end
+  
+end

data/lib/textigniter/parsers.rb

@@ -0,0 +1,3 @@
+class Textigniter::Parsers
+  
+end

data/lib/textigniter/{build → parsers}/blog_parser.rb

@@ -1,4 +1,5 @@
-class Textigniter::Build::BlogParser
+# This class parses for blog content
+class Textigniter::Parsers::BlogParser
   
   def parse(blogs)
     # blog keys

data/lib/textigniter/parsers/manifest_parser.rb

@@ -0,0 +1,41 @@
+class Textigniter::Parsers::ManifestParser
+  
+  def initialize
+
+  end
+  
+  def write_manifest(format)
+    # get the items
+    items = Dir.glob("#{$twd}/#{format}/**/*")   
+    # create an array to store the new build list in
+    manifest = Array.new
+    # Clean up the build list
+    items.each do |l|
+      # if not a directory keep the file
+      unless File.directory?(l)
+        manifest.push({ filename: l, modified_at: File.mtime(l) })
+      end
+    end 
+    # write the manifest to file
+    File.open("#{$twd}/manifests/#{format}.yml", 'w') do |file|
+       file.write manifest.to_yaml
+    end
+  end
+  
+  # get the manifest
+  def get_manifest(filename)
+    # manifiest file path
+    file = "#{$twd}/manifests/#{filename}.yml"
+    # check to see if manifest exists
+    if File.file?(file)
+      # get the contents
+      the_manifest = YAML::load(File.open(file))
+    else
+      # fake contents
+      the_manifest = Array.new
+    end
+    # return the manifiest
+    return the_manifest
+  end
+  
+end

data/lib/textigniter/{build → parsers}/script_parser.rb

@@ -1,9 +1,9 @@
 # This class parses scripts.  Currently it only parses coffeescript
-class Textigniter::Build::ScriptParser
+class Textigniter::Parsers::ScriptParser
   
   def process(build_list)
     # Output message
-    STDOUT.puts "Parsing ".yellow_on_black + "[coffeescript]".blue_on_black + " scripts ".yellow_on_black + "[OK]".green_on_black
+    STDOUT.puts "Rendering ".yellow_on_black + "[coffeescript]".blue_on_black + " scripts ".yellow_on_black + "[OK]".green_on_black
     # create array to store processed items in
     items = Array.new
     # process the build list
@@ -18,7 +18,13 @@ class Textigniter::Build::ScriptParser
       directory = File.dirname(f).sub($twd,$owd) + '/'
       @h['directory'] = directory
       # get the file name
-      @h['filename'] = File.basename(f, ".coffeescript}")
+      @h['filename'] = File.basename(f, ".coffeescript")
+      # extension
+      @h['extension'] = File.extname(f)
+      # modified_at key
+      @h['modified_at'] = File.mtime(f)
+      # filename for manifest
+      @h['manifest'] = f
       # parse the content
       @h['output'] = parse(contents)
       # push processed item onto the array

data/lib/textigniter/{build → parsers}/style_parser.rb

@@ -1,9 +1,9 @@
 # The StyleParser parses css files.  Currently it only parses less files.
-class Textigniter::Build::StyleParser
+class Textigniter::Parsers::StyleParser
   
-  def process(build_list)
+  def process(build_list)    
     # Output message
-    STDOUT.puts "Parsing ".yellow_on_black + "[less]".blue_on_black + " styles ".yellow_on_black + "[OK]".green_on_black
+    STDOUT.puts "Rendering ".yellow_on_black + "[less]".blue_on_black + " styles ".yellow_on_black + "[OK]".green_on_black
     # create array to store processed items in
     items = Array.new
     # process the build list
@@ -19,6 +19,12 @@ class Textigniter::Build::StyleParser
       @h['directory'] = directory
       # get the file name
       @h['filename'] = File.basename(f, ".less")
+      # filename for manifest
+      @h['manifest'] = f
+      # extension
+      @h['extension'] = File.extname(f)
+      # modified_at key
+      @h['modified_at'] = File.mtime(f)
       # parse the content
       @h['output'] = parse(contents)
       # push processed item onto the array

data/lib/textigniter/{build → parsers}/template_parser.rb

@@ -1,9 +1,9 @@
 # This class parses templates. Currently it only parses liquid templates
-class Textigniter::Build::TemplateParser
+class Textigniter::Parsers::TemplateParser
   
   def process(item_list)
     # Output message
-    STDOUT.puts "Parsing ".yellow_on_black + "[liquid]".blue_on_black + " templates ".yellow_on_black + "[OK]".green_on_black
+    STDOUT.puts "Rendering ".yellow_on_black + "[liquid]".blue_on_black + " templates ".yellow_on_black + "[OK]".green_on_black
     # create an array to store processed templates
     items = Array.new
     # iterate through the item list and parse templates

data/lib/textigniter/{build → parsers}/text_parser.rb

@@ -1,5 +1,5 @@
 # this is the script parser
-class Textigniter::Build::TextParser
+class Textigniter::Parsers::TextParser
   
   def plugins
     @plugins = Textigniter::Plugins.new
@@ -8,7 +8,7 @@ class Textigniter::Build::TextParser
   # parse the text and build a hash to send to template rendering
   def process(build_list)
     # Output message
-    STDOUT.puts "Parsing ".yellow_on_black + "[#{$config['text_parser']}]".blue_on_black + " content ".yellow_on_black +  "[OK]".green_on_black
+    STDOUT.puts "Rendering ".yellow_on_black + "[#{$config['text_parser']}]".blue_on_black + " content ".yellow_on_black +  "[OK]".green_on_black
     # parse for plugins
     plugin_parser = Textigniter::Plugins.new
     # create array to store processed items in
@@ -44,6 +44,15 @@ class Textigniter::Build::TextParser
       # created_at key
       @h['created_at'] = File.basename(f, ".#{$config['text_parser']}")[0..9] unless @h.has_key? 'created_at'
 
+      # modified_at key
+      @h['modified_at'] = File.mtime(f)
+
+      # filename
+      @h['manifest'] = f
+
+      # extension
+      @h['extension'] = File.extname(f)
+
       # slug key
       @h['slug'] = "#{File.dirname(f)}/#{File.basename(f, ".#{$config['text_parser']}")}"  unless @h.has_key? 'slug'
       
@@ -82,7 +91,7 @@ class Textigniter::Build::TextParser
     @results['items'] = items
 
     # initialize a blog parser
-    blog_parser = Textigniter::Build::BlogParser.new
+    blog_parser = Textigniter::Parsers::BlogParser.new
 
     # store blog posts to separate key
     @results['blogs'] = blog_parser.parse(blogs)
@@ -135,5 +144,5 @@ end
 
 # requirements
 require 'date'
-require_relative '../build/blog_parser'
+require_relative '../parsers/blog_parser'
 require_relative '../plugins'

data/textigniter.gemspec

@@ -2,17 +2,17 @@ Gem::Specification.new do |s|
   s.rubygems_version        = '1.9.2'
 
   s.name                    = 'textigniter'
-  s.version                 = '0.0.35'
+  s.version                 = '0.0.36'
   s.executables             << 'textigniter'
-  s.date                    = '2011-11-19'
+  s.date                    = '2011-11-25'
   
   s.summary                 = 'A static site generator'
   s.description             = <<-EOF
-    Textigniter is a lightweight static site generator based on textile (markdown optional), liquid, less, and coffeescript. You can have as many blogs as you want and use your own custom meta tags in templates without having to write plugins for them (You can however write plugins to add more power to your text-based information) 
+    Textigniter is a lightweight static site generator based on textile (markdown optional), liquid, less, and coffeescript. It supports multiple blogs, custom meta, custom content blocks, and your own custom meta tags in templates without having to write plugins for them (You can however write plugins to add more power to your text-based information) 
     EOF
   
   s.authors                 = ["Kaleb Heitzman"]
-  s.email                   = 'jkheitzman@gmail.com'
+  s.email                   = 'kalebheitzman@me.com'
   s.homepage                = 'http://github.com/kalebheitzman/textigniter'
   
   s.extra_rdoc_files        = %w[README.textile LICENSE]
@@ -38,22 +38,26 @@ Gem::Specification.new do |s|
     lib/skeleton/.textigniter/layouts/default.liquid
     lib/skeleton/.textigniter/layouts/partials/_header.liquid
     lib/skeleton/.textigniter/layouts/partials/_footer.liquid
+    lib/skeleton/.textigniter/manifests/README.textile
     lib/skeleton/.textigniter/plugins/README.textile
     lib/textigniter.rb
     lib/textigniter/build.rb
+    lib/textigniter/build/render_files.rb
     lib/textigniter/help.rb
     lib/textigniter/init.rb
+    lib/textigniter/list.rb
+    lib/textigniter/parsers.rb
+    lib/textigniter/parsers/blog_parser.rb
+    lib/textigniter/parsers/manifest_parser.rb
+    lib/textigniter/parsers/script_parser.rb
+    lib/textigniter/parsers/style_parser.rb
+    lib/textigniter/parsers/template_parser.rb
+    lib/textigniter/parsers/text_parser.rb
     lib/textigniter/plugins.rb
-    lib/textigniter/scrub.rb
-    lib/textigniter/build/blog_parser.rb
-    lib/textigniter/build/render_files.rb
-    lib/textigniter/build/script_parser.rb
-    lib/textigniter/build/style_parser.rb
-    lib/textigniter/build/template_parser.rb
-    lib/textigniter/build/text_parser.rb
     lib/textigniter/plugins/breadcrumbs.rb
     lib/textigniter/plugins/created_at.rb
     lib/textigniter/plugins/slug.rb
+    lib/textigniter/scrub.rb
   ]
   # = MANIFEST =
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textigniter
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70149730914420 !ruby/object:Gem::Requirement
+  requirement: &70212859033000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149730914420
+  version_requirements: *70212859033000
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70149730913540 !ruby/object:Gem::Requirement
+  requirement: &70212859027480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149730913540
+  version_requirements: *70212859027480
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &70149730912820 !ruby/object:Gem::Requirement
+  requirement: &70212859024220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149730912820
+  version_requirements: *70212859024220
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70149730912340 !ruby/object:Gem::Requirement
+  requirement: &70212859019260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149730912340
+  version_requirements: *70212859019260
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70149730911820 !ruby/object:Gem::Requirement
+  requirement: &70212859010140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149730911820
+  version_requirements: *70212859010140
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70149730911240 !ruby/object:Gem::Requirement
+  requirement: &70212859008460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,13 +76,13 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149730911240
+  version_requirements: *70212859008460
 description: ! "    Textigniter is a lightweight static site generator based on textile
-  (markdown optional), liquid, less, and coffeescript. You can have as many blogs
-  as you want and use your own custom meta tags in templates without having to write
-  plugins for them (You can however write plugins to add more power to your text-based
-  information) \n"
-email: jkheitzman@gmail.com
+  (markdown optional), liquid, less, and coffeescript. It supports multiple blogs,
+  custom meta, custom content blocks, and your own custom meta tags in templates without
+  having to write plugins for them (You can however write plugins to add more power
+  to your text-based information) \n"
+email: kalebheitzman@me.com
 executables:
 - textigniter
 extensions: []
@@ -102,22 +102,26 @@ files:
 - lib/skeleton/.textigniter/layouts/default.liquid
 - lib/skeleton/.textigniter/layouts/partials/_header.liquid
 - lib/skeleton/.textigniter/layouts/partials/_footer.liquid
+- lib/skeleton/.textigniter/manifests/README.textile
 - lib/skeleton/.textigniter/plugins/README.textile
 - lib/textigniter.rb
 - lib/textigniter/build.rb
+- lib/textigniter/build/render_files.rb
 - lib/textigniter/help.rb
 - lib/textigniter/init.rb
+- lib/textigniter/list.rb
+- lib/textigniter/parsers.rb
+- lib/textigniter/parsers/blog_parser.rb
+- lib/textigniter/parsers/manifest_parser.rb
+- lib/textigniter/parsers/script_parser.rb
+- lib/textigniter/parsers/style_parser.rb
+- lib/textigniter/parsers/template_parser.rb
+- lib/textigniter/parsers/text_parser.rb
 - lib/textigniter/plugins.rb
-- lib/textigniter/scrub.rb
-- lib/textigniter/build/blog_parser.rb
-- lib/textigniter/build/render_files.rb
-- lib/textigniter/build/script_parser.rb
-- lib/textigniter/build/style_parser.rb
-- lib/textigniter/build/template_parser.rb
-- lib/textigniter/build/text_parser.rb
 - lib/textigniter/plugins/breadcrumbs.rb
 - lib/textigniter/plugins/created_at.rb
 - lib/textigniter/plugins/slug.rb
+- lib/textigniter/scrub.rb
 - LICENSE
 homepage: http://github.com/kalebheitzman/textigniter
 licenses: