plato 0.1.2 → 0.2.0

data/.gitignore

@@ -1,7 +1,2 @@
 .DS_Store
 /pkg
-/content
-/template
-/resources
-/cache
-/config.rb

data/Rakefile

@@ -22,7 +22,8 @@ begin
     gemspec.email = "matt@freels.name"
     gemspec.homepage = "http://github.com/freels/plato"
     gemspec.authors = ["Matt Freels"]
-    gemspec.add_dependency 'tilt', '>= 1.0.1'
+    gemspec.add_dependency 'tilt', '~> 1.0.1'
+    gemspec.add_dependency 'ruby_archive', '~> 0.1.2'
 
     # development
     gemspec.add_development_dependency 'rspec'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/plato

@@ -1,6 +1,45 @@
 #!/usr/bin/env ruby
 
 require 'plato'
+require 'yaml'
+require 'optparse'
 
-# bare-bones for now...
-Plato::Site.new.generate!
+opts = {
+  'root'     => '.',
+  'template' => 'template',
+  'cache'    => 'cache'
+}
+
+op = OptionParser.new {|op|
+  op.on('-s url')       {|val| opts['base_url'] = val }
+  op.on('-d dir')       {|val| opts['root']     = val }
+  op.on('-t template')  {|val| opts['template'] = val }
+  op.on('-c cache')     {|val| opts['cache']    = val }
+  op.on('-h', '--help') { puts op }
+}
+
+op.parse!(ARGV.dup)
+
+platorc = File.join(opts['root'], 'platorc')
+
+if File.exist? platorc
+  begin
+    opts.update YAML.load_file(platorc)
+  rescue
+    $stderr.puts "Error reading from platorc."; exit 2
+  end
+end
+
+
+# error checking
+
+unless opts['base_url']
+  $stderr.puts "Error: Must specify a base site url: plato -s URL"
+  $stderr.puts "\n"
+  $stderr.puts op
+  exit 1
+end
+
+puts "Generating site..."
+Plato::Site.new(*opts.values_at('base_url', 'template', 'cache', 'root')).generate!
+puts "done!"

data/dist/hooks/post-receive

@@ -5,5 +5,5 @@ require 'fileutils'
 git_dir = ENV['GIT_DIR'] = File.expand_path(ENV['GIT_DIR'])
 
 FileUtils.cd '..'
-system "env GIT_DIR=#{git_dir} git reset --hard HEAD >> /tmp/post-receive 2>&1"
-system "plato >> /tmp/post-receive 2>&1"
+system "env GIT_DIR=#{git_dir} git reset --hard HEAD"
+system "plato"

data/lib/plato.rb

@@ -1,4 +1,5 @@
 require 'tilt'
+require 'ruby_archive'
 
 module Plato
   require 'plato/config'

data/lib/plato/manifest.rb

@@ -22,7 +22,7 @@ module Plato
 
     def save_to(path, codec = nil)
       repo = Repo.new(path, codec || self.codec)
-      @contents.each {|path, hash| repo.save(path, hash) }
+      @contents.map {|path, hash| repo.save(path, hash); path }
     end
 
     def [](key)

data/lib/plato/site.rb

@@ -1,26 +1,44 @@
 module Plato
   class Site
-    attr_accessor :root
+    attr_reader :base_url
+    attr_reader :root
+    attr_reader :template_path, :config_path, :content_path, :resources_path, :cache_path
 
-    def initialize(root = '.')
-      @root = File.expand_path(root)
+    def initialize(base_url, template = 'template', cache = 'cache', root = '.')
+      @base_url = base_url
+      @root     = File.expand_path(root)
+
+      @cache_path     = File.expand_path(cache, @root)
+      @template_path  = detect_zip_path File.expand_path(template, @root)
+
+      @config_path    = File.join(@template_path, 'config.rb')
+      @content_path   = File.join(@root, "content")
+      @resources_path = File.join(@root, "resources")
     end
 
     def generate!
       RenderContext.load_view_helpers(File.join(template_path, 'view_helpers.rb'))
-      resources.save_to(cache_path)
-      template_resources.save_to(cache_path)
-      rendered_templates.save_to(cache_path)
-      rendered_content.save_to(cache_path)
+      [ resources.save_to(cache_path),
+        template_resources.save_to(cache_path),
+        rendered_templates.save_to(cache_path),
+        rendered_content.save_to(cache_path)
+      ].each do |ps|
+        puts ps.map{|s| " » #{s}" }
+      end
     end
 
-    def base_url; config['base_url'] end
+    DETECT_EXT = /(?:(.*)\/)?([^\/]+)\.([^.]+)\Z/
+    def detect_zip_path(path)
+      path = "#{path}.zip" if !File.exist? path and File.exist? "#{path}.zip"
 
-    def config_path; File.join(root, "config.rb") end
-    def template_path; File.join(root, "template") end
-    def content_path; File.join(root, "content") end
-    def resources_path; File.join(root, "resources") end
-    def cache_path; File.join(root, "cache") end
+      if File.exist? path and !File.directory? path and path.match(DETECT_EXT)
+        dir, base, ext = path.match(DETECT_EXT).values_at(1,2,3)
+
+        [dir, "#{base}.#{ext}!", base].compact.join("/")
+      else
+        path
+      end
+    end
 
     def config
       @config ||= Config.read(ConfigDSL, File.read(config_path))
@@ -31,7 +49,7 @@ module Plato
 
       manifest = Manifest.new template_path, {
         :codec => :template,
-        :filter => lambda {|p| p !~ /\Aview_helpers\.rb/ }
+        :filter => lambda {|p| p !~ /\A(config\.rb|view_helpers\.rb)/ }
       }
 
       path_parser = PathTemplate.new(":name*.:format.:engine")

data/plato.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plato}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-10-09}
   s.description = %q{use templates and content to generate static sites.}
   s.email = %q{matt@freels.name}
   s.executables = ["plato", "plato-prepare-repo"]
@@ -41,16 +41,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tilt>, [">= 1.0.1"])
+      s.add_runtime_dependency(%q<tilt>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<ruby_archive>, ["~> 0.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<tilt>, [">= 1.0.1"])
+      s.add_dependency(%q<tilt>, ["~> 1.0.1"])
+      s.add_dependency(%q<ruby_archive>, ["~> 0.1.2"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<tilt>, [">= 1.0.1"])
+    s.add_dependency(%q<tilt>, ["~> 1.0.1"])
+    s.add_dependency(%q<ruby_archive>, ["~> 0.1.2"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plato
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-10-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ruby_archive
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +63,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,7 +77,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: use templates and content to generate static sites.
 email: matt@freels.name
 executables: