logi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3475cb97948ff33502fbd216c8724b9b3de00ae5
-  data.tar.gz: 732a3c178a6ce76c9e53732046f0c2ee5282aa4c
+  metadata.gz: 5de594ac9c881a4153b5e2bc19dde37a01adb8dd
+  data.tar.gz: 8ec9ecf75ce2d0c4aff2e04d451519cd57788648
 SHA512:
-  metadata.gz: 518489b42423a530f1c129c1bb0f59f61ebd6d90485b7b1459fb527503b630f37f7a8078530e41c78846fb71c08b601aa3ce685a23b9353fea10144921458e64
-  data.tar.gz: 49ac258973c40a12737c0e47d4cf123aae429cc84ae3191988a0e3cebf43612dbd2fea9c5e4246a6bbfbe9b78a31289ab32dae11239f0925ce98556a0f12e54a
+  metadata.gz: 084251b20f1df902bc977d9e567989bc0d0831bb587942065f1ceca3a833971cfc56ec695ac48750b3ca38e4f9d665e537c2482f2edbc7110b7de850dcbf8e64
+  data.tar.gz: b063fdba5b23b23caeca987377980adb5b709ff9515156a891cc29101fb38011bb981b6b5558bcc06a2215df688182cffe704fba08d64cf9f420c72fa38c9b07

data/.gitignore

@@ -1,2 +1,2 @@
-pkg
+/pkg/
 *.rbc

data/.travis.yml

@@ -0,0 +1,11 @@
+before_install: 'git submodule update --init'
+script: 'ruby -r bundler/setup -S rake test'
+
+env:
+  - 'RBXOPT=-X19'
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - rbx-head
+  - jruby-head

data/CHANGES.md

@@ -0,0 +1,16 @@
+# CHANGES
+
+## logi 0.1.1 -- 2013-09-30
+
+* It would no longer give errors if layout is absent.
+  Instead, it would emit a warning and use an empty layout.
+* It would now expand the root you're passing.
+* All commands would now follow --quiet or --nocolor options.
+* JRuby support is fixed. (IO.copy_stream cannot work on non-files
+  on JRuby)
+* `logi -h` would now print the example site path.
+* [logi-list] It would now sort the posts with links.
+
+## logi 0.1.0 -- 2013-09-20
+
+* Birthday!

data/README.md

@@ -24,13 +24,42 @@ Highly customizable static blog/wiki generator.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 2.0.0, Rubinius and JRuby.
+* Ruby 1.9+ (Also tested with JRuby and Rubinius)
 * Tilt for built-in post/list generator: `gem install tilt`
+* Kramdown for markdown generator: `gem install kramdown`
 
 ## INSTALLATION:
 
+If you have Ruby installed, you could simply run:
+
     gem install logi
-    gem install tilt # if you want to use built-in generators
+    gem install tilt     # If you want to use built-in generators
+    gem install kramdown # If you want to use Markdown with tilt
+
+If you need to install Ruby, first you should try the one provided
+by your package manager.
+
+For Arch Linux, run:
+
+    sudo pacman -Syu     # Update packages list first
+    sudo pacman -S ruby
+
+For Mac OS X, if you have Homebrew installed, run:
+
+    brew update          # Update packages list first
+    brew install ruby --with-doc
+
+For Windows, you might want to try [RubyInstaller][].
+
+If your package manager does not yet provide Ruby 2.0,
+you could try [ruby-install][] which could compile and
+handle Ruby's own dependencies for you.
+
+Or just [grab the source tarball][ruby-download] and install it manually.
+
+[RubyInstaller]: http://rubyinstaller.org/
+[ruby-install]: https://github.com/postmodern/ruby-install
+[ruby-download]: https://www.ruby-lang.org/en/downloads/
 
 ## SYNOPSIS:
 

data/Rakefile

@@ -1,24 +1,16 @@
-# encoding: utf-8
 
 begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
