milkode 1.0.2 → 1.1.0

data/HISTORY.ja.rdoc

@@ -1,3 +1,19 @@
+=== 1.1.0 2013/06/26
+
+* milk web
+  * Support relative URL (e.g. http://example.com/milkode)
+  * Change milkode.css -> milkode.scss (For url_for)
+
+* milk
+  * 'milk files' add --all option
+
+* gmilk
+  * Add exist_command?('cat')
+  * Change how to call exist_command?
+
+* etc
+  * Add sinatra-url-for
+
 === 1.0.2 2013/06/08
 
 * gmilk

data/HISTORY.rdoc

@@ -1,3 +1,19 @@
+=== 1.1.0 2013/06/26
+
+* milk web
+  * Support relative URL (e.g. http://example.com/milkode)
+  * Change milkode.css -> milkode.scss (For url_for)
+
+* milk
+  * 'milk files' add --all option
+
+* gmilk
+  * Add exist_command?('cat')
+  * Change how to call exist_command?
+
+* etc
+  * Add sinatra-url-for
+
 === 1.0.2 2013/06/08
 
 * gmilk

data/LICENSE.txt

@@ -146,3 +146,28 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=================================
+sinatra-url-for - Construct absolute paths and full URLs
+=================================
+
+Copyright 2009 Eric Kidd
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/bin/gmilk

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

data/bin/milk

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

data/lib/milkode/cdstk/cdstk.rb

@@ -956,7 +956,7 @@ EOF
     end
 
     def files(args, options)
-      packages = find_packages(args)
+      packages = options[:all] ? @yaml.contents : find_packages(args)
       return if (packages.empty?)
 
       db_open
@@ -968,7 +968,11 @@ EOF
           if options[:relative]
             @out.puts Util::relative_path(record.path, basedir)
           else
-            @out.puts record.restpath
+            if options[:all]
+              @out.puts record.path
+            else
+              @out.puts record.restpath
+            end
           end
         end
       end

data/lib/milkode/cdweb/app.rb

@@ -23,17 +23,32 @@ require 'milkode/cdweb/lib/web_setting'
 require 'milkode/cdweb/lib/package_list'
 require 'milkode/cdweb/lib/info_home'
 require 'milkode/cdweb/lib/info_package'
+require 'sinatra/url_for'
 
 set :haml, :format => :html5
 
+get '/js/:filename' do
+  content_type :js
+  erb(File.read(File.join(settings.views, params[:filename])))
+end
+
+get '/css/milkode.css' do
+  content_type :css
+
+  contents = File.read(File.join(settings.views, 'milkode.scss'))
+  contents = erb(contents)
+  engine   = Sass::Engine.new(contents, :syntax => :scss)
+  engine.render
+end
+
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "1.0.2"
+    @version = "1.1.0"
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords
-    @package_list = PackageList.new(Database.instance.grndb)
+    @package_list = PackageList.new(Database.instance.grndb, url_for(''))
     haml :index, :layout => false
   else
     <<EOF
@@ -43,8 +58,8 @@ EOF
   end
 end
 
-def package_path(path)
-  path.split('/')[0,3].join('/')
+def package_path(homeurl, path)
+  homeurl + path.sub(homeurl, "").split('/')[0,2].join('/')
 end
 
 post '/search*' do
@@ -53,22 +68,24 @@ post '/search*' do
   if params[:clear]
     redirect Mkurl.new("#{path}", params).inherit_shead
   else
+    homeurl = url_for "/home"
+    
     case params[:shead]
     when 'all'
-      path = "/home"
+      path = homeurl
     when 'package'
-      path = package_path(path)
+      path = package_path(homeurl, path)
     when 'directory'
       # do nothing
     else
-      path = package_path(path)
+      path = package_path(homeurl, path)
     end
 
     query = Query.new(params[:query])
     # gotolineモードで1つだけ渡された時は直接ジャンプ
     if query.keywords.size == 1 && Milkode::Util::gotoline_keyword?(query.keywords[0])
       gotoline = Milkode::Util::parse_gotoline(query.keywords)[0]
-      path2 = File.join('/home', gotoline[0][0])
+      path2 = File.join(url_for('/home'), gotoline[0][0])
       redirect Mkurl.new(path2, params).inherit_query_shead + "#n#{gotoline[1]}"
     else
       redirect Mkurl.new("#{path}", params).inherit_query_shead
@@ -89,7 +106,7 @@ post '/command' do
     end
   when 'favorite'
     Database.instance.set_fav(params[:name], params[:favorited] == 'true')
-    @package_list = PackageList.new(Database.instance.grndb)
+    @package_list = PackageList.new(Database.instance.grndb, url_for(''))
     "お気に入り: " + @package_list.favorite_list({})
   end
 end
@@ -98,21 +115,22 @@ get '/home*' do |path|
   before = Time.now
   path = path.sub(/^\//, "")
   record = Database.instance.record(path)
-  @package_list = PackageList.new(Database.instance.grndb)
+  @package_list = PackageList.new(Database.instance.grndb, url_for(''))
+  suburl = url_for('')
 
   if path.empty?
     if (params[:query] and !params[:query].empty?)
-      search(path, params, before)
+      search(path, params, before, suburl)
     else
-      packages(params, before)
+      packages(params, before, suburl)
     end
   elsif (record)
     view(record, params, before)
   else
     if (params[:query] and !params[:query].empty?)
-      search(path, params, before)
+      search(path, params, before, suburl)
     else
-      filelist(path, params, before)
+      filelist(path, params, before, suburl)
     end
   end
 end
@@ -124,7 +142,7 @@ get %r{/help} do
 end
 
 get '/info' do
-  obj = InfoHome.new
+  obj = InfoHome.new(url_for '')
 
   @setting             = WebSetting.new
   @path                = ""
@@ -138,7 +156,7 @@ get '/info/:package' do
   before = Time.now
 
   name = params[:package]
-  obj = InfoPackage.new(name)
+  obj = InfoPackage.new(name, url_for(''))
     
   @setting         = WebSetting.new
   @path            = name
@@ -215,8 +233,10 @@ EOF
   end
 
   def create_headmenu(path, query, flistpath = '')
-    href = Mkurl.new('/home/' + path, params).inherit_query_shead
-    flist = File.join("/home/#{path}", flistpath)
+    suburl = url_for ""
+
+    href = Mkurl.new("#{suburl}/home/#{path}", params).inherit_query_shead
+    flist = File.join("#{suburl}/home/#{path}", flistpath)
 
     package_name = ""
     modal_body = "全てのパッケージを更新しますか？"
@@ -226,15 +246,15 @@ EOF
       modal_body = "#{package_name} を更新しますか？"
     end
 
-    info_path = "/info"
+    info_path = "#{suburl}/info"
     info_path = File.join(info_path, package_name) if package_name != ""
 
     <<EOF
-    #{headicon('go-home-5.png')}<a href="/home" class="headmenu">ホーム</a>&nbsp;
-    #{headicon('directory.png')}<a href="#{flist}" class="headmenu">ディレクトリ</a>
-    #{headicon('view-refresh-4.png')}<a href="#updateModal" class="headmenu" data-toggle="modal">パッケージを更新</a>&nbsp;
-    #{headicon('info.png')}<a href="#{info_path}" class="headmenu">統計情報</a>&nbsp;
-    #{headicon('help.png')}<a href="/help" class="headmenu">ヘルプ</a>
+    #{headicon('go-home-5.png', suburl)}<a href="#{suburl}/home" class="headmenu">ホーム</a>&nbsp;
+    #{headicon('directory.png', suburl)}<a href="#{flist}" class="headmenu">ディレクトリ</a>
+    #{headicon('view-refresh-4.png', suburl)}<a href="#updateModal" class="headmenu" data-toggle="modal">パッケージを更新</a>&nbsp;
+    #{headicon('info.png', suburl)}<a href="#{info_path}" class="headmenu">統計情報</a>&nbsp;
+    #{headicon('help.png', suburl)}<a href="#{suburl}/help" class="headmenu">ヘルプ</a>
 
     <div id="updateModal" class="modal hide fade">
       <div class="modal-header">
@@ -279,8 +299,8 @@ EOF
 EOF
   end
 
-  def headicon(name)
-    "<img alt='' style='vertical-align:center; border: 0px; margin: 0px;' src='/images/#{name}'>"
+  def headicon(name, suburl)
+    "<img alt='' style='vertical-align:center; border: 0px; margin: 0px;' src='#{suburl}/images/#{name}'>"
   end
 
   def topic_path(path, params)
@@ -289,7 +309,7 @@ EOF
 
     path.split('/').map_with_index {|v, index|
       href += '/' + v
-      "<a id='topic_#{index}' href='#{Mkurl.new(href, params).inherit_query_shead}' onclick='topic_path(\"topic_#{index}\");'>#{v}</a>"
+      "<a id='topic_#{index}' href='#{url_for Mkurl.new(href, params).inherit_query_shead}' onclick='topic_path(\"topic_#{index}\");'>#{v}</a>"
     }.join('/')
   end
 

data/lib/milkode/cdweb/cli_cdweb.rb

@@ -57,6 +57,9 @@ module Milkode
         # 起動URL生成
         launch_url = create_launch_url(options)
 
+        # URL設定
+        ENV['MILKODE_RELATIVE_URL'] = File.join('/', options[:url]) if options[:url]
+
         # 起動
         rack_server.start do
           # この時点でoptions[:Host]やoptions[:Port]などの値が壊れてしまっているため事前にURLを生成している
@@ -71,8 +74,10 @@ module Milkode
       if (options[:LaunchBrowser])
         host = options[:Host] || options[:BindAddress] # options[:BindAddress] for WEBrick
 
-        if (options[:LaunchURL])
-          "http://#{host}:#{options[:Port]}#{options[:LaunchURL]}"
+        base = "http://#{host}:#{options[:Port]}"
+
+        if options[:url]
+          File.join(base, options[:url])
         else
           "http://#{host}:#{options[:Port]}"
         end

data/lib/milkode/cdweb/config.ru

@@ -1,3 +1,6 @@
 require './app'
-run Sinatra::Application
+
+map (ENV['MILKODE_RELATIVE_URL'] || '/') do
+  run Sinatra::Application
+end
 

data/lib/milkode/cdweb/lib/command.rb

@@ -53,14 +53,14 @@ module Milkode
     haml :view
   end
 
-  def search(path, params, before)
+  def search(path, params, before, suburl)
     @setting = WebSetting.new
     @path = path
     query = Query.new(params[:query])
     @title = "'#{query.query_string}' in #{path_title(path)}"
 
     if (query.gotolines.size > 0)
-      searcher = SearchFuzzyGotoLine.new(path, params, query)
+      searcher = SearchFuzzyGotoLine.new(path, params, query, suburl)
 
       if searcher.directjump?
         redirect searcher.directjump_url
@@ -68,16 +68,16 @@ module Milkode
 
     elsif (query.keywords.size > 0)
       if Util::gotoline_keyword?(query.keywords[0])
-        searcher = SearchGotoLine.new(path, params, query)
+        searcher = SearchGotoLine.new(path, params, query, suburl)
       else
-        searcher = SearchContents.new(path, params, query)
+        searcher = SearchContents.new(path, params, query, suburl)
 
         if searcher.directjump?
           redirect searcher.directjump_url
         end
       end
     else
-      searcher = SearchFiles.new(path, params, query)
+      searcher = SearchFiles.new(path, params, query, suburl)
     end
     
     @total_records = searcher.total_records
@@ -88,21 +88,21 @@ module Milkode
     haml :search
   end
 
-  def filelist(path, params, before)
+  def filelist(path, params, before, suburl)
     @setting = WebSetting.new
     @title = filelist_title(path)
     @path = path
     fileList = Database.instance.fileList(path)
     @total_records = fileList.size
     @record_content = fileList.map do |v|
-      "<dt class='result-file'>#{file_or_dirimg(v[1])}<a href='#{Mkurl.new('/home/' + v[0], params).inherit_query_shead}'>#{File.basename v[0]}</a></dt>"
+      "<dt class='result-file'>#{file_or_dirimg(v[1], suburl)}<a href='#{Mkurl.new(suburl + '/home/' + v[0], params).inherit_query_shead}'>#{File.basename v[0]}</a></dt>"
     end.join
     Database.instance.touch_viewtime(path)
     @elapsed = Time.now - before
     haml :filelist
   end
 
-  def packages(params, before)
+  def packages(params, before, suburl)
     @setting = WebSetting.new
     @title = "Package List"
     @path = ""
@@ -123,7 +123,7 @@ module Milkode
       ].join("\n")
 
     @record_content = packages.map do |v|
-      "<dt class='result-file'>#{file_or_dirimg(false)}<a href='#{Mkurl.new('/home/' + v, params).inherit_query_shead}'>#{File.basename v}</a></dt>"
+      "<dt class='result-file'>#{file_or_dirimg(false, suburl)}<a href='#{Mkurl.new(suburl + '/home/' + v, params).inherit_query_shead}'>#{File.basename v}</a></dt>"
     end.join
     @elapsed = Time.now - before
     haml :packages
@@ -131,21 +131,21 @@ module Milkode
 
   private
   
-  def file_or_dirimg(is_file)
-    src = (is_file) ? 'file.png' : 'directory.png'
-    img_icon(src)
+  def file_or_dirimg(is_file, suburl)
+    filename = (is_file) ? 'file.png' : 'directory.png'
+    img_icon(filename, suburl)
   end
 
-  def img_icon(srcfile)
-    "<img alt='' style='vertical-align:bottom; border: 0; margin: 1px;' src='/images/#{srcfile}'>"
+  def img_icon(filename, suburl)
+    "<img alt='' style='vertical-align:bottom; border: 0; margin: 1px;' src='#{suburl}/images/#{filename}'>"
   end
 
   def sort_change_content(current_value, text, sort_kind = nil)
     if (current_value != sort_kind)
       if (sort_kind)
-        "<a href='#{Mkurl.new('/home', params).inherit_query_shead_set_sort(sort_kind)}'>#{text}</a>"
+        "<a href='#{url_for Mkurl.new('/home', params).inherit_query_shead_set_sort(sort_kind)}'>#{text}</a>"
       else
-        "<a href='#{Mkurl.new('/home', params).inherit_query_shead}'>#{text}</a>"
+        "<a href='#{url_for Mkurl.new('/home', params).inherit_query_shead}'>#{text}</a>"
       end
     else
       text

data/lib/milkode/cdweb/lib/info_home.rb

@@ -10,7 +10,7 @@ module Milkode
     attr_reader :record_content
     attr_reader :summary_content
 
-    def initialize
+    def initialize(suburl)
       packages       = Database.instance.packages(nil)
 
       @summary_content = <<EOF
@@ -21,7 +21,7 @@ module Milkode
 EOF
 
       @record_content = packages.map do |name|
-        "<dt class='result-file'><img src='/images/info.png' /><a href='/info/#{name}'>#{name}</a></dt>"
+        "<dt class='result-file'><img src='#{suburl}/images/info.png'/><a href='#{suburl}/info/#{name}'>#{name}</a></dt>"
       end.join("\n")
     end
 

data/lib/milkode/cdweb/lib/info_package.rb

@@ -14,7 +14,9 @@ module Milkode
     attr_reader :summary_content
     attr_reader :plang_content
 
-    def initialize(name)
+    def initialize(name, suburl)
+      @suburl = suburl
+      
       records = Database.instance.package_records(name)
       # plangs  = sorted_plangs(records)
       
@@ -54,7 +56,7 @@ EOF
         params = { :query => lang_to_query(lang) }
 
         if params[:query] != ""
-          url = "/home/" + Mkurl.new(package_name, params).inherit_query_shead
+          url = @suburl + "/home/" + Mkurl.new(package_name, params).inherit_query_shead
           "<tr><td>#{name}</td><td align=\"right\"><a href=\"#{url}\">#{count}</a></td><td align=\"right\">#{percent}%</td></tr>"
         else
           "<tr><td>#{name}</td><td align=\"right\">#{count}</td><td align=\"right\">#{percent}%</td></tr>"

data/lib/milkode/cdweb/lib/package_list.rb

@@ -16,8 +16,9 @@ module Milkode
 
     FAVORITE_LIST_NUM = 7
     
-    def initialize(grndb)
-      @grndb = grndb
+    def initialize(grndb, suburl)
+      @grndb  = grndb
+      @suburl = suburl
     end
 
     # topページへの表示数の調整は結構大切
@@ -47,12 +48,12 @@ module Milkode
       names = @grndb.packages.favs.map{|r| r.name}[0..FAVORITE_LIST_NUM-1]
 
       list = names.map_with_index {|v, index|
-        "<strong><a id='favorite_list_#{index}' href='#{Mkurl.new('/home/' + v, params).inherit_query_shead}' onclick='topic_path(\"favorite_list_#{index}\");'>#{v}</a></strong>"
+        "<strong><a id='favorite_list_#{index}' href='#{Mkurl.new(@suburl + '/home/' + v, params).inherit_query_shead}' onclick='topic_path(\"favorite_list_#{index}\");'>#{v}</a></strong>"
       }.join("&nbsp;&nbsp;\n")
 
       <<EOF
 #{list}&nbsp;&nbsp;
-<a href="/home?sort=favtime">...</a>
+<a href="#{@suburl}/home?sort=favtime">...</a>
 EOF
     end
 
@@ -66,12 +67,12 @@ EOF
 
     def top_list(list, column_name)
       list = list.map {|v|
-        "  <li><a href=\"/home/#{v}\">#{v}</a></li>"
+        "  <li><a href=\"#{@suburl}/home/#{v}\">#{v}</a></li>"
       }.join("\n")
       <<EOF
 <ul class="unstyled_margin">
 #{list}
-<li><a href=\"/home?sort=#{column_name}">next >></a></li>
+<li><a href=\"#{@suburl}/home?sort=#{column_name}">next >></a></li>
 </ul>
 EOF
     end

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

@@ -26,7 +26,7 @@ module Milkode
 
     DEFAULT_WIDE_MATCH_RANGE = 7 # 未指定時のワイド検索範囲
 
-    def initialize(path, params, query)
+    def initialize(path, params, query, suburl)
       @path             = path
       @params           = params
       @q                = query
@@ -35,6 +35,8 @@ module Milkode
       @line             = params[:line].to_i
       @is_onematch      = params[:onematch]  == 'on'
       @is_sensitive     = params[:sensitive] == 'on'
+      @suburl           = suburl
+      @homeurl          = @suburl + "/home/"
 
       @searcher_fuzzy_gotoline = nil
 
@@ -165,7 +167,7 @@ EOF
         tmpp         = @params.clone
         tmpp[:query] = conv_query.query_string
         url          = Mkurl.new(@path, tmpp).inherit_query_shead
-        result << "<dt class='result-file'>#{img_icon('document-new-4.png')}<a href='#{url}'>#{conv_query.query_string}</a></dt>"
+        result << "<dt class='result-file'>#{img_icon('document-new-4.png', @suburl)}<a href='#{url}'>#{conv_query.query_string}</a></dt>"
       end
 
       if recommended_wide_match_range?
@@ -184,7 +186,7 @@ EOF
         tmpp[:query] = conv_query.query_string
         url          = Mkurl.new(@path, tmpp).inherit_query_shead
 
-        result << "<dt class='result-file'>#{img_icon('document-new-4.png')}<a href='#{url}'>#{conv_query.query_string}</a> (<a href='#{w0_url}'>w:0</a>, <a href='#{w1_url}'>w:1</a>)</dt>"
+        result << "<dt class='result-file'>#{img_icon('document-new-4.png', @suburl)}<a href='#{url}'>#{conv_query.query_string}</a> (<a href='#{w0_url}'>w:0</a>, <a href='#{w1_url}'>w:1</a>)</dt>"
       end
       
       if recommended_fpath_or_packages?
@@ -192,7 +194,7 @@ EOF
         tmpp         = @params.clone
         tmpp[:query] = conv_query.query_string
         url          = Mkurl.new(@path, tmpp).inherit_query_shead
-        result << "<dt class='result-file'>#{img_icon('document-new-4.png')}<a href='#{url}'>#{conv_query.query_string}</a></dt>"
+        result << "<dt class='result-file'>#{img_icon('document-new-4.png', @suburl)}<a href='#{url}'>#{conv_query.query_string}</a></dt>"
       end
 
       unless result.empty?
@@ -308,7 +310,7 @@ EOF
       coderay.col_limit(COL_LIMIT)
       coderay.set_range(first_index..last_index)
 
-      url = "/home/" + record_link(record)
+      url = @homeurl + record_link(record)
       
       <<EOS
     <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a>#{result_refinement(record)}</dt>
@@ -332,7 +334,7 @@ EOS
 
     def result_record(record)
       <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
 EOS
     end
 
@@ -343,11 +345,11 @@ EOS
     def refinement_suffix(suffix)
       params = @params.clone
       params[:query] = [@params[:query], "s:#{suffix}"].join(" ")
-      "/home/" + Mkurl.new(@path, params).inherit_query_shead
+      @homeurl + Mkurl.new(@path, params).inherit_query_shead
     end
 
     def refinement_directory(path)
-      "/home/" + Mkurl.new(path, @params).inherit_query_shead
+      @homeurl + Mkurl.new(path, @params).inherit_query_shead
     end
 
     def result_refinement(record)

data/lib/milkode/cdweb/lib/search_files.rb

@@ -17,10 +17,12 @@ module Milkode
 
     DISP_NUM = 100              # 1ページの表示数
     
-    def initialize(path, params, query)
-      @path = path
-      @params = params
-      @q = query
+    def initialize(path, params, query, suburl)
+      @path    = path
+      @params  = params
+      @q       = query
+      @suburl  = suburl
+      @homeurl = @suburl + "/home/"
       
       @offset = params[:offset].to_i
 
@@ -77,7 +79,7 @@ EOF
 
     def result_record(record)
       <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-file'>#{file_or_dirimg(true, @suburl)}<a href='#{@homeurl + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
 EOS
     end
 

data/lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb

@@ -22,12 +22,14 @@ module Milkode
     NTH = 3                    # 表示範囲
     COL_LIMIT = 200            # 1行の桁制限
 
-    def initialize(path, params, query)
-      @path = path
-      @params = params
-      @q = query
-      @page = params[:page].to_i || 0
-      @offset = params[:offset].to_i
+    def initialize(path, params, query, suburl)
+      @path    = path
+      @params  = params
+      @q       = query
+      @page    = params[:page].to_i || 0
+      @offset  = params[:offset].to_i
+      @suburl  = suburl
+      @homeurl = @suburl + "/home/"
 
       # 検索クエリを解析
       gotolines = Util::parse_gotoline(@q.gotolines + @q.keywords)
@@ -84,7 +86,7 @@ EOF
     end
 
     def directjump_url
-      path   = File.join('/home', @match_records[0].record.shortpath)
+      path   = @homeurl + @match_records[0].record.shortpath
       lineno = "#n#{@gotoline[1]}"
       Mkurl.new(path, @params).inherit_query_shead + lineno
     end
@@ -124,7 +126,7 @@ EOF
       coderay.col_limit(COL_LIMIT)
       coderay.set_range(first_index..last_index)
 
-      url = "/home/" + record_link(record)
+      url = @homeurl + record_link(record)
       
       <<EOS
     <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
@@ -146,12 +148,6 @@ EOS
       "<ul><li>#{content}</li></ul>\n"
     end
 
-    def result_record(record)
-      <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
-EOS
-    end
-
     def record_link(record)
       Mkurl.new(record.shortpath, @params).inherit_query_shead
     end

data/lib/milkode/cdweb/lib/search_gotoline.rb

@@ -23,12 +23,14 @@ module Milkode
     MATH_FILE_DISP  = 3        # マッチファイルの最大表示数
     MATH_FILE_LIMIT = MATH_FILE_DISP + 1 # マッチファイルの検索リミット数
     
-    def initialize(path, params, query)
-      @path = path
-      @params = params
-      @q = query
-      @page = params[:page].to_i || 0
-      @offset = params[:offset].to_i
+    def initialize(path, params, query, suburl)
+      @path    = path
+      @params  = params
+      @q       = query
+      @page    = params[:page].to_i || 0
+      @offset  = params[:offset].to_i
+      @suburl  = suburl
+      @homeurl = @suburl + "/home/"
 
       # 検索クエリを解析
       @gotolines = Util::parse_gotoline(@q.keywords)
@@ -113,7 +115,7 @@ EOF
       coderay.col_limit(COL_LIMIT)
       coderay.set_range(first_index..last_index)
 
-      url = "/home/" + record_link(record)
+      url = @homeurl + record_link(record)
       
       <<EOS
     <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
@@ -135,12 +137,6 @@ EOS
       "<ul><li>#{content}</li></ul>\n"
     end
 
-    def result_record(record)
-      <<EOS
-    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
-EOS
-    end
-
     def record_link(record)     # 
       Mkurl.new(record.shortpath, @params).inherit_query_shead
     end

data/lib/milkode/cdweb/views/header_menu.haml

@@ -1,5 +1,5 @@
 .header
   %h1
-    <a href="/"><img src=#{@setting.header_icon} alt="milkode-icon-mini" border="0" height="75px"/></a>
+    <a href="#{url_for '/'}"><img src=#{url_for @setting.header_icon} alt="milkode-icon-mini" border="0" height="75px"/></a>
     #{@setting.header_title} &nbsp;
     = create_headmenu(@path, params, defined?(flistpath) ? flistpath : '')

data/lib/milkode/cdweb/views/help.haml

@@ -71,6 +71,6 @@
           /proj1/file.rb:1 /proj2/file.c:2         <span class="comment"># 空白で区切れば複数個渡せる</span>
 
       %li ファイルモードで行番号をクリックすると取得可能
-      <img src="/images/milkode-directpath-copy.gif" />
+      <img src="#{url_for '/images/milkode-directpath-copy.gif'}" />
 
       %li <a href="https://github.com/ongaeshi/emacs-milkode">emacs-milkode</a>との連携にも使う

data/lib/milkode/cdweb/views/index.haml

@@ -6,27 +6,27 @@
   %head
     %meta(charset='utf-8')
     %title= [@title, @setting.home_title].compact.join(' - ')
-    %link(rel="shortcut icon" href="#{@setting.favicon}")
-    %link(rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/bootstrap-responsive.min.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/milkode.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/smoothness/jquery-ui-1.8.22.custom.css" type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/jquery.multiselect.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/jquery.multiselect.filter.css"  type="text/css" media="all")
+    %link(rel="shortcut icon" href="#{url_for @setting.favicon}")
+    %link(rel="stylesheet" href="#{url_for '/css/bootstrap.min.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/bootstrap-responsive.min.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/milkode.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/smoothness/jquery-ui-1.8.22.custom.css'}" type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/jquery.multiselect.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/jquery.multiselect.filter.css'}"  type="text/css" media="all")
 
   %body
     .container#toppage
       .row
         .span10.offset2
-          %h1 <a href="/"><img src=#{@setting.home_icon} alt="milkode-icon" border="0" height="135px" /></a> #{@setting.home_title} <font class="version">#{@version}</font>
+          %h1 <a href="#{url_for '/'}"><img src=#{url_for @setting.home_icon} alt="milkode-icon" border="0" height="135px" /></a> #{@setting.home_title} <font class="version">#{@version}</font>
 
       .row
         .span10.offset2
           .form
-            %form(method="post" action="/search")
+            %form(method="post" action="#{url_for '/search'}")
               %input(name="query" type="text" style="width: 419px;")
               %input(type="submit" value="検索")
-              %input(name='pathname' type='hidden' value='/home')
+              %input(name='pathname' type='hidden' value='#{url_for '/home'}')
 
       .row
         .span4.offset4
@@ -52,16 +52,16 @@
       .row
         .span4.offset4
           .footer
-            <a href="/home">#{@package_num}</a>のパッケージ<br>
-            <a href="/home?query=f:*">#{@file_num}</a>のファイル<br>
-            <a href="/help">ヘルプ</a>
+            <a href="#{url_for '/home'}">#{@package_num}</a>のパッケージ<br>
+            <a href="#{url_for '/home?query=f:*'}">#{@file_num}</a>のファイル<br>
+            <a href="#{url_for '/help'}">ヘルプ</a>
             = @setting.about_milkode
 
-    %script(type='text/javascript' src='/js/jquery-1.7.2.min.js')
-    %script(type='text/javascript' src='/js/jquery-ui-1.8.22.custom.min.js')
-    %script(type='text/javascript' src='/js/jquery.multiselect.min.js')
-    %script(type='text/javascript' src='/js/jquery.multiselect.filter.min.js')
-    %script(type='text/javascript' src='/js/milkode.js')
+    %script(type='text/javascript' src='#{url_for '/js/jquery-1.7.2.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery-ui-1.8.22.custom.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.filter.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/milkode.js'}')
             
 
     

data/lib/milkode/cdweb/views/info_home.haml

@@ -3,7 +3,7 @@
 .content
   .info-package-content
 
-    %h1 <a href="/home">全体</a>の統計
+    %h1 <a href="#{url_for '/home'}">全体</a>の統計
 
     ~ @summary_content
 

data/lib/milkode/cdweb/views/info_package.haml

@@ -2,7 +2,7 @@
 
 .content
   .info-package-content
-    %h1 <a href="/info"><img src="/images/info-big.png"/></a> <a href="/home/#{@path}">#{@path}</a>の統計
+    %h1 <a href="#{url_for '/info'}"><img src="#{url_for '/images/info-big.png'}"/></a> <a href="#{url_for "/home/#{@path}"}">#{@path}</a>の統計
 
     %h2 基本情報
     ~ @summary_content

data/lib/milkode/cdweb/views/layout.haml

@@ -4,24 +4,24 @@
   %head
     %meta(charset='utf-8')
     %title= [@title, @setting.home_title].compact.join(' - ')
-    %link(rel="shortcut icon" href="#{@setting.favicon}")
-    %link(rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/bootstrap-responsive.min.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/milkode.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/coderay.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/coderay-patch.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/smoothness/jquery-ui-1.8.22.custom.css" type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/jquery.multiselect.css"  type="text/css" media="all")
-    %link(rel="stylesheet" href="/css/jquery.multiselect.filter.css"  type="text/css" media="all")
+    %link(rel="shortcut icon" href="#{url_for @setting.favicon}")
+    %link(rel="stylesheet" href="#{url_for '/css/bootstrap.min.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/bootstrap-responsive.min.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/milkode.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/coderay.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/coderay-patch.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/smoothness/jquery-ui-1.8.22.custom.css'}" type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/jquery.multiselect.css'}"  type="text/css" media="all")
+    %link(rel="stylesheet" href="#{url_for '/css/jquery.multiselect.filter.css'}"  type="text/css" media="all")
 
   %body
     .container-fluid#mainpage
       != yield
-    %script(type='text/javascript' src='/js/jquery-1.7.2.min.js')
-    %script(type='text/javascript' src='/js/jquery-ui-1.8.22.custom.min.js')
-    %script(type='text/javascript' src='/js/jquery.multiselect.min.js')
-    %script(type='text/javascript' src='/js/jquery.multiselect.filter.min.js')
-    %script(type='text/javascript' src='/js/bootstrap.min.js')
-    %script(type='text/javascript' src='/js/milkode.js')
+    %script(type='text/javascript' src='#{url_for '/js/jquery-1.7.2.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery-ui-1.8.22.custom.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/jquery.multiselect.filter.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/bootstrap.min.js'}')
+    %script(type='text/javascript' src='#{url_for '/js/milkode.js'}')
 
 -#  GoogleAnalyticsを使いたい場合はここにコードを挿入して下さい。

data/lib/milkode/cdweb/{public/js → views}/milkode.js

@@ -77,13 +77,13 @@ function favorite_list(id) {
 
 function update_package(package_name) {
   // click button
-  $("#updateModal .modal-body").html("<h4>更新中... <img src='/images/waiting.gif'/></h4>");
+  $("#updateModal .modal-body").html("<h4>更新中... <img src='" + '<%= url_for "/images/waiting.gif" %>' + "'/></h4>");
   $("#updateCancel").addClass("hide");
   $("#updateOk").button('loading').off('click');
 
   // update end
   $.post(
-    '/command',
+    '<%= url_for "/command" %>',
     {
       kind: 'update',
       name: package_name
@@ -191,7 +191,7 @@ $(document).ready(function() {
 
     // ajax通信
     $.post(
-      '/command',
+      '<%= url_for "/command" %>',
       {
         kind:      'favorite',
         name:      pname,

data/lib/milkode/cdweb/{public/css/milkode.css → views/milkode.scss}

@@ -255,7 +255,7 @@ label.ui-corner-all {
 .star {
      text-indent: -5000px;
      display: block;
-     background: transparent url(/images/milkode-star.png) 20px;
+     background: transparent url(<%= url_for "/images/milkode-star.png" %>) 20px;
      height: 20px;
      width: 20px;
 }

data/lib/milkode/cdweb/views/search_form.haml

@@ -3,7 +3,7 @@
     function set_pathname() {
       document.searchform.pathname.value = location.pathname;
     }
-  %form(name="searchform" action="/search" method="post")
+  %form(name="searchform" action="#{url_for '/search'}" method="post")
     %p
       %input#query(name="query" size="70" type="text" style="width: 419px;"){:value => params[:query]}
       %input#search(type="submit" name="search" value="検索" onclick="set_pathname()")

data/lib/milkode/cli.rb

@@ -151,12 +151,13 @@ EOF
     end
 
     desc "web", "Startup web interface"
-    option :db, :default => Milkode::CLI_Cdweb::select_dbdir
-    option :host, :default => '127.0.0.1', :aliases => '-o'
-    option :port, :default => 9292, :aliases => '-p'
-    option :server, :default => 'thin', :aliases => '-s'
-    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :type => :boolean, :desc => 'Do not launch browser.'
     option :customize, :type => :boolean, :desc => 'Create customize file.'
+    option :db, :default => Milkode::CLI_Cdweb::select_dbdir, :desc => 'Database dir.'
+    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :type => :boolean, :desc => 'Do not launch browser.'
+    option :host, :default => '127.0.0.1', :aliases => '-o', :desc => 'Listen on HOST.'
+    option :port, :default => 9292, :aliases => '-p', :desc => 'Use PORT.'
+    option :server, :default => 'thin', :aliases => '-s', :desc => 'Use SERVER.'
+    option :url, :aliases => '-u', :type => :string, :desc => 'Relative URL. (Default: "/")'
     def web
       opts = {
         :environment => ENV['RACK_ENV'] || "development",
@@ -169,6 +170,7 @@ EOF
         :server        => options[:server],
         :LaunchBrowser => !options[:no_browser],
         :DbDir         => options[:db],
+        :url           => options[:url],
       }
       opts[:customize] = options[:customize]
       # cdstk(opts[:DbDir]).assert_compatible
@@ -195,6 +197,7 @@ EOF
     end
 
     desc "files", "Display package files"
+    option :all, :type => :boolean, :aliases => '-a', :desc => 'Display all package files.'
     option :relative, :type => :boolean, :aliases => '-r', :desc => "Display relative path."
     def files(*args)
       cdstk.files(args, options)

data/lib/milkode/common/util.rb

@@ -235,7 +235,7 @@ module Milkode
     # 指定したコマンドが存在するか？
     def exist_command?(command)
       begin
-        Open3.capture3("type #{command}")[2].exited?
+        Open3.capture3('type', command)[2].exited?
       rescue Errno::ENOENT
         false
       end

data/lib/milkode/grep/cli_grep.rb

@@ -209,7 +209,7 @@ EOF
               findGrep.searchAndPrint2(stdout, records)
             else
               # レコード数が多い時は"-e grep"で検索
-              if Util::exist_command?('grep') && Util::exist_command?('xargs')
+              if Util::exist_command?('cat') && Util::exist_command?('grep') && Util::exist_command?('xargs')
                 $stderr.puts "Number of records is large. Use auto external tool (gmilk -e grep)"
                 search_external_tool(arguments, option, records, 'grep -n', 'grep')
               else

data/lib/sinatra/url_for.rb

@@ -0,0 +1,64 @@
+module Sinatra
+  module UrlForHelper
+    # Construct a link to +url_fragment+, which should be given relative to
+    # the base of this Sinatra app.  The mode should be either
+    # <code>:path_only</code>, which will generate an absolute path within
+    # the current domain (the default), or <code>:full</code>, which will
+    # include the site name and port number.  (The latter is typically
+    # necessary for links in RSS feeds.)  Example usage:
+    #
+    #   url_for "/"            # Returns "/myapp/"
+    #   url_for "/foo"         # Returns "/myapp/foo"
+    #   url_for "/foo", :full  # Returns "http://example.com/myapp/foo"
+    #
+    # You can also pass in a hash of options, which will be appended to the
+    # URL as escaped parameters, like so:
+    #
+    #   url_for "/", :x => "y" # Returns "/myapp/?x=y"
+    #   url_for "/foo", :x => "M&Ms" # Returns "/myapp/foo?x=M%26Ms"
+    #
+    # You can also specify the mode:
+    #
+    #   url_for "/foo", :full, :x => "y" # Returns "http://example.com/myapp/foo?x=y"
+    #
+    #--
+    # See README.rdoc for a list of some of the people who helped me clean
+    # up earlier versions of this code.
+    def url_for url_fragment, mode=nil, options = nil
+      if mode.is_a? Hash
+        options = mode
+        mode = nil
+      end
+      
+      if mode.nil?
+        mode = :path_only
+      end
+      
+      mode = mode.to_sym unless mode.is_a? Symbol
+      optstring = nil
+      
+      if options.is_a? Hash
+        optstring = '?' + options.map { |k,v| "#{k}=#{URI.escape(v.to_s, /[^#{URI::PATTERN::UNRESERVED}]/)}" }.join('&')
+      end
+
+      case mode
+      when :path_only
+        base = request.script_name
+      when :full
+        scheme = request.scheme
+        if (scheme == 'http' && request.port == 80 ||
+            scheme == 'https' && request.port == 443)
+          port = ""
+        else
+          port = ":#{request.port}"
+        end
+        base = "#{scheme}://#{request.host}#{port}#{request.script_name}"
+      else
+        raise TypeError, "Unknown url_for mode #{mode.inspect}"
+      end
+      "#{base}#{url_fragment}#{optstring}"
+    end
+  end
+
+  helpers UrlForHelper
+end

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2013-06-08}
+  s.date = %q{2013-06-26}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -61,7 +61,6 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/css/coderay.css",
     "lib/milkode/cdweb/public/css/jquery.multiselect.css",
     "lib/milkode/cdweb/public/css/jquery.multiselect.filter.css",
-    "lib/milkode/cdweb/public/css/milkode.css",
     "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png",
     "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png",
     "lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png",
@@ -97,7 +96,6 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/js/jquery-ui-1.8.22.custom.min.js",
     "lib/milkode/cdweb/public/js/jquery.multiselect.filter.min.js",
     "lib/milkode/cdweb/public/js/jquery.multiselect.min.js",
-    "lib/milkode/cdweb/public/js/milkode.js",
     "lib/milkode/cdweb/views/error.haml",
     "lib/milkode/cdweb/views/filelist.haml",
     "lib/milkode/cdweb/views/header_menu.haml",
@@ -106,6 +104,8 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/views/info_home.haml",
     "lib/milkode/cdweb/views/info_package.haml",
     "lib/milkode/cdweb/views/layout.haml",
+    "lib/milkode/cdweb/views/milkode.js",
+    "lib/milkode/cdweb/views/milkode.scss",
     "lib/milkode/cdweb/views/packages.haml",
     "lib/milkode/cdweb/views/search.haml",
     "lib/milkode/cdweb/views/search_form.haml",
@@ -133,6 +133,7 @@ Gem::Specification.new do |s|
     "lib/milkode/grep/fast_gotoline.rb",
     "lib/milkode/grep/findgrep.rb",
     "lib/milkode/grep/findgrep_option.rb",
+    "lib/sinatra/url_for.rb",
     "milkode.gemspec",
     "test/data/.gitignore",
     "test/data/.gitignore.sjis",

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-08 00:00:00 +09:00
+date: 2013-06-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -328,7 +328,6 @@ files:
 - lib/milkode/cdweb/public/css/coderay.css
 - lib/milkode/cdweb/public/css/jquery.multiselect.css
 - lib/milkode/cdweb/public/css/jquery.multiselect.filter.css
-- lib/milkode/cdweb/public/css/milkode.css
 - lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 - lib/milkode/cdweb/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
 - lib/milkode/cdweb/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -364,7 +363,6 @@ files:
 - lib/milkode/cdweb/public/js/jquery-ui-1.8.22.custom.min.js
 - lib/milkode/cdweb/public/js/jquery.multiselect.filter.min.js
 - lib/milkode/cdweb/public/js/jquery.multiselect.min.js
-- lib/milkode/cdweb/public/js/milkode.js
 - lib/milkode/cdweb/views/error.haml
 - lib/milkode/cdweb/views/filelist.haml
 - lib/milkode/cdweb/views/header_menu.haml
@@ -373,6 +371,8 @@ files:
 - lib/milkode/cdweb/views/info_home.haml
 - lib/milkode/cdweb/views/info_package.haml
 - lib/milkode/cdweb/views/layout.haml
+- lib/milkode/cdweb/views/milkode.js
+- lib/milkode/cdweb/views/milkode.scss
 - lib/milkode/cdweb/views/packages.haml
 - lib/milkode/cdweb/views/search.haml
 - lib/milkode/cdweb/views/search_form.haml
@@ -400,6 +400,7 @@ files:
 - lib/milkode/grep/fast_gotoline.rb
 - lib/milkode/grep/findgrep.rb
 - lib/milkode/grep/findgrep_option.rb
+- lib/sinatra/url_for.rb
 - milkode.gemspec
 - test/data/.gitignore
 - test/data/.gitignore.sjis