milkode 0.9.1.1 → 0.9.2

data/HISTORY.ja.rdoc

@@ -1,3 +1,18 @@
+=== 0.9.2 2012/09/07
+
+* etc
+  * Add emacs plugin : [ongaeshi/emacs-milkode](https://github.com/ongaeshi/emacs-milkode)
+* milk
+  * Add 'milkode plugins' command
+  * [fatal] already exist 'Documents', [fatal] -> [warning]
+* gmilk
+  * strict_packages に対応
+
+=== 0.9.1.1 2012/08/07
+
+* milk web
+  * WebKitで行番号の表示が崩れてしまう問題を修正
+
 === 0.9.1 2012/08/05
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,18 @@
+=== 0.9.2 2012/09/07
+
+* etc
+  * Add emacs plugin : [ongaeshi/emacs-milkode](https://github.com/ongaeshi/emacs-milkode)
+* milk
+  * Add 'milkode plugins' command
+  * [fatal] already exist 'Documents', [fatal] -> [warning]
+* gmilk
+  * Support strict_packages
+
+=== 0.9.1.1 2012/08/07
+
+* milk web
+  * Fixed line numbers will fall apart in WebKit
+
 === 0.9.1 2012/08/05
 
 * milk web

data/VERSION

@@ -1 +1 @@
-0.9.1.1
+0.9.2

data/bin/gmilk

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

data/bin/milk

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

data/lib/milkode/cdstk/cdstk.rb

@@ -188,7 +188,7 @@ module Milkode
     def add_yaml(package)
       # すでに同名パッケージがある
       if @yaml.find_name(package.name)
-        error_alert("already exist '#{package.name}'.")
+        warning_alert("already exist '#{package.name}'.")
         return
       end
 
@@ -949,8 +949,12 @@ EOF
       alert(title, msg) if @is_display_info
     end
 
+    def warning_alert(msg)
+      @out.puts "[warning] #{msg}"
+    end
+
     def error_alert(msg)
-      @out.puts "[fatal] #{msg}"
+      @out.puts "[error] #{msg}"
     end
 
     def update_display_info(options)

data/lib/milkode/cdweb/app.rb

@@ -22,7 +22,7 @@ set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.9.1"
+  @version = "0.9.2"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
   @package_list = PackageList.new(Database.instance.grndb)

data/lib/milkode/cli.rb

@@ -163,6 +163,16 @@ EOF
       Milkode::CLI_Grep.execute($stdout, args)
     end
 
+    desc "plugins", "Display plugins"
+    long_desc "Display plugin list."
+    def plugins(*args)
+      $stdout.puts <<EOF
+Gitomb              https://github.com/tomykaira/gitomb
+redmine_milkode     https://github.com/suer/redmine_milkode
+emacs-milkode       https://github.com/ongaeshi/emacs-milkode
+EOF
+    end
+
     # --------------------------------------------------------------------------
     
     no_tasks do

data/lib/milkode/findgrep/findgrep.rb

@@ -24,6 +24,7 @@ module FindGrep
                         :isSilent,
                         :debugMode,
                         :packages,
+                        :strict_packages,
                         :filePatterns,
                         :suffixs,
                         :ignoreFiles,
@@ -51,6 +52,7 @@ module FindGrep
                                 [],
                                 [],
                                 [],
+                                [],
                                 Platform.get_shell_kcode,
                                 false,
                                 nil,
@@ -212,6 +214,7 @@ module FindGrep
         :keywords  => @option.keywords,
         :paths     => @option.filePatterns,
         :packages  => @option.packages,
+        :strict_packages  => @option.strict_packages,
         # :restpaths => ,
         :suffixs   => @option.suffixs
         # :offset    => ,

data/lib/milkode/grep/cli_grep.rb

@@ -20,8 +20,12 @@ module Milkode
       my_option = {}
       my_option[:packages] = []
 
+      # current dir's package
+      current_package = nil
+      current_dir     = nil
+
       begin
-        current_dir = package_root_dir(File.expand_path("."))
+        current_package = package_root(File.expand_path("."))
       rescue NotFoundPackage => e
         current_dir = File.expand_path(".")
       end
@@ -101,7 +105,9 @@ EOF
 
       # 現在位置のパッケージを記録
       if option.packages.empty? && !my_option[:all] && !is_abs_path
-        if (package_dir_in? current_dir)
+        if (current_package)
+          option.strict_packages << current_package.name
+        elsif (package_dir_in? current_dir)
           option.filePatterns << current_dir
         else
           stdout.puts "fatal: Not package dir '#{current_dir}'."
@@ -190,6 +196,16 @@ EOF
       end
     end
 
+    def self.package_root(dir)
+      package_root = yaml_load.package_root(dir)
+
+      if (package_root)
+        package_root
+      else
+        raise NotFoundPackage.new dir
+      end
+    end
+
     def self.yaml_load
       YamlFileWrapper.load(Dbdir.select_dbdir)
     end

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.9.1.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-08-08}
+  s.date = %q{2012-09-07}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  - 1
-  version: 0.9.1.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - ongaeshi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-08 00:00:00 +09:00
+date: 2012-09-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency