rabbit 1.0.9 → 2.0.0

data/lib/rabbit/config.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2005-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 'rbconfig'
+
+module Rabbit
+  module Config
+    IMAGE_PATH = [
+      File.join(File.dirname(__FILE__), "..", "..", "data"),
+      RbConfig::CONFIG["datadir"],
+    ]
+    append_path_from_gem = lambda do
+      return unless Object.const_defined?(:Gem)
+      rabbit_gem_spec = Gem.loaded_specs["rabbit"]
+      return if rabbit_gem_spec.nil?
+      unless rabbit_gem_spec.respond_to?(:activated?)
+        def rabbit_gem_spec.activated?
+          loaded?
+        end
+      end
+      if rabbit_gem_spec.activated?
+        IMAGE_PATH.unshift(File.join(rabbit_gem_spec.full_gem_path, "data"))
+      end
+    end
+    append_path_from_gem.call
+  end
+end

data/lib/rabbit/console.rb

@@ -1,7 +1,26 @@
+# Copyright (C) 2005-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 'English'
 
+require "shellwords"
 require "optparse"
 require "ostruct"
+require "uri"
+require "pathname"
 
 require "rabbit/rabbit"
 require "rabbit/logger"
@@ -10,36 +29,83 @@ require "rabbit/console/roff"
 
 Thread.abort_on_exception = true
 
-include Rabbit::GetText
-
 module Rabbit
-  module Console
+  class Console
+    include GetText
+
     @@locale_dir_option_name = "--locale-dir"
 
-    module_function
-    def parse!(args, logger=nil)
-      bindtextdomain
-      logger ||= guess_default_logger
+    class << self
+      def parse!(args, logger=nil, &block)
+        new(logger).parse!(args, &block)
+      end
+
+      def get_last_name(klass)
+        klass.name.split("::").last
+      end
+    end
+
+    def initialize(logger=nil)
+      @logger = logger || Logger.default
+    end
+
+    def parse!(args)
       options = OpenStruct.new
-      options.logger = logger
-      options.default_logger = logger
+      options.logger = @logger
+      options.default_logger = @logger
+      options.druby_uri = "druby://127.0.0.1:10101"
+      options.version = VERSION
+      options.options_file = nil
+      options.rest = []
+      options.after_hooks = []
 
       process_locale_options(args)
 
-      opts = OptionParser.new(banner) do |opts|
-        yield(opts, options)
-        setup_common_options(opts, options)
+      parser = OptionParser.new(banner) do |_parser|
+        yield(_parser, options)
+        setup_common_options(_parser, options)
       end
 
       begin
-        opts.parse!(args)
+        options_file = options.options_file
+        if options_file and File.exist?(options_file)
+          read_options_file(parser, options, options_file)
+        end
+        options.rest.concat(parser.parse!(args))
+        options.after_hooks.each do |hook|
+          hook.call(self, parser, options)
+        end
       rescue
-        logger.fatal($!.message)
+        @logger.fatal($!.message)
       end
 
       [options, options.logger]
     end
 
+    def read_options_file(parser, options, options_file)
+      options_in_file = []
+      File.open(options_file) do |file|
+        file.each_line do |line|
+          options_in_file.concat(Shellwords.split(line))
+        end
+      end
+      source_info = parser.parse(options_in_file)
+
+      source_info = source_info.collect do |path|
+        if URI(path).scheme
+          path
+        else
+          if Pathname(path).absolute?
+            path
+          else
+            File.join(File.dirname(options_file), path)
+          end
+        end
+      end
+      options.rest.concat(source_info)
+    end
+
+    private
     def banner
       _("Usage: %s [options]") % File.basename($0, '.*')
     end
@@ -47,42 +113,53 @@ module Rabbit
     def process_locale_options(args)
       args.each_with_index do |arg, i|
         if arg == @@locale_dir_option_name
-          bindtextdomain(args[i + 1])
+          self.class.bindtextdomain(GetText::DOMAIN, :path => args[i + 1])
         elsif /#{@@locale_dir_option_name}=/ =~ arg
