milkode 0.9.3.1 → 0.9.4

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 # gemspec
-gem 'termcolor','>= 1.2.0'
+gem 'termcolor','>= 1.2.0', '< 1.2.2'
 gem 'rroonga','>= 1.1.0'
 gem 'rack','>=1.3.4'
 gem 'sinatra', '>=1.2.6'

data/HISTORY.ja.rdoc

@@ -1,3 +1,28 @@
+=== 0.9.4 2012/11/14
+
+* milk web
+  * 行番号クリック時の処理を改善 
+    * ウィンドウをモーダルに変更
+    * ハイライト、URLを選択行に差し替え (thanks asane)
+  * 検索ボックスの操作性を改善 (thanks kenhys)
+    * Select query text on click event
+    * keep query text selected after searching
+    * suppress select() call for query text by tag jump
+  * パッケージ一覧のソートのルールを整理
+  * ソースコードの文字コードがEUC-JPの場合、検索結果に表示される日本語が文字化けする問題を修正 (thanks azurite)
+  * 文言修正 : '新しい検索' -> 'タブを複製'
+
+* milk
+  * milk remove 改善
+  * milk init /path/to/dir -s が正しく動作しない問題を修正
+  * milkode_yaml.rb: package_root の正規表現調整
+  * 他のオプションとのバッティングを防ぐために milk -v は使えないように、 milk --version を推奨
+  * 拡張子 csproj, vbproj, sln に対応 (VisualStudio)
+  * document_table.rb: addするとnegative string size (or size too big) (ArgumentError)となる問題を修正 (thanks azurite)
+
+* Bug fix
+  * termcolorの要求バージョンを '< 1.2.2' に (thanks mallowlabs)
+
 === 0.9.3.1 2012/10/14
 
 * 'milk plugins' add gem-milkode, bundle-milkode

data/HISTORY.rdoc

@@ -1,3 +1,20 @@
+=== 0.9.4
+
+* milk web
+  * Improve handling when you click the line number 
+  * Improve the usability of the search box (thanks kenhys)
+
+* milk
+  * Improve milk remove
+  * Fix milk init /path/to/dir -s
+  * milkode_yaml.rb: Fix package_root regexp
+  * milk -v -> milk --version
+  * plang_detector.rb: Add csproj, vbproj, sln (VisualStudio)
+  * document_table.rb: Fix error negative string size (or size too big)
+
+* Bug fix
+  * termcolor require version '< 1.2.2' (thanks mallowlabs)
+
 === 0.9.3.1 2012/10/14
 
 * 'milk plugins' add gem-milkode, bundle-milkode

data/VERSION

@@ -1 +1 @@
-0.9.3.1
+0.9.4

data/bin/gmilk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/grep/cli_grep'
 
-Version = "0.9.3.1"
+Version = "0.9.4"
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cli'
 
