rabbit 1.0.9 → 2.0.0

data/bin/rabbit-command

@@ -5,88 +5,80 @@ require 'drb/drb'
 
 require "rabbit/console"
 
+include Rabbit::GetText
+
 def parse(args=ARGV, logger=nil)
-  Rabbit::Console.parse!(args, logger) do |opts, options|
-    options.rabbit_uri = "druby://localhost:10101"
-    options.druby_uri_specified = false
+  Rabbit::Console.parse!(args, logger) do |parser, options|
+    options.rabbit_uri = options.druby_uri
     options.commands = []
 
-    opts.separator ""
+    parser.separator ""
 
-    opts.on("--rabbit-uri=URI",
-            _("Specify Rabbit's dRuby URI as [URI]."),
-            "(#{options.rabbit_uri})") do |uri|
+    parser.on("--rabbit-uri=URI",
+              _("Specify Rabbit's dRuby URI as [URI]."),
+              "(#{options.rabbit_uri})") do |uri|
       options.rabbit_uri = uri
     end
 
-    opts.on("--druby-uri=URI",
-            _("Deprecated."),
-            _("Use --rabbit-uri instead."),
-            _("Specify Rabbit's dRuby URI as [URI]."),
-            "(#{options.rabbit_uri})") do |uri|
-      options.rabbit_uri = uri
-      options.druby_uri_specified = true
-    end
+    parser.separator(_("Move commands"))
 
-    opts.separator(_("Move commands"))
-
-    opts.on("--previous", _("Move to previous")) do
+    parser.on("--previous", _("Move to previous")) do
       options.commands << [false, :move_to_previous_if_can]
     end
 
-    opts.on("--next", _("Move to next")) do
+    parser.on("--next", _("Move to next")) do
       options.commands << [false, :move_to_next_if_can]
     end
 
-    opts.on("--previous-slide", _("Move to the previous slide")) do
+    parser.on("--previous-slide", _("Move to the previous slide")) do
       options.commands << [false, :move_to_previous_slide_if_can]
     end
 
-    opts.on("--next-slide", _("Move to the next slide")) do
+    parser.on("--next-slide", _("Move to the next slide")) do
       options.commands << [false, :move_to_next_slide_if_can]
     end
 
-    opts.on("--first-slide", _("Move to the first slide")) do
+    parser.on("--first-slide", _("Move to the first slide")) do
       options.commands << [false, :move_to_first]
     end
 
-    opts.on("--last-slide", _("Move to the last slide")) do
+    parser.on("--last-slide", _("Move to the last slide")) do
       options.commands << [false, :move_to_last]
     end
 
-    opts.on("--jump-to=N", Integer, _("Move to the Nth slide")) do |n|
+    parser.on("--jump-to=N", Integer, _("Move to the Nth slide")) do |n|
       options.commands << [false, :move_to_if_can, n]
     end
 
-    opts.separator(_("Get commands"))
+    parser.separator(_("Get commands"))
 
-    opts.on("--source", _("Show source")) do
+    parser.on("--source", _("Show source")) do
       options.commands << [:puts, :source]
     end
 
-    opts.on("--current-slide-rd", _("Show the current slide source as RD")) do
+    parser.on("--current-slide-rd", _("Show the current slide source as RD")) do
       options.commands << [:puts, :current_slide_rd]
     end
 
-    opts.separator(_("Control commands"))
+    parser.separator(_("Control commands"))
 
-    opts.on("--toggle-fullscreen", _("Toggle fullscreen")) do
+    parser.on("--toggle-fullscreen", _("Toggle fullscreen")) do
       options.commands << [false, :toggle_fullscreen]
     end
 
-    opts.on("--toggle-index-mode", _("Toggle index mode")) do
+    parser.on("--toggle-index-mode", _("Toggle index mode")) do
       options.commands << [false, :toggle_index_mode]
     end
 
-    opts.on("--toggle-whiteout", _("Toggle whiteout")) do
+    parser.on("--toggle-whiteout", _("Toggle whiteout")) do
       options.commands << [false, :toggle_whiteout]
     end
 
