milkode 0.9.4 → 0.9.5

data/HISTORY.ja.rdoc

@@ -1,3 +1,17 @@
+=== 0.9.5 2012/12/09
+
+* milk web 
+  * 行番号クリック時のモーダルにコピーボタンを配置
+    * 'ダイレクトパスのコピー' ボタン
+    * 'Lineno + Text' ボタン
+  * バグ修正
+    * 総マッチ数が正しく表示されないバグを修正 (thanks yosyyy)
+    * search_gotoline.rb: ファイル名のリンク位置修正
+    * typo
+
+* milk
+  * 'milk add --empty' オプションを追加
+
 === 0.9.4 2012/11/14
 
 * milk web

data/HISTORY.rdoc

@@ -1,4 +1,18 @@
-=== 0.9.4
+=== 0.9.5 2012/12/09
+
+* milk web 
+  * Add copy buttons in modal
+    * 'Direct path' button
+    * 'Lineno + Text' button
+  * Bug fix
+    * Fix incorrect total match count (thanks yosyyy)
+    * search_gotoline.rb: Fix link
+    * typo
+
+* milk
+  * Add 'milk add --empty' options
+
+=== 0.9.4 2012/11/14
 
 * milk web
   * Improve handling when you click the line number 

data/LICENSE.txt

@@ -121,3 +121,28 @@ 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.
+
+=================================
+Clippy
+=================================
+
+Copyright (c) 2008 Tom Preston-Werner
+
+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 @@
-0.9.4
+0.9.5

data/bin/gmilk

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

data/bin/milk

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

data/lib/milkode/cdstk/cdstk.rb

@@ -142,7 +142,7 @@ module Milkode
             set_yaml_options(package, options, is_update_with_git_pull)
 
             # アップデート
-            update_dir_in(dir)
+            update_dir_in(dir) unless options[:empty]
           end
         rescue ConvetError
           return

data/lib/milkode/cdweb/app.rb

@@ -22,7 +22,7 @@ set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.9.4"
+  @version = "0.9.5"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
   @package_list = PackageList.new(Database.instance.grndb)
@@ -198,7 +198,7 @@ EOF
       </div>
       <div class="modal-footer">
         <a href="#" id="updateCancel" class="btn" data-dismiss="modal">Cancel</a>
-        <a href="#" id="updateOk" class="btn btn-primary" data-loading-text="Updating..." milkode-package-name="#{package_name}"">OK</a>
+        <a href="#" id="updateOk" class="btn btn-primary" data-loading-text="Updating..." milkode-package-name="#{package_name}">OK</a>
       </div>
     </div>
 
@@ -214,6 +214,7 @@ EOF
         </tr></table>
     </div>
       <div class="modal-footer">
+        <span id="lineno-copyall"></span>
         <a href="#" id="lineno-ok" class="btn" data-dismiss="modal">OK</a>
       </div>
     </div>

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

@@ -87,9 +87,10 @@ module Milkode
       end
 
       # 検索
-      result = []
+      result, total_records = [], 0
+      
       unless is_not_search