-          bindtextdomain($POSTMATCH)
+          self.class.bindtextdomain(GetText::DOMAIN, :path => $POSTMATCH)
         end
       end
     end
 
-    def setup_common_options(opts, options)
-      opts.separator ""
-      opts.separator _("Common options")
+    def setup_common_options(parser, options)
+      parser.separator ""
+      parser.separator _("Common options")
+
+      setup_options_options(parser, options)
+      setup_locale_options(parser, options)
+      setup_logger_options(parser, options)
+      setup_common_options_on_tail(parser, options)
+    end
+
+    def setup_options_options(parser, options)
+      parser.on("--options-file=FILE",
+                _("Load options from FILE."),
+                _("(none)")) do |file|
+        read_options_file(parser, options, file)
+      end
 
-      setup_locale_options(opts, options)
-      setup_logger_options(opts, options)
-      setup_common_options_on_tail(opts, options)
+      parser.separator ""
     end
-    
-    def setup_locale_options(opts, options)
-      opts.on("--locale-dir=DIR",
-              _("Specify locale dir as [DIR]."),
-              _("(auto)")) do |d|
-        bindtextdomain(d)
+
+    def setup_locale_options(parser, options)
+      parser.on("--locale-dir=DIR",
+                _("Specify locale dir as [DIR]."),
+                _("(auto)")) do |directory|
+        self.class.bindtextdomain(GetText::DOMAIN, :path => directory)
       end
 
-      opts.separator ""
+      parser.separator ""
     end
 
-    def setup_logger_options(opts, options)
+    def setup_logger_options(parser, options)
       logger_type_names = Rabbit::Logger.types.collect do |x|
         get_last_name(x).downcase
       end
 
-      opts.on("--logger-type=TYPE",
-              logger_type_names,
-              _("Specify logger type as [TYPE]."),
-              _("Select from [%s].") % logger_type_names.join(', '),
-              "(#{get_last_name(options.logger.class)})") do |logger_type|
+      parser.on("--logger-type=TYPE",
+                logger_type_names,
+                _("Specify logger type as [TYPE]."),
+                _("Select from [%s].") % logger_type_names.join(', '),
+                "(#{get_last_name(options.logger.class)})") do |logger_type|
         logger_class = Rabbit::Logger.types.find do |t|
           get_last_name(t).downcase == logger_type.downcase
         end
@@ -95,24 +172,24 @@ module Rabbit
       end
 
       level_names = Logger::Severity.names
-      opts.on("--log-level=LEVEL",
-              level_names,
-              _("Specify log level as [LEVEL]."),
-              _("Select from [%s].") % level_names.join(', '),
-              "(#{Logger::Severity.name(options.logger.level)})") do |name|
+      parser.on("--log-level=LEVEL",
+                level_names,
+                _("Specify log level as [LEVEL]."),
+                _("Select from [%s].") % level_names.join(', '),
+                "(#{Logger::Severity.name(options.logger.level)})") do |name|
         options.logger.level = Logger::Severity.level(name)
       end
 
-      opts.separator ""
+      parser.separator ""
     end
 
-    def setup_common_options_on_tail(opts, options)
-      opts.on_tail("--help", _("Show this message.")) do
-        output_info_and_exit(options, opts.to_s)
+    def setup_common_options_on_tail(parser, options)
+      parser.on_tail("--help", _("Show this message.")) do
+        output_info_and_exit(options, parser.to_s)
       end
 
-      opts.on_tail("--version", _("Show version.")) do
-        output_info_and_exit(options, "#{VERSION}\n")
+      parser.on_tail("--version", _("Show version.")) do
+        output_info_and_exit(options, "#{options.version}\n")
       end
     end
 
@@ -127,15 +204,7 @@ module Rabbit
     end
 
     def get_last_name(klass)
-      klass.name.split("::").last
-    end
-
-    def guess_default_logger
-      if Utils.support_console_output? or !Logger.const_defined?(:GUI)
-        Logger::STDERR.new
-      else
-        Logger::GUI.new
-      end
+      self.class.get_last_name(klass)
     end
   end
 end