-  sh "git submodule update --init"
-  exec Gem.ruby, "-S", "rake", *ARGV
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.dir = dir
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib")).uniq!
-
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    require 'logi/version'
-    s.name    = 'logi'
-    s.version = Logi::VERSION
-    %w[].each{ |g| s.add_dependency(g) }
-    %w[bacon muack tilt].each{ |g| s.add_development_dependency(g) }
-  end
-
-  Gemgem.write
+Gemgem.init(dir) do |s|
+  require 'logi/version'
+  s.name    = 'logi'
+  s.version = Logi::VERSION
+  %w[].each{ |g| s.add_dependency(g) }
+  %w[bacon muack
+     tilt kramdown].each{ |g| s.add_development_dependency(g) }
 end

data/TODO.md

@@ -0,0 +1,7 @@
+# TODO
+
+* blogger importer
+
+xml.css('entry').select{ |n| n.css('id').text.include?('post') }
+
+* md5 checksum

data/example/layout/list.html.erb

@@ -8,9 +8,9 @@
   <body>
     <h1>Posts listing</h1>
     <ul>
-    <% @posts.each do |post| %>
+<% @posts.each do |post| %>
       <li><a href="<%= post.link %>"><%= post.title %></a></li>
-    <% end %>
+<% end %>
     </ul>
   </body>
 </html>

data/lib/logi.rb

@@ -11,7 +11,7 @@ class Logi
   end
 
   def make
-    config.posts.each_value do |post|
+    config.posts.values.sort.each do |post|
       io = compiler.compile(post.command,
                             config.post_path_for(post),
                             config.layout_path_for(post))

data/lib/logi/command.rb

@@ -0,0 +1,47 @@
+
+class Logi; end
+module Logi::Command
+  module_function
+  def check_argv path, layout
+    [check_path(path), check_path(layout)]
+  end
+
+  def check_path path
+    if File.exist?(path)
+      path
+    else
+      require 'logi/logger'
+      extend Logi::Logger
+      log red("ERROR: Post does not exist: #{cyan(strip_path(path))}")
+      exit(1)
+    end
+  end
+
+  def check_layout layout
+    if File.exist?(layout)
+      layout
+    else
+      require 'logi/default'
+      require 'logi/logger'
+      extend Logi::Logger
+      log red("WARN: Layout does not exist: #{cyan(strip_path(layout))}")
+      Logi::Default.empty_layout
+    end
+  end
+
+  def options
+    @options ||= {:quiet   => tribool(ENV['LOGI_QUIET'  ]),
+                  :nocolor => tribool(ENV['LOGI_NOCOLOR'])}
+  end
+
+  def tribool value
+    case value
+    when 'true'
+      true
+    when 'false'
+      false
+    else
+      nil
+    end
+  end
+end

data/lib/logi/command/list.rb

@@ -1,10 +1,18 @@
 
+require 'logi/command'
+
 require 'tilt'
 
 class  Logi         ; end
 module Logi::Command; end
 module Logi::Command::List
-  Post = Struct.new(:link, :title)
+  extend Logi::Command
+
+  class Post < Struct.new(:link, :title)
+    def <=> that
+      link <=> that.link
+    end
+  end
 
   module_function
   def run argv
@@ -13,7 +21,7 @@ module Logi::Command::List
     @posts = Dir["#{dir}/**/*.*"].map{ |post|
       name = post.sub("#{dir}/", '')
       Post.new(name.sub(/\..+$/, '.html'), name.sub(/\..+$/, ''))
-    }
-    puts Tilt.new(layout).render(self)
+    }.sort
+    puts Tilt.new(check_layout(layout)).render(self)
   end
 end

data/lib/logi/command/post.rb

@@ -1,12 +1,16 @@
 
+require 'logi/command'
+
 require 'tilt'
 
 class  Logi         ; end
 module Logi::Command; end
 module Logi::Command::Post
+  extend Logi::Command
+
   module_function
   def run argv
-    path, layout = argv
+    path, layout = check_argv(*argv)
     puts Tilt.new(layout).render{Tilt[path].new{$stdin.read}.render}
   end
 end

data/lib/logi/compiler.rb

@@ -13,22 +13,31 @@ class Logi::Compiler
   end
 
   def compile command, path, layout
-    log_compile(command, path, layout)
     wiki = IO.popen("logi-wiki #{path}", 'r')
     out  = IO.popen("logi-#{command} #{path} #{layout}", 'r+')
-    IO.copy_stream(wiki, out)
+    copy_stream(wiki, out)
     out.close_write
+    log_compile(command, path, layout) unless out.eof?
     out
   end
 
   def write output, out
+    return if out.eof?
     log_write(output)
     FileUtils.mkdir_p(File.dirname(output))
-    IO.copy_stream(out, output)
+    copy_stream(out, output)
   ensure
     out.close
   end
 
+  def copy_stream from, to
+    IO.copy_stream(from, to)
+  rescue TypeError # JRuby can only copy from file to file
+    to.write(from.read(8192)) until from.eof?
+  ensure
+    from.close
+  end
+
   private
   def log_compile command, path, layout
     w = red('logi-wiki')

data/lib/logi/config.rb

@@ -1,18 +1,10 @@
 
+require 'logi/default'
 require 'logi/loader'
 
 class Logi; end
 class Logi::Config < Struct.new(:post_path, :layout_path,
                                 :output_path, :default_layout)
-  def self.default_root_path  ; '.'     ; end
-  def self.default_post_path  ; 'post'  ; end
-  def self.default_layout_path; 'layout'; end
-  def self.default_output_path; 'public'; end
-  def self.default_command    ; 'post'  ; end
-  def self.default_layout
-    File.expand_path("#{__dir__}/layout/default.html.erb")
-  end
-
   attr_reader :options
   attr_accessor
   def initialize options={}
