retter 0.0.3 → 0.0.4

data/README.md

@@ -1,6 +1,13 @@
 # RETTER (レッター) Lightweight diary workflow.
 
-コマンドラインで簡単に起動してブラウザですぐに確認できてデプロイがちょう楽そうな日記作成支援コマンドをつくる予定。
+簡単さにこだわったシンプルな記事作成ツール。以下のような特徴があります。
+
+* CLIでの操作を前提としています
+* どこにいてもすぐに記事を編集できます（Markdown）
+* オフラインで簡単にプレビューできます
+* だいたいどんなサーバ上でも動作します（静的HTMLまたはRackアプリとして）
+* RSSフィードを吐きます
+* トラックバック、コメントなどの機能はありません
 
 ## Installation
 
@@ -22,13 +29,15 @@ use `new` sub-command.
 
 ### Settings
 
-**retter required $EDITOR variable.**
+**retter requires `$EDITOR` variable.**
 
 ~~~~
   $ echo "export EDITOR=vim" >> ~/.bash_profile
   $ . ~/.bash_profile
 ~~~~
 
+ファイルシステム上のどこに居ても `retter` コマンドを使って編集から公開まで行えるよう、 事前に `$RETTER_HOME` 環境変数を設定しておくことができます。
+
 You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
 
 ~~~~
@@ -36,40 +45,87 @@ You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
   $ . ~/.bash_profile
 ~~~~
 
-### Write a article, and publish.
+### Write an article
+
+`retter` コマンドは設定されているエディタを起動します。Markdownで記事を書くことができます。
 
-`retter` open `$EDITOR`. Write an article with Markdown.
-The article will be draft.
+`retter` opens `$EDITOR`. Write an article with Markdown. That article will be the draft.
 
 ~~~~
   $ retter
 ~~~~
 
-`preview` open the draft article by your default browser.
+`preview` で書きかけの最新記事をブラウザで確認することができます（デフォルトブラウザが起動します）。
+
+`preview` opens the draft article by your default browser.
 
 ~~~~
   $ retter preview
 ~~~~
 
-`bind` and `rebind` binds the draft article.
-And re-generates actual html web pages. All html pages will overwrite.
+`bind`, `rebind` は下書きの記事をその日の記事として保存し、すべてのHTMLを再生成します。
+
+`bind` and `rebind` binds the draft article. And re-generates actual html web pages. All html pages will be overwritten.
 
 ~~~~
   $ retter bind
 ~~~~
 
+### Publish
 
-To publish, use the git command.
+記事を公開するには、すべてのファイルを git リポジトリにコミットし、リモートサーバに push するか単純にファイルをアップロードします。
+
+To publish, use the git command. Or, upload the file to your server.
+
+#### Basic flow
+
+最も原始的な方法は、gitコマンドを直接使う方法です。
 
 ~~~~
+  $ cd $RETTER_HOME
   $ git add .
   $ git commit -m 'commit message'
   $ git push [remote] [branch]     # heroku, github pages, etc..
 ~~~~
 
-Or, upload the file to your server.
+#### Using shortcut commands
+
+いくつかのショートカットを使い、コミットメッセージを書くことを省略したりすることができます。
+
+~~~~
+  $ retter commit # Shortcut of `git add . ; git commit -m 'Retter commit'`
+  $ retter home   # Open a new shell at $RETTER_HOME
+  (retter) git push [remote] [branch] # heroku, github pages, etc..
+~~~~
+
+#### Using Callbacks
+
+コールバックを定義しておくことで、公開の作業を無意識に実行することができます。
+
+Callback is enabled in `edit`, `bind`, `rebind` and `commit` sub-command.
+
+~~~~ruby
+  after [command], [invoke command or proc]
+~~~~
+
+以下のような内容を Retterfile に記述しておくことで、rebind または bind が実行されると即座に公開までの処理も実行されます。
 
