milkode 1.6.1 → 1.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef388fc3823334de6936be6caf2202fc5739c279
+  data.tar.gz: 8664bf3c752e15ad46a77924f7bc8a5cbb7bfbf0
+SHA512:
+  metadata.gz: 7266759f8427dfea3e3e1e2fa0707d49aa74e4c0fdb14787b56de55e7ba98a8eaf1d8961a922086de6af0bfd5357b9b9b03c9a3914e3def56a6a70c95fa6a98e
+  data.tar.gz: d797d5c1ceae24946def6d121ebdedc425d6e9597cfdf14840a0db92094c9d41049f9805bd83f9186563b6bec4c32241811a3168ae8b3c121dc9701c250c4368

data/.gitignore

@@ -0,0 +1,24 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+.sass-cache
+TAGS

data/.travis.yml

@@ -12,4 +12,4 @@ rvm:
   - 2.0.0
 
 before_install:
-  - curl https://raw.github.com/groonga/groonga/master/data/travis/setup.sh | sh
+  - curl --silent --location https://github.com/groonga/groonga/raw/master/data/travis/setup.sh | sh

data/Gemfile

@@ -1,29 +1,4 @@
 source "http://rubygems.org"
 
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-# gemspec
-gem 'termcolor'   , '>= 1.2.0' , '< 1.2.2'
-gem 'rroonga'     , '>= 1.1.0'
-gem 'rack'        , '>= 1.5.2'
-gem 'sinatra'     , '>= 1.2.6'
-gem 'launchy'     , '>= 0.3.7'
-gem 'coderay'     , '>= 1.0.5'
-gem 'thin'        , '>= 1.2.10', '< 2.0.0'
-gem 'archive-zip' , '>= 0.4.0'
-gem 'haml'        , '>= 3.1.2'
-gem 'sass'        , '>= 3.1.3'
-gem 'thor'        , '>= 0.18.1'
-gem 'i18n'        , '~> 0.6.5'
-gem 'whichr'      , '~> 0.3'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'bundler'
-  gem 'jeweler'
-  gem 'rack-test'
-  gem 'sinatra-reloader'
-  gem 'test-unit' , '>= 2.5.4'
-end
+# Specify your gem's dependencies in milkode.gemspec
+gemspec

data/HISTORY.ja.rdoc

@@ -1,3 +1,20 @@
+=== 1.7.0 2014/06/02
+
+* milk web
+  * Support gomilk option (milk web -g)
+    * https://github.com/ongaeshi/gomilk
+  * Support i18n in the help.haml
+
+* gmilk
+  *  #66 gmilkでの検索結果のファイルのパス (thanks kazuna)
+
+* etc
+  * Improve README
+  * Add a badge of gem version
+  * Change the setting of TravisCI [groonga-dev,02268]
+  * Change to Bundler a method of generating a gem
+    * Jeweler, Thanks for long support
+
 === 1.6.1 2014/04/15
 
 * milk

data/HISTORY.rdoc

@@ -1,3 +1,20 @@
+=== 1.7.0 2014/06/02
+
+* milk web
+  * Support gomilk option (milk web -g)
+    * https://github.com/ongaeshi/gomilk
+  * Support i18n in the help.haml
+
+* gmilk
+  * #66 gmilk --expand-path (thanks kazuna)
+
+* etc
+  * Improve README
+  * Add a badge of gem version
+  * Change the setting of TravisCI [groonga-dev,02268]
+  * Change to Bundler a method of generating a gem
+    * Jeweler, Thanks for long support
+
 === 1.6.1 2014/04/15
 
 * milk

data/README.md

@@ -1,6 +1,6 @@
 # Milkode
 
