rabbit 2.2.1 → 3.0.0

data/po/ja/rabbit.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Rabbit 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-11-19 10:38+0900\n"
+"PO-Revision-Date: 2019-09-06 06:24+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Kouhei Sutou <kou@cozmixng.org> and Kobayashi Noritada <nori1@d"
 "olphin.c.u-tokyo.ac.jp>\n"
@@ -336,6 +336,12 @@ msgstr "  new:    新しいスライドを作成"
 msgid "  change: change an existing slide"
 msgstr "  change: 既存のスライドを変更"
 
+msgid "User interface"
+msgstr "ユーザーインターフェイス"
+
+msgid "Don't use GUI"
+msgstr "GUIを使わない"
+
 msgid "Slide information"
 msgstr "スライドの情報"
 
@@ -369,6 +375,9 @@ msgstr "新しいスライドのタイトル"
 msgid "--title=\"Rabbit Introduction\""
 msgstr "--title=\"Rabbitの紹介\""
 
+msgid "License of the new slide"
+msgstr "新しいスライドのライセンス"
+
 msgid "Tags of the new slide"
 msgstr "新しいスライドのタグ"
 
@@ -378,6 +387,12 @@ msgstr "プレゼンの持ち時間"
 msgid "Presentation date with the new slide"
 msgstr "新しいスライドでプレゼンする日"
 
+msgid "Presentation start time"
+msgstr ""
+
+msgid "Presentation end time"
+msgstr ""
+
 msgid "Your information"
 msgstr "あなたの情報"
 
@@ -749,12 +764,6 @@ msgstr "3D"
 msgid "Specify whether to use OpenGL if available."
 msgstr "可能ならOpenGLを使うかどうかを指定します．"
 
-msgid "Display"
-msgstr "画面表示"
-
-msgid "Specify whether to keep above window."
-msgstr "ウィンドウを常に前面に表示するかどうかを指定します。"
-
 msgid "Others"
 msgstr "その他"
 
@@ -1027,15 +1036,9 @@ msgstr ""
 msgid "[FILENAME]"
 msgstr "[ファイル名]"
 
-msgid "[HIKI_CGI_URI] and [PAGE_NAME]"
-msgstr "[HikiのCGIのURI]と[ページ名]"
-
 msgid "[FILENAME_OR_NOT]"
 msgstr "[ファイル名か何も指定しない]"
 
-msgid "[USER] and [TITLE]"
-msgstr "[USER]と[TITLE]"
-
 msgid "URI"
 msgstr "URI"
 

data/rabbit.gemspec

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2019  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
@@ -14,24 +14,45 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-base_dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(base_dir, 'lib'))
-require "rabbit/version"
+require_relative "lib/rabbit/version"
 
 Gem::Specification.new do |spec|
   spec.name = "rabbit"
   spec.version = Rabbit::VERSION.dup
-  spec.rubyforge_project = "rabbit"
   spec.homepage = "http://rabbit-shocker.org/"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@cozmixng.org"]
-  spec.summary = 'Rabbit is an RD-document-based presentation application.'
-  spec.description = spec.summary # FIXME
+  spec.summary = "Rabbit is a presentation tool for Rubyist"
+  normalize_new_lines = lambda do |text|
+    paragraphs = text.split("\n\n").collect do |paragraph|
+      paragraph.gsub("\n", "")
+    end
+    paragraphs.join("\n\n")
+  end
+  spec.description = normalize_new_lines.call(<<-DESCRIPTION)
+You can create your slide as a text file. It means that you can version control
+your slide like your Ruby scripts. You can custom your slide style by Ruby.
+So Rabbit is for Rubyist.
+
+You can use RD, Markdown and Wiki format as slide source.
+
+Rabbit provides programmer friendly keyboard interface. It uses Emacs and Vi
+style keybindings by default.
+
+You can use PDF and image as slide source. Rabbit can show PDF and image
+directly. You can create your slide by other presentation tool and show your
+slide by Rabbit. If you show your slide by Rabbit, you can use programmer
+friendly keyboard interface provided by Rabbit to control your slide.
+
+You can upload your slide as a gem. If you publish your slide as a gem, you
+can see your slide at https://slide.rabbit-shocker.org/ .
+  DESCRIPTION
   spec.license = "GPLv2+"
 
   spec.files = ["Rakefile", "COPYING", "GPL", "README", "Gemfile"]
   spec.files += ["#{spec.name}.gemspec"]
-  spec.files += Dir.glob("{lib,data,entities,sample,misc,doc}/**/*")
+  spec.files += Dir.glob("lib/**/*.{rb,erb,ui}")
+  spec.files += Dir.glob("{data,entities,sample,misc,doc}/**/*")
   spec.files += Dir.glob("po/*/*.po")
   spec.files -= Dir.glob("doc/_site/**/*")
   spec.files += Dir.glob("*.rb")
@@ -43,29 +64,26 @@ Gem::Specification.new do |spec|
     spec.executables = Dir.glob("*")
   end
 