-### Edit specific date article.
+In Retterfile:
+
+~~~~ruby
+  after :rebind, :commit
+
+  after :commit do
+    system "cd #{config.retter_home}"
+    system 'git push origin master'
+  end
+~~~~
+
+`--silent` option skip the callback.
+
+### Edit article (specific date).
+
+過去や未来の日付を指定して記事を編集・プレビューするには、 `--date` オプションを用います。
 
 `--date` option is available in `edit` `preview` sub-command.
 
@@ -80,7 +136,9 @@ Or, upload the file to your server.
 
 ### Browse offline
 
-`open` sub-command open your (static) website by your default browser.
+生成されるすべてのページは静的HTMLです。`open` でサーバにデプロイしたものとほぼ同じようにオフラインでも閲覧することができます。rackでもOK。
+
+`open` sub-command opens your (static) website by your default browser.
 
 ~~~~
   $ retter open    # visit file://path/to/my_sweet_diary/index.html
@@ -93,6 +151,26 @@ Or, Use rack if needed.
   $ bundle exec rackup
 ~~~~
 
+### Pre-installed themes
+
+スタイルシートを変更することでテーマを変更できます。HTMLのヘッダを変更するには `layouts/retter.html.haml` を編集します。
+
+#### Default
+
+~~~~haml
+    %link{href: '/stylesheets/default.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+~~~~
+
+![Default](http://hibariya.github.com/images/theme_samples/retter_default.jpg)
+
+#### Orange
+
+~~~~haml
+    %link{href: '/stylesheets/orange.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+~~~~
+
+![Orange](http://hibariya.github.com/images/theme_samples/retter_orange.jpg)
+
 ## LICENSE
 
 The MIT License

data/lib/generator/newretter.rb

@@ -7,22 +7,31 @@ require 'bundler/cli'
 require 'retter'
 
 class Newretter < Thor::Group
-  FILES = %w(
-    .gitignore
-    Gemfile
+  TEMPLATES = %w(
     Retterfile
+    Gemfile
     config.ru
+    index.html
     layouts/entries.html.haml
     layouts/entry.html.haml
     layouts/profile.html.haml
     layouts/index.html.haml
     layouts/retter.html.haml
+  )
+
+  FILES = %w(
+    .gitignore
+    retters/.gitkeep
     images/.gitkeep
-    index.html
     entries/.gitkeep
     javascripts/.gitkeep
-    stylesheets/application.css
-    retters/.gitkeep
+    stylesheets/base.css
+    stylesheets/retter.css
+
+    stylesheets/orange.css
+    images/orange/bg_body.jpg
+    images/orange/bg_entry.jpg
+    images/orange/bg_header.png
   )
 
   include Thor::Actions
@@ -35,6 +44,10 @@ class Newretter < Thor::Group
 
   def create_files
     FILES.each do |file|
+      copy_file("skel/#{file}", "#{name}/#{file}")
+    end
+
+    TEMPLATES.each do |file|
       template("skel/#{file}", "#{name}/#{file}")
     end
   end

data/lib/generator/skel/layouts/entry.html.haml

@@ -1,4 +1,5 @@
 %article
   .entry
-    %h1.date= entry.date.strftime('%Y/%m/%d')
+    %h1.date
+      %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
     = entry

data/lib/generator/skel/layouts/retter.html.haml

@@ -4,7 +4,8 @@
     %title= config.title
     %meta{:'http-equiv' => 'Content-Type', content: 'text/html', charset: 'utf-8'}
     %link{rel: 'icon', type: 'image/png', href: '/favicon.png'}
-    %link{href: '/stylesheets/application.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+    %link{href: '/stylesheets/base.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+    %link{href: '/stylesheets/retter.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
     %link{rel: 'alternate', type: 'application/rss+xml', title: 'RSS', href: '/entries.rss'}
   %body
     #header
@@ -18,8 +19,10 @@
         %li
           %a{href: '/entries.html'} Archives
         %li
-          %a{href: '/entries.rss'} RSS
+          %a{href: '/entries.rss', target: '_blank'} RSS
     #page
       #content= content
     #footer
       #{config.title} (C) #{config.author}
+      Generated by
+      %a{href: 'https://github.com/hibariya/retter', target: '_blank'} Retter

data/lib/generator/skel/stylesheets/base.css

@@ -0,0 +1,8 @@
+
+dl dd {
+  margin-bottom: 1em;
+}
+
+pre {
+  overflow: scroll;
+}

data/lib/generator/skel/stylesheets/orange.css

@@ -0,0 +1,154 @@
+@charset "utf-8";
+
+html {
+  height: 100%;
+}
+
+body {
+  margin: 0 auto 0 auto;
+  padding: 0;
+  font-family: sans-serif;
+  background: #EEE;
+  background-image:url("../images/orange/bg_body.jpg");
+  height: 100%;
+}
+
+ul {
+  list-style: none;
+}
+
+a {
+  text-decoration: none;
+  color: rgb(25,30,10);
+}
+
+#header {
+  padding: 0;
+  margin: 0;
+}
+
+#header h1 {
+  margin: 0;
+  padding: 0.2em 0 0.2em 1em;
+  color: rgb(77,144,253);
+  height:40px;
+  background-image:url("../images/orange/bg_header.png");
+  background-repeat:repeat-x;
+}
+
+#header h1 a {
+  color:#FFF;
+}
+
+#header ul#menu {
+  margin: 0.5em 0 3em 0;
+  padding: 0 0 0 2em;
+}
+
+#header ul#menu{
+}
+
+#header ul#menu li {
+  float: left;
+  margin-right: 0.5em;
+  background:rgba(255,255,255,0.5);
+  padding:5px;
+}
+
+#header ul#menu li a {
+  color:#336;
+}
+
+#header ul#menu li a:hover {
+  color:#09C;
+}
+
+#page {
+  clear: both;
+  margin: 0 auto 0 auto;
+  width: 800px;
+  position: relative;
+  min-height: 100%;
+}
+
+article {
+  color:#603;
+  border-radius: 10px;
+  border: 3px #FFC solid;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  padding: 1em 1.5em 1em 1.5em;
+  margin: 1em 0 1em 0;
+  width 100%;
+  background-image:url("../images/orange/bg_entry.jpg");
+  position:relative;
+}
+
+article .date {
+  font-size: 1em;
+  text-align: center;
+  background-color:#036;
+  padding:10px;
+  width:100px;
+  float:right;
+
+  position:absolute;
+  top:-24px;
+  left:650px;
+}
+
+article .date a {
+  color:#FFF;
+}
+
+article .date a:visited {
+  color:#FFF;
+}
+
+article .date a:hover {
+  color:#669;
+}
+
+article ul#entries > li {
+  margin-top: 1em;
+}
+
+article ul#entries {
+  line-height: 1.5em;
+}
+
+#entries {
+  width 100%;
+}
+
+pre {
+  background: #EEE;
+  color: rgb(0,30,67);
+  padding: 1em;
+  border-radius: 10px;
+  border: 1px #BBB solid;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+}
+
+#footer {
+  text-align: center;
+  margin: 1em 0 0 0;
+  padding: 0.5em 0.5em 0.5em 1em;
+  background: #036;
+  color: #FFF;
+  position: relative; bottom: 0;
+}
+
+#footer a {
+  color: #FFF;
+}
+
+#footer a:visited {
+  color: #FFF;
+}
+
+#footer a:hover {
+  color: #669;
+}
+