-[![Build Status](https://travis-ci.org/ongaeshi/milkode.svg?branch=develop)](https://travis-ci.org/ongaeshi/milkode)
+[![Version](https://img.shields.io/gem/v/milkode.svg)](https://rubygems.org/gems/milkode) [![Build Status](https://travis-ci.org/ongaeshi/milkode.svg?branch=develop)](https://travis-ci.org/ongaeshi/milkode)
 
 Milkode is "Line Based" local source code search engine written by Ruby. It have command line interface and web application. It will accelerate the code reading of your life.
 
@@ -10,10 +10,124 @@ Milkode is "見るコード". "See a code" is meaning.
 
 ![milk-web-01.jpg](http://milkode.ongaeshi.me/images/milk-web-01.jpg)
 
-## DOCUMENTS
+## Installation
+
+    $ gem install milkode
+
+When you faild to install Rroonga, Please refer.
+* [File: install — rroonga - Ranguba](http://ranguba.org/rroonga/en/file.install.html)
+
+## Usage
+
+### Create a database
+
+```
+$ milk init --default
+create     : /Users/auser/.milkode/milkode.yaml
+create     : /Users/auser/.milkode/db/milkode.db created.
+```
+
+Create database to current dir.
+
+```
+$ milk init
+Create database to "/path/to/dir/db/honyomi.db"
+```
+
+If you want to use custom database, Please specify `MILKODE_DEFAULT_DIR` variable.
+
+```
+$ MILKODE_DEFAULT_DIR=/path/to/dir milk add /path/to/project
+```
+
+### Add packages
+
+Add source code from local directory.
+
+```
+$ milk add ~/Documents/codes/linux-3.10-rc4
+package    : linux-3.10-rc4
+.
+.
+result     : 1 packages, 42810 records, 42810 add.
+*milkode*  : 1 packages, 42810 records in /Users/ongaeshi/.milkode/db/milkode.db.
+```
+
+Add source code from gem.
+
+```
+$ milk add /opt/local/lib/ruby2.0/gems/2.0.0/gems/milkode-1.6.0/
+```
+
+Add source code from GitHub.
+
+```
+$ milk add https://github.com/ongaeshi/milkode.git -p git
+$ milk add git://github.com/ongaeshi/milkode.git
+$ milk add git://github.com/ongaeshi/milkode.git -b develop -n milkode_develop
+```
+
+Add source code from http-zip.
+
+```
+$ milk add http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.zip
+```
+
+### List packages
+
+```
+$ milk list
+a_project
+milkode
+milkode-1.6.0
+ruby-2.1.2
+```
+
+Filter by keyword.
+
+```
+$ milk list milk
+milkode-1.6.0
+milkode
+```
+
+### Search command line
+
+Gmilk command can use the AND search.
+
+```
+$ cd ~/Documents/codes/linux-3.10-rc4
+$ gmilk according prototypes
+Documentation/cdrom/cdrom-standard.tex:977:  according to prototypes listed in \cdromh, and specifications given
+```
+
+Remember the project root.
+
+```
+$ cd driver/acpi
+$ gmilk according prototypes
+../../Documentation/cdrom/cdrom-standard.tex:977:  according to prototypes listed in \cdromh, and specifications given
+```
+
+[Gomilk](https://github.com/ongaeshi/gomilk) is faster version written by Go.
+
+### Web application
+
+```
+$ milk web
+```
+
+![milk-web-02.jpg](http://milkode.ongaeshi.me/images/milk-web-02.jpg)
+
+## Documents
 
 * [Milkode - line based local source code search engine](http://milkode.ongaeshi.me/)
 
+## Plugins
+
+* [emacs-milkode](https://github.com/ongaeshi/emacs-milkode)
+* [anything-milkode](https://github.com/ongaeshi/anything-milkode)
+
 ## HISTORY
 
 * [History.rdoc](https://github.com/ongaeshi/milkode/blob/master/HISTORY.rdoc)

data/Rakefile

@@ -1,66 +1,8 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'bundler'
-# begin
-#   Bundler.setup(:default, :development)
-# rescue Bundler::BundlerError => e
-#   $stderr.puts e.message
-#   $stderr.puts "Run `bundle install` to install missing gems"
-#   exit e.status_code
-# end
-require 'rake'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "milkode"
-  gem.homepage = "http://github.com/ongaeshi/milkode"
-  gem.license = "MIT"
-  gem.summary = %Q{Line based local source code search engine.}
-  gem.description = %Q{Milkode is line based local source code search engine. It have command line interface and web application. It will accelerate the code reading of your life.}
-  gem.email = "ongaeshi0621@gmail.com"
-  gem.authors = ["ongaeshi"]
-  # Dependencies move to 'Gemfile'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-
-# groonga関連のテストが通らないため、独自のrake_test_loaderを読み込む
-$LOAD_PATH.unshift '.'
-module Rake
-  class TestTask < TaskLib
-    def rake_loader # :nodoc:
-      find_file('test/rake_test_loader') or
-        fail "unable to find rake test loader"
-    end
-  end
-end
- 
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/**/test_*.rb']
-  test.verbose = true
-end
-
-task :test_all do
-  puts "--- rvm 1.9.2@milkode ---"
-  system('rvm 1.9.2@milkode')
-  system('rake test')
-
-  puts "--- rvm system ---"
-  system('rvm system')
-  system('rake test')
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
 end
 
 task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "milkode #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/bin/gmilk

@@ -4,7 +4,8 @@
 #  
 
 require 'rubygems'
+require 'milkode'
 require 'milkode/grep/cli_grep'
 
-Version = "1.6.1"
+Version = Milkode::VERSION
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

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

data/lib/milkode.rb

@@ -0,0 +1,6 @@
+require "milkode/version"
+
+module Milkode
+  # Your code goes here...
+end
+

data/lib/milkode/cdweb/app.rb

@@ -43,7 +43,7 @@ end
 get '/' do
   if Database.validate?
     @setting = WebSetting.new
-    @version = "1.6.1"
+    @version = Milkode::VERSION
 
     @package_num = Database.instance.yaml_package_num
     @file_num = Database.instance.totalRecords
@@ -138,6 +138,7 @@ end
 get %r{/help} do
   @setting = WebSetting.new
   @path                = ""
+  update_locale
   haml :help
 end
 
@@ -168,6 +169,14 @@ get '/info/:package' do
   haml :info_package
 end
 
+get '/gomilk' do
+  if ENV['MILKODE_SUPPORT_GOMILK']
+    search_for_gomilk(params)
+  else
+    "Error: Need 'milk web --gomilk'"
+  end
+end
+
 # -- helper function --
 
 helpers do

data/lib/milkode/cdweb/cli_cdweb.rb

@@ -7,40 +7,6 @@ require 'milkode/cdweb/lib/database'
 
 module Milkode
   class CLI_Cdweb
-    def self.execute(stdout, argv)
-      options = {
-        :environment => ENV['RACK_ENV'] || "development",
-        :pid         => nil,
-        :Port        => 9292,
-        :Host        => "0.0.0.0",
-        :AccessLog   => [],
-        :config      => "config.ru",
-        # ----------------------------
-        :server      => "thin",
-        :LaunchBrowser => true,
-        :DbDir => select_dbdir,
-      }
-
-      opts = OptionParser.new("#{File.basename($0)}")
-      opts.on('--db DB_DIR', 'Database dir (default : current_dir)') {|v| options[:DbDir] = v }
-      opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") {|host| options[:Host] = host }
-      opts.on('-p', '--port PORT', 'use PORT (default: 9292)') {|v| options[:Port] = v }
-      opts.on("-s", "--server SERVER", "serve using SERVER (default : thin)") {|s| options[:server] = s }
-      opts.on('-n', '--no-browser', 'No launch browser.') {|v| options[:LaunchBrowser] = false }
-      opts.on('--customize', 'Create customize file.') {|v| options[:customize] = true }
-
-      # --hostが'-h'を上書きするので、'-h'を再定義してあげる
-      opts.on_tail("-h", "-?", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-      
-      opts.parse!(argv)
-      
-      # 実行！！
-      execute_with_options(options)
-    end
-    
     def self.execute_with_options(stdout, options)
       dbdir = File.expand_path(options[:DbDir])
       
@@ -60,6 +26,9 @@ module Milkode
         # URL設定
         ENV['MILKODE_RELATIVE_URL'] = File.join('/', options[:url]) if options[:url]
 
+        # Allow "http://127.0.0.1:9292/gomilk"
+        ENV['MILKODE_SUPPORT_GOMILK'] = "true" if options[:gomilk]
+
         # 起動
         rack_server.start do
           # この時点でoptions[:Host]やoptions[:Port]などの値が壊れてしまっているため事前にURLを生成している

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

@@ -5,14 +5,15 @@
 # @author ongaeshi
 # @date   2011/07/11
 
-require 'milkode/cdweb/lib/database'
 require 'milkode/cdweb/lib/coderay_wrapper'
+require 'milkode/cdweb/lib/database'
+require 'milkode/cdweb/lib/mkurl'
 require 'milkode/cdweb/lib/search_contents'
 require 'milkode/cdweb/lib/search_files'
-require 'milkode/cdweb/lib/search_gotoline'
 require 'milkode/cdweb/lib/search_fuzzy_gotoline'
-require 'milkode/cdweb/lib/mkurl'
+require 'milkode/cdweb/lib/search_gotoline'
 require 'milkode/common/util'
+require 'milkode/grep/findgrep'
 
 module Milkode
   def view(record, params, before)
@@ -133,6 +134,26 @@ module Milkode
     haml :packages
   end
 
+  def search_for_gomilk(params)
+    documents = Database.instance.documents
+    grn = documents.table
+
+    query = params[:query]
+
+    unless params[:all]
+      begin
+        package = CLI_Grep.package_root(params[:dir].gsub("\\", "/"))
+      rescue CLI_Grep::NotFoundPackage
+        return "Error: Not package dir '#{params[:dir]}'"
+      end
+      query += " package: #{package.name}"
+    end
+
+    records = grn.select(query, default_column: "content")
+
+    records.map { |r| r.path }.join("\n")
+  end
+
   private
   
   def file_or_dirimg(is_file, suburl)