bitclust-core 0.6.0 → 0.7.0

data/lib/bitclust/subcommands/preproc_command.rb

@@ -0,0 +1,35 @@
+require 'pathname'
+require 'optparse'
+
+require 'bitclust/rrdparser'
+
+module BitClust
+  module Subcommands
+    class PreprocCommand < Subcommand
+
+      def initialize
+        super
+        @params = { "version" => "2.0.0" }
+        @parser.banner = "Usage: #{File.basename($0, '.*')} <file>..."
+        @parser.on('--param=KVPAIR', 'Set parameter by key/value pair.') {|pair|
+          key, value = pair.split('=', 2)
+          params[key] = value
+        }
+      end
+
+      def exec(argv, options)
+        argv.each do |path|
+          File.open(path) {|file|
+            Preprocessor.wrap(file, @params).each do |line|
+              puts line
+            end
+          }
+        end
+      rescue WriterError => err
+        $stderr.puts err.message
+        exit 1
+      end
+
+    end
+  end
+end

data/lib/bitclust/subcommands/property_command.rb

@@ -8,66 +8,65 @@ require 'yaml'
 require 'bitclust'
 require 'bitclust/subcommand'
 
-module BitClust::Subcommands
-  class PropertyCommand < BitClust::Subcommand
-    def initialize
-      @mode = nil
-      @parser = OptionParser.new {|opt|
-        opt.banner = "Usage: #{File.basename($0, '.*')} property [options]"
-        opt.on('--list', 'List all properties.') {
+module BitClust
+  module Subcommands
+    class PropertyCommand < Subcommand
+      def initialize
+        super
+        @mode = nil
+        @parser.banner = "Usage: #{File.basename($0, '.*')} property [options]"
+        @parser.on('--list', 'List all properties.') {
           @mode = :list
         }
-        opt.on('--get', 'Get property value.') {
+        @parser.on('--get', 'Get property value.') {
           @mode = :get
         }
-        opt.on('--set', 'Set property value.') {
+        @parser.on('--set', 'Set property value.') {
           @mode = :set
         }
-        opt.on('--help', 'Prints this message and quit.') {
-          puts opt.help
-          exit 0
-        }
-      }
-    end
-
-    def parse(argv)
-      super
-      unless @mode
-        error "one of (--list|--get|--set) is required"
       end
-      case @mode
-      when :list
-        unless argv.empty?
-          error "--list requires no argument"
+
+      def parse(argv)
+        super
+        unless @mode
+          error "one of (--list|--get|--set) is required"
         end
-      when :get
-        ;
-      when :set
-        unless argv.size == 2
-          error "--set requires just 2 arguments"
+        case @mode
+        when :list
+          unless argv.empty?
+            error "--list requires no argument"
+          end
+        when :get
+          ;
+        when :set
+          unless argv.size == 2
+            error "--set requires just 2 arguments"
+          end
+        else
+          raise "must not happen: #{@mode}"
         end
-      else
-        raise "must not happen: #{@mode}"
       end
-    end
 
-    def exec(db, argv)
-      case @mode
-      when :list
-        db.properties.each do |key, val|
-          puts "#{key}=#{val}"
-        end
-      when :get
-        argv.each do |key|
-          puts db.propget(key)
+      def exec(argv, options)
+        prefix = options[:prefix]
+        db = MethodDatabase.new(prefix)
+        case @mode
+        when :list
+          db.properties.each do |key, val|
+            puts "#{key}=#{val}"
+          end
+        when :get
+          argv.each do |key|
+            puts db.propget(key)
+          end
+        when :set
+          key, val = *argv
+          db.transaction {
+            db.propset key, val
+          }
+        else
+          raise "must not happen: #{@mode}"
         end
-      when :set
-        key, val = *argv
-        db.transaction {
-          db.propset key, val
-        }
-      else
-        raise "must not happen: #{@mode}"
       end
     end
   end

data/lib/bitclust/subcommands/query_command.rb

@@ -8,26 +8,20 @@ require 'yaml'
 require 'bitclust'
 require 'bitclust/subcommand'
 
-module BitClust::Subcommands
-  class QueryCommand < BitClust::Subcommand
+module BitClust
+  module Subcommands
+    class QueryCommand < Subcommand
 
-    def initialize
-      @parser = OptionParser.new {|opt|
-        opt.banner = "Usage: #{File.basename($0, '.*')} query <ruby-script>"
-        opt.on('--help', 'Prints this message and quit.') {
-          puts opt.help
-          exit 0
-        }
-      }
-    end
-
-    def parse(argv)
-    end
+      def initialize
+        super
+        @parser.banner = "Usage: #{File.basename($0, '.*')} query <ruby-script>"
+      end
 
-    def exec(db, argv)
-      argv.each do |query|
-        #pp eval(query)   # FIXME: causes ArgumentError
-        p eval(query)
+      def exec(argv, options)
+        argv.each do |query|
+          # pp eval(query)   # FIXME: causes ArgumentError
+          p eval(query)
+        end
       end
     end
   end

data/lib/bitclust/subcommands/server_command.rb

@@ -10,208 +10,206 @@ require 'uri'
 require 'bitclust'
 require 'bitclust/subcommand'
 
-module BitClust::Subcommands
-  class ServerCommand < BitClust::Subcommand
-    def initialize
-      require 'webrick'
-      require 'uri'
+module BitClust
+  module Subcommands
+    class ServerCommand < Subcommand
+      def initialize
+        super
+        require 'webrick'
+        require 'uri'
 
-      @params = {
-        :BindAddress => "0.0.0.0",
-        :Port => 10080
-      }
-      @baseurl = nil
-      @dbpath = nil
-      @srcdir = @datadir = @themedir = @theme = @templatedir = nil
-      @encoding = 'utf-8'   # encoding of view
-      if Object.const_defined?(:Encoding)
-        Encoding.default_external = @encoding
-      end
+        @params = {
+          :BindAddress => "0.0.0.0",
+          :Port => 10080
+        }
+        @baseurl = nil
+        @dbpath = nil
+        @srcdir = @datadir = @themedir = @theme = @templatedir = nil
+        @encoding = 'utf-8'   # encoding of view
+        if Object.const_defined?(:Encoding)
+          Encoding.default_external = @encoding
+        end
 
-      @debugp = false
-      @autop = false
-      @browser = nil
-      @pid_file = nil
-      @capi = false
+        @debugp = false
+        @autop = false
+        @browser = nil
+        @pid_file = nil
+        @capi = false
 
-      @parser = OptionParser.new
-      @parser.banner = "#{$0} [--bind-address=ADDR] [--port=NUM] --baseurl=URL --database=PATH [--srcdir=PATH] [--datadir=PATH] [--themedir=PATH] [--debug] [--auto] [--browser=BROWSER] [--pid-file=PATH] [--capi]"
-      @parser.on('--bind-address=ADDR', 'Bind address') {|addr|
-        @params[:BindAddress] = addr
-      }
-      @parser.on('--port=NUM', 'Listening port number') {|num|
-        @params[:Port] = num.to_i
-      }
-      @parser.on('--baseurl=URL', 'The base URL to host.') {|url|
-        @baseurl = url
-      }
-      @parser.on('--database=PATH', 'MethodDatabase root directory.') {|path|
-        @dbpath = path
-      }
-      @parser.on('--srcdir=PATH', 'BitClust source directory.') {|path|
-        set_srcdir(path)
-      }
-      @parser.on('--datadir=PATH', 'BitClust data directory.') {|path|
-        @datadir = path
-      }
-      @parser.on('--templatedir=PATH', 'Template directory.') {|path|
-        @templatedir = path
-      }
-      @parser.on('--themedir=PATH', 'BitClust theme directory.') {|path|
-        @themedir = path
-      }
-      @parser.on('--theme=THEME', 'BitClust theme.') {|th|
-        @theme = th
-      }
-      @parser.on('--[no-]debug', 'Debug mode.') {|flag|
-        @debugp = flag
-      }
-      @parser.on('--[no-]auto', 'Auto mode.') {|flag|
-        @autop = flag
-      }
-      @parser.on('--browser=BROWSER', 'Open with the browser.') {|path|
-        @browser = path
-      }
-      @parser.on('--pid-file=PATH', 'Write pid of the daemon to the specified file.') {|path|
-        @pid_file = path
-      }
-      @parser.on('--help', 'Prints this message and quit.') {
-        puts @parser.help
-        exit 0
-      }
-      @parser.on('--capi', 'see also FunctionDatabase.') {|path|
-        @capi = true
-      }
-    end
+        @parser.banner = "#{$0} [--bind-address=ADDR] [--port=NUM] --baseurl=URL --database=PATH [--srcdir=PATH] [--datadir=PATH] [--themedir=PATH] [--debug] [--auto] [--browser=BROWSER] [--pid-file=PATH] [--capi]"
+        @parser.on('--bind-address=ADDR', 'Bind address') {|addr|
+          @params[:BindAddress] = addr
+        }
+        @parser.on('--port=NUM', 'Listening port number') {|num|
+          @params[:Port] = num.to_i
+        }
+        @parser.on('--baseurl=URL', 'The base URL to host.') {|url|
+          @baseurl = url
+        }
+        @parser.on('--database=PATH', 'MethodDatabase root directory.') {|path|
+          @dbpath = path
+        }
+        @parser.on('--srcdir=PATH', 'BitClust source directory.') {|path|
+          set_srcdir(path)
+        }
+        @parser.on('--datadir=PATH', 'BitClust data directory.') {|path|
+          @datadir = path
+        }
+        @parser.on('--templatedir=PATH', 'Template directory.') {|path|
+          @templatedir = path
+        }
+        @parser.on('--themedir=PATH', 'BitClust theme directory.') {|path|
+          @themedir = path
+        }
+        @parser.on('--theme=THEME', 'BitClust theme.') {|th|
+          @theme = th
+        }
+        @parser.on('--[no-]debug', 'Debug mode.') {|flag|
+          @debugp = flag
+        }
+        @parser.on('--[no-]auto', 'Auto mode.') {|flag|
+          @autop = flag
+        }
+        @parser.on('--browser=BROWSER', 'Open with the browser.') {|path|
+          @browser = path
+        }
+        @parser.on('--pid-file=PATH', 'Write pid of the daemon to the specified file.') {|path|
+          @pid_file = path
+        }
+        @parser.on('--capi', 'see also FunctionDatabase.') {|path|
+          @capi = true
+        }
+      end
 
-    def parse(argv)
-      super
-      load_config_file
-      set_srcdir(srcdir_root) unless @srcdir
+      def parse(argv)
+        super
+        load_config_file
+        set_srcdir(srcdir_root) unless @srcdir
 
-      unless @baseurl
-        $stderr.puts "missing base URL.  Use --baseurl or check ~/.bitclust/config"
-        exit 1
-      end
-      unless @dbpath || @autop
-        $stderr.puts "missing database path.  Use --database"
-        exit 1
-      end
-      unless @datadir
-        $stderr.puts "missing datadir.  Use --datadir"
-        exit 1
-      end
-      unless @themedir
-        $stderr.puts "missing themedir.  Use --themedir"
-        exit 1
-      end
-      if @pid_file
-        if File.exist?(@pid_file)
-          $stderr.puts "There is still #{@pid_file}.  Is another process running?"
+        unless @baseurl
+          $stderr.puts "missing base URL.  Use --baseurl or check ~/.bitclust/config"
           exit 1
         end
-        @pid_file = File.expand_path(@pid_file)
-      end
-    end
-
-    def exec(db, argv)
-      require 'bitclust/app'
-      if @debugp
-        @params[:Logger] = WEBrick::Log.new($stderr, WEBrick::Log::DEBUG)
-        @params[:AccessLog] = [
-          [ $stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
-          [ $stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
-          [ $stderr, WEBrick::AccessLog::AGENT_LOG_FORMAT   ],
-       ]
-      else
-        @params[:Logger] = WEBrick::Log.new($stderr, WEBrick::Log::INFO)
-        @params[:AccessLog] = []
+        unless @dbpath || @autop
+          $stderr.puts "missing database path.  Use --database"
+          exit 1
+        end
+        unless @datadir
+          $stderr.puts "missing datadir.  Use --datadir"
+          exit 1
+        end
+        unless @themedir
+          $stderr.puts "missing themedir.  Use --themedir"
+          exit 1
+        end
+        if @pid_file
+          if File.exist?(@pid_file)
+            $stderr.puts "There is still #{@pid_file}.  Is another process running?"
+            exit 1
+          end
+          @pid_file = File.expand_path(@pid_file)
+        end
       end
-      basepath = URI.parse(@baseurl).path
-      server = WEBrick::HTTPServer.new(@params)
 
-      if @autop
-        app = BitClust::App.new(
-          :dbpath => Dir.glob("#{@database_prefix}-*"),
-          :baseurl => @baseurl,
-          :datadir => @datadir,
-          :templatedir => @templatedir,
-          :theme => @theme,
-          :encoding => @encoding,
-          :capi => @capi
-        )
-        app.interfaces.each do |version, interface|
-          server.mount(File.join(basepath, version), interface)
+      def exec(argv, options)
+        require 'bitclust/app'
+        if @debugp
+          @params[:Logger] = WEBrick::Log.new($stderr, WEBrick::Log::DEBUG)
+          @params[:AccessLog] = [
+                                 [ $stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
+                                 [ $stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
+                                 [ $stderr, WEBrick::AccessLog::AGENT_LOG_FORMAT   ],
+                                ]
+        else
+          @params[:Logger] = WEBrick::Log.new($stderr, WEBrick::Log::INFO)
+          @params[:AccessLog] = []
         end
-        server.mount(File.join(basepath, '/'), app)
-      else
-        viewpath = File.join(basepath, 'view')
-        app = BitClust::App.new(
-          :viewpath => viewpath,
-          :dbpath => @dbpath,
-          :baseurl => @baseurl,
-          :datadir => @datadir,
-          :templatedir => @templatedir,
-          :theme => @theme,
-          :encoding => @encoding,
-          :capi => @capi
-        )
-        app.interfaces.each do |viewpath, interface|
-          server.mount viewpath, interface
+        basepath = URI.parse(@baseurl).path
+        server = WEBrick::HTTPServer.new(@params)
+
+        if @autop
+          app = App.new(
+                        :dbpath => Dir.glob("#{@database_prefix}-*"),
+                        :baseurl => @baseurl,
+                        :datadir => @datadir,
+                        :templatedir => @templatedir,
+                        :theme => @theme,
+                        :encoding => @encoding,
+                        :capi => @capi
+                        )
+          app.interfaces.each do |version, interface|
+            server.mount(File.join(basepath, version), interface)
+          end
+          server.mount(File.join(basepath, '/'), app)
+        else
+          viewpath = File.join(basepath, 'view')
+          app = App.new(
+                        :viewpath => viewpath,
+                        :dbpath => @dbpath,
+                        :baseurl => @baseurl,
+                        :datadir => @datadir,
+                        :templatedir => @templatedir,
+                        :theme => @theme,
+                        :encoding => @encoding,
+                        :capi => @capi
+                        )
+          app.interfaces.each do |viewpath, interface|
+            server.mount viewpath, interface
+          end
+          # Redirect from '/' to "#{viewpath}/"
+          server.mount('/', app)
         end
-        # Redirect from '/' to "#{viewpath}/"
-        server.mount('/', app)
-      end
 
-      server.mount File.join(basepath, 'theme/'), WEBrick::HTTPServlet::FileHandler, @themedir
+        server.mount File.join(basepath, 'theme/'), WEBrick::HTTPServlet::FileHandler, @themedir
 
-      if @debugp
-        trap(:INT) { server.shutdown }
-      else
-        WEBrick::Daemon.start do
-          trap(:TERM) {
-            server.shutdown
-            begin
-              File.unlink @pid_file if @pid_file
-            rescue Errno::ENOENT
-            end
-          }
-          File.open(@pid_file, 'w') {|f| f.write Process.pid } if @pid_file
+        if @debugp
+          trap(:INT) { server.shutdown }
+        else
+          WEBrick::Daemon.start do
+            trap(:TERM) {
+              server.shutdown
+              begin
+                File.unlink @pid_file if @pid_file
+              rescue Errno::ENOENT
+              end
+            }
+            File.open(@pid_file, 'w') {|f| f.write Process.pid } if @pid_file
+          end
         end
-      end
-      exit if $".include?("exerb/mkexy.rb")
-      if @autop && !@browser
-        case RUBY_PLATFORM
-        when /mswin/
-          @browser = "start"
+        exit if $".include?("exerb/mkexy.rb")
+        if @autop && !@browser
+          case RUBY_PLATFORM
+          when /mswin/
+            @browser = "start"
+          end
         end
+        system("#{@browser} http://localhost:#{@params[:Port]}/") if @browser
+        server.start
       end
-      system("#{@browser} http://localhost:#{@params[:Port]}/") if @browser
-      server.start
-    end
 
-    private
+      private
 
-    def srcdir_root
-      Pathname.new(__FILE__).realpath.dirname.parent.parent.parent.cleanpath
-    end
+      def srcdir_root
+        Pathname.new(__FILE__).realpath.dirname.parent.parent.parent.cleanpath
+      end
 
-    def set_srcdir(dir)
-      @srcdir ||= dir
-      @datadir ||= "#{@srcdir}/data/bitclust"
-      @themedir ||= "#{@srcdir}/theme"
-    end
+      def set_srcdir(dir)
+        @srcdir ||= dir
+        @datadir ||= "#{@srcdir}/data/bitclust"
+        @themedir ||= "#{@srcdir}/theme"
+      end
 
-    def load_config_file
-      home_directory = Pathname(ENV['HOME'])
-      config_path = home_directory + ".bitclust/config"
-      if config_path.exist?
-        config = YAML.load_file(config_path)
-        @baseurl  ||= config[:baseurl]
-        @dbpath   ||= "#{config[:database_prefix]}-#{config[:default_version]}"
-        @port     ||= config[:port]
-        @pid_file ||= config[:pid_file]
-        @database_prefix ||= config[:database_prefix]
+      def load_config_file
+        home_directory = Pathname(ENV['HOME'])
+        config_path = home_directory + ".bitclust/config"
+        if config_path.exist?
+          config = YAML.load_file(config_path)
+          @baseurl  ||= config[:baseurl]
+          @dbpath   ||= "#{config[:database_prefix]}-#{config[:default_version]}"
+          @port     ||= config[:port]
+          @pid_file ||= config[:pid_file]
+          @database_prefix ||= config[:database_prefix]
+        end
       end
     end
   end