data/lib/generator/skel/stylesheets/{application.css → retter.css}

@@ -112,3 +112,6 @@ pre {
   position: relative; bottom: 0;
 }
 
+#footer a:visited {
+  color: rgb(77,144,253);
+}

data/lib/retter/command.rb

@@ -2,11 +2,11 @@
 
 class Retter::Command < Thor
   desc 'edit', 'Open $EDITOR. Write an article with Markdown.'
-  method_options date: :string
+  method_options date: :string, silent: :boolean
   def edit
     system config.editor, detected_retter_file.to_s
 
-    invoke_after :edit
+    invoke_after :edit unless options[:silent]
   end
 
   default_task :edit
@@ -26,19 +26,25 @@ class Retter::Command < Thor
   end
 
   desc 'rebind', 'Bind the draft article, re-generate all html pages.'
+  method_options silent: :boolean
   def rebind
     binder = Retter::Stationery.binder(config)
 
     binder.commit_wip_file
     binder.rebind!
 
-    invoke_after :rebind
+    unless options[:silent]
+      invoke_after :bind
+      invoke_after :rebind
+    end
   end
 
   desc 'bind', 'Re-bind the draft article, re-generate all html pages.'
+  method_options silent: :boolean
   alias_method :bind, :rebind
 
   desc 'commit', "cd $RETTER_HOME && git add . && git commit -m 'Retter commit'"