-  spec.required_ruby_version = ">= 2.1.0"
+  spec.required_ruby_version = ">= 2.4.0"
 
-  spec.add_runtime_dependency("gio2")
   spec.add_runtime_dependency("gdk_pixbuf2", ">= 3.0.9")
-  spec.add_runtime_dependency("gtk2")
+  spec.add_runtime_dependency("gtk3")
   spec.add_runtime_dependency("rsvg2", ">= 3.1.4")
-  spec.add_runtime_dependency("poppler")
+  spec.add_runtime_dependency("poppler", ">= 3.2.5")
   spec.add_runtime_dependency("hikidoc")
   spec.add_runtime_dependency("nokogiri")
   spec.add_runtime_dependency("rdtool")
   spec.add_runtime_dependency("rttool")
   spec.add_runtime_dependency("coderay", ">= 1.0.0")
-  spec.add_runtime_dependency("kramdown")
+  spec.add_runtime_dependency("kramdown-parser-gfm")
   spec.add_runtime_dependency("gettext", ">= 3.0.1")
   spec.add_runtime_dependency("faraday")
   # spec.add_runtime_dependency("gstreamer")
   spec.add_runtime_dependency("rouge")
 
-  spec.add_development_dependency("gtk3")
   spec.add_development_dependency("test-unit")
-  spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("test-unit-rr")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("bundler")
-  spec.add_development_dependency("jekyll", ">= 1.0.2")
+  spec.add_development_dependency("jekyll")
 end

data/test/command/test-rabbit.rb

@@ -0,0 +1,100 @@
+# Copyright (C) 2018-2019  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.
+
+class RabbitCommandRabbitTest < Test::Unit::TestCase
+  def setup
+    @base_dir = File.expand_path(File.join(__dir__, "..", ".."))
+    @dir = Dir.mktmpdir
+  end
+
+  def teardown
+    FileUtils.rm_rf(@dir)
+  end
+
+  def rabbit(*arguments)
+    Dir.chdir(@dir) do
+      pid = spawn({
+                    "LANG" => "C",
+                  },
+                  RbConfig.ruby,
+                  "-I", File.join(@base_dir, "lib"),
+                  File.join(@base_dir, "bin", "rabbit"),
+                  *arguments,
+                  {
+                    :out => "stdout",
+                    :err => "stderr",
+                  })
+      _, status = Process.waitpid2(pid)
+      return status.success?, File.read("stdout"), File.read("stderr")
+    end
+  end
+
+  test("--save-as-image") do
+    File.open(File.join(@dir, "slide.rab"), "w") do |slide|
+      slide.puts(<<-'SLIDE')
+= ス\nラ/イ\ド:タイトル
+
+= ページタイトル
+      SLIDE
+    end
+    success, stdout, stderr = rabbit("--save-as-image", "slide.rab")
+    Dir.chdir(@dir) do
+      assert_equal([
+                     true,
+                     "",
+                     "[INFO]\nCreating a image for the 0th page\n" +
+                     "[INFO]\nCreating a image for the 1th page\n",
+                     [
+                       "スラ-イ-ド-タイトル-0.png",
+                       "スラ-イ-ド-タイトル-1.png",
+                     ],
+                   ],
+                   [
+                     success,
+                     stdout,
+                     stderr,
+                     Dir.glob("*.png").sort,
+                   ])
+    end
+  end
+
+  test("--print") do
+    File.open(File.join(@dir, "slide.rab"), "w") do |slide|
+      slide.puts(<<-'SLIDE')
+= ス\nラ/イ\ド:タイトル
+
+= ページタイトル
+      SLIDE
+    end
+    success, stdout, stderr = rabbit("--print", "slide.rab")
+    Dir.chdir(@dir) do
+      assert_equal([
+                     true,
+                     "",
+                     "",
+                     [
+                       "スラ-イ-ド-タイトル.pdf",
+                     ],
+                   ],
+                   [
+                     success,
+                     stdout,
+                     stderr,
+                     Dir.glob("*.pdf").sort,
+                   ])
+    end
+  end
+end

