diff --git a/Manifest.txt b/Manifest.txt index 0572dcc9..525d3356 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -2,6 +2,6 @@ History.txt Manifest.txt README.txt Rakefile -bin/autoblog -lib/autoblog.rb -test/test_autoblog.rb \ No newline at end of file +bin/conveyer +lib/conveyer.rb +test/test_conveyer.rb \ No newline at end of file diff --git a/README.textile b/README.textile index 3a699d7b..a85484c6 100644 --- a/README.textile +++ b/README.textile @@ -1,10 +1,10 @@ -h1. AutoBlog +h1. Conveyer Blog like a developer. h2. Example Proto-Site -My own personal site/blog is generated with autoblog. +My own personal site/blog is generated with Conveyer. The proto-site repo ("http://github.com/mojombo/tpw":http://github.com/mojombo/tpw) is converted into the actual site ("http://tom.preston-werner.com/":http://tom.preston-werner.com) @@ -14,9 +14,9 @@ h2. Install and Run This is beta software. You will need to download the source and run the software from there. - $ git clone git://github.com/mojombo/autoblog - $ cd autoblog - $ bin/autoblog /path/to/proto/site /path/to/generated/site + $ git clone git://github.com/mojombo/conveyer + $ cd conveyer + $ bin/conveyer /path/to/proto/site /path/to/generated/site h2. License diff --git a/Rakefile b/Rakefile index eb18931e..a8e51158 100644 --- a/Rakefile +++ b/Rakefile @@ -1,12 +1,12 @@ require 'rubygems' require 'hoe' -# Hoe.new('autoblog', Autoblog::VERSION) do |p| -# # p.rubyforge_name = 'autoblogx' # if different than lowercase project name +# Hoe.new('conveyer', Conveyer::VERSION) do |p| +# # p.rubyforge_name = 'conveyerx' # if different than lowercase project name # # p.developer('FIX', 'FIX@example.com') # end desc "Open an irb session preloaded with this library" task :console do - sh "irb -rubygems -r ./lib/autoblog.rb" + sh "irb -rubygems -r ./lib/conveyer.rb" end \ No newline at end of file diff --git a/bin/autoblog b/bin/conveyer similarity index 60% rename from bin/autoblog rename to bin/conveyer index 8dd741fa..7905a2a3 100755 --- a/bin/autoblog +++ b/bin/conveyer @@ -2,6 +2,6 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib]) -require 'autoblog' +require 'conveyer' -AutoBlog.process(ARGV[0], ARGV[1]) \ No newline at end of file +Conveyer.process(ARGV[0], ARGV[1]) \ No newline at end of file diff --git a/lib/autoblog.rb b/lib/conveyer.rb similarity index 57% rename from lib/autoblog.rb rename to lib/conveyer.rb index ce2d7367..a671c2be 100644 --- a/lib/autoblog.rb +++ b/lib/conveyer.rb @@ -14,17 +14,17 @@ require 'liquid' require 'redcloth' # internal requires -require 'autoblog/site' -require 'autoblog/convertible' -require 'autoblog/layout' -require 'autoblog/page' -require 'autoblog/post' -require 'autoblog/filters' +require 'conveyer/site' +require 'conveyer/convertible' +require 'conveyer/layout' +require 'conveyer/page' +require 'conveyer/post' +require 'conveyer/filters' -module AutoBlog +module Conveyer VERSION = '0.1.0' def self.process(source, dest) - AutoBlog::Site.new(source, dest).process + Conveyer::Site.new(source, dest).process end end \ No newline at end of file diff --git a/lib/autoblog/convertible.rb b/lib/conveyer/convertible.rb similarity index 94% rename from lib/autoblog/convertible.rb rename to lib/conveyer/convertible.rb index dfe444fb..f41edb7d 100644 --- a/lib/autoblog/convertible.rb +++ b/lib/conveyer/convertible.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer module Convertible # Read the YAML frontmatter # +base+ is the String path to the dir containing the file @@ -35,7 +35,7 @@ module AutoBlog payload = payload.merge(site_payload) # render content - self.content = Liquid::Template.parse(self.content).render(payload, [AutoBlog::Filters]) + self.content = Liquid::Template.parse(self.content).render(payload, [Conveyer::Filters]) # output keeps track of what will finally be written self.output = self.content @@ -44,7 +44,7 @@ module AutoBlog layout = layouts[self.data["layout"]] while layout payload = payload.merge({"content" => self.output, "page" => self.data}) - self.output = Liquid::Template.parse(layout.content).render(payload, [AutoBlog::Filters]) + self.output = Liquid::Template.parse(layout.content).render(payload, [Conveyer::Filters]) layout = layouts[layout.data["layout"]] end diff --git a/lib/autoblog/filters.rb b/lib/conveyer/filters.rb similarity index 92% rename from lib/autoblog/filters.rb rename to lib/conveyer/filters.rb index 3bf2418d..420c64de 100644 --- a/lib/autoblog/filters.rb +++ b/lib/conveyer/filters.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer module Filters def date_to_string(date) diff --git a/lib/autoblog/layout.rb b/lib/conveyer/layout.rb similarity index 94% rename from lib/autoblog/layout.rb rename to lib/conveyer/layout.rb index ef4eec5f..97957f12 100644 --- a/lib/autoblog/layout.rb +++ b/lib/conveyer/layout.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer class Layout include Convertible @@ -36,12 +36,12 @@ module AutoBlog # Returns nothing def add_layout(layouts, site_payload) payload = {"page" => self.data}.merge(site_payload) - self.content = Liquid::Template.parse(self.content).render(payload, [AutoBlog::Filters]) + self.content = Liquid::Template.parse(self.content).render(payload, [Conveyer::Filters]) layout = layouts[self.data["layout"]] || self.content payload = {"content" => self.content, "page" => self.data} - self.content = Liquid::Template.parse(layout).render(payload, [AutoBlog::Filters]) + self.content = Liquid::Template.parse(layout).render(payload, [Conveyer::Filters]) end end diff --git a/lib/autoblog/page.rb b/lib/conveyer/page.rb similarity index 98% rename from lib/autoblog/page.rb rename to lib/conveyer/page.rb index 5865b6c1..d4cc8eff 100644 --- a/lib/autoblog/page.rb +++ b/lib/conveyer/page.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer class Page include Convertible diff --git a/lib/autoblog/post.rb b/lib/conveyer/post.rb similarity index 99% rename from lib/autoblog/post.rb rename to lib/conveyer/post.rb index 36c0b3c2..34678759 100644 --- a/lib/autoblog/post.rb +++ b/lib/conveyer/post.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer class Post include Comparable diff --git a/lib/autoblog/site.rb b/lib/conveyer/site.rb similarity index 99% rename from lib/autoblog/site.rb rename to lib/conveyer/site.rb index 6df05b45..223b86d1 100644 --- a/lib/autoblog/site.rb +++ b/lib/conveyer/site.rb @@ -1,4 +1,4 @@ -module AutoBlog +module Conveyer class Site attr_accessor :source, :dest diff --git a/test/helper.rb b/test/helper.rb index 81ab0d0b..ab7e02a8 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -1,8 +1,8 @@ -require File.join(File.dirname(__FILE__), *%w[.. lib autoblog]) +require File.join(File.dirname(__FILE__), *%w[.. lib conveyer]) require 'test/unit' -include AutoBlog +include Conveyer def dest_dir File.join(File.dirname(__FILE__), *%w[dest]) diff --git a/test/test_autoblog.rb b/test/test_conveyer.rb similarity index 100% rename from test/test_autoblog.rb rename to test/test_conveyer.rb