@@ -25,7 +17,7 @@ class Logi::Config < Struct.new(:post_path, :layout_path,
   end
 
   def root
-    options[:root] || self.class.default_root_path
+    File.expand_path(options[:root] || Logi::Default.default_root_path)
   end
 
   def path
@@ -40,7 +32,7 @@ class Logi::Config < Struct.new(:post_path, :layout_path,
     if layout = post.options[:layout] || default_layout
       "#{root}/#{layout_path}/#{layout}"
     else
-      self.class.default_layout
+      Logi::Default.default_layout
     end
   end
 
@@ -49,14 +41,14 @@ class Logi::Config < Struct.new(:post_path, :layout_path,
   end
 
   def post_path
-    super || self.class.default_post_path
+    super || Logi::Default.default_post_path
   end
 
   def layout_path
-    super || self.class.default_layout_path
+    super || Logi::Default.default_layout_path
   end
 
   def output_path
-    super || self.class.default_output_path
+    super || Logi::Default.default_output_path
   end
 end

data/lib/logi/default.rb

@@ -0,0 +1,24 @@
+
+class Logi; end
+module Logi::Default
+  module_function
+  def default_root_path  ; '.'     ; end
+  def default_post_path  ; 'post'  ; end
+  def default_layout_path; 'layout'; end
+  def default_output_path; 'public'; end
+  def default_command    ; 'post'  ; end
+  def default_layout
+    File.expand_path("#{__dir__}/layout/default.html.erb")
+  end
+  def empty_layout
+    File.expand_path("#{__dir__}/layout/empty.html.erb")
+  end
+  def example_directory
+    File.expand_path("#{__dir__}/../../example")
+  end
+
+  # For Ruby 1.9-
+  def __dir__
+    File.dirname(__FILE__)
+  end unless respond_to?(:__dir__, true)
+end

data/lib/logi/layout/empty.html.erb

@@ -0,0 +1 @@
+<%= yield %>

data/lib/logi/loader.rb

@@ -1,4 +1,5 @@
 
+require 'logi/default'
 require 'logi/post'
 
 class Logi; end
@@ -14,7 +15,7 @@ class Logi::Loader
     Dir["#{prefix}/**/*.*"].each do |fullpath|
       path = fullpath.sub("#{prefix}/", '')
       config.posts[path] ||=
-        Logi::Post.new(config.class.default_command, path, {}, nil)
+        Logi::Post.new(Logi::Default.default_command, path, {}, nil)
     end
   end
 

data/lib/logi/logger.rb

@@ -4,7 +4,7 @@ module Logi::Logger
   module_function
   def log msg
     return if options[:quiet]
-    puts msg
+    $stderr.puts msg
   end
 
   def   black text; color(30, text); end
@@ -18,7 +18,7 @@ module Logi::Logger
   def color rgb, text
     if nocolor = options[:nocolor]
       text
-    elsif nocolor.nil? && !$stdout.tty? # auto-detect
+    elsif nocolor.nil? && !$stderr.tty? # auto-detect
       text
     else
       "\e[#{rgb}m#{text}\e[0m"

data/lib/logi/post.rb

@@ -1,3 +1,7 @@
 
 class Logi; end
-Logi::Post = Struct.new(:command, :path, :options, :block)
+class Logi::Post < Struct.new(:command, :path, :options, :block)
+  def <=> that
+    path <=> that.path
+  end
+end

data/lib/logi/runner.rb

@@ -12,13 +12,15 @@ module Logi::Runner
      ['-h, --help'       , 'Print this message'     ],
      ['-v, --version'    , 'Print the version'      ],
      ['defaults:'        , ''                       ],
-     ['  root directory' , Logi::Config.  default_root_path],
-     ['  post directory' , Logi::Config.  default_post_path],
-     ['layout directory' , Logi::Config.default_layout_path],
-     ['output directory' , Logi::Config.default_output_path],
-     ['    post command' , Logi::Config.default_command    ],
+     ['  root directory' , Logi::Default.  default_root_path],
+     ['  post directory' , Logi::Default.  default_post_path],
+     ['layout directory' , Logi::Default.default_layout_path],
+     ['output directory' , Logi::Default.default_output_path],
+     ['    post command' , Logi::Default.default_command    ],
      ['     layout file' , Logi::Logger.strip_path(
-                             Logi::Config.default_layout)  ]]
+                             Logi::Default.default_layout)  ],
+     ['    example site' , Logi::Logger.strip_path(
+                             Logi::Default.example_directory)]]
   end
 
   def run argv=ARGV
@@ -32,19 +34,19 @@ module Logi::Runner
     until argv.empty?
       case arg = argv.shift
       when /^-c/, '--color'
-        options[:nocolor] = false
+        ENV['LOGI_NOCOLOR'] = (options[:nocolor] = false).to_s
         parse_next(argv, arg)
 
       when /^-n/, '--no-color'
-        options[:nocolor] = true
+        ENV['LOGI_NOCOLOR'] = (options[:nocolor] = true).to_s
         parse_next(argv, arg)
 
       when /^-V/, '--verbose'
-        options[:quiet] = false
+        ENV['LOGI_QUIET'] = (options[:quiet] = false).to_s
         parse_next(argv, arg)
 
       when /^-q/, '--quiet'
-        options[:quiet] = true
+        ENV['LOGI_QUIET'] = (options[:quiet] = true).to_s
         parse_next(argv, arg)
 
       when /^-h/, '--help'
@@ -52,8 +54,8 @@ module Logi::Runner
         exit
 
       when /^-v/, '--version'
-        require 'rib/version'
-        puts(Rib::VERSION)
+        require 'logi/version'
+        puts(Logi::VERSION)
         exit
 
       else
@@ -68,10 +70,10 @@ module Logi::Runner
   end
 
   def help
-    require 'logi/config'
+    require 'logi/default'
     require 'logi/logger'
     optt = options.transpose