-    opts.on("--toggle-blackout", _("Toggle blackout")) do
+    parser.on("--toggle-blackout", _("Toggle blackout")) do
       options.commands << [false, :toggle_blackout]
     end
 
-    opts.on("--quit", _("Quit")) do
+    parser.on("--quit", _("Quit")) do
       options.commands << [false, :quit]
     end
   end
@@ -95,9 +87,6 @@ end
 def main
   options, logger = parse
 
-  if options.druby_uri_specified
-    logger.warning(_("--druby-uri is deprecated. Use --rabbit-uri instead."))
-  end
   rabbit = DRbObject.new_with_uri(options.rabbit_uri)
   options.commands.each do |output, method, *args|
     result = rabbit.send(method, *args)

data/bin/rabbit-slide

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rabbit/command/rabbit-slide"
+
+exit(Rabbit::Command::RabbitSlide.run(*ARGV))

data/bin/rabbit-theme

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rabbit/command/rabbit-theme"
+
+exit(Rabbit::Command::RabbitTheme.run(*ARGV))

data/bin/rabbit-theme-manager

@@ -8,7 +8,7 @@ require "rabbit/console"
 COMMANDS = %w(generate browse)
 
 def parse(args=ARGV, logger=nil)
-  Rabbit::Console.parse!(args, logger) do |opts, options|
+  Rabbit::Console.parse!(args, logger) do |parser, options|
     options.startup_theme = nil
     options.theme_doc_dir = "theme-doc"
     options.locale_dir = nil
@@ -17,64 +17,64 @@ def parse(args=ARGV, logger=nil)
     options.height = 400
 
 
-    opts.banner = "#{opts.banner} [COMMAND]"
+    parser.banner = "#{parser.banner} [COMMAND]"
 
-    opts.separator _("[COMMAND] is one of them: [%s]") % COMMANDS.join(', ')
-    opts.separator "(#{COMMANDS.first})"
-    opts.separator ""
+    parser.separator _("[COMMAND] is one of them: [%s]") % COMMANDS.join(', ')
+    parser.separator "(#{COMMANDS.first})"
+    parser.separator ""
 
-    opts.on("-I", "--include [PATH]",
-            _("Add [PATH] to load path.")) do |path|
+    parser.on("-I", "--include [PATH]",
+              _("Add [PATH] to load path.")) do |path|
       $LOAD_PATH.unshift(path)
     end
     
-    opts.separator ""
+    parser.separator ""
     
-    opts.on("--startup-theme [THEME]",
-            _("Show [THEME] when startup."),
-            "(#{options.startup_theme})") do |theme|
+    parser.on("--startup-theme [THEME]",
+              _("Show [THEME] when startup."),
+              "(#{options.startup_theme})") do |theme|
       options.startup_theme = theme
     end
 
-    opts.separator ""
+    parser.separator ""
     
-    opts.on("-w", "--width [WIDTH]",
-            Integer,
-            _("Set window width to [WIDTH]."),
-            "(#{options.width})") do |width|
+    parser.on("-w", "--width [WIDTH]",
+              Integer,
+              _("Set window width to [WIDTH]."),
+              "(#{options.width})") do |width|
       options.width = width
     end
 
-    opts.on("-h", "--height [HEIGHT]",
-            Integer,
-            _("Set window height to [HEIGHT]."),
-            "(#{options.height})") do |height|
+    parser.on("-h", "--height [HEIGHT]",
+              Integer,
+              _("Set window height to [HEIGHT]."),
+              "(#{options.height})") do |height|
       options.height = height
     end
 
     message = _("Set window width and height to\n" \
                 "[WIDTH] and [HEIGHT].")
     message = message.split(/\n/) + ["(#{options.width},#{options.height})"]
-    opts.on("-S", "--size [WIDTH],[HEIGHT]",
-            Array,
-            *message) do |size|
+    parser.on("-S", "--size [WIDTH],[HEIGHT]",
+              Array,
+              *message) do |size|
       width, height = size.collect{|x| Integer(x)}
       options.width = width
       options.height = height
     end
 
-    opts.separator ""
+    parser.separator ""
     
