rabbit 0.9.2 → 0.9.3

data/Gemfile

@@ -0,0 +1,16 @@
+# -*- ruby -*-
+
+source "http://rubygems.org"
+
+gem 'gtk2'
+gem 'rsvg2'
+gem 'poppler'
+gem 'hikidoc'
+gem 'twitter-stream'
+gem 'twitter_oauth'
+
+group :development, :test do
+  gem 'rake'
+  gem 'jeweler'
+  gem 'jekyll'
+end

data/README

@@ -0,0 +1 @@
+See doc/ or http://rabbit-shockers.org/.

data/Rakefile

@@ -2,73 +2,65 @@
 
 require 'find'
 require 'rubygems'
-require 'hoe'
+require 'rubygems/package_task'
+require 'jeweler'
 
 base_dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(base_dir, 'lib'))
 require 'rabbit/rabbit'
 
-truncate_base_dir = Proc.new do |x|
-  x.gsub(/\A#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
-end
+rsync_base_path = "rabbit@rabbit-shockers.org:public_html/"
 
-manifest = File.join(base_dir, "Manifest.txt")
-manifest_contents = []
-base_dir_included_components = %w(COPYING COPYING.ja GPL Manifest.txt
-                                  NEWS.en
-                                  NEWS.ja
-                                  README.en
-                                  README.ja
-                                  Rakefile TODO setup.rb
-                                  update-mo.rb update-po.rb)
-excluded_components = %w(.svn .test-result .tmp doc log tmp pkg config.rb)
-excluded_suffixes = %w(.po~)
-white_list_paths = []
-Find.find(base_dir + File::SEPARATOR) do |target|
-  target = truncate_base_dir[target]
-  components = target.split(File::SEPARATOR)
-  next if components.empty?
-  if components.size == 1 and !File.directory?(target)
-    next unless base_dir_included_components.include?(components[0])
-  end
-  unless white_list_paths.include?(target)
-    Find.prune if (excluded_components - components) != excluded_components
-    next if /~\z/ =~ target
-    next if excluded_suffixes.include?(File.extname(target))
+ENV["VERSION"] ||= Rabbit::VERSION
+version = ENV["VERSION"].dup
+spec = nil
+Jeweler::Tasks.new do |_spec|
+  spec = _spec
+  spec.name = "rabbit"
+  spec.version = version.dup
+  spec.rubyforge_project = "rabbit"
+  spec.homepage = "http://rabbit-shockers.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.license = "GPLv2+"
+  Bundler.load.dependencies_for(:default).each do |dependency|
+    spec.add_runtime_dependency(dependency.name, dependency.requirement.to_s)
   end
-  manifest_contents << target if File.file?(target)
+
+  spec.files = FileList["{lib,data,entities,bin,sample,misc,doc,po}/**/*",
+                        "*.rb",
+                        "Rakefile",
+                        "COPYING",
+                        "GPL",
+                        "README",
+                        "Gemfile"]
+  spec.test_files = FileList["test/**/*.rb"]
+  spec.executables -= ["rabbit.bat"]
 end
 
-File.open(manifest, "w") do |f|
-  f.puts manifest_contents.sort.join("\n")
+Jeweler::RubygemsDotOrgTasks.new
+
+def force_array(enumerable)
+  array = []
+  enumerable.each do |element|
+    array << element
+  end
+  array
 end
-at_exit do
-  FileUtils.rm_f(manifest)
+
+def spec.files
+  @files = force_array(super)
 end
 
-ENV["VERSION"] = Rabbit::VERSION
-project = Hoe.spec('rabbit') do
-  self.version = Rabbit::VERSION
-  self.rubyforge_name = 'rabbit'
-  self.author = ['Kouhei Sutou']
-  self.email = ['kou@cozmixng.org']
-  self.summary = 'Rabbit is an RD-document-based presentation application.'
-  self.url = 'http://www.cozmixng.org/~rwiki/?cmd=view;name=Rabbit'
-  self.test_globs = ['test/test_*.rb']
-  self.changes = File.read('NEWS.en').split(/^== /)[1].gsub(/^==/, '').strip
-  self.extra_deps = [
-                     ['gtk2'],
-                     ['gdk_pixbuf2'],
-                     ['rsvg2'],
-                     ['poppler'],
-                     ['hikidoc'],
-                     # ['gettext'],
-                    ]
-  self.description = self.summary # FIXME
-  self.need_tar = false
+def spec.extra_rdoc_files
+  @extra_rdoc_files = force_array(super)
 end
 
-project.spec.executables -= ["rabbit.bat"]
+Gem::PackageTask.new(spec) do |package|
+  package.need_tar_gz = true
+end
 
 rule '.png' => ['.svg'] do |t|
   sh("inkscape", "--export-png", t.name, t.source)
@@ -83,3 +75,119 @@ end
     sh("inkscape", "--export-png", t.name, *t.prerequisites)
   end
 end
+
+namespace :entity do
+  desc "Update entities"
+  task :update do
+    sh("entities/ent2rb.rb entities/*.ent")
+  end
+end
+
+namespace :html do
+  screenshots = []
+
+  languages = ["ja", "en"]
+  languages.each do |lang|
+    screenshots_dir = "doc/images/screenshots/#{lang}"
+    directory screenshots_dir
+
+    screenshot_rab = "doc/screenshot.#{lang}.rab"
+
+    screenshot_themes = ["blue-circle", "clear-blue", "cozmixng",
+                         "dark-gradation", "day-white",
+                         "debian", "green-circle", "night-black",
+                         "rabbit", "ranguba", "red-frame", "ruby-gnome2"]
+    screenshot_themes.each do |theme|
+      screenshot_base_name = "#{screenshots_dir}/#{theme}"
+      screenshot_raw = "#{screenshot_base_name}-raw.png"
+      screenshot = "#{screenshot_base_name}.png"
+      screenshots << screenshot
+
+      file screenshot_raw => [screenshots_dir, screenshot_rab, __FILE__] do
+        ruby("-I", "lib", "bin/rabbit",
+             "--save-as-image",
+             "--theme", theme,
+             "--size", "200,150",
+             "--saved-image-base-name", screenshot_base_name,
+             screenshot_rab)
+        mv("#{screenshot_base_name}-0.png", screenshot_raw)
+      end
+
+      file screenshot => screenshot_raw do
+        true_value = 1
+        false_value = 0
+        run_mode = false_value
+        offset_x = 8
+        offset_y = 8
+        blur_radius = 15.0
+        black = "'(122 122 122)"
+        shadow_color = black
+        opacity = 80.0
+        allow_resizing = true_value
+        drop_shadow = <<-EOC
+(let* ((image (car (gimp-file-load RUN-NONINTERACTIVE
+                                   "#{screenshot_raw}"
+                                   "#{screenshot_raw}")))
+       (picture-layer (car (gimp-image-get-active-drawable image))))
+  (script-fu-drop-shadow image picture-layer
+                         #{offset_x} #{offset_y}
+                         #{blur_radius} #{shadow_color}
+                         #{opacity} #{allow_resizing})
+  (let ((layer (car (gimp-image-merge-visible-layers image CLIP-TO-IMAGE))))
+    (file-png-save-defaults RUN-NONINTERACTIVE image layer
+                            "#{screenshot}"
+                            "#{screenshot}"))
+  (gimp-image-delete image))
+EOC
+        sh("gimp",
+           "-i",
+           "-b", drop_shadow,
+           "-b", "(gimp-quit TRUE)")
+      end
+    end
+  end
+
+  desc "generate HTML and needed files."
+  task :generate => screenshots do
+    Dir.chdir("doc") do
+      sh("ruby", "-S", "jekyll")
+    end
+  end
+
+  desc "publish HTML."
+  task :publish => :generate do
+    sh("rsync", "-avz", "--delete",
+       "--exclude", "*.svn",
+       "--exclude", "*-raw.png",
+       "--exclude", "*.svg",
+       "--exclude", "*.rab",
+       "--exclude", "/download/",
+       "doc/_site/",
+       rsync_base_path)
+  end
+end
+
+desc "Tag the current revision."
+task :tag do
+  sh("git tag -a #{version} -m 'release #{version}!!!'")
+end
+
+namespace :package do
+  desc "Upload tar.gz."
+  task :upload => :package do
+    htaccess = ".htaccess"
+    rabbit_tar_gz = "rabbit.tar.gz"
+    current_rabbit_tar_gz = "rabbit-#{version}.tar.gz"
+    File.open(htaccess, "w") do |file|
+      file.puts("Options +Indexes +FollowSymlinks")
+    end
+    ln_s(current_rabbit_tar_gz, rabbit_tar_gz)
+    sh("rsync", "-avz",
+       htaccess,
+       rabbit_tar_gz,
+       "pkg/#{current_rabbit_tar_gz}",
+       "#{rsync_base_path}download/")
+    rm(rabbit_tar_gz)
+    rm(htaccess)
+  end
+end

data/TODO

@@ -1,3 +1,5 @@
+* setup content management system for rabbit-shockers.org.
+  gollum? jekyll?
 * documents all key-bindings and mouse-bindings. (e.g. spotlight)
 * support centering in table cell.
 * [BUG]: PDF slide doesn't scale???

data/bin/rabbit

@@ -14,7 +14,7 @@ def parse_args(args=ARGV, logger=nil)
     options.theme = "default"
     options.theme_specified = false
     options.base = nil
-    options.source_type = Rabbit::Source::File
+    options.source_type = :auto
     options.full_screen = false
     options.index_mode = false
     options.geometry = nil
@@ -42,7 +42,7 @@ def parse_args(args=ARGV, logger=nil)
     options.page_margin_top = nil
     options.page_margin_bottom = nil
     options.use_druby = true
-    options.druby_uri = "druby://:10101"
+    options.druby_uri = "druby://127.0.0.1:10101"
     options.output_druby_uri = false
     options.use_soap = false
     options.soap_host = "0.0.0.0"
@@ -51,10 +51,8 @@ def parse_args(args=ARGV, logger=nil)
     options.xmlrpc_host = "0.0.0.0"
     options.xmlrpc_port = 10104
     options.server = false
-    options.default_public_level = "strict"
+    options.default_public_level = "all"
     options.public_level = nil
-    options.comment_source = nil
-    options.comment_encoding = nil
     options.migemo_dictionary_search_path = [
       File.join(Config::CONFIG["prefix"], "share"),
       File.join("", "usr", "local", "share"),
@@ -73,9 +71,9 @@ def parse_args(args=ARGV, logger=nil)
 
     opts.on("-I", "--include=PATH",
             _("Add [PATH] to load path.")) do |path|
-      $LOAD_PATH.unshift(path)
+      $LOAD_PATH.unshift(File.expand_path(path))
     end
-    
+
     opts.on("-t", "--theme=THEME",
             _("Use [THEME] as theme."),
             "(#{options.theme})") do |theme|
@@ -89,6 +87,7 @@ def parse_args(args=ARGV, logger=nil)
     source_type_names = Rabbit::Source.types.collect do |x|
       Rabbit::Console.get_last_name(x).downcase
     end
+    source_type_names.unshift("auto")
     source_type_descs = Rabbit::Source.types.collect do |x|
       message = _("When select %s\nspecify %s\nas [SOURCE_INFOS].")
       type = Rabbit::Console.get_last_name(x)
@@ -100,12 +99,15 @@ def parse_args(args=ARGV, logger=nil)
             _("Specify source type as [TYPE]."),
             _("Select from [%s].") % source_type_names.join(', '),
             _("Note: case insensitive."),
-            "(#{Rabbit::Console.get_last_name(options.source_type)})",
-            _("(ARGV: if no filename is given)"),
+            "(auto)",
             " ",
             *source_type_descs) do |source_type|
-      options.source_type = Rabbit::Source.types.find do |t|
-        Rabbit::Console.get_last_name(t).downcase == source_type.downcase
+      if source_type == "auto"
+        options.source_type = :auto
+      else
+        options.source_type = Rabbit::Source.types.find do |t|
+          Rabbit::Console.get_last_name(t).downcase == source_type.downcase
+        end
       end
     end
 
@@ -467,15 +469,15 @@ def parse_args(args=ARGV, logger=nil)
     opts.category _("Comment")
     
     opts.on("--comment-source=FILE",
+            _("Deprecated. Just ignored."),
             _("Specify initial comment source."),
             _("(default source)")) do |name|
-      options.comment_source = name
     end
     
     opts.on("--comment-encoding=ENCODING",
+            _("Deprecated. Just ignored."),
             _("Specify comment source encoding."),
             _("(auto)")) do |encoding|
-      options.comment_encoding = encoding
     end
 
     opts.category _("Migemo")
@@ -523,30 +525,68 @@ def parse_args(args=ARGV, logger=nil)
 end
 
 def make_canvas(options, logger, renderer)
-  args = [
-    logger, renderer,
-    options.comment_source, options.comment_encoding,
-  ]
-  Rabbit::Canvas.new(*args)
+  Rabbit::Canvas.new(logger, renderer)
+end
+
+def add_source_dialog_filter(dialog, name, pattern)
+  filter = Gtk::FileFilter.new
+  filter.name = "#{name} (#{pattern})"
+  filter.add_pattern(pattern)
+  dialog.add_filter(filter)
+end
+
+def choose_source_file_by_dialog(options)
+  dialog = Gtk::FileChooserDialog.new(_("Choose a Rabbit source file"),
+                                      nil,
+                                      Gtk::FileChooser::ACTION_OPEN,
+                                      nil,
+                                      [Gtk::Stock::CANCEL,
+                                       Gtk::Dialog::RESPONSE_CANCEL],
+                                      [Gtk::Stock::OPEN,
+                                       Gtk::Dialog::RESPONSE_ACCEPT])
+  dialog.current_folder = options.base if options.base
+  add_source_dialog_filter(dialog, "Rabbit files", "*.rab")
+  add_source_dialog_filter(dialog, "RD files", "*.rd")
+  add_source_dialog_filter(dialog, "Hiki files", "*.hiki")
+  add_source_dialog_filter(dialog, "PDF files", "*.pdf")
+  add_source_dialog_filter(dialog, "All files", "*")
+  file_name = nil
+  if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
+    file_name = dialog.filename
+    dialog.destroy
+  end
+  file_name
 end
 
 def make_source(options, argv, logger)
-  if options.source_type == Rabbit::Source::File and argv.empty?
-    options.source_type = Rabbit::Source::ARGF
+  if options.source_type == :auto
+    if argv.empty?
+      if Rabbit::Utils.support_console_input?
+        options.source_type = Rabbit::Source::ARGF
+      else
+        file_name = choose_source_file_by_dialog(options)
+        exit if file_name.nil?
+        argv = [file_name]
+        options.source_type = Rabbit::Source::File
+      end
+    elsif argv.size == 1 and /\Ahttps?:\/\// =~ argv[0]
+      options.source_type = Rabbit::Source::URI
+    else
+      options.source_type = Rabbit::Source::File
+    end
   end
   if options.source_type == Rabbit::Source::ARGF
     infos = [ARGF]
   else
     infos = argv
   end
-  options.source_type.new(options.encoding, logger, *infos)
+  source = options.source_type.new(options.encoding, logger, *infos)
+  source.base = options.base if options.base
+  source
 end
 
 def make_front(canvas, options)
   level = options.public_level
-  if options.source_type == Rabbit::Source::Memory or options.server
-    level ||= "all"
-  end
   level ||= options.default_public_level
   level = level.gsub(/-/, "_").upcase
   canvas.front(Rabbit::Front::PublicLevel.const_get(level))
@@ -556,9 +596,7 @@ def apply_theme_if_need(target, options)
   target.apply_theme(options.theme) if options.theme_specified
 end
 
-def parse(target, options, logger, background=false)
-  source = make_source(options, ARGV, logger)
-  source.base = options.base if options.base
+def parse(target, source, background=false)
   if background
     callback = Rabbit::Utils.process_pending_events_proc
   else
@@ -664,13 +702,14 @@ def setup_xmlrpc(front, options, logger)
 end
 
 def do_print(options, logger)
+  source = make_source(options, ARGV, logger)
   renderer = Rabbit::Renderer.printable_renderer(options.slides_per_page)
   canvas = make_canvas(options, logger, renderer)
   setup_paper_size(canvas, options)
   setup_print_info(canvas, options)
   setup_3d_info(canvas, options)
   apply_theme_if_need(canvas, options)
-  parse(canvas, options, logger)
+  parse(canvas, source)
   canvas.print
   canvas.quit
 rescue Rabbit::NoPrintSupportError
@@ -681,6 +720,7 @@ def do_save_as_image(options, logger)
   Rabbit::Renderer::Pixmap.init
   Rabbit.gui_init
 
+  source = make_source(options, ARGV, logger)
   canvas = make_canvas(options, logger, Rabbit::Renderer::Pixmap)
   setup_size(canvas, options)
   setup_image_info(canvas, options)
@@ -688,7 +728,7 @@ def do_save_as_image(options, logger)
   setup_paper_size(canvas, options)
   setup_3d_info(canvas, options)
   apply_theme_if_need(canvas, options)
-  parse(canvas, options, logger)
+  parse(canvas, source)
   canvas.activate("ToggleIndexMode") if options.index_mode
   canvas.save_as_image
   canvas.quit
@@ -698,6 +738,7 @@ def do_display(options, logger)
   Rabbit::Renderer::Display.init
   Rabbit.gui_init
 
+  source = make_source(options, ARGV, logger)
   canvas = make_canvas(options, logger, Rabbit::Renderer::Display)
   frame = Rabbit::Frame.new(logger, canvas)
   frame.geometry = options.geometry
@@ -714,7 +755,7 @@ def do_display(options, logger)
     logger.info(_("Window ID: %d") % native_window.xid)
   end
   apply_theme_if_need(frame, options)
-  parse(frame, options, logger, !Rabbit::Utils.windows?)
+  parse(frame, source, !Rabbit::Utils.windows?)
   canvas.activate("ToggleIndexMode") if options.index_mode
 
   front = make_front(canvas, options)
@@ -727,10 +768,11 @@ end
 
 def do_server(options, logger)
   Rabbit.gui_init
-  
+
   # GLib::Log.cancel_handler
   # GLib::Log.set_handler(nil, GLib::Log::LEVEL_ERROR)
-  
+
+  source = make_source(options, ARGV, logger)
   canvas = make_canvas(options, logger, Rabbit::Renderer::Pixmap)
   setup_size(canvas, options)
   setup_paper_size(canvas, options)
@@ -738,11 +780,11 @@ def do_server(options, logger)
   setup_print_info(canvas, options)
   setup_3d_info(canvas, options)
   apply_theme_if_need(canvas, options)
-  parse(canvas, options, logger)
+  parse(canvas, source)
 
   soap_server_thread = nil
   xmlrpc_server_thread = nil
-  
+
   front = make_front(canvas, options)
   setup_druby(front, options, logger) if options.use_druby
   if options.use_soap
@@ -780,6 +822,8 @@ def main
   else
     do_display(options, logger)
   end
+
+  Rabbit.cleanup
 end
 
 main