data/lib/rabbit/gem-finder.rb

@@ -0,0 +1,61 @@
+# 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/gettext"
+
+module Rabbit
+  class GemFinder
+    include GetText
+
+    def initialize(logger=nil)
+      @logger = logger || Logger.default
+    end
+
+    def find(name, prefix)
+      normalized_name = name.downcase
+      unless normalized_name.start_with?(prefix)
+        normalized_name = "#{prefix}#{normalized_name}"
+      end
+
+      retried = false
+      spec = nil
+      begin
+        spec = Gem::Specification.find_by_name(name)
+      rescue Gem::LoadError
+        begin
+          spec = Gem::Specification.find_by_name(normalized_name)
+        rescue Gem::LoadError
+          unless retried
+            retried = true
+            require "rubygems/dependency_installer"
+            options = {}
+            if File.writable?(Gem.dir)
+              @logger.info(_("Installing gem: %s") % normalized_name)
+            else
+              options[:user_install] = true
+              format = _("Installing gem in user install mode: %s")
+              @logger.info(format % normalized_name)
+            end
+            installer = Gem::DependencyInstaller.new(options)
+            installer.install(normalized_name, Gem::Requirement.default)
+            retry
+          end
+        end
+      end
+      spec
+    end
+  end
+end

data/lib/rabbit/gettext.rb

@@ -1,87 +1,14 @@
-begin
-  require "rubygems"
-  raise LoadError if Gem.respond_to?(:_deprecated_all_load_paths)
-  require "gettext"
-  module GetText
-    if ::GetText::TextDomainManager.respond_to?(:textdomain)
-      alias _gettext gettext
-      module_function :_gettext
-      def gettext(msgid)
-        return msgid
-        if @@__textdomain[callersrc]
-          _gettext(msgid)
-        else
-          msgid
-        end
-      end
-    end
-  end
-rescue LoadError
-  module GetText
-
-    module_function
-    def bindtextdomain(*args)
-    end
-    
-    def gettext(msgid)
-      msgid
-    end
-  end
-
-  module Locale
-    module_function
-    def get
-      ["LC_ALL", "LC_MESSAGES", "LANG"].each do |env|
-        ret = ENV[env]
-        break if ret
-      end
-      ret = "C" unless ret
-      ret
-    end
-  end
-end
+require "gettext"
 
 module Rabbit
   module GetText
-
     DOMAIN = "rabbit"
-    module_function
-    def bindtextdomain(path=nil, locale=nil, charset=nil)
-      if Rabbit::Config.const_defined?(:GETTEXT_PATH)
-        path ||= Rabbit::Config::GETTEXT_PATH
-      end
-      charset ||= "UTF-8"
-      ::GetText.bindtextdomain(DOMAIN, path, locale, charset)
-      if defined?(::GetText::TextDomainManager) and path
-        if ::GetText::TextDomainManager.respond_to?(:textdomain)
-          # workaround for Ruby-GetText 1.6.0 < 2.0.0
-          textdomain = ::GetText::TextDomainManager.textdomain(DOMAIN)
-          locale_paths = ["#{path}/%{locale}/LC_MESSAGES/%{name}.mo",
-                        "#{path}/%{locale}/%{name}.mo"]
-          textdomain.locale_paths.concat(locale_paths)
-          locale ||= textdomain.current_locale || Locale.get
-          textdomain.set_locale(locale, true)
-        end
-      end
-    end
-    
-    def _(msgid)
-      ::GetText.gettext(msgid)
-    end
 
-    def N_(msgid)
-      msgid
-    end
-
-    def locale=(locale)
-      ::GetText.locale = locale
-    end
-  end
-
-  module Locale
-    module_function
-    def get
-      ::Locale.get
+    class << self
+      def included(mod)
+        mod.send(:include, ::GetText)
+        mod.bindtextdomain(DOMAIN)
+      end
     end
   end
 end

data/lib/rabbit/html/generator.rb

@@ -14,6 +14,7 @@ require 'rabbit/keys'
 module Rabbit
   module HTML
     class Generator
+      include GetText
       include ERB::Util
       public :h