milkode 0.2.4 → 0.2.9

data/HISTORY.ja.rdoc

@@ -1,3 +1,19 @@
+=== 0.2.9 2011/12/24
+
+* gmilk
+  * grepのようにコマンドラインから検索可能に
+* mcd
+ * データベースに登録したパッケージを簡単にディレクトリ移動することが出来る
+* milk
+ * milk setdb を追加、デフォルトデータベースの切り替え
+ * milk update の改善、現在位置がパッケージなら
+ * milk dir を追加、指定パッケージのディレクトリ位置を表示
+ * milk mcd を追加、mcdコマンドのインストール用
+* milk web
+  * Ruby1.8の時はhpricotを(文字化けが直る)、Ruby1.9の時はnokogiriを使うように(hpricotだと日本語検索が上手くいかない)。
+  * ファイルリストをフォルダ、名前で並べ替えるように
+* MilkodeTestWorkクラスを追加、テスト向け環境構築を容易に
+  
 === 0.2.4 2011/10/02
 
 * gem 1.3.6, 1.3.7 でインストール出来ない問題を修正

data/HISTORY.rdoc

@@ -1,3 +1,28 @@
+=== 0.2.9 2011/12/24
+
+* gmilk
+ * 'gmilk' search from the command line available the grep.
+* mcd
+ * 'mcd', you can easy directory move package registered in the database
+* milk
+ * Add 'milk setdb'.
+ * Add 'milk update'.
+ * Add 'milk dir'.
+ * Add 'milk mcd'.
+* milk web
+  * Ruby1.8 -> hpricot, Ruby1.9 -> nokogiri.
+  * Sort the file list folder, and name
+* Add MilkodeTestWork class.
+
+=== 0.2.4 2011/10/02
+
+* Fixed not installing gem 1.3.6, 1.3.7.
+
+=== 0.2.3 2011/09/29
+
+* Search web interface speed.
+* Corresponds to the Japan language file names.
+
 === 0.2.2 2011/08/26
 
 * Add a file grep.

data/Rakefile

@@ -23,8 +23,8 @@ Jeweler::Tasks.new do |gem|
 
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   gem.add_runtime_dependency 'termcolor','>= 1.2.0'
-  gem.add_runtime_dependency 'rroonga','>= 1.0.0'
-  gem.add_runtime_dependency 'rack','>=1.2.1'
+  gem.add_runtime_dependency 'rroonga','>= 1.1.0'
+  gem.add_runtime_dependency 'rack','>=1.3.4'
   gem.add_runtime_dependency 'sinatra', '>=1.2.6'
   gem.add_runtime_dependency 'launchy', '>=0.3.7'
   gem.add_runtime_dependency 'coderay', '=0.9.8'
@@ -33,6 +33,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'haml', '>=3.1.2'
   gem.add_runtime_dependency 'sass', '>=3.1.3'
   gem.add_runtime_dependency 'nokogiri', '>=1.5.0'
+  gem.add_runtime_dependency 'hpricot', '>=0.8.2'
 
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_development_dependency 'rspec', '> 1.2.3'

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.9

data/bin/gmilk

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+#
+#  milg command.
+#  
+
+require 'rubygems'
+require 'milkode/grep/cli_grep'
+
+Version = "0.2.9"
+Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cdstk/cli_cdstk'
 