-    opts.on("--theme-doc-dir [DIR]",
-            _("Specify theme document directory as [DIR].")) do |dir|
+    parser.on("--theme-doc-dir [DIR]",
+              _("Specify theme document directory as [DIR].")) do |dir|
       options.theme_doc_dir = dir
     end
     
-    opts.separator ""
+    parser.separator ""
     
-    opts.on("--locales [LOC1,LOC2,...]",
-            _("Specify target locales as [LOC1,LOC2,...]."),
-            "([#{options.locales.join(', ')}])") do |locales|
+    parser.on("--locales [LOC1,LOC2,...]",
+              _("Specify target locales as [LOC1,LOC2,...]."),
+              "([#{options.locales.join(', ')}])") do |locales|
       options.locales = locales
     end
   end

data/doc/_config.yml

@@ -1,2 +1,10 @@
 markdown: rdiscount
 pygments: true
+version: 2.0.0
+release_date: 2012-08-29
+rabbiter_version: 2.0.0
+rabbiter_release_date: 2012-08-29
+rabbirack_version: 2.0.0
+rabbirack_release_date: 2012-08-29
+rabwii_version: 2.0.0
+rabwii_release_date: 2012-08-29

data/doc/_includes/en.menu.html

@@ -0,0 +1,8 @@
+  <ul>
+    <li><a href="/en/">README</a></li>
+    <li><a href="/en/install/">Install</a></li>
+    <li><a href="/en/usage.html">Usage</a></li>
+    <li><a href="/en/how-to-make/">How to make</a></li>
+    <li><a href="/en/users.html">Shockers</a></li>
+    <li><a href="/en/development.html">Development</a></li>
+  </ul>

data/doc/_includes/ja.menu.html

@@ -0,0 +1,8 @@
+  <ul>
+    <li><a href="/ja/">はじめに</a></li>
+    <li><a href="/ja/install/">インストール</a></li>
+    <li><a href="/ja/usage.html">使い方</a></li>
+    <li><a href="/ja/how-to-make/">作り方</a></li>
+    <li><a href="/ja/users.html">ショッカー</a></li>
+    <li><a href="/ja/development.html">開発</a></li>
+  </ul>

data/doc/_layouts/en.html

@@ -5,14 +5,7 @@ country: US
 ---
 {% if page.lang_suffix == null %}
 <nav class="menu">
-  <ul>
-    <li><a href="/en/">README</a></li>
-    <li><a href="/en/install/">Install</a></li>
-    <li><a href="/en/usage.html">Usage</a></li>
-    <li><a href="/en/how-to-make/">How to make</a></li>
-    <li><a href="/en/users.html">Shockers</a></li>
-    <li><a href="/en/development.html">Development</a></li>
-  </ul>
+{% include en.menu.html %}
 </nav>
 {% endif %}
 {% if page.no_sidebar %}
@@ -22,16 +15,26 @@ country: US
   {{ content }}
   <nav id="sidebar">
     <h3>The Latest Release</h3>
-    <p><a href="en/news.html">1.0.8</a> is the latest release. It had been released at 2012-06-17.</p>
-    <h3>Links</h3>
     <ul>
-      <li><a href="/en/">README</a></li>
-      <li><a href="/en/install/">Install</a></li>
-      <li><a href="/en/usage.html">Usage</a></li>
-      <li><a href="/en/how-to-make/">How to make</a></li>
-      <li><a href="/en/users.html">Shockers</a></li>
-      <li><a href="/en/development.html">Development</a></li>
+      <li>
+        Rabbit <a href="/en/news.html">{{ site.version }}</a>:
+        {{ site.release_date }}
+      </li>
+      <li>
+        <a href="/en/rabbiter/">Rabbiter</a> <a href="/en/rabbiter/news.html">{{ site.rabbiter_version }}</a>:
+        {{ site.rabbiter_release_date }}
+      </li>
+      <li>
+        <a href="/en/rabbirack">RabbiRack</a> <a href="/en/rabbirack/news.html">{{ site.rabbirack_version }}</a>:
+        {{ site.rabbirack_release_date }}
+      </li>
+      <li>
+        <a href="/en/rabwii">RabWii</a> <a href="/en/rabwii/news.html">{{ site.rabwii_version }}</a>:
+        {{ site.rabwii_release_date }}
+      </li>
     </ul>