-        result = @documents.search(
+        result, total_records = @documents.search_with_match(
           :patterns  => patterns,
           :keywords  => keywords,
           :paths     => paths,
@@ -104,7 +105,7 @@ module Milkode
       end
 
       # 結果
-      return result.map{|r| DocumentRecord.new(r)}, result.size
+      return result.map{|r| DocumentRecord.new(r)}, total_records
     end
 
     def selectAll(offset, limit)

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

@@ -116,7 +116,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>

data/lib/milkode/cdweb/public/css/milkode.css

@@ -169,3 +169,8 @@ label.ui-corner-all {
     margin-top: 20px;
 }
 
+/* lineno-modal */
+
+#lineno-copyall {
+    font-size: 13px;
+}

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

@@ -3,6 +3,10 @@
 // @author ongaeshi
 // @date   2011/08/24
 
+function escapeHTML(str) {
+  return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
 function replace_query_param(url, value)
 {
   var url_s = url.split("?");
@@ -123,17 +127,52 @@ function update_package(package_name)
   );
 }
 
+function clippy_text(text, bgcolor)
+{
+  return '    <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"' + 
+    '            width="110"' +
+    '            height="14"' +
+    '            id="clippy" >' +
+    '    <param name="movie" value="/flash/clippy.swf"/>' +
+    '    <param name="allowScriptAccess" value="always" />' +
+    '    <param name="quality" value="high" />' +
+    '    <param name="scale" value="noscale" />' +
+    '    <param NAME="FlashVars" value="text=' + text + '">' +
+    '    <param name="bgcolor" value="#FFFFFF">' +
+    '    <embed src="/flash/clippy.swf"' +
+    '           width="110"' +
+    '           height="14"' +
+    '           name="clippy"' +
+    '           quality="high"' +
+    '           allowScriptAccess="always"' +
+    '           type="application/x-shockwave-flash"' +
+    '           pluginspage="http://www.macromedia.com/go/getflashplayer"' +
+    '           FlashVars="text=' + text + '"' +
+    '           bgcolor="' + bgcolor + '"' +
+    '    />' +
+    '    </object>';
+}
+
 function lineno_setup(path, lineno)
 {
-  var n_lineno = "#n" + lineno;
+  var n_lineno     = "#n" + lineno;
 
+  // scroll reset
   var h    = $('html, body');
   var prev = h.scrollTop();
   window.location.hash = n_lineno;
   h.scrollTop(prev);
 
+  var n_lineno_dom = $(n_lineno);
+  var directpath   = path + lineno;
+
+  // select line
   $(".code > pre > *").removeClass("select-line");
-  $(n_lineno).addClass("select-line");
-  $("#lineno-path").text(path + lineno);
-  $("#lineno-body").html($(n_lineno).html());
+  n_lineno_dom.addClass("select-line");
+
+  // copy text button
+  $("#lineno-path").html(directpath + clippy_text(directpath, '#FFFFFF'));
+  $("#lineno-body").html(n_lineno_dom.html());
+  $("#lineno-copyall").html("Lineno + Text" + clippy_text(directpath + " " + escapeHTML(n_lineno_dom.text()), '#F5F5F5'));
 }
+

data/lib/milkode/cli.rb

@@ -25,14 +25,17 @@ Add package(s) to milkode
 Samples:
   milk add /path/to/dir1
   milk add /path/to/dir2 /path/to/dir3
+  milk add /path/to/dir1 -i cache .htaccess       # With ignore setting
+  milk add /path/to/dir1 --empty                  # Add empty package
   milk add /path/is/*
   milk add /path/to/zipfile.zip
   milk add /path/to/addon.xpi
   milk add http://example.com/urlfile.zip
   milk add git://github.com/ongaeshi/milkode.git
 EOF
+    option :empty, :type => :boolean, :desc => 'Add empty package.'
     option :ignore, :type => :array, :aliases => '-i', :desc => 'Ignore path.'
-    option :no_auto_ignore, :type => :boolean, :aliases => '-n', :desc => 'Disable auto ignore (.gitignore).'
+    option :no_auto_ignore, :type => :boolean, :aliases => '-n', :desc => 'Disable auto ignore.'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
     
     def add(*args)

data/lib/milkode/database/document_table.rb

@@ -154,7 +154,7 @@ module Milkode
     #  :suffixs  => 拡張子
     #  :offset   => オフセット(default = 0)
     #  :limit    => 表示リミット(default = -1)
-    def search(options)
+    def search_with_match(options)
       patterns = options[:patterns] || []
       keywords = options[:keywords] || []
       packages = options[:packages] || []
@@ -266,11 +266,18 @@ module Milkode
       records = result.sort([{:key => "package", :order => "ascending"},
                             {:key => "restpath", :order => "ascending"}],
                            :offset => offset,
-                           :limit => limit)
+                            :limit => limit)
 
-      records
+      # 検索結果のレコード(limitの影響を受ける), 総マッチ数(limitの影響を受けない)
+      return records, result.size
     end
 
+    # マッチしたレコードのみを返す
+    def search(options)
+      records, match_total = search_with_match(options)
+      records
+    end
+    
     def select_all_sort_by_shortpath(offset = 0, limit = -1)
       result = @table.select
 

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-11-14}
+  s.date = %q{2012-12-09}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_888888_256x240.png",
     "lib/milkode/cdweb/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png",
     "lib/milkode/cdweb/public/css/smoothness/jquery-ui-1.8.22.custom.css",
+    "lib/milkode/cdweb/public/flash/clippy.swf",
     "lib/milkode/cdweb/public/images/MilkodeIcon135.png",
     "lib/milkode/cdweb/public/images/directory.png",
     "lib/milkode/cdweb/public/images/document-new-4.png",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-14 00:00:00 +09:00
+date: 2012-12-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -307,6 +307,7 @@ files:
 - lib/milkode/cdweb/public/css/smoothness/images/ui-icons_888888_256x240.png
 - lib/milkode/cdweb/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png
 - lib/milkode/cdweb/public/css/smoothness/jquery-ui-1.8.22.custom.css
+- lib/milkode/cdweb/public/flash/clippy.swf
 - lib/milkode/cdweb/public/images/MilkodeIcon135.png
 - lib/milkode/cdweb/public/images/directory.png
 - lib/milkode/cdweb/public/images/document-new-4.png