-Version = "0.2.4"
+Version = "0.2.9"
 Milkode::CLI_Cdstk.execute(STDOUT, ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -19,6 +19,7 @@ rescue LoadError
 end
 require 'milkode/cdweb/lib/database'
 require 'open-uri'
+require 'milkode/cdstk/cdstk_command'
 
 module Milkode
   class Cdstk
@@ -60,20 +61,51 @@ module Milkode
       db_open(db_file)
     end
 
-    def update(args = nil)
+    def update_all
       print_result do 
         yaml = yaml_load
-        
-        update_list = (!args || args.empty?) ? yaml_load.list : yaml_load.list(CdstkYaml::Query.new(args))
-        
+
         db_open(db_file)
 
-        update_list.each do |content|
+        yaml.list.each do |content|
           update_dir_in(content["directory"])
         end
       end
     end
 
+    def update(args, options)
+      if (options[:all])
+        update_all
+      else
+        if (args.empty?)
+          path = File.expand_path('.')
+          package = yaml_load.package_root( path )
+
+          if (package)
+            print_result do
+              db_open(db_file)
+              update_dir_in(package["directory"])
+            end
+          else
+            @out.puts "Not registered. If you want to add, 'milk add #{path}'."
+          end
+        else
+          print_result do
+            update_list = yaml_load.list CdstkYaml::Query.new(args)
+            db_open(db_file)
+            update_list.each do |content|
+              update_dir_in(content["directory"])
+            end
+          end
+        end
+      end
+    end
+
+    def update_package(dir)
+      db_open(db_file)
+      update_dir(dir)
+    end
+
     def update_dir(dir)
       update_dir_in(dir)
     end
@@ -285,7 +317,7 @@ module Milkode
     def rebuild
       db_delete(db_file)
       db_create(db_file)
-      update
+      update_all
     end
 
     def dump
@@ -305,6 +337,85 @@ module Milkode
       @out.puts "total #{records.size} record."
     end
 
+    def dir(args, options)
+      yaml = yaml_load
+      
+      if args.empty?
+        path = File.expand_path('.')
+        package = yaml.package_root(path)
+
+        if (package)
+          @out.print package['directory'] + (options[:top] ? "" : "\n")
+        else
+          # Use mcd.
+          @out.print "Not registered." + (options[:top] ? "" : "\n")
+        end
+      else
+        dirs = yaml.list(CdstkYaml::Query.new(args)).map{|v|v['directory']}.reverse
+
+        if options[:top]
+          unless (dirs.empty?)
+            @out.print dirs[0]
+          else
+            @out.print ""
+          end
+        else
+          @out.puts dirs
+        end
+      end
+    end
+
+    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 (args.empty?)
+        @out.puts Dbdir.default_dir
+      else
+        path = File.expand_path(args[0])
+        begin
+          CdstkCommand.setdb_set path
+          @out.puts "Set default db #{path}."
+        rescue CdstkCommand::NotExistDatabase
+          @out.puts "fatal: '#{path}' is not database."
+        end
+      end
+    end
+
+    def mcd(args, options)
+      @out.print <<EOF
+# Copy to '.bashrc'.
+mcd() {
+    local args="$1 $2 $3 $4 $5 $6 $7 $8 $9"
+    local dir=`milk dir --top $args`
+
+    if [ "$dir" = "" ]; then
+        echo "fatal: Not found package: $1 $2 $3 $4 $5 $6 $7 $8 $9"
+    elif [ "$dir" = "Not registered." ]; then
+        echo "fatal: Not a package dir: `pwd`"
+    else
+        cd $dir
+        pwd
+    fi
+}
+
+# For Cygwin.
+mcd() {
+    local args="$1 $2 $3 $4 $5 $6 $7 $8 $9"
+    local dir=`milk.bat dir --top $args`
+
+    if [ "$dir" = "" ]; then
+        echo "fatal: Not found package: $1 $2 $3 $4 $5 $6 $7 $8 $9"
+    elif [ "$dir" = "Not registered." ]; then
+        echo "fatal: Not a package dir: `pwd`"
+    else
+        cd $dir
+        pwd
+    fi
+}
+EOF
+    end
+
     private
 
     def db_file
@@ -319,6 +430,10 @@ module Milkode
       File.expand_path(@db_dir)
     end
 
+    def custom_db?
+      db_dir_expand != Dbdir.default_dir
+    end
+
     def yaml_file
       CdstkYaml.yaml_file @db_dir
     end

data/lib/milkode/cdstk/cdstk_command.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief cdstk command set (Only action, not display message.)
+# @author ongaeshi
+# @date   2011/12/12
+
+require 'milkode/common/dbdir'
+
+module Milkode
+  module CdstkCommand
+    module_function
+
+    def setdb_set(path)
+      raise NotExistDatabase unless Dbdir.dbdir?(path)
+      open(Dbdir.milkode_db_dir, "w") {|f| f.print path }
+    end
+
+    def setdb_reset
+      FileUtils.rm_f(Dbdir.milkode_db_dir)
+    end
+    
+    # --- error ---
+    class NotExistDatabase < RuntimeError ; end
+  end
+end
+
+

data/lib/milkode/cdstk/cdstk_yaml.rb

@@ -36,6 +36,15 @@ module Milkode
     def initialize(yaml_file, data)
       @yaml_file = yaml_file
       @data = data
+      normalize
+    end
+
+    def normalize
+      if (Util::platform_win?)
+        contents.each do |v|
+          v['directory'] = Util::normalize_filename v['directory']
+        end
+      end
     end
 
     def add(dirs)
@@ -44,7 +53,7 @@ module Milkode
     end
 
     def remove(query)
-      r = query.select(contents)
+      r = query.select_any?(contents)
       r.each {|v| contents.delete v}
     end
 
@@ -69,7 +78,7 @@ module Milkode
     end
 
     def list(query = nil)
-      query ? query.select(contents) : contents
+      query ? query.select_all?(contents) : contents
     end
 
     def exist?(shortname)
@@ -94,6 +103,18 @@ module Milkode
       end
     end
 
+    def package_root(dir)
+      nd = Util::normalize_filename dir
+      @data['contents'].find do |v|
+        v if nd =~ /^#{v['directory']}/
+      end
+    end
+
+    def package_root_dir(dir)
+      package = package_root(dir)
+      (package) ? package['directory'] : nil
+    end
+
     def self.yaml_file(path)
       Dbdir.yaml_path(path)
     end
@@ -103,11 +124,17 @@ module Milkode
         @keywords = keywords
       end
 
-      def select(contents)
+      def select_any?(contents)
         contents.find_all do |v|
           @keywords.any? {|s| File.basename(v['directory']).include? s }
         end
       end
+
+      def select_all?(contents)
+        contents.find_all do |v|
+          @keywords.all? {|s| File.basename(v['directory']).include? s }
+        end
+      end
     end
   end
 end

data/lib/milkode/cdstk/cli_cdstk.rb

@@ -4,6 +4,7 @@ require 'milkode/cdstk/cli_cdstksub'
 require 'milkode/cdstk/cdstk'
 require 'milkode/common/dbdir.rb'
 require 'milkode/cdweb/cli_cdweb'
+require 'milkode/grep/cli_grep'
 include Milkode
 
 module Milkode
@@ -13,24 +14,42 @@ module Milkode
 #{File.basename($0)} COMMAND [ARGS]
 
 The most commonly used #{File.basename($0)} are:
-  init        Init db.
   add         Add packages.
-  update      Update packages.
-  web         Run web-app.
-  remove      Remove packages.
+  cleanup     Cleanup garbage records.
+  dir         Disp package dir.
+  dump        Dump records.
+  grep        Print lines matching a pattern
+  init        Init db.
   list        List packages. 
+  mcd         Print 'mcd' command.
   pwd         Disp current db.
-  cleanup     Cleanup garbage records.
   rebuild     Rebuild db.
-  dump        Dump records.
+  remove      Remove packages.
+  setdb       Set default db. 
+  update      Update packages.
+  web         Run web-app.
 EOF
 
+      opt.order!(arguments)
+      subcommand = arguments.shift
+      
+      case subcommand
+      when 'grep'
+        Milkode::CLI_Grep.execute(stdout, arguments)
+      else
+        subcommand_default(stdout, opt, subcommand, arguments)
+      end
+    end
+
+    private
+
+    def self.subcommand_default(stdout, opt, subcommand, arguments)
       subopt = Hash.new
       suboptions = Hash.new
       
       subopt['init'], suboptions['init'] = CLI_Cdstksub.setup_init
       subopt['add'] = CLI_Cdstksub.setup_add
-      subopt['update'] = OptionParser.new("#{File.basename($0)} update package1 [package2 ...]")
+      subopt['update'], suboptions['update'] = CLI_Cdstksub.setup_update
       subopt['remove'], suboptions['remove'] = CLI_Cdstksub.setup_remove
       subopt['list'], suboptions['list'] = CLI_Cdstksub.setup_list
       subopt['pwd'], suboptions['pwd'] = CLI_Cdstksub.setup_pwd
@@ -38,10 +57,10 @@ EOF
       subopt['rebuild'] = OptionParser.new("#{File.basename($0)} rebuild")
       subopt['dump'] = OptionParser.new("#{File.basename($0)} dump")
       subopt['web'], suboptions['web'] = CLI_Cdstksub.setup_web
-
-      opt.order!(arguments)
-      subcommand = arguments.shift
-
+      subopt['dir'], suboptions['dir'] = CLI_Cdstksub.setup_dir
+      subopt['setdb'], suboptions['setdb'] = CLI_Cdstksub.setup_setdb
+      subopt['mcd'], suboptions['mcd'] = CLI_Cdstksub.setup_mcd
+      
       if (subopt[subcommand])
         subopt[subcommand].parse!(arguments) unless arguments.empty?
         init_default = suboptions['init'][:init_default]
@@ -54,7 +73,7 @@ EOF
           FileUtils.mkdir_p db_dir if (init_default)
           obj.init 
         when 'update'
-          obj.update(arguments)
+          obj.update(arguments, suboptions[subcommand])
         when 'add'
           obj.add(arguments)
         when 'remove'
@@ -72,6 +91,12 @@ EOF
         when 'web'
           obj.compatible?
           Milkode::CLI_Cdweb.execute_with_options(stdout, suboptions[subcommand])
+        when 'dir'
+          obj.dir(arguments, suboptions[subcommand])
+        when 'setdb'
+          obj.setdb(arguments, suboptions[subcommand])
+        when 'mcd'
+          obj.mcd(arguments, suboptions[subcommand])
         end
       else
         if subcommand
@@ -82,8 +107,6 @@ EOF
       end
     end
 
-    private
-
     def self.select_dbdir(subcommand, init_default)
       if (subcommand == 'init')
         if (init_default)