stack 0.0.6 → 0.0.7

data/README.markdown

@@ -1,4 +1,4 @@
-Stack
+stack
 =====
 
 Generates a static site from template files with YAML and Liquid. Stack supports template transformation through Markdown, Textile and Less CSS.
@@ -35,9 +35,13 @@ Usage
 	
 Generate runs through the source and transforms the templates, if no source is specified the current directory will be used.
 	
+	gen
+	
+Alias of `generate`.
+	
 	server
 	
-Runs a web server serving the output of the transformed source, by default when running Stack in server mode your templates will be automatically transformed when changed (this can be disabled).
+Runs a web server serving the output of the transformed source, by default when running stack in server mode your templates will be automatically transformed when changed (this can be disabled).
 	
 	watch
 	
@@ -45,17 +49,24 @@ Watches a directory and re-builds whenever theres file changes.
 	
 #### Options
 
-	--source
+	--source [DIR]
+	
+Directory to use as the source for generating a site with stack, by default the current directory will be used.
+	
+	--target [DIR]
 	
-	--target
+Directory to use as the target directory, if none is specified the target will be a folder called `_stack` in the source directory.
 	
 ##### Server Options
 	
-	--port
+	--port [PORT]
 	
-	--watches
+Specifies the port number the server should use when serving content through the `server` command.
+	
+	--disable-watch
+	
+Disables automatic transformation when serving content through the `server` command. 
 	
-
 ### Ruby
 
 	require 'stack'
@@ -65,7 +76,7 @@ Watches a directory and re-builds whenever theres file changes.
 Templates and YAML
 ------------------
 
-Template files can contain YAML block's that are processed by Stack and can be used to define Liquid variables for use in your templates. A YAML block can be something like;
+Template files can contain YAML block's that are processed by stack and can be used to define Liquid variables for use in your templates. A YAML block can be something like;
 
 	---
 	layout: application
@@ -80,11 +91,11 @@ This specifies the layout file to use around the content, theres no need to spec
 
 	generator
 	
-This variable holds the current  hash used to transform the current template. You should not override this from the YAML block.
+This variable holds the current hash used to transform the current template. You should not override this from the YAML block.
 
 	generator.time
 	
-The current Time from when the Stack processed and transformed the templates.
+The current Time from when the stack processed and transformed the templates.
 
 	generator.processed_at
 	

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_dependency "maruku", ">= 0.5.9"
     gem.add_dependency "less", ">= 1.0.0"
     gem.add_dependency "directory_watcher", ">= 1.2.0"
+    gem.add_dependency "mash", ">= 0.0.3"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 6
+:patch: 7

data/lib/core_ext/hash.rb

@@ -1,9 +1,3 @@
-class String
-  def liquify(payload)
-    return Liquid::Template.parse(self).render(Mash.new(payload))
-  end
-end
-
 class Hash
 
   # Returns a new hash just like this one, but with all the string keys expressed as symbols.

data/lib/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def liquify(payload)
+    return Liquid::Template.parse(self).render(Mash.new(payload))
+  end
+end

data/lib/stack/configuration.rb

@@ -1,6 +1,7 @@
 module Stack
   class Configuration
     attr_accessor :source, :target
+    attr_accessor :server_port, :server_watch
     
     def initialize(hash = nil)
       self.from_hash(hash)
@@ -10,7 +11,20 @@ module Stack
       if (hash != nil)
         @source = hash[:source]
         @target = hash[:target]
+        @server_port = hash[:server][:port]
+        @server_watch = hash[:server][:watch]
       end
     end
+    
+    def to_hash
+      {
+        :source => self.source,
+        :target => self.target,
+        :server => {
+          :port => self.server_port,
+          :watch => self.server_watch
+        }
+      }
+    end
   end
 end

data/lib/stack/generator.rb

@@ -7,6 +7,8 @@ module Stack
     attr_accessor :layouts
     attr_accessor :pages
     
+    attr_accessor :remove_first
+    
     attr_accessor :processed_at, :transformed_at
     
     def initialize(source, target, parent = nil)
@@ -14,6 +16,8 @@ module Stack
       self.target = target
       self.parent = parent
       
+      self.remove_first = false
+      
       self.layouts = (parent) ? parent.layouts.dup : { }
       
       self.children = [ ]
@@ -54,6 +58,10 @@ module Stack
     end
     
     def transform!
+      if self.remove_first
+        FileUtils.rm_r self.target
+      end
+      
       self.transformed_at = Time.now
       
       self.pages.each do |name, page|

data/lib/stack/runner.rb

@@ -44,9 +44,11 @@ module Stack
         @generator.transform!
       when /(server)/
         # make a watcher
-        watcher = Stack::Watcher.new(@generator)
-        watcher.keep_alive = false
-        watcher.observe
+        if Stack::runner.configuration.server_watch
+          watcher = Stack::Watcher.new(@generator)
+          watcher.keep_alive = false
+          watcher.observe
+        end
         # and a server
         server = Stack::Server.new(@generator)
         server.observe
@@ -54,6 +56,12 @@ module Stack
         # setup a watcher
         watcher = Stack::Watcher.new(@generator)
         watcher.observe