-    maxn = optt.first.map(&:size).max
+    maxn =  optt.first.map(&:size).max
     maxd = [optt.last .map(&:size).max, `tput cols`.to_i - maxn - 4].min
     "Usage: logi [OPTIONS] [PATH to logi root]\n" +
     options.map{ |(name, desc)|

data/lib/logi/test.rb

@@ -0,0 +1,13 @@
+
+require 'bacon'
+require 'muack'
+require 'logi'
+
+Bacon.summary_on_exit
+include Muack::API
+
+module Kernel
+  def eq? rhs
+    self == rhs
+  end
+end

data/lib/logi/version.rb

@@ -1,4 +1,4 @@
 
 class Logi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/logi.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
-# stub: logi 0.1.0 ruby lib
+# stub: logi 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "logi"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-09-20"
+  s.date = "2013-09-30"
   s.description = "Highly customizable static blog/wiki generator."
   s.email = ["godfat (XD) godfat.org"]
   s.executables = [
@@ -18,10 +18,13 @@ Gem::Specification.new do |s|
   s.files = [
   ".gitignore",
   ".gitmodules",
+  ".travis.yml",
+  "CHANGES.md",
   "Gemfile",
   "LICENSE",
   "README.md",
   "Rakefile",
+  "TODO.md",
   "bin/logi",
   "bin/logi-list",
   "bin/logi-post",
@@ -39,25 +42,31 @@ Gem::Specification.new do |s|
   "example/public/list.html",
   "example/public/misc/about.html",
   "lib/logi.rb",
+  "lib/logi/command.rb",
   "lib/logi/command/list.rb",
   "lib/logi/command/post.rb",
   "lib/logi/command/wiki.rb",
   "lib/logi/compiler.rb",
   "lib/logi/config.rb",
+  "lib/logi/default.rb",
   "lib/logi/layout/default.html.erb",
+  "lib/logi/layout/empty.html.erb",
   "lib/logi/loader.rb",
   "lib/logi/logger.rb",
   "lib/logi/post.rb",
   "lib/logi/runner.rb",
+  "lib/logi/test.rb",
   "lib/logi/version.rb",
   "logi.gemspec",
   "task/.gitignore",
-  "task/gemgem.rb"]
+  "task/gemgem.rb",
+  "test/test_example.rb"]
   s.homepage = "https://github.com/godfat/logi"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.4"
+  s.rubygems_version = "2.1.5"
   s.summary = "Highly customizable static blog/wiki generator."
+  s.test_files = ["test/test_example.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -66,14 +75,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<muack>, [">= 0"])
       s.add_development_dependency(%q<tilt>, [">= 0"])
+      s.add_development_dependency(%q<kramdown>, [">= 0"])
     else
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<muack>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0"])
+      s.add_dependency(%q<kramdown>, [">= 0"])
     end
   else
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<muack>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0"])
+    s.add_dependency(%q<kramdown>, [">= 0"])
   end
 end

data/task/gemgem.rb

@@ -1,14 +1,26 @@
 
-require 'pathname'
-
 module Gemgem
   class << self
-    attr_accessor :dir, :spec
+    attr_accessor :dir, :spec, :spec_create
   end
 
   module_function
+  def gem_tag    ; "#{spec.name}-#{spec.version}"     ; end
+  def gem_path   ; "#{pkg_dir}/#{gem_tag}.gem"        ; end
+  def spec_path  ; "#{dir}/#{spec.name}.gemspec"      ; end
+  def pkg_dir    ; "#{dir}/pkg"                       ; end
+  def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
+
+  def init dir, &block
+    self.dir = dir
+    $LOAD_PATH.unshift("#{dir}/lib")
+    ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
+    ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.spec_create = block
+  end
+
   def create
-    yield(spec = Gem::Specification.new{ |s|
+    spec = Gem::Specification.new do |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
@@ -16,163 +28,146 @@ module Gemgem
       s.summary     = description.first
       s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
 
-      s.rubygems_version = Gem::VERSION
-      s.date             = Time.now.strftime('%Y-%m-%d')
-      s.files            = gem_files
-      s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
-      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
-      s.require_paths    = %w[lib]
-    })
-    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
-    spec
+      s.date        = Time.now.strftime('%Y-%m-%d')
+      s.files       = gem_files
+      s.test_files  = test_files
+      s.executables = bin_files
+    end
+    spec_create.call(spec)
+    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    self.spec = spec
   end
 
-  def readme
-    path = %w[README.md README].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @readme ||=
-      if path
-        ps = "##{File.read(path)}".
-             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
-        ps.inject('HEADER' => ps.first){ |r, s, i|
-          r[s[/\w+/]] = s
-          r
-        }
+  def write
+    File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
+  end
+
+  def split_lines ruby
+    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
+      if $2.index(',')
+        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
       else
-        {}
+        s
       end
+    }
   end
 
-  def description
-    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines
+  def strip_path path
+    strip_home_path(strip_cwd_path(path))
   end
 
-  def changes
-    path = %w[CHANGES.md CHANGES].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @changes ||=
-      if path
-        date = '\d+{4}\-\d+{2}\-\d{2}'
-        File.read(path).match(
-          /([^\n]+#{date}\n\n(.+?))(?=\n\n[^\n]+#{date}\n|\Z)/m)[1]
-      else
-        ''
-      end
+  def strip_home_path path
+    path.sub(ENV['HOME'], '~')
   end
 
-  def ann_md
-     "#{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
-    "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
-    "### CHANGES:\n\n"                                                     \
-    "###{changes}\n\n"                                                     \
-    "##{readme['INSTALLATION']}\n\n"                                       +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS'][/[^\n]+\n\n[^\n]+/]}"
-    else '' end
+  def strip_cwd_path path
+    path.sub(Dir.pwd, '.')
   end
 
-  def ann_html
-    gem 'nokogiri'
-    gem 'kramdown'
-
-    IO.popen('kramdown', 'r+') do |md|
-      md.puts Gemgem.ann_md
-      md.close_write
-      require 'nokogiri'
-      html = Nokogiri::XML.parse("<gemgem>#{md.read}</gemgem>")
-      html.css('*').each{ |n| n.delete('id') }
-      html.root.children.to_html
-    end
+  def git *args
+    `git --git-dir=#{dir}/.git #{args.join(' ')}`
   end
 
-  def ann_email
-    "#{readme['HEADER'].sub(/([\w\-]+)/, "\\1 <#{spec.homepage}>")}\n\n" \
-    "#{readme['DESCRIPTION']}\n\n"                                       \
-    "#{readme['INSTALLATION']}\n\n"                                      +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}\n\n" else '' end  +
-    "## CHANGES:\n\n"                                                    \
-    "##{changes}\n\n"
+  def sh_git *args
+    Rake.sh('git', "--git-dir=#{dir}/.git", *args)
   end
 
-  def gem_tag
-    "#{spec.name}-#{spec.version}"
+  def sh_gem *args
+    Rake.sh(Gem.ruby, '-S', 'gem', *args)
   end
 
-  def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
-      f << split_lines(spec.to_ruby) }
+  def glob path=dir
+    Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
   end
 
-  def split_lines ruby
-    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
-      if $2.index(',')
-        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+  def readme
+    @readme ||=
+      if (path = "#{Gemgem.dir}/README.md") && File.exist?(path)
+        ps = "##{File.read(path)}".
+             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
+        ps.inject('HEADER' => ps.first){ |r, s, i|
+          r[s[/\w+/]] = s
+          r
+        }
       else
-        s
+        {}
       end
-    }
+  end
+
+  def description
+    # JRuby String#lines is returning an enumerator
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
   def all_files