+  method_options silent: :boolean
   def commit
     working_dir = config.retter_home.to_s
     git = Grit::Repo.new(working_dir)
@@ -47,7 +53,15 @@ class Retter::Command < Thor
     say git.add(working_dir), :green
     say git.commit_all('Retter commit'), :green
 
-    invoke_after :commit
+    invoke_after :commit unless options[:silent]
+  end
+
+  desc 'home', 'Open a new shell in $RETTER_HOME'
+  def home
+    Dir.chdir config.retter_home.to_s
+
+    system %(PS1="(retter) " #{config.shell})
+    say 'bye', :green
   end
 
   desc 'new', 'Create a new site'
@@ -98,26 +112,28 @@ class Retter::Command < Thor
   def self.usage
     <<-EOM
 Usage:
-  # startup
+  # Startup
   cd /path/to/dir
   retter new my_sweet_diary
   echo "export EDITOR=vim" >> ~/.zshenv # retter requires $EDITOR.
   echo "export RETTER_HOME=/path/to/my_sweet_diary" >> ~/.zshenv
   . ~/.zshenv
 
-  # write a article, and publish.
+  # Write a article
   retter         # $EDITOR will open. Write an article with Markdown.
   retter preview # Preview the draft article (browser will open).
+
+  # Publish
   retter bind    # bind the draft article, re-generate all html pages.
-  git add .
-  git commit -m 'commit message'
-  git push [remote] [branch]
+  retter commit  # shortcut of "cd $RETTER_HOME; git add .; git commit -m 'Retter commit'"
+  cd $RETTER_HOME
+  git push [remote] [branch] # or sftp, rsync, etc...
 
-  # edit specific date article.
+  # Specific date
   retter edit --date=20110101
   retter preview --date=20110101
 
-  # browse offline.
+  # Browse offline.
   retter open    # Open your (static) site top page (browser will open).
 
   See also: https://github.com/hibariya/retter

data/lib/retter/config.rb

@@ -1,8 +1,9 @@
 # coding: utf-8
 
 class Retter::Config
-  ATTRIBUTES =  [
+  ATTRIBUTES = [
     :editor,
+    :shell,
     :title,
     :description,
     :url,
@@ -41,13 +42,12 @@ class Retter::Config
 
     @retter_home = Pathname.new(@env['RETTER_HOME'])
     load_defaults
-
-    retterfile = retter_home.join('Retterfile')
-    instance_eval retterfile.read if retterfile.exist?
+    load_retterfile_if_exists
   end
 
   def load_defaults
     editor              @env['EDITOR']
+    shell               @env['SHELL']
     url                 'http://example.com'
     retters_dir         retter_home.join('retters/')
     wip_file            retters_dir.join('today.md')
@@ -64,6 +64,11 @@ class Retter::Config
     feed_file           retter_home.join('entries.rss')
   end
 
+  def load_retterfile_if_exists
+    retterfile = retter_home.join('Retterfile')
+    instance_eval retterfile.read if retterfile.exist?
+  end
+
   def detect_retter_home
     # TODO こういうの上のディレクトリも見て判断するのを何か参考にして書く
     @env['RETTER_HOME'] = Dir.pwd if File.exist? 'Retterfile'

data/lib/retter/stationery/binder.rb

@@ -12,18 +12,6 @@ module Retter::Stationery
       @config = config
     end
 
-    def view_scope
-      @view_scope ||= View::Scope.new(config, entries: entries)
-    end
-
-    def layout_renderer
-      @layout_renderer ||= Haml::Engine.new(layout_file.read, ugly: true)
-    end
-
-    def entry_renderer
-      @entry_renderer ||= Haml::Engine.new(entry_layout_file.read, ugly: true)
-    end
-
     def rebind!
       commit_wip_file
 
@@ -118,5 +106,19 @@ module Retter::Stationery
     def entry_url(date, id = nil)
       (URI.parse(url) + date.strftime('/entries/%Y%m%d.html')).to_s
     end
+
+    private
+
+    def view_scope
+      @view_scope ||= View::Scope.new(config, entries: entries)
+    end
+
+    def layout_renderer
+      @layout_renderer ||= Haml::Engine.new(layout_file.read, ugly: true)
+    end
+
+    def entry_renderer
+      @entry_renderer ||= Haml::Engine.new(entry_layout_file.read, ugly: true)
+    end
   end
 end

data/lib/retter/stationery/previewer.rb

@@ -16,24 +16,32 @@ module Retter::Stationery
       load_wip_entry_if_needed
     end
 
+    def print
+      build_entry
+      print_html 
+    end
+
     def file_path
       config.retter_home.join '.preview.html'
     end
 
-    def renderer
-      Haml::Engine.new(layout_file.read, ugly: true)
-    end
+    private
 
-    def entry_renderer
-      Haml::Engine.new(entry_layout_file.read, ugly: true)
+    def load_retter_file
+      retter_file = retter_file(@date)
+      @body = retter_file.exist? ? retter_file.read : ''
     end
 
-    def print
-      build_entry
-      print_html 
+    def load_wip_entry_if_needed
+      if @date == Date.today && wip_file.exist?
+        @body = [@body, wip_file.read].join("\n")
+      end
     end
 
-    private
+    def build_entry
+      body_html = Retter::Stationery.markupper.render(@body)
+      @entry    = Retter::Entry.new(date: @date, body: body_html)
+    end
 
     def print_html
       scope = View::Scope.new(config)
@@ -45,19 +53,12 @@ module Retter::Stationery
       end
     end
 
-    def build_entry
-      @entry = Retter::Entry.new(date: @date, body: Retter::Stationery.markupper.render(@body))
-    end
-
-    def load_retter_file
-      retter_file = retter_file(@date)
-      @body = retter_file.exist? ? retter_file.read : ''
+    def renderer
+      Haml::Engine.new(layout_file.read, ugly: true)
     end
 
-    def load_wip_entry_if_needed
-      if @date == Date.today && wip_file.exist?
-        @body = [@body, wip_file.read].join("\n")
-      end
+    def entry_renderer
+      Haml::Engine.new(entry_layout_file.read, ugly: true)
     end
   end
 end

data/lib/retter/stationery/renderer.rb

@@ -3,7 +3,7 @@
 module Retter::Stationery
   class Renderer < ::Redcarpet::Render::HTML
     def block_code(code, lang)
-      ::CodeRay.scan(code, lang ? lang.intern : :plain).div#.div(line_numbers: :table)
+      ::CodeRay.scan(code, lang ? lang.intern : :plain).div
     end
   end
 end

data/lib/retter/stationery/view.rb

@@ -7,6 +7,16 @@ module Retter::Stationery::View
     def fix_path(html, prefix='./')
       elements = Nokogiri::HTML(html)
 
+      fix_href_path(fix_src_path(elements, prefix), prefix).to_s
+    end
+
+    def entry_path(date, id = nil)
+      date.strftime('/entries/%Y%m%d.html') + (id ? "##{id}" : '')
+    end
+
+    private
+
+    def fix_src_path(elements, prefix = './')
       elements.search("[src!=''][src!='']").each do |el|
         src = el.attr('src').scan(/[^\.\/]{3}.*/).first
         next if src =~ /^(?:http|https):\/\//
@@ -14,6 +24,10 @@ module Retter::Stationery::View
         el.set_attribute 'src', [prefix, src].join
       end
 
+      elements
+    end
+
+    def fix_href_path(elements, prefix = './')
       elements.search("[href][href!='#']").each do |el|
         href = el.attr('href')
         next if href =~ /^(?:http|https):\/\//
@@ -25,12 +39,9 @@ module Retter::Stationery::View
         end
       end
 
-      elements.to_s
+      elements
     end
 
-    def entry_path(date, id = nil)
-      date.strftime('/entries/%Y%m%d.html') + (id ? "##{id}" : '')
-    end
   end
 
   class Scope
@@ -43,9 +54,7 @@ module Retter::Stationery::View
     def_delegators :@config, *Retter::Config.delegatables
 
     [:entries].each do |meth|
-      define_method meth do
-        @assigns[meth]
-      end
+      define_method(meth) { @assigns[meth] }
     end
 
     def initialize(config, assigns = {})

data/lib/retter/version.rb

@@ -1,3 +1,3 @@
 module Retter
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/retter.gemspec

@@ -5,7 +5,7 @@ require "retter/version"
 Gem::Specification.new do |s|
   s.name        = "retter"
   s.version     = Retter::VERSION
-  s.authors     = ["hibariya"]
+  s.authors     = ["hibariya", "uzura29"]
   s.email       = ["celluloid.key@gmail.com"]
   s.homepage    = "https://github.com/hibariya/retter"
   s.summary     = %q{Lightweight diary workflow}

data/spec/command/commit_spec.rb

@@ -15,9 +15,23 @@ describe 'Retter::Command#commit', clean: :all do
     command.stub!(:say) { true }
     wip_file.open('w') {|f| f.puts article }
     command.rebind
+  end
+
+  context 'with no options' do
+    before do
+      command.should_receive(:invoke_after).with(:commit)
+      command.commit
+    end
 
-    command.commit
+    it { repo.commits.first.message.should == 'Retter commit' }
   end
 
-  it { repo.commits.first.message.should == 'Retter commit' }
+  context 'with silent option' do
+    before do
+      command.stub!(:options) { {silent: true} }
+      command.should_not_receive(:invoke_after)
+    end
+
+    it { command.commit.should }
+  end
 end

data/spec/command/edit_spec.rb

@@ -12,6 +12,7 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'no options' do
     before do
+      command.should_receive(:invoke_after).with(:edit)
       command.edit
     end
 
@@ -38,11 +39,13 @@ describe 'Retter::Command#edit', clean: :all do
     end
   end
 
-  context 'with date' do
+  context 'with date option' do
     let(:date_str) { '20110101' }
 
     before do
       command.stub!(:options) { {date: date_str} }
+
+      command.should_receive(:invoke_after).with(:edit)
       command.edit
     end
 
@@ -54,4 +57,15 @@ describe 'Retter::Command#edit', clean: :all do
       it { should written }
     end
   end
+
+  context 'with silent option' do
+    before do
+      command.stub!(:options) { {silent: true} }
+
+      command.should_not_receive(:invoke_after)
+      command.edit
+    end
+
+    it { wip_file.should written }
+  end
 end

data/spec/command/rebind_spec.rb

@@ -28,6 +28,8 @@ describe 'Retter::Command#rebind', clean: :all do
       wip_file.open('w') {|f| f.puts article }
       Date.stub!(:today).and_return(Date.parse(date_str))
 
+      command.should_receive(:invoke_after).with(:bind)
+      command.should_receive(:invoke_after).with(:rebind)
       command.rebind
     end
 
@@ -58,4 +60,15 @@ describe 'Retter::Command#rebind', clean: :all do
       it { texts_of(entry_html, '.entry h1').should == %w(2011/01/01 朝11時 夜1時) }
     end
   end
+
+  context 'with silent option' do
+    before do
+      wip_file.open('w') {|f| f.puts 'article' }
+      command.stub!(:options) { {silent: true} }
+
+      command.should_not_receive(:invoke_after)
+    end
+
+    it { command.rebind.should }
+  end
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: retter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - hibariya
+- uzura29
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70165694450760 !ruby/object:Gem::Requirement
+  requirement: &70099940455160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70165694450760
+  version_requirements: *70099940455160
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70165694450200 !ruby/object:Gem::Requirement
+  requirement: &70099940452260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165694450200
+  version_requirements: *70099940452260
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70165694449720 !ruby/object:Gem::Requirement
+  requirement: &70099940451680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: 2.0.0b3
   type: :runtime
   prerelease: false
-  version_requirements: *70165694449720
+  version_requirements: *70099940451680
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70165694449240 !ruby/object:Gem::Requirement
+  requirement: &70099940451100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70165694449240
+  version_requirements: *70099940451100
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70165694448760 !ruby/object:Gem::Requirement
+  requirement: &70099940450560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165694448760
+  version_requirements: *70099940450560
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70165694448280 !ruby/object:Gem::Requirement
+  requirement: &70099940450040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70165694448280
+  version_requirements: *70099940450040
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70165694447800 !ruby/object:Gem::Requirement
+  requirement: &70099940449440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70165694447800
+  version_requirements: *70099940449440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165694447320 !ruby/object:Gem::Requirement
+  requirement: &70099940448860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165694447320
+  version_requirements: *70099940448860
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70165694431940 !ruby/object:Gem::Requirement
+  requirement: &70099940448280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +110,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165694431940
+  version_requirements: *70099940448280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165694431440 !ruby/object:Gem::Requirement
+  requirement: &70099940447700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +121,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70165694431440
+  version_requirements: *70099940447700
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70165694430920 !ruby/object:Gem::Requirement
+  requirement: &70099940447220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +132,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70165694430920
+  version_requirements: *70099940447220
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70165694430420 !ruby/object:Gem::Requirement
+  requirement: &70099940446620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +143,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70165694430420
+  version_requirements: *70099940446620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165694429900 !ruby/object:Gem::Requirement
+  requirement: &70099940446040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +154,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70165694429900
+  version_requirements: *70099940446040
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70165694429420 !ruby/object:Gem::Requirement
+  requirement: &70099940445440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +165,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70165694429420
+  version_requirements: *70099940445440
 description: Lightweight diary workflow. ruby-1.9.2 or later is required.
 email:
 - celluloid.key@gmail.com
@@ -186,6 +187,9 @@ files:
 - lib/generator/skel/config.ru
 - lib/generator/skel/entries/.gitkeep
 - lib/generator/skel/images/.gitkeep
+- lib/generator/skel/images/orange/bg_body.jpg
+- lib/generator/skel/images/orange/bg_entry.jpg
+- lib/generator/skel/images/orange/bg_header.png
 - lib/generator/skel/index.html
 - lib/generator/skel/javascripts/.gitkeep
 - lib/generator/skel/layouts/entries.html.haml
@@ -194,7 +198,9 @@ files:
 - lib/generator/skel/layouts/profile.html.haml
 - lib/generator/skel/layouts/retter.html.haml
 - lib/generator/skel/retters/.gitkeep
-- lib/generator/skel/stylesheets/application.css
+- lib/generator/skel/stylesheets/base.css
+- lib/generator/skel/stylesheets/orange.css
+- lib/generator/skel/stylesheets/retter.css
 - lib/retter.rb
 - lib/retter/command.rb
 - lib/retter/config.rb