+      when /(create)/
+        File.open("#{Stack::runner.configuration.source}/_stack.yml", "w") { |file|
+          YAML.dump(Stack::runner.configuration.to_hash, file)
+        }
+        
+        puts "Created configuration file at '#{Stack::runner.configuration.source}/_stack.yml'"
       end
     end
   end

data/lib/stack/server.rb

@@ -13,7 +13,7 @@ module Stack
     
     def observe
       self.http_server = WEBrick::HTTPServer.new(
-        :Port => 4000,
+        :Port => Stack::runner.configuration.server_port,
         :DocumentRoot => self.target
       )
       

data/lib/stack/utils/standard.rb

@@ -0,0 +1,7 @@
+module Stack
+  module Utils
+    def self.to_path(str)
+      "#{self.gsub(/[\/]+$/, '')}/"
+    end
+  end
+end

data/lib/stack/watcher.rb

@@ -28,11 +28,13 @@ module Stack
       self.directory_watcher.glob = dirs
       
       self.directory_watcher.add_observer do |*args|
+        time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        puts "[#{time}] #{args.size} files changed."
         self.generator.process!
         self.generator.transform!
         
         time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{time}] #{args.size} files changed and processed."
+        puts "[#{time}] #{args.size} files processed."
       end
       
       self.directory_watcher.start

data/lib/stack.rb

@@ -10,6 +10,7 @@ require 'RedCloth'
 require 'less'
 require 'webrick'
 
+require 'core_ext/string'
 require 'core_ext/hash'
 
 require 'stack/configuration'
@@ -21,27 +22,33 @@ require 'stack/parsable'
 require 'stack/server'
 require 'stack/watcher'
 
-require 'stack/templates/page'
-require 'stack/templates/layout'
-
 require 'stack/filters/register'
 require 'stack/filters/standard'
 require 'stack/filters/convertors'
 require 'stack/filters/datetime'
 require 'stack/filters/string'
 
+require 'stack/templates/page'
+require 'stack/templates/layout'
+
+require 'stack/utils/standard'
+
 module Stack
   # Default options used by stack, overridden from the command line or YML configration file.
   DEFAULTS = {
     :source => '.',
-    :target => File.join('.', '_stack')
+    :target => File.join('.', '_stack'),
+    :server => {
+      :port => 4000,
+      :watch => true
+    }
   }.freeze
   
   # Array of valid commands stack can use
-  COMMANDS = %w(create generate server watch)
+  COMMANDS = %w(create generate gen server watch)
   
   # Array of transformable extensions (these extensions go through the liquid transformer)
-  EXTENSIONS = %w(.html .markdown .mdown .mkdn .md .textile .js .css)
+  EXTENSIONS = %w(.html .markdown .mdown .mkdn .md .textile .js .less .css)
   
   class << self
     attr_accessor :runner
@@ -49,19 +56,31 @@ module Stack
   
   # Parses the options configuration from the command line
   def self.parse!(argv)
-    config = { }
+    config = Stack::DEFAULTS.dup
     
     parser = OptionParser.new do |opts|
-      opts.banner = "Usage: stack [options] #{Stack::COMMANDS.join('|')}"
+      opts.banner = "Usage: stack #{Stack::COMMANDS.join('|')} [options...]"
 
+      opts.separator ""
+      opts.separator "Generator options:"
+      
       opts.on("-s", "--source [DIR]", "Directory to use as the source for generating a stack") do |l|
         if !l.nil?
           config[:source] = l
-          config[:target] = "#{config[:source]}_stack"
+          config[:target] = File.join(config[:source], "_stack")
         end
       end
       opts.on("-t", "--target [DIR]", "Directory to use as the target directory") do |l| config[:target] = l unless l.nil? end
       
+      opts.separator ""
+      opts.separator "Server options:"
+      
+      opts.on("-p", "--port [PORT]", "Port number to use when serving content") do |l| config[:server][:port] = l unless l.nil? end
+      opts.on("--disable-watch", "--disable-watch", "Disables automatic transformation when serving content") do |l| config[:server][:watch] = false end
+      
+      opts.separator ""
+      opts.separator "Common options:"
+      
       opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
       opts.on_tail("-v", "--version", "Show version") do puts "stack #{Stack::version}"; exit; end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stack
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - sixones
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 +00:00
+date: 2009-11-01 00:00:00 +00:00
 default_executable: stack
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+    version: 
 description: Generates a static site from template files with YAML and Liquid. Stack supports template transformation through Markdown, Textile and Less CSS.
 email: dev@sixones.com
 executables: 
@@ -88,6 +98,7 @@ files:
 - VERSION.yml
 - bin/stack
 - lib/core_ext/hash.rb
+- lib/core_ext/string.rb
 - lib/stack.rb
 - lib/stack/configuration.rb
 - lib/stack/filters/convertors.rb
@@ -102,6 +113,7 @@ files:
 - lib/stack/template.rb
 - lib/stack/templates/layout.rb
 - lib/stack/templates/page.rb
+- lib/stack/utils/standard.rb
 - lib/stack/watcher.rb
 - test/helper.rb
 - test/test_stack.rb