-Version = "0.9.3.1"
+Version = "0.9.4"
 Milkode::CLI.start(ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -316,29 +316,21 @@ module Milkode
       if (options[:all])
         remove_all
       else
-        if (args.empty?)
-          path = File.expand_path('.')
-          package = @yaml.package_root(path)
+        print_result do
+          db_open
+          args.each do |arg|
+            package = @yaml.find_name(arg) || @yaml.find_dir(arg)
 
-          if (package)
-            print_result do
-              db_open
-              remove_dir(package.directory)
+            unless package
+              path = File.expand_path(arg)
+              package = @yaml.package_root(path)
             end
-          else
-            @out.puts "Not registered. '#{path}'."
-          end
-        else
-          print_result do
-            db_open
-            args.each do |name|
-              package = @yaml.find_name(name) || @yaml.find_dir(name)
-              if (package)
-                remove_dir(package.directory)                
-              else
-                @out.puts "Not found package '#{name}'."
-                return
-              end
+            
+            if (package)
+              remove_dir(package.directory)                
+            else
+              @out.puts "Not found package '#{arg}'."
+              return
             end
           end
         end
@@ -584,13 +576,14 @@ module Milkode
       end
     end
 
-    def setdb(dbpath, options)
+    def setdb(args, options)
       if (options[:reset])
         CdstkCommand.setdb_reset
         @out.puts "Reset default db\n  remove:      #{Dbdir.milkode_db_dir}\n  default_db:  #{Dbdir.default_dir}"
-      elsif (dbpath.nil?)
+      elsif (args.empty?)
         @out.puts Dbdir.default_dir
       else
+        dbpath = args.first
         path = File.expand_path(dbpath)
         begin
           CdstkCommand.setdb_set path

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -74,7 +74,7 @@ EOF
     def package_root(dir)
       nd = Util::normalize_filename dir
       @contents.find do |v|
-        v if nd =~ /^#{Regexp.escape(v.directory)}/
+        v if nd =~ /^#{Regexp.escape(v.directory)}(:?\/|\Z)/
       end
     end
 

data/lib/milkode/cdweb/app.rb

@@ -22,7 +22,7 @@ set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.9.3.1"
+  @version = "0.9.4"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
   @package_list = PackageList.new(Database.instance.grndb)
@@ -183,7 +183,7 @@ EOF
 
     <<EOF
     #{headicon('go-home-5.png')} <a href="/home" class="headmenu">ホーム</a>
-    #{headicon('document-new-4.png')} <a href="#{href}" class="headmenu" onclick="window.open('#{href}'); return false;">新しい検索</a>
+    #{headicon('document-new-4.png')} <a href="#{href}" class="headmenu" onclick="window.open('#{href}'); return false;">タブを複製</a>
     #{headicon('directory.png')} <a href="#{flist}" class="headmenu">ディレクトリ</a> 
     #{headicon('view-refresh-4.png')} <a href="#updateModal" class="headmenu" data-toggle="modal">パッケージを更新</a>
     #{headicon('help.png')} <a href="/help" class="headmenu">ヘルプ</a>
@@ -201,6 +201,22 @@ EOF
         <a href="#" id="updateOk" class="btn btn-primary" data-loading-text="Updating..." milkode-package-name="#{package_name}"">OK</a>
       </div>
     </div>
+
+    <div id="lineno-modal" class="modal hide">
+      <div class="modal-header">
+        <a href="#" class="close" data-dismiss="modal">&times;</a>
+        <h3 id="lineno-path"></h3>
+      </div>
+      <div class="modal-body">
+        <table class="CodeRay"><tr>
+          <td class="code"><pre id="lineno-body">
+          </pre></td>
+        </tr></table>
+    </div>
+      <div class="modal-footer">
+        <a href="#" id="lineno-ok" class="btn" data-dismiss="modal">OK</a>
+      </div>
+    </div>
 EOF
   end
 

data/lib/milkode/cdweb/lib/coderay_html2.rb

@@ -5,6 +5,9 @@
 # @author ongaeshi
 # @date   2012/03/18
 
+require 'rubygems'
+require 'rack'
+
 module CodeRay
 module Encoders
   class HTML2 < HTML
@@ -168,7 +171,8 @@ module Encoders
       elsif options[:onclick_copy_line_number]
         prefix = options[:onclick_copy_prefix] || ""
         proc do |line|
-          "<a href=\"#!\" onclick=\"alert('#{prefix + line.to_s}');\" title=\"Display line number\">#{line.to_s}</a>"
+          "<a href=\"#lineno-modal\" data-toggle=\"modal\" onclick=\"lineno_setup('#{prefix}', '#{line.to_s}');\" title=\"Display line number\">#{line.to_s}</a>"
+          # "<a onclick=\"lineno_setup('#{prefix}', '#{line.to_s}');\" title=\"Display line number\">#{line.to_s}</a>"
         end
       else
         proc { |line| line.to_s }  # :to_s.to_proc in Ruby 1.8.7+

data/lib/milkode/cdweb/lib/coderay_php_utf8.rb

@@ -0,0 +1,523 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/03/18
+
+require 'rubygems'
+require 'coderay/scanner'
+
+# coderay-1.0.5/lib/coderay/scanners/php.rb
+module CodeRay
+module Scanners
+  
+  load :html
+  
+  # Scanner for PHP.
+  # 
+  # Original by Stefan Walk.
+  class PHP_UTF8 < Scanner
+    
+    # register_for :php
+    register_for :php_utf8      # customize
+    file_extension 'php'
+    # encoding 'BINARY'
+    encoding 'UTF-8'            # customize
+    
+    KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
+    
+  protected
+    
+    def setup
+      @html_scanner = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true, :keep_state => true
+    end
+    
+    def reset_instance
+      super
+      @html_scanner.reset
+    end
+    
+    module Words  # :nodoc:
+      
+      # according to http://www.php.net/manual/en/reserved.keywords.php
+      KEYWORDS = %w[
+        abstract and array as break case catch class clone const continue declare default do else elseif
+        enddeclare endfor endforeach endif endswitch endwhile extends final for foreach function global
+        goto if implements interface instanceof namespace new or private protected public static switch
+        throw try use var while xor
+        cfunction old_function
+      ]
+      
+      TYPES = %w[ int integer float double bool boolean string array object resource ]
+      
+      LANGUAGE_CONSTRUCTS = %w[
+        die echo empty exit eval include include_once isset list
+        require require_once return print unset
+      ]
+      
+      CLASSES = %w[ Directory stdClass __PHP_Incomplete_Class exception php_user_filter Closure ]
+      
+      # according to http://php.net/quickref.php on 2009-04-21;
+      # all functions with _ excluded (module functions) and selected additional functions
+      BUILTIN_FUNCTIONS = %w[
+        abs acos acosh addcslashes addslashes aggregate array arsort ascii2ebcdic asin asinh asort assert atan atan2
+        atanh basename bcadd bccomp bcdiv bcmod bcmul bcpow bcpowmod bcscale bcsqrt bcsub bin2hex bindec
+        bindtextdomain bzclose bzcompress bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite
+        calculhmac ceil chdir checkdate checkdnsrr chgrp chmod chop chown chr chroot clearstatcache closedir closelog
+        compact constant copy cos cosh count crc32 crypt current date dcgettext dcngettext deaggregate decbin dechex
+        decoct define defined deg2rad delete dgettext die dirname diskfreespace dl dngettext doubleval each
+        ebcdic2ascii echo empty end ereg eregi escapeshellarg escapeshellcmd eval exec exit exp explode expm1 extract
+        fclose feof fflush fgetc fgetcsv fgets fgetss file fileatime filectime filegroup fileinode filemtime fileowner
+        fileperms filepro filesize filetype floatval flock floor flush fmod fnmatch fopen fpassthru fprintf fputcsv
+        fputs fread frenchtojd fscanf fseek fsockopen fstat ftell ftok ftruncate fwrite getallheaders getcwd getdate
+        getenv gethostbyaddr gethostbyname gethostbynamel getimagesize getlastmod getmxrr getmygid getmyinode getmypid
+        getmyuid getopt getprotobyname getprotobynumber getrandmax getrusage getservbyname getservbyport gettext
+        gettimeofday gettype glob gmdate gmmktime gmstrftime gregoriantojd gzclose gzcompress gzdecode gzdeflate
+        gzencode gzeof gzfile gzgetc gzgets gzgetss gzinflate gzopen gzpassthru gzputs gzread gzrewind gzseek gztell
+        gzuncompress gzwrite hash header hebrev hebrevc hexdec htmlentities htmlspecialchars hypot iconv idate
+        implode include intval ip2long iptcembed iptcparse isset
+        jddayofweek jdmonthname jdtofrench jdtogregorian jdtojewish jdtojulian jdtounix jewishtojd join jpeg2wbmp
+        juliantojd key krsort ksort lcfirst lchgrp lchown levenshtein link linkinfo list localeconv localtime log
+        log10 log1p long2ip lstat ltrim mail main max md5 metaphone mhash microtime min mkdir mktime msql natcasesort
+        natsort next ngettext nl2br nthmac octdec opendir openlog
+        ord overload pack passthru pathinfo pclose pfsockopen phpcredits phpinfo phpversion pi png2wbmp popen pos pow
+        prev print printf putenv quotemeta rad2deg rand range rawurldecode rawurlencode readdir readfile readgzfile
+        readline readlink realpath recode rename require reset rewind rewinddir rmdir round rsort rtrim scandir
+        serialize setcookie setlocale setrawcookie settype sha1 shuffle signeurlpaiement sin sinh sizeof sleep snmpget
+        snmpgetnext snmprealwalk snmpset snmpwalk snmpwalkoid sort soundex split spliti sprintf sqrt srand sscanf stat
+        strcasecmp strchr strcmp strcoll strcspn strftime stripcslashes stripos stripslashes stristr strlen
+        strnatcasecmp strnatcmp strncasecmp strncmp strpbrk strpos strptime strrchr strrev strripos strrpos strspn
+        strstr strtok strtolower strtotime strtoupper strtr strval substr symlink syslog system tan tanh tempnam
+        textdomain time tmpfile touch trim uasort ucfirst ucwords uksort umask uniqid unixtojd unlink unpack
+        unserialize unset urldecode urlencode usleep usort vfprintf virtual vprintf vsprintf wordwrap
+        array_change_key_case array_chunk array_combine array_count_values array_diff array_diff_assoc
+        array_diff_key array_diff_uassoc array_diff_ukey array_fill array_fill_keys array_filter array_flip
+        array_intersect array_intersect_assoc array_intersect_key array_intersect_uassoc array_intersect_ukey
+        array_key_exists array_keys array_map array_merge array_merge_recursive array_multisort array_pad
+        array_pop array_product array_push array_rand array_reduce array_reverse array_search array_shift
+        array_slice array_splice array_sum array_udiff array_udiff_assoc array_udiff_uassoc array_uintersect
+        array_uintersect_assoc array_uintersect_uassoc array_unique array_unshift array_values array_walk
+        array_walk_recursive
+        assert_options base_convert base64_decode base64_encode
+        chunk_split class_exists class_implements class_parents
+        count_chars debug_backtrace debug_print_backtrace debug_zval_dump
+        error_get_last error_log error_reporting extension_loaded
+        file_exists file_get_contents file_put_contents load_file
+        func_get_arg func_get_args func_num_args function_exists
+        get_browser get_called_class get_cfg_var get_class get_class_methods get_class_vars
+        get_current_user get_declared_classes get_declared_interfaces get_defined_constants
+        get_defined_functions get_defined_vars get_extension_funcs get_headers get_html_translation_table
+        get_include_path get_included_files get_loaded_extensions get_magic_quotes_gpc get_magic_quotes_runtime
+        get_meta_tags get_object_vars get_parent_class get_required_filesget_resource_type
+        gc_collect_cycles gc_disable gc_enable gc_enabled
+        halt_compiler headers_list headers_sent highlight_file highlight_string
+        html_entity_decode htmlspecialchars_decode
+        in_array include_once inclued_get_data
+        is_a is_array is_binary is_bool is_buffer is_callable is_dir is_double is_executable is_file is_finite
+        is_float is_infinite is_int is_integer is_link is_long is_nan is_null is_numeric is_object is_readable
+        is_real is_resource is_scalar is_soap_fault is_string is_subclass_of is_unicode is_uploaded_file
+        is_writable is_writeable
+        locale_get_default locale_set_default
+        number_format override_function parse_str parse_url
+        php_check_syntax php_ini_loaded_file php_ini_scanned_files php_logo_guid php_sapi_name
+        php_strip_whitespace php_uname
+        preg_filter preg_grep preg_last_error preg_match preg_match_all preg_quote preg_replace
+        preg_replace_callback preg_split print_r
+        require_once register_shutdown_function register_tick_function
+        set_error_handler set_exception_handler set_file_buffer set_include_path
+        set_magic_quotes_runtime set_time_limit shell_exec
+        str_getcsv str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split str_word_count
+        strip_tags substr_compare substr_count substr_replace
+        time_nanosleep time_sleep_until
+        token_get_all token_name trigger_error
+        unregister_tick_function use_soap_error_handler user_error
+        utf8_decode utf8_encode var_dump var_export
+        version_compare
+        zend_logo_guid zend_thread_id zend_version
+        create_function call_user_func_array
+        posix_access posix_ctermid posix_get_last_error posix_getcwd posix_getegid
+        posix_geteuid posix_getgid posix_getgrgid posix_getgrnam posix_getgroups
+        posix_getlogin posix_getpgid posix_getpgrp posix_getpid posix_getppid
+        posix_getpwnam posix_getpwuid posix_getrlimit posix_getsid posix_getuid
+        posix_initgroups posix_isatty posix_kill posix_mkfifo posix_mknod
+        posix_setegid posix_seteuid posix_setgid posix_setpgid posix_setsid
+        posix_setuid posix_strerror posix_times posix_ttyname posix_uname
+        pcntl_alarm pcntl_exec pcntl_fork pcntl_getpriority pcntl_setpriority
+        pcntl_signal pcntl_signal_dispatch pcntl_sigprocmask pcntl_sigtimedwait
+        pcntl_sigwaitinfo pcntl_wait pcntl_waitpid pcntl_wexitstatus pcntl_wifexited
+        pcntl_wifsignaled pcntl_wifstopped pcntl_wstopsig pcntl_wtermsig
+      ]
+      # TODO: more built-in PHP functions?
+      
+      EXCEPTIONS = %w[
+        E_ERROR E_WARNING E_PARSE E_NOTICE E_CORE_ERROR E_CORE_WARNING E_COMPILE_ERROR E_COMPILE_WARNING
+        E_USER_ERROR E_USER_WARNING E_USER_NOTICE E_DEPRECATED E_USER_DEPRECATED E_ALL E_STRICT
+      ]
+      
+      CONSTANTS = %w[
+        null true false self parent
+        __LINE__ __DIR__ __FILE__ __LINE__
+        __CLASS__ __NAMESPACE__ __METHOD__ __FUNCTION__
+        PHP_VERSION PHP_MAJOR_VERSION PHP_MINOR_VERSION PHP_RELEASE_VERSION PHP_VERSION_ID PHP_EXTRA_VERSION PHP_ZTS
+        PHP_DEBUG PHP_MAXPATHLEN PHP_OS PHP_SAPI PHP_EOL PHP_INT_MAX PHP_INT_SIZE DEFAULT_INCLUDE_PATH
+        PEAR_INSTALL_DIR PEAR_EXTENSION_DIR PHP_EXTENSION_DIR PHP_PREFIX PHP_BINDIR PHP_LIBDIR PHP_DATADIR
+        PHP_SYSCONFDIR PHP_LOCALSTATEDIR PHP_CONFIG_FILE_PATH PHP_CONFIG_FILE_SCAN_DIR PHP_SHLIB_SUFFIX
+        PHP_OUTPUT_HANDLER_START PHP_OUTPUT_HANDLER_CONT PHP_OUTPUT_HANDLER_END
+        __COMPILER_HALT_OFFSET__
+        EXTR_OVERWRITE EXTR_SKIP EXTR_PREFIX_SAME EXTR_PREFIX_ALL EXTR_PREFIX_INVALID EXTR_PREFIX_IF_EXISTS
+        EXTR_IF_EXISTS SORT_ASC SORT_DESC SORT_REGULAR SORT_NUMERIC SORT_STRING CASE_LOWER CASE_UPPER COUNT_NORMAL
+        COUNT_RECURSIVE ASSERT_ACTIVE ASSERT_CALLBACK ASSERT_BAIL ASSERT_WARNING ASSERT_QUIET_EVAL CONNECTION_ABORTED
+        CONNECTION_NORMAL CONNECTION_TIMEOUT INI_USER INI_PERDIR INI_SYSTEM INI_ALL M_E M_LOG2E M_LOG10E M_LN2 M_LN10
+        M_PI M_PI_2 M_PI_4 M_1_PI M_2_PI M_2_SQRTPI M_SQRT2 M_SQRT1_2 CRYPT_SALT_LENGTH CRYPT_STD_DES CRYPT_EXT_DES
+        CRYPT_MD5 CRYPT_BLOWFISH DIRECTORY_SEPARATOR SEEK_SET SEEK_CUR SEEK_END LOCK_SH LOCK_EX LOCK_UN LOCK_NB
+        HTML_SPECIALCHARS HTML_ENTITIES ENT_COMPAT ENT_QUOTES ENT_NOQUOTES INFO_GENERAL INFO_CREDITS
+        INFO_CONFIGURATION INFO_MODULES INFO_ENVIRONMENT INFO_VARIABLES INFO_LICENSE INFO_ALL CREDITS_GROUP
+        CREDITS_GENERAL CREDITS_SAPI CREDITS_MODULES CREDITS_DOCS CREDITS_FULLPAGE CREDITS_QA CREDITS_ALL STR_PAD_LEFT
+        STR_PAD_RIGHT STR_PAD_BOTH PATHINFO_DIRNAME PATHINFO_BASENAME PATHINFO_EXTENSION PATH_SEPARATOR CHAR_MAX
+        LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_ALL LC_MESSAGES ABDAY_1 ABDAY_2 ABDAY_3 ABDAY_4 ABDAY_5
+        ABDAY_6 ABDAY_7 DAY_1 DAY_2 DAY_3 DAY_4 DAY_5 DAY_6 DAY_7 ABMON_1 ABMON_2 ABMON_3 ABMON_4 ABMON_5 ABMON_6
+        ABMON_7 ABMON_8 ABMON_9 ABMON_10 ABMON_11 ABMON_12 MON_1 MON_2 MON_3 MON_4 MON_5 MON_6 MON_7 MON_8 MON_9
+        MON_10 MON_11 MON_12 AM_STR PM_STR D_T_FMT D_FMT T_FMT T_FMT_AMPM ERA ERA_YEAR ERA_D_T_FMT ERA_D_FMT ERA_T_FMT
+        ALT_DIGITS INT_CURR_SYMBOL CURRENCY_SYMBOL CRNCYSTR MON_DECIMAL_POINT MON_THOUSANDS_SEP MON_GROUPING
+        POSITIVE_SIGN NEGATIVE_SIGN INT_FRAC_DIGITS FRAC_DIGITS P_CS_PRECEDES P_SEP_BY_SPACE N_CS_PRECEDES
+        N_SEP_BY_SPACE P_SIGN_POSN N_SIGN_POSN DECIMAL_POINT RADIXCHAR THOUSANDS_SEP THOUSEP GROUPING YESEXPR NOEXPR
+        YESSTR NOSTR CODESET LOG_EMERG LOG_ALERT LOG_CRIT LOG_ERR LOG_WARNING LOG_NOTICE LOG_INFO LOG_DEBUG LOG_KERN
+        LOG_USER LOG_MAIL LOG_DAEMON LOG_AUTH LOG_SYSLOG LOG_LPR LOG_NEWS LOG_UUCP LOG_CRON LOG_AUTHPRIV LOG_LOCAL0
+        LOG_LOCAL1 LOG_LOCAL2 LOG_LOCAL3 LOG_LOCAL4 LOG_LOCAL5 LOG_LOCAL6 LOG_LOCAL7 LOG_PID LOG_CONS LOG_ODELAY
+        LOG_NDELAY LOG_NOWAIT LOG_PERROR
+      ]
+      
+      PREDEFINED = %w[
+        $GLOBALS $_SERVER $_GET $_POST $_FILES $_REQUEST $_SESSION $_ENV
+        $_COOKIE $php_errormsg $HTTP_RAW_POST_DATA $http_response_header
+        $argc $argv
+      ]
+      
+      IDENT_KIND = WordList::CaseIgnoring.new(:ident).
+        add(KEYWORDS, :keyword).
+        add(TYPES, :predefined_type).
+        add(LANGUAGE_CONSTRUCTS, :keyword).
+        add(BUILTIN_FUNCTIONS, :predefined).
+        add(CLASSES, :predefined_constant).
+        add(EXCEPTIONS, :exception).
+        add(CONSTANTS, :predefined_constant)
+      
+      VARIABLE_KIND = WordList.new(:local_variable).
+        add(PREDEFINED, :predefined)
+    end
+    
+    module RE  # :nodoc:
+      
+      PHP_START = /
+        <script\s+[^>]*?language\s*=\s*"php"[^>]*?> |
+        <script\s+[^>]*?language\s*=\s*'php'[^>]*?> |
+        <\?php\d? |
+        <\?(?!xml)
+      /xi
+      
+      PHP_END = %r!
+        </script> |
+        \?>
+      !xi
+      
+      HTML_INDICATOR = /<!DOCTYPE html|<(?:html|body|div|p)[> ]/i
+      
+      # IDENTIFIER = /[a-z_\x7f-\xFF][a-z0-9_\x7f-\xFF]*/i
+      IDENTIFIER = /[a-z_][a-z0-9_]*/i # customize
+      VARIABLE = /\$#{IDENTIFIER}/
+      
+      OPERATOR = /
+        \.(?!\d)=? |      # dot that is not decimal point, string concatenation
+        && | \|\| |       # logic
+        :: | -> | => |    # scope, member, dictionary
+        \\(?!\n) |        # namespace
+        \+\+ | -- |       # increment, decrement
+        [,;?:()\[\]{}] |  # simple delimiters
+        [-+*\/%&|^]=? |   # ordinary math, binary logic, assignment shortcuts
+        [~$] |            # whatever
+        =& |              # reference assignment
+        [=!]=?=? | <> |   # comparison and assignment
+        <<=? | >>=? | [<>]=?  # comparison and shift
+      /x
+      
+    end
+    
+  protected
+    
+    def scan_tokens encoder, options
+      
+      if check(RE::PHP_START) ||  # starts with <?
+       (match?(/\s*<\S/) && check(/.{1,1000}#{RE::PHP_START}/om)) || # starts with tag and contains <?
+       check(/.{0,1000}#{RE::HTML_INDICATOR}/om) ||
+       check(/.{1,100}#{RE::PHP_START}/om)  # PHP start after max 100 chars
+        # is HTML with embedded PHP, so start with HTML
+        states = [:initial]
+      else
+        # is just PHP, so start with PHP surrounded by HTML
+        states = [:initial, :php]
+      end
+      
+      label_expected = true
+      case_expected = false
+      
+      heredoc_delimiter = nil
+      delimiter = nil
+      modifier = nil
+      
+      until eos?
+        
+        case states.last
+        
+        when :initial  # HTML
+          if match = scan(RE::PHP_START)
+            encoder.text_token match, :inline_delimiter
+            label_expected = true
+            states << :php
+          else
+            match = scan_until(/(?=#{RE::PHP_START})/o) || scan_rest
+            @html_scanner.tokenize match unless match.empty?
+          end
+        
+        when :php
+          if match = scan(/\s+/)
+            encoder.text_token match, :space
+          
+          elsif match = scan(%r! (?m: \/\* (?: .*? \*\/ | .* ) ) | (?://|\#) .*? (?=#{RE::PHP_END}|$) !xo)
+            encoder.text_token match, :comment
+          
+          elsif match = scan(RE::IDENTIFIER)
+            kind = Words::IDENT_KIND[match]
+            if kind == :ident && label_expected && check(/:(?!:)/)
+              kind = :label
+              label_expected = true
+            else
+              label_expected = false
+              if kind == :ident && match =~ /^[A-Z]/
+                kind = :constant
+              elsif kind == :keyword
+                case match
+                when 'class'
+                  states << :class_expected
+                when 'function'
+                  states << :function_expected
+                when 'case', 'default'
+                  case_expected = true
+                end
+              elsif match == 'b' && check(/['"]/)  # binary string literal
+                modifier = match
+                next
+              end
+            end
+            encoder.text_token match, kind
+          
+          elsif match = scan(/(?:\d+\.\d*|\d*\.\d+)(?:e[-+]?\d+)?|\d+e[-+]?\d+/i)
+            label_expected = false
+            encoder.text_token match, :float
+          
+          elsif match = scan(/0x[0-9a-fA-F]+/)
+            label_expected = false
+            encoder.text_token match, :hex
+          
+          elsif match = scan(/\d+/)
+            label_expected = false
+            encoder.text_token match, :integer
+          
+          elsif match = scan(/['"`]/)
+            encoder.begin_group :string
+            if modifier
+              encoder.text_token modifier, :modifier
+              modifier = nil
+            end
+            delimiter = match
+            encoder.text_token match, :delimiter
+            states.push match == "'" ? :sqstring : :dqstring
+          
+          elsif match = scan(RE::VARIABLE)
+            label_expected = false
+            encoder.text_token match, Words::VARIABLE_KIND[match]
+          
+          elsif match = scan(/\{/)
+            encoder.text_token match, :operator
+            label_expected = true
+            states.push :php
+          
+          elsif match = scan(/\}/)
+            if states.size == 1
+              encoder.text_token match, :error
+            else
+              states.pop
+              if states.last.is_a?(::Array)
+                delimiter = states.last[1]
+                states[-1] = states.last[0]
+                encoder.text_token match, :delimiter
+                encoder.end_group :inline
+              else
+                encoder.text_token match, :operator
+                label_expected = true
+              end
+            end
+          
+          elsif match = scan(/@/)
+            label_expected = false
+            encoder.text_token match, :exception
+          
+          elsif match = scan(RE::PHP_END)
+            encoder.text_token match, :inline_delimiter
+            states = [:initial]
+          
+          elsif match = scan(/<<<(?:(#{RE::IDENTIFIER})|"(#{RE::IDENTIFIER})"|'(#{RE::IDENTIFIER})')/o)
+            encoder.begin_group :string
+            # warn 'heredoc in heredoc?' if heredoc_delimiter
+            heredoc_delimiter = Regexp.escape(self[1] || self[2] || self[3])
+            encoder.text_token match, :delimiter
+            states.push self[3] ? :sqstring : :dqstring
+            heredoc_delimiter = /#{heredoc_delimiter}(?=;?$)/
+          
+          elsif match = scan(/#{RE::OPERATOR}/o)
+            label_expected = match == ';'
+            if case_expected
+              label_expected = true if match == ':'
+              case_expected = false
+            end
+            encoder.text_token match, :operator
+          
+          else
+            encoder.text_token getch, :error
+          
+          end
+        
+        when :sqstring
+          if match = scan(heredoc_delimiter ? /[^\\\n]+/ : /[^'\\]+/)
+            encoder.text_token match, :content
+          elsif !heredoc_delimiter && match = scan(/'/)
+            encoder.text_token match, :delimiter
+            encoder.end_group :string
+            delimiter = nil
+            label_expected = false
+            states.pop
+          elsif heredoc_delimiter && match = scan(/\n/)
+            if scan heredoc_delimiter
+              encoder.text_token "\n", :content
+              encoder.text_token matched, :delimiter
+              encoder.end_group :string
+              heredoc_delimiter = nil
+              label_expected = false
+              states.pop
+            else
+              encoder.text_token match, :content
+            end
+          elsif match = scan(heredoc_delimiter ? /\\\\/ : /\\[\\'\n]/)
+            encoder.text_token match, :char
+          elsif match = scan(/\\./m)
+            encoder.text_token match, :content
+          elsif match = scan(/\\/)
+            encoder.text_token match, :error
+          else
+            states.pop
+          end
+        
+        when :dqstring
+          if match = scan(heredoc_delimiter ? /[^${\\\n]+/ : (delimiter == '"' ? /[^"${\\]+/ : /[^`${\\]+/))
+            encoder.text_token match, :content
+          elsif !heredoc_delimiter && match = scan(delimiter == '"' ? /"/ : /`/)
+            encoder.text_token match, :delimiter
+            encoder.end_group :string
+            delimiter = nil
+            label_expected = false
+            states.pop
+          elsif heredoc_delimiter && match = scan(/\n/)
+            if scan heredoc_delimiter
+              encoder.text_token "\n", :content
+              encoder.text_token matched, :delimiter
+              encoder.end_group :string
+              heredoc_delimiter = nil
+              label_expected = false
+              states.pop
+            else
+              encoder.text_token match, :content
+            end
+          elsif match = scan(/\\(?:x[0-9A-Fa-f]{1,2}|[0-7]{1,3})/)
+            encoder.text_token match, :char
+          elsif match = scan(heredoc_delimiter ? /\\[nrtvf\\$]/ : (delimiter == '"' ? /\\[nrtvf\\$"]/ : /\\[nrtvf\\$`]/))
+            encoder.text_token match, :char
+          elsif match = scan(/\\./m)
+            encoder.text_token match, :content
+          elsif match = scan(/\\/)
+            encoder.text_token match, :error
+          elsif match = scan(/#{RE::VARIABLE}/o)
+            if check(/\[#{RE::IDENTIFIER}\]/o)
+              encoder.begin_group :inline
+              encoder.text_token match, :local_variable
+              encoder.text_token scan(/\[/), :operator
+              encoder.text_token scan(/#{RE::IDENTIFIER}/o), :ident
+              encoder.text_token scan(/\]/), :operator
+              encoder.end_group :inline
+            elsif check(/\[/)
+              match << scan(/\[['"]?#{RE::IDENTIFIER}?['"]?\]?/o)
+              encoder.text_token match, :error
+            elsif check(/->#{RE::IDENTIFIER}/o)
+              encoder.begin_group :inline
+              encoder.text_token match, :local_variable
+              encoder.text_token scan(/->/), :operator
+              encoder.text_token scan(/#{RE::IDENTIFIER}/o), :ident
+              encoder.end_group :inline
+            elsif check(/->/)
+              match << scan(/->/)
+              encoder.text_token match, :error
+            else
+              encoder.text_token match, :local_variable
+            end
+          elsif match = scan(/\{/)
+            if check(/\$/)
+              encoder.begin_group :inline
+              states[-1] = [states.last, delimiter]
+              delimiter = nil
+              states.push :php
+              encoder.text_token match, :delimiter
+            else
+              encoder.text_token match, :content
+            end
+          elsif match = scan(/\$\{#{RE::IDENTIFIER}\}/o)
+            encoder.text_token match, :local_variable
+          elsif match = scan(/\$/)
+            encoder.text_token match, :content
+          else
+            states.pop
+          end
+        
+        when :class_expected
+          if match = scan(/\s+/)
+            encoder.text_token match, :space
+          elsif match = scan(/#{RE::IDENTIFIER}/o)
+            encoder.text_token match, :class
+            states.pop
+          else
+            states.pop
+          end
+        
+        when :function_expected
+          if match = scan(/\s+/)
+            encoder.text_token match, :space
+          elsif match = scan(/&/)
+            encoder.text_token match, :operator
+          elsif match = scan(/#{RE::IDENTIFIER}/o)
+            encoder.text_token match, :function
+            states.pop
+          else
+            states.pop
+          end
+        
+        else
+          raise_inspect 'Unknown state!', encoder, states
+        end
+        
+      end
+      
+      encoder
+    end
+    
+  end
+  
+end
+end

data/lib/milkode/cdweb/lib/coderay_wrapper.rb

@@ -10,10 +10,12 @@ require 'coderay'
 require 'coderay/helpers/file_type'
 require 'milkode/common/util'
 require 'milkode/cdweb/lib/coderay_html2'
+require 'milkode/cdweb/lib/coderay_php_utf8'
 
 module Milkode
   class CodeRayWrapper
     attr_reader :line_number_start
+    attr_reader :highlight_lines
     
     def initialize(content, filename, match_lines = [])
       @content = content
@@ -76,6 +78,8 @@ module Milkode
 
     def file_type
       case File.extname(@filename)
+      when ".php"
+        :php_utf8
       when ".el"
         # :scheme
         CodeRay::FileType.fetch @filename, :plaintext

data/lib/milkode/cdweb/lib/database.rb

@@ -139,13 +139,15 @@ module Milkode
       paths = records.map {|record|
         DocumentRecord.new(record).shortpath.split("/")
       }.find_all {|parts|
-        parts.length > base_depth and parts[0, base_depth] == base_parts
+        # 先頭フォルダ名が一致するものをピックアップ
+        parts.length > base_depth && parts[0, base_depth] == base_parts
       }.map {|parts|
-        is_file = parts.length == base_depth + 1
-        path = parts[0, base_depth + 1].join("/")
-        [path, is_file]
+        # [path, is_file]
+        [parts[0, base_depth + 1].join("/"), parts.length == base_depth + 1]
       }.sort_by {|parts|
-        [if parts[1] then 1 else 0 end, parts[0].downcase]
+        # 配列の比較を利用したディレクトリ優先ソート
+        # aaa, bbb/, aaa/, bbb -> [aaa/, bbb/, aaa, bbb]
+        [parts[1] ? 1 : 0, parts[0].downcase] # [is_file(int), path(downcase)]
       }.uniq
       
       paths
@@ -159,7 +161,9 @@ module Milkode
       elsif (sort_kind)
         sorted = @grndb.packages.sort(sort_kind)
       else
-        sorted = @grndb.packages.sort("name", "ascending")
+        # 大文字／小文字を無視してソートするため、速度を犠牲に
+        # sorted = @grndb.packages.sort("name", "ascending")
+        sorted = @grndb.packages.to_a.sort_by {|r| r.name.downcase}        
       end
 
       sorted.map {|r| r.name}

data/lib/milkode/cdweb/lib/search_contents.rb

@@ -197,7 +197,7 @@ EOF
       url = "/home/" + record_link(record)
       
       <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.line_number_start}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
     <dd>
 #{coderay.to_html_anchorlink(url)}
     </dd>
@@ -222,7 +222,7 @@ EOS
 EOS
     end
 
-    def record_link(record)     # 
+    def record_link(record)
       Mkurl.new(record.shortpath, @params).inherit_query_shead
     end
 

data/lib/milkode/cdweb/public/css/coderay-patch.css

@@ -1,5 +1,6 @@
 /* for CodeRay */
 .CodeRay .highlight-line { background-color: #d0ff9c; }
+.CodeRay .select-line    { background-color: #fff280; }
 
 /* html_anchor */
 .match-num { font-size: 13px; font-weight: bold; }

data/lib/milkode/cdweb/public/js/milkode.js

@@ -89,6 +89,17 @@ $(document).ready(function(){
     update_package($("#updateOk").attr("milkode-package-name"));
     return false;
   });
+
+  var match = document.URL.match(/.+(#n\d+)$/);
+  if ( match ) {
+    $(match[1]).addClass("select-line");
+  } else {
+    $("#query").select();
+  }
+
+  $('#query').click(function(){
+    $(this).select();
+  });
 });
 
 function update_package(package_name)
@@ -111,3 +122,18 @@ function update_package(package_name)
     }
   );
 }
+
+function lineno_setup(path, lineno)
+{
+  var n_lineno = "#n" + lineno;
+
+  var h    = $('html, body');
+  var prev = h.scrollTop();
+  window.location.hash = n_lineno;
+  h.scrollTop(prev);
+
+  $(".code > pre > *").removeClass("select-line");
+  $(n_lineno).addClass("select-line");
+  $("#lineno-path").text(path + lineno);
+  $("#lineno-body").html($(n_lineno).html());
+}

data/lib/milkode/cli.rb

@@ -8,7 +8,7 @@ require 'milkode/grep/cli_grep'
 module Milkode
   class CLI < Thor
     class_option :help,    :type => :boolean, :aliases => '-h', :desc => 'Help message.'
-    class_option :version, :type => :boolean, :aliases => '-v', :desc => 'Show version.'
+    class_option :version, :type => :boolean, :desc => 'Show version.'
 
     desc "init [db_dir]", "Initialize database directory. If db_dir is omitted"
     option :default, :type => :boolean, :desc => "Init default db, ENV['MILKODE_DEFAULT_DIR'] or ~/.milkode."
@@ -52,11 +52,15 @@ EOF
     end
 
     desc "remove keyword_or_path1 [keyword_or_path2 ...]", "Remove package"
-    option :all, :type => :boolean, :desc => 'Remove all.'
+    option :all, :type => :boolean, :aliases => '-a', :desc => 'Remove all.'
     option :force, :type => :boolean, :aliases => '-f', :desc => 'Force remove.'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
     def remove(*args)
-      cdstk.remove(args, options)
+      if args.empty? && !options[:all]
+        CLI.task_help(shell, "remove")
+      else
+        cdstk.remove(args, options)
+      end
     end
 
     desc "list [package1 package2 ...]", "List package"
@@ -98,8 +102,8 @@ EOF
 
     desc "setdb [dbpath]", "Set default db to dbpath"
     option :reset, :type => :boolean, :aliases => '--default', :desc => 'Reset to the system default database.'
-    def setdb(dbpath = nil)
-      cdstk.setdb(dbpath, options)
+    def setdb(*args)
+      cdstk.setdb(args, options)
     end
 
     desc "mcd", "Generate `mcd' command"

data/lib/milkode/common/plang_detector.rb

@@ -59,6 +59,7 @@ module Milkode
        { :name => 'SVG'           , :suffixs   => ['svg']                                               },
        { :name => 'Tcl'           , :suffixs   => ['tcl']                                               },
        { :name => 'Text'          , :suffixs   => ['txt']                                               },
+       { :name => 'Visual Studio' , :suffixs   => ['csproj', 'vbproj', 'sln']                           },
        { :name => 'XML'           , :suffixs   => ['xml']                                               },
        { :name => 'Yaml'          , :suffixs   => ['yml', 'yaml']                                       },
        # { :name => ''              , :suffixs   => []          , :filenames => [] },

data/lib/milkode/common/util.rb

@@ -183,6 +183,10 @@ module Milkode
     def pipe?(io)
       !io.instance_of?(IO) || !File.pipe?(io) 
     end
+
+    def warning_alert(out, msg)
+      out.puts "[warning] #{msg}"
+    end
   end
 end
 

data/lib/milkode/database/document_table.rb

@@ -327,7 +327,13 @@ module Milkode
     private
 
     def load_content(filename)
-      Kconv.kconv(File.read(filename), Kconv::UTF8)
+      str = File.read(filename)
+      begin
+        Kconv.kconv(str, Kconv::UTF8)
+      rescue ArgumentError
+        Util.warning_alert($stdout, "skip kconv. file size too big (or negative string size) : #{filename}.")
+        str
+      end
     end
 
     def package_expression(record, packages)

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.3.1"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-10-14}
+  s.date = %q{2012-11-14}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/cli_cdweb.rb",
     "lib/milkode/cdweb/config.ru",
     "lib/milkode/cdweb/lib/coderay_html2.rb",
+    "lib/milkode/cdweb/lib/coderay_php_utf8.rb",
     "lib/milkode/cdweb/lib/coderay_wrapper.rb",
     "lib/milkode/cdweb/lib/command.rb",
     "lib/milkode/cdweb/lib/database.rb",
@@ -186,7 +187,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
       s.add_runtime_dependency(%q<rroonga>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.3.4"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
@@ -201,7 +202,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
-      s.add_dependency(%q<termcolor>, [">= 1.2.0"])
+      s.add_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
       s.add_dependency(%q<rroonga>, [">= 1.1.0"])
       s.add_dependency(%q<rack>, [">= 1.3.4"])
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
@@ -217,7 +218,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
-    s.add_dependency(%q<termcolor>, [">= 1.2.0"])
+    s.add_dependency(%q<termcolor>, [">= 1.2.0", "< 1.2.2"])
     s.add_dependency(%q<rroonga>, [">= 1.1.0"])
     s.add_dependency(%q<rack>, [">= 1.3.4"])
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])

data/test/test_plang_detector.rb

@@ -19,6 +19,7 @@ module Milkode
       assert_equal 'Ruby'        , PlangDetector.new('template.rb').name
       assert_equal 'README'      , PlangDetector.new('readme.txt').name
       assert_equal 'JavaScript'  , PlangDetector.new('main.js').name
+      assert_equal 'Visual Studio', PlangDetector.new('hoge.sln').name
     end
 
     def test_unknown

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  - 1
-  version: 0.9.3.1
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - ongaeshi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-14 00:00:00 +09:00
+date: 2012-11-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +33,14 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -267,6 +274,7 @@ files:
 - lib/milkode/cdweb/cli_cdweb.rb
 - lib/milkode/cdweb/config.ru
 - lib/milkode/cdweb/lib/coderay_html2.rb
+- lib/milkode/cdweb/lib/coderay_php_utf8.rb
 - lib/milkode/cdweb/lib/coderay_wrapper.rb
 - lib/milkode/cdweb/lib/command.rb
 - lib/milkode/cdweb/lib/database.rb