pipin 0.1.1 → 0.1.2

data/README.rdoc

@@ -5,7 +5,7 @@
 == setup
 
  #pipin new myblog
- ruby -r pipin -e 'Pipin.command :new' myblog
+ ruby -I ./lib -r pipin -e 'Pipin::Exec.new().create_from_template' myblog
 
 == build
 
@@ -28,13 +28,13 @@
 == trap
 
 * 原稿ファイルを削除した場合、削除したファイルはrakeビルド時の更新条件から除外されます
-** htmlが再出力されない場合は、そのhtmlファイルを手動で削除してからrakeを実行してください
+  * htmlが再出力されない場合は、そのhtmlファイルを手動で削除してからrakeを実行してください
 
 == from tDiary
 
 * 静的なhtmlとして保存できる
-** postのhtmlを生成するプラグインや
-** 写真とかもそのままいける
+  * postのhtmlを生成するプラグインや
+  * 写真とかもそのままいける
 * urlの互換
 * exportはレンダリングされたhtmlから
 * todo: コメント...

data/lib/pipin/build_tasks.rb

@@ -22,7 +22,7 @@ task :default => [:index, :archives, :months, :sitemap] + DSTS.sort.reverse
 # posts
 SRC_EXTNAMES.each do |extname|
   rule /public\/\w+\.html/ => "#{SRCDIR}/%n.#{extname}" do |t|
-    Pipin.build 'post', File.basename(t.name, '.html')
+    Pipin::Exec.new('post', File.basename(t.name, '.html')).build
   end
 end
 
@@ -33,7 +33,7 @@ Pipin::Post.year_months.each do |year, months|
     dst = dst_html(year + month)
     srcs = FileList["#{SRCDIR}/#{year + month}[0-9][0-9]*.{#{EXTS}}"]
     file dst => srcs do
-      Pipin.build 'month', year, month
+      Pipin::Exec.new('month', year, month).build
     end
   end
 end
@@ -48,7 +48,7 @@ OTHER_TASKS.each do |pagename, srcs|
   dst = dst_html(pagename)
   task pagename => dst
   file dst => srcs do
-    Pipin.build pagename
+    Pipin::Exec.new(pagename).build
   end
 end
 

data/lib/pipin/version.rb

@@ -1,3 +1,3 @@
 module Pipin
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/pipin/views/layout.haml

@@ -11,9 +11,9 @@
   %body
     %h1&= config[:title]
     .menus
-      %a{:href => './index' + html_extname} Latest
-      %a{:href => './archives' + html_extname} Archives
-      %a{:href => './about' + html_extname} About
+      %a{:href => '' + html_extname} Latest
+      %a{:href => 'archives' + html_extname} Archives
+      %a{:href => 'about' + html_extname} About
     .main
       =# render_plugin_hook(:flavour_header, self)
       .content
@@ -23,7 +23,7 @@
       =# render_plugin_hook(:flavour_footer, self)
     .footer
       .sitemap
-        %a{:href => './sitemap' + html_extname} Sitemap
+        %a{:href => 'sitemap' + html_extname} Sitemap
       %a{:href => 'https://github.com/dan5/pipin'} Pipin
       &= Pipin::VERSION
       on

data/lib/pipin.rb

@@ -2,6 +2,7 @@ require 'pipin/version'
 require 'haml'
 require 'fileutils'
 
+# todo: move in Pipin
 def rootdir() File.join(File.dirname(File.expand_path(__FILE__)), 'pipin') end
 def html_extname() config[:html_extname] or '.html' end
 
@@ -9,23 +10,22 @@ module Pipin
   Diary_pattern = '[0-9]' * 8 + '*'
   Post_pattern = '[0-9a-zA-Z]*'
 
-  def self.build(page_name, *args)
-    command :build, page_name, *args
-  end
-
-  def self.command(cmd, *args)
-    opts = args.empty? ? ARGV : args
-    __send__ "command_#{cmd}", *opts
-  end
+  class Exec
+    def initialize(*args)
+      @args = args.empty? ? ARGV : args
+    end
 
-  def self.command_new(dir)
-    File.exist?(dir) && raise("File exists - #{dir}")
-    FileUtils.cp_r File.join(rootdir ,'templates'), dir
-    puts Dir.glob(File.join(dir, '**/*')).map {|e| '  create ' + e }
-  end
+    def create_from_template
+      dir = @args.first
+      File.exist?(dir) && raise("File exists - #{dir}")
+      FileUtils.cp_r File.join(rootdir ,'templates'), dir
+      puts Dir.glob(File.join(dir, '**/*')).map {|e| '  create ' + e }
+    end
 
-  def self.command_build(page_name, *args)
-    Builder.new('public').__send__('render_' + page_name, *args)
+    def build
+      page_name, *opts = @args
+      Builder.new('public').__send__('render_' + page_name, *opts)
+    end
   end
 
   class Builder

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pipin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - dan5ya
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 Z
+date: 2011-06-24 00:00:00.000000000Z
 dependencies: []
-
 description: simple blog system
-email: 
+email:
 - dan5.ya@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -48,30 +43,26 @@ files:
 - pipin.gemspec
 homepage: https://github.com/dan5/pipin
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pipin
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: blog
 test_files: []
-