-    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/|\.git$}
-        nil
+    @all_files ||= fold_files(glob).sort
+  end
+
+  def fold_files files
+    files.inject([]){ |r, path|
+      if File.file?(path) && path !~ %r{/\.git(/|$)}  &&
+         (rpath = path[%r{^#{escaped_dir}/(.*$)}, 1])
+        r << rpath
+      elsif File.symlink?(path) # walk into symlinks...
+        r.concat(fold_files(glob(File.expand_path(path,
+                                                  File.readlink(path)))))
       else
-        file.to_s
+        r
       end
-    }.compact.sort
+    }
   end
 
   def gem_files
-    @gem_files ||= all_files - ignored_files
+    @gem_files ||= all_files.reject{ |f|
+      f =~ ignored_pattern && !git_files.include?(f)
+    }
   end
 
-  def ignored_files
-    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
-      path =~ ignore && !git_files.include?(path)}}
+  def test_files
+    @test_files ||= gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+  end
+
+  def bin_files
+    @bin_files ||= gem_files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   end
 
   def git_files
     @git_files ||= if File.exist?("#{dir}/.git")
-                     `git ls-files`.split("\n")
+                     git('ls-files').split("\n")
                    else
                      []
                    end
   end
 
-  # protected
-  def find_files path
-    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
-    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  def ignored_files
+    @ignored_files ||= all_files.grep(ignored_pattern)
   end
 