data/test/{rabbit-test-utils.rb → helper.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2019  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
@@ -14,9 +14,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+require "fileutils"
+require "rbconfig"
+require "tmpdir"
+
 require "test-unit"
-require "test/unit/notify"
 require "test/unit/rr"
 
-require "rabbit-test-utils/fixture"
-require "rabbit-test-utils/parser"
+require "helper/fixture"
+require "helper/parser"

data/test/{rabbit-test-utils → helper}/fixture.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2019  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
@@ -14,7 +14,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module RabbitTestUtils
+module Helper
   module Fixture
     private
     def fixture_path(*components)

data/test/{rabbit-test-utils → helper}/parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2019  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
@@ -14,7 +14,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module RabbitTestUtils
+module Helper
   module Parser
     private
     def parse(parser_class, text)

data/test/image/test-dia.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2019  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
@@ -17,7 +17,7 @@
 require "rabbit/image/dia"
 
 class TestImageDia < Test::Unit::TestCase
-  include RabbitTestUtils::Fixture
+  include Helper::Fixture
 
   private
   def fixture_path(base_name)

data/test/image/test-eps.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2019  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
@@ -17,7 +17,7 @@
 require "rabbit/image/eps"
 
 class TestImageEPS < Test::Unit::TestCase
-  include RabbitTestUtils::Fixture
+  include Helper::Fixture
 
   private
   def fixture_path(base_name)

data/test/parser/test-markdown.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2019  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
@@ -14,16 +14,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit-test-utils"
-
 require "rabbit/logger"
 require "rabbit/slide"
 require "rabbit/source/memory"
 require "rabbit/parser/markdown"
 
 class RabbitParserMarkdownTest < Test::Unit::TestCase
-  include RabbitTestUtils::Fixture
-  include RabbitTestUtils::Parser
+  include Helper::Fixture
+  include Helper::Parser
 
   private
   def parse(markdown)

data/test/parser/test-rd.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2019  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
@@ -14,8 +14,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit-test-utils"
-
 require "rabbit/slide"
 require "rabbit/source/memory"
 require "rabbit/parser/rd"

data/test/parser/test-wiki.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2015-2019  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
@@ -14,16 +14,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit-test-utils"
-
 require "rabbit/logger"
 require "rabbit/slide"
 require "rabbit/source/memory"
 require "rabbit/parser/wiki"
 
 class RabbitParserWikiTest < Test::Unit::TestCase
-  include RabbitTestUtils::Fixture
-  include RabbitTestUtils::Parser
+  include Helper::Fixture
+  include Helper::Parser
 
   private
   def parse(wiki_text)

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2004-2013  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2019  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
@@ -22,6 +22,6 @@ test_dir = File.join(base_dir, "test")
 $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 $LOAD_PATH.unshift(test_dir)
 
-require "rabbit-test-utils"
+require_relative "helper"
 
-exit Test::Unit::AutoRunner.run(true, test_dir)
+exit(Test::Unit::AutoRunner.run(true, test_dir))

data/test/test-applier.rb

@@ -1,42 +1,73 @@
-require 'fileutils'
-
-require "rabbit-test-utils"
+# Copyright (C) 2012-2019  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/theme/applier"
 
 class RabbitApplierTest < Test::Unit::TestCase
-  def test_normalize_source
-    assert_normalize_source_ivar("x_large_font_size", "huge_font_size")
-    assert_normalize_source_ivar("xx_large_font_size", "very_huge_font_size")
-    assert_normalize_source_ivar("x_large_script_font_size",
-                                 "huge_script_font_size")
-  end
-
-  def normalize_source(src)
-    dummy = Object.new
-    def dummy.slides
+  def setup
+    theme = Object.new
+    def theme.slides
       Object.new
     end
-    Rabbit::Theme::Applier.new(dummy).__send__(:normalize_source, src)
+    @applier = Rabbit::Theme::Applier.new(theme)
   end
 
-  def assert_normalize_source(expected, src)
-    _wrap_assertion do
-      assert_equal(expected, normalize_source(src))
+  sub_test_case("#normalize_source") do
+    def normalize_source(source)
+      @applier.__send__(:normalize_source, source)
+    end
+
+    data("x large",
+         ["x_large_font_size", "huge_font_size"],
+         keep: true)
+    data("xx large",
+         ["xx_large_font_size", "very_huge_font_size"],
+         keep: true)
+    data("x large script",
+         ["x_large_script_font_size", "huge_script_font_size"],
+         keep: true)
+
+    def test_reference
+      after, before = data
+      assert_equal("@#{after}",
+                   normalize_source("@#{before}"))
+    end
+
+    def test_reference_in_parentheses
+      after, before = data
+      assert_equal("(@#{after})",
+                   normalize_source("(@#{before})"))
+    end
+
+    def test_reference_with_arguments_in_parentheses
+      after, before = data
+      assert_equal("(xxx, @#{after}, xxx)",
+                   normalize_source("(xxx, @#{before}, xxx)"))
+    end
+
+    def test_assign_without_space
+      after, before = data
+      assert_equal("@#{after}=111",
+                   normalize_source("@#{before}=111"))
     end
-  end
 
-  def assert_normalize_source_ivar(after, before)
-    _wrap_assertion do
-      assert_normalize_source("@#{after}", "@#{before}")
-      assert_normalize_source("@#{after}=111",
-                              "@#{before}=111")
-      assert_normalize_source("@#{after} = 111",
-                              "@#{before} = 111")
-      assert_normalize_source("(@#{after})",
-                              "(@#{before})")
-      assert_normalize_source("(xxx, @#{after}, xxx)",
-                              "(xxx, @#{before}, xxx)")
+    def test_assign_with_space
+      after, before = data
+      assert_equal("@#{after} = 111",
+                   normalize_source("@#{before} = 111"))
     end
   end
 end