+    <h3>Links</h3>
+{% include en.menu.html %}
   </nav>
 </div>
 {% endif %}

data/doc/_layouts/ja.html

@@ -5,14 +5,7 @@ country: JP
 ---
 {% if page.lang_suffix == null %}
 <nav class="menu">
-  <ul>
-    <li><a href="/ja/">はじめに</a></li>
-    <li><a href="/ja/install/">インストール</a></li>
-    <li><a href="/ja/usage.html">使い方</a></li>
-    <li><a href="/ja/how-to-make/">作り方</a></li>
-    <li><a href="/ja/users.html">ショッカー</a></li>
-    <li><a href="/ja/development.html">開発</a></li>
-  </ul>
+{% include ja.menu.html %}
 </nav>
 {% endif %}
 {% if page.no_sidebar %}
@@ -22,16 +15,26 @@ country: JP
   {{ content }}
   <nav id="sidebar">
     <h3>最新リリース</h3>
-    <p>2012-06-17にリリースされた<a href="/ja/news.html">1.0.8</a>が最新リリースです。</p>
-    <h3>リンク</h3>
     <ul>
-      <li><a href="/ja/">はじめに</a></li>
-      <li><a href="/ja/install/">インストール</a></li>
-      <li><a href="/ja/usage.html">使い方</a></li>
-      <li><a href="/ja/how-to-make/">作り方</a></li>
-      <li><a href="/ja/users.html">ショッカー</a></li>
-      <li><a href="/ja/development.html">開発</a></li>
+      <li>
+        Rabbit <a href="/ja/news.html">{{ site.version }}</a>:
+        {{ site.release_date }}
+      </li>
+      <li>
+        <a href="/ja/rabbiter/">Rabbiter</a> <a href="/ja/rabbiter/news.html">{{ site.rabbiter_version }}</a>:
+        {{ site.rabbiter_release_date }}
+      </li>
+      <li>
+        <a href="/ja/rabbirack">RabbiRack</a> <a href="/ja/rabbirack/news.html">{{ site.rabbirack_version }}</a>:
+        {{ site.rabbirack_release_date }}
+      </li>
+      <li>
+        <a href="/ja/rabwii">RabWii</a> <a href="/ja/rabwii/news.html">{{ site.rabwii_version }}</a>:
+        {{ site.rabwii_release_date }}
+      </li>
     </ul>
+    <h3>リンク</h3>
+{% include ja.menu.html %}
   </nav>
 </div>
 {% endif %}

data/doc/_plugins/converters/rd.rb

@@ -42,7 +42,7 @@ module Jekyll
     def add_number(source, around=nil)
       i = 1
       puts source
-      lines = source.to_a[0..-2]
+      lines = source.lines.to_a[0..-2]
       if around
         i = [1, around - SNIPPET_SIZE].max
         lines = lines[i, 2 * SNIPPET_SIZE]

data/doc/_plugins/support_symlink.rb

@@ -0,0 +1,11 @@
+module Jekyll
+  class Site
+    class File < ::File
+      class << self
+        def symlink?(path)
+          super and !exist?(readlink(path))
+        end
+      end
+    end
+  end
+end

data/doc/en/development.rd

@@ -21,7 +21,7 @@ to the ML, send an e-mail like the following.
 
 == Bug report
 
-Use mailing list (see ((<users.html/Users>)) page about
+Use mailing list (see ((<users.rd/Users>)) page about
 mailing list) or ((<Issues on
 GitHub|URL:https://github.com/shockers/rabbit/issues>)) for
 reporting a bug or a request.
@@ -38,7 +38,7 @@ when you create a theme.
 === Documentation
 
 Rabbit lacks documentation in English. Please consider that
-you write your tips to ((<faq.html/FAQ>)) page.
+you write your tips to ((<faq.rd/FAQ>)) page.
 
 === Translation