-  def ignore_patterns
-    @ignore_files ||= expand_patterns(
-      gitignore.split("\n").reject{ |pattern|
-        pattern.strip == ''
-      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  def ignored_pattern
+    @ignored_pattern ||= Regexp.new(expand_patterns(gitignore).join('|'))
   end
 
   def expand_patterns pathes
-    pathes.map{ |path|
-      if path !~ /\*/
-        path
-      else
-        expand_patterns(
-          Dir[path] +
-          Pathname.new(File.dirname(path)).children.select(&:directory?).
-            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
+    # http://git-scm.com/docs/gitignore
+    pathes.flat_map{ |path|
+      case path
+      when %r{\*}
+        Regexp.escape(path).gsub(/\\\*/, '[^/]*')
+      when %r{^/}
+        "^#{Regexp.escape(path[1..-1])}"
+      else # we didn't implement negative pattern for now
+        Regexp.escape(path)
       end
-    }.flatten
+    }
   end
 
   def gitignore
-    if File.exist?(path = "#{dir}/.gitignore")
-      File.read(path)
-    else
-      ''
-    end
+    @gitignore ||= if File.exist?(path = "#{dir}/.gitignore")
+                     File.read(path).lines.
+                       reject{ |l| l == /^\s*(#|\s+$)/ }.map(&:strip)
+                   else
+                     []
+                   end
   end
 end
 
@@ -180,22 +175,37 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.sh_gem('install', Gemgem.gem_path)
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
-  sh("mkdir -p pkg")
-  sh("mv #{Gemgem.gem_tag}.gem pkg/")
+  require 'fileutils'
+  require 'rubygems/package'
+  gem = nil
+  Dir.chdir(Gemgem.dir) do
+    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
+    FileUtils.mkdir_p(Gemgem.pkg_dir)
+    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
+  end
+  puts "\e[35mGem built: \e[33m" \
+       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+end
+
+desc 'Generate gemspec'
+task :spec do
+  Gemgem.create
+  Gemgem.write
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  sh("git tag #{Gemgem.gem_tag}")
-  sh("git push")
-  sh("git push --tags")
-  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.module_eval do
+    sh_git('tag', Gemgem.gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', Gemgem.gem_path)
+  end
 end
 
 task :check do
@@ -218,51 +228,37 @@ end # of gem namespace
 
 desc 'Run tests in memory'
 task :test do
+  next if Gemgem.test_files.empty?
+
   require 'bacon'
   Bacon.extend(Bacon::TestUnitOutput)
   Bacon.summary_on_exit
-  $LOAD_PATH.unshift('lib')
-  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
-end
-
-desc 'Run tests with shell'
-task 'test:shell', :RUBY_OPTS do |t, args|
-  files = Dir['test/**/test_*.rb'].join(' ')
-
-  cmd = [Gem.ruby, args[:RUBY_OPTS],
-         '-I', 'lib', '-S', 'bacon', '--quiet', files]
-
-  sh(cmd.compact.join(' '))
+  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
 end
 
-desc 'Generate ann markdown'
-task 'ann:md' => ['gem:spec'] do
-  puts Gemgem.ann_md
-end
+desc 'Remove ignored files'
+task :clean => ['gem:spec'] do
+  next if Gemgem.ignored_files.empty?
 
-desc 'Generate ann html'
-task 'ann:html' => ['gem:spec'] do
-  puts Gemgem.ann_html
-end
+  require 'fileutils'
+  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
+  puts "Move the following files into:" \
+       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
 
-desc 'Generate ann email'
-task 'ann:email' => ['gem:spec'] do
-  puts Gemgem.ann_email
-end
+  Gemgem.ignored_files.each do |file|
+    from = "#{Gemgem.dir}/#{file}"
+    to   = "#{trash}/#{File.dirname(file)}"
+    puts Gemgem.strip_path(from)
 
-desc 'Generate rdoc'
-task :doc => ['gem:spec'] do
-  sh("yardoc -o rdoc --main README.md" \
-     " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
-end
+    FileUtils.mkdir_p(to)
+    FileUtils.mv(from, to)
+  end
 
-desc 'Remove ignored files'
-task :clean => ['gem:spec'] do
-  trash = "~/.Trash/#{Gemgem.spec.name}/"
-  sh "mkdir -p #{trash}" unless File.exist?(File.expand_path(trash))
-  Gemgem.ignored_files.each{ |file| sh "mv #{file} #{trash}" }
+  print "\e[0m"
 end
 
 task :default do
-  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+  # Is there a reliable way to do this in the current process?
+  # It failed miserably before between Rake versions...
+  exec "#{Gem.ruby} -S #{$PROGRAM_NAME} -f #{Rake.application.rakefile} -T"
 end

data/test/test_example.rb

@@ -0,0 +1,34 @@
+
+require 'logi/test'
+
+describe Logi do
+  logi = Logi.new(:root => "#{File.dirname(__FILE__)}/../example")
+  conf = logi.config
+  comp = logi.compiler
+
+  after do
+    Muack.verify
+  end
+
+  should 'make' do
+    logs = []
+    stub(comp).log(is_a(String)){ |msg| logs << "#{msg}\n" }
+
+    mock(comp).write(is_a(String), is_a(IO)){ |path, io|
+      File.read(path).should.eq(io.read)
+    }.times(conf.posts.size)
+
+    logi.make
+
+    logs.join.gsub(/\e\[\d+m/, '').should.eq <<-MESSAGE
+logi-wiki ./example/post/hello.md |
+logi-post ./example/post/hello.md ./example/layout/another.html.erb
+logi-wiki ./example/post/index.md |
+logi-post ./example/post/index.md ./example/layout/default.html.erb
+logi-wiki ./example/post/list |
+logi-list ./example/post/list ./example/layout/list.html.erb
+logi-wiki ./example/post/misc/about.md |
+logi-post ./example/post/misc/about.md ./example/layout/default.html.erb
+    MESSAGE
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Highly customizable static blog/wiki generator.
 email:
 - godfat (XD) godfat.org
@@ -65,10 +79,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/logi
 - bin/logi-list
 - bin/logi-post
@@ -86,20 +103,25 @@ files:
 - example/public/list.html
 - example/public/misc/about.html
 - lib/logi.rb
+- lib/logi/command.rb
 - lib/logi/command/list.rb
 - lib/logi/command/post.rb
 - lib/logi/command/wiki.rb
 - lib/logi/compiler.rb
 - lib/logi/config.rb
+- lib/logi/default.rb
 - lib/logi/layout/default.html.erb
+- lib/logi/layout/empty.html.erb
 - lib/logi/loader.rb
 - lib/logi/logger.rb
 - lib/logi/post.rb
 - lib/logi/runner.rb
+- lib/logi/test.rb
 - lib/logi/version.rb
 - logi.gemspec
 - task/.gitignore
 - task/gemgem.rb
+- test/test_example.rb
 homepage: https://github.com/godfat/logi
 licenses:
 - Apache License 2.0
@@ -120,8 +142,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Highly customizable static blog/wiki generator.
-test_files: []
+test_files:
+- test/test_example.rb