milkode 0.6.3 → 0.7.0

data/Gemfile

@@ -2,11 +2,10 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-
+gemspec
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
 end

data/HISTORY.ja.rdoc

@@ -1,3 +1,24 @@
+=== 0.7.0 2012/05/05
+
+* milk
+  * 'milk add git://..' に対応、update時に`git pull`するように
+  * Thor を利用するように (thanks tomykaira)
+  
+* gmilk
+  * gotolineモード(-g)で、複数のパスを渡せるように
+    * 例: gmilk -g VERSION:1 bin/milk:9 bin/gmilk:9 lib/milkode/cdweb/app.rb:23
+  * Windows環境(SJIS) + Ruby1.9 でエンコーディングエラーが起きる問題を修正
+
+* milk web
+  * カスタマイズしても<title></title>部分がMilkodeのままになっていた問題を修正
+  * 現在位置検索が正しく動いてない問題を修正
+
+* common
+  * Package#options[:update_with_git_pull] を追加
+  * Gemfile.lock を無視した (thanks tomykaira)
+  * Remove dependency on rcov (thanks tomykaira)
+  * 環境によってYAMLオブジェクトの構文が異なり、テストが落ちる可能性があるのを対策 (thanks tomykaira)
+  
 === 0.6.0 2012/03/28
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,17 @@
+=== 0.7.0 2012/05/05
+
+* milk
+  * `milk add git://..` to enabled. When you update `git pull` like you.
+  * Use Thor
+* gmilk
+  * gotoline mode(-g) enabled multi args.
+    * Sample: gmilk -g VERSION:1 bin/milk:9 bin/gmilk:9 lib/milkode/cdweb/app.rb:23
+  * Windows(SJIS) + Ruby1.9 support
+* milk web
+  * Bug fix
+* common
+  * Bug fix
+  
 === 0.6.0 2012/03/28
 
 * milk web

data/Rakefile

@@ -32,6 +32,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'archive-zip', '>=0.4.0'
   gem.add_runtime_dependency 'haml', '>=3.1.2'
   gem.add_runtime_dependency 'sass', '>=3.1.3'
+  gem.add_runtime_dependency 'thor', '~> 0.15.0'
 
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
@@ -67,13 +68,6 @@ task :test_all do
   system('rake test')
 end
 
-# require 'rcov/rcovtask'
-# Rcov::RcovTask.new do |test|
-#   test.libs << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-# end
-
 task :default => :test
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/bin/gmilk

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

data/bin/milk

@@ -4,7 +4,7 @@
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
-require 'milkode/cdstk/cli_cdstk'
+require 'milkode/cli'
 
-Version = "0.6.0"
-Milkode::CLI_Cdstk.execute(STDOUT, ARGV)
+Version = "0.7.0"
+Milkode::CLI.start(ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -9,6 +9,7 @@ require 'pathname'
 require 'milkode/common/grenfiletest'
 require 'milkode/common/util'
 require 'milkode/common/dir'
+require 'milkode/findgrep/findgrep'
 include Milkode
 require 'kconv'
 begin
@@ -66,7 +67,7 @@ module Milkode
       end
     end
 
-    def compatible?
+    def assert_compatible
       db_open(db_file)
     end
 
@@ -75,7 +76,7 @@ module Milkode
         db_open(db_file)
 
         @yaml.contents.each do |package|
-          update_dir_in(package.directory)
+          update_package_in(package)
         end
       end
     end
@@ -93,7 +94,7 @@ module Milkode
           if (package)
             print_result do
               db_open(db_file)
-              update_dir_in(package.directory)
+              update_package_in(package)
             end
           else
             @out.puts "Not registered. If you want to add, 'milk add #{path}'."
@@ -104,7 +105,7 @@ module Milkode
             args.each do |name|
               package = @yaml.find_name(name)
               if (package)
-                update_dir_in(package.directory)                
+                update_package_in(package)
               else
                 @out.puts "Not found package '#{name}'."
                 return
@@ -115,12 +116,8 @@ module Milkode
       end
     end
 
-    def update_package(dir)
+    def update_for_grep(dir)
       db_open(db_file)
-      update_dir(dir)
-    end
-
-    def update_dir(dir)
       update_dir_in(dir)
     end
 
@@ -140,10 +137,13 @@ module Milkode
             # YAMLに追加
             package = Package.create(dir, options[:ignore])
             add_yaml(package)
-            set_yaml_options(package, options)
+
+            # オプション設定
+            is_update_with_git_pull = git_url?(v)
+            set_yaml_options(package, options, is_update_with_git_pull)
 
             # アップデート
-            update_dir(dir)
+            update_dir_in(dir)
           end
         rescue ConvetError
           return
@@ -151,23 +151,30 @@ module Milkode
       end
     end
 
-    def set_yaml_options(package, src)
+    def set_yaml_options(package, options, is_update_with_git_pull)
       is_dirty = false
       
-      if src[:no_auto_ignore]
+      if options[:no_auto_ignore]
         dst = package.options
         dst[:no_auto_ignore] = true
         package.set_options(dst)
         is_dirty = true
       end
 
-      if src[:name]
+      if options[:name]
         dst = package.options
         dst[:name] = src[:name]
         package.set_options(dst)
         is_dirty = true
       end
 
+      if is_update_with_git_pull
+        dst = package.options
+        dst[:update_with_git_pull] = is_update_with_git_pull
+        package.set_options(dst)
+        is_dirty = true
+      end
+
       if is_dirty
         @yaml.update(package)
         @yaml.save
@@ -177,7 +184,7 @@ module Milkode
     def add_dir(dir, no_yaml = false)
       add_yaml(Package.create(dir)) unless no_yaml
       db_open(db_file)
-      update_dir(dir)
+      update_dir_in(dir)
     end
 
     # yamlにパッケージを追加
@@ -236,11 +243,18 @@ module Milkode
     def download_file(src)
       if (src =~ /^https?:/)
         download_file_in(src)
+      elsif (git_url? src)
+        git_clone_in(src)
       else
         src
       end
     end
 
+    def git_url?(src)
+      (src =~ /^git:/) != nil
+    end
+    private :git_url?
+
     def download_file_in(url)
       alert("download", "#{url}")
       
@@ -258,6 +272,23 @@ module Milkode
       filename
     end
 
+    def git_clone_in(url)
+      alert("git", url)
+
+      dst_dir = File.join(@db_dir, "packages/git")
+      # FileUtils.mkdir_p dst_dir
+
+      filename = File.join(dst_dir, File.basename(url).sub(/\.git\Z/, ""))
+
+      # git output progress to stderr.
+      # `git clone #{url} #{filename} 2>&1`
+
+      # with output
+      system("git clone #{url} #{filename}")
+
+      filename
+    end
+
     def remove_all
       print_result do
         list([], {:verbose => true})
@@ -481,14 +512,14 @@ module Milkode
       end
     end
 
-    def setdb(args, options)
+    def setdb(dbpath, 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?)
+      elsif (dbpath.nil?)
         @out.puts Dbdir.default_dir
       else
-        path = File.expand_path(args[0])
+        path = File.expand_path(dbpath)
         begin
           CdstkCommand.setdb_set path
           @out.puts "Set default db #{path}."
@@ -498,8 +529,9 @@ module Milkode
       end
     end
 
-    def mcd(args, options)
-      @out.print <<EOF
+    def mcd(options)
+      if options[:shell] != 'cygwin'
+        @out.print <<EOF
 # Copy to '.bashrc'.
 mcd() {
     local args="$1 $2 $3 $4 $5 $6 $7 $8 $9"
@@ -514,7 +546,11 @@ mcd() {
         pwd
     fi
 }
+EOF
+      end
 
+      if options[:shell] != 'sh'
+        @out.print <<EOF
 # For Cygwin.
 mcd() {
     local args="$1 $2 $3 $4 $5 $6 $7 $8 $9"
@@ -530,9 +566,10 @@ mcd() {
     fi
 }
 EOF
+      end
     end
 
-    def info(args, options)
+    def info
       milkode_info
     end
 
@@ -547,12 +584,12 @@ EOF
         raise IgnoreError, "Not a package dir: '#{current_dir}'" unless package
       end
 
-      if options[:test]
+      if options[:dry_run]
         # Test mode
         db_open(db_file)
         @is_display_info = true
         @is_silent = true
-        update_dir(package.directory)
+        update_dir_in(package.directory)
       elsif options[:delete_all]
         # Delete all
         package.set_ignore([])
@@ -613,6 +650,14 @@ EOF
       YamlFileWrapper.yaml_file @db_dir
     end
 
+    def update_package_in(package)
+      if package.options[:update_with_git_pull]
+        Dir.chdir(package.directory) { system("git pull") }
+      end
+
+      update_dir_in(package.directory)
+    end
+
     def update_dir_in(dir)
       alert("package", File.basename(dir) )
       @package_count += 1

data/lib/milkode/cdweb/app.rb

@@ -20,7 +20,7 @@ set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.6.0"
+  @version = "0.7.0"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
   haml :index

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

@@ -64,13 +64,20 @@ module Milkode
         return [], 0 if packages.empty?
       else
         # パッケージ名未指定の時は現在位置もfpathsに含める
-        fpaths << current_path + "/" unless current_path == ""
+        if current_path != ""
+          fpaths << path2fpath(current_path)
+        end
       end
       
       # @todo fpathを厳密に検索するには、検索結果からさらに先頭からのパスではないものを除外する
       records, total_records = searchMain(patterns, packages, fpaths, suffixs, offset, limit)
     end
 
+    def path2fpath(path)
+      pa = path.split("/")
+      File.join(convert_packages([pa[0]])[0], pa[1..-1].join('/'))
+    end
+
     def selectAll(offset = 0, limit = -1)
       table = @documents.select
 

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

@@ -3,7 +3,7 @@
 %html(lang='ja')
   %head
     %meta(charset='utf-8')
-    %title= [@title, 'Milkode'].compact.join(' - ')
+    %title= [@title, @setting.home_title].compact.join(' - ')
     %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")

data/lib/milkode/cli.rb

@@ -0,0 +1,249 @@
+# -*- coding: utf-8 -*-
+require 'thor'
+require 'milkode/cdstk/cdstk'
+require 'milkode/common/dbdir.rb'
+require 'milkode/cdweb/cli_cdweb'
+require 'milkode/grep/cli_grep'
+
+module Milkode
+  class CLI < Thor
+    desc "init [db_dir]", "Initialize database directory. If db_dir is omitted"
+    option :default, :type => :boolean, :desc => "Init default db, ENV['MILKODE_DEFAULT_DIR'] or ~/.milkode."
+    option :setdb, :type => :boolean, :aliases => '-s', :desc => 'Run setdb after initialization.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def init(db_dir = nil)
+      if options[:help]
+        CLI.task_help(shell, "init")
+      else
+        db_dir = db_dir || Dbdir.default_dir
+        FileUtils.mkdir_p db_dir
+        cdstk(db_dir).init(options)
+      end
+    end
+
+    desc "add PATH", <<EOF
+Add package(s) to milkode
+
+Samples:
+  milk add /path/to/dir1
+  milk add /path/to/dir2 /path/to/dir3
+  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 :ignore, :type => :array, :aliases => '-i', :desc => 'Ignore path.'
+    option :no_auto_ignore, :type => :boolean, :desc => 'Disable auto ignore (.gitignore).'
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def add(*args)
+      if options[:help] || args.empty?
+        CLI.task_help(shell, "add")
+      else
+        cdstk.add(args, options)
+      end
+    end
+
+    desc "update [keyword1 keyword2 ...]", "Update database"
+    option :all, :type => :boolean, :desc => "Update all."
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def update(*args)
+      if options[:help]
+        CLI.task_help(shell, "update")
+      else
+        cdstk.update(args, options)
+      end
+    end
+
+    desc "remove keyword1 [keyword2 ...]", "Remove package"
+    option :all, :type => :boolean, :desc => 'Remove all.'
+    option :force, :type => :boolean, :aliases => '-f', :desc => 'Force remove.'
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def remove(*args)
+      if options[:help]
+        CLI.task_help(shell, "remove")
+      else
+        cdstk.remove(args, options)
+      end
+    end
+
+    desc "list [package1 package2 ...]", "List package"
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def list(*args)
+      if options[:help]
+        CLI.task_help(shell, "list")
+      else
+        cdstk.list(args, options)
+      end
+    end
+
+    desc "pwd", "Display the current database"
+    option :default, :type => :boolean, :desc => 'Show default db, ENV[\'MILKODE_DEFAULT_DIR\'] or ~/.milkode.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def pwd()
+      if options[:help]
+        CLI.task_help(shell, "pwd")
+      else
+        cdstk.pwd(options)
+      end
+    end
+
+    desc "cleanup", "Creanup garbage recoeds"
+    option :force, :type => :boolean, :aliases => '-f', :desc => 'Force cleanup.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def cleanup
+      if options[:help]
+        CLI.task_help(shell, "cleanup")
+      else
+        cdstk.cleanup(options)
+      end
+    end
+
+    desc "rebuild [keyword1 keyword2]", "Rebuild database"
+    option :all, :type => :boolean, :desc => 'Rebuild all.'
+    option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def rebuild(*args)
+      if options[:help]
+        CLI.task_help(shell, "rebuild")
+      else
+        cdstk.rebuild(args, options)
+      end
+    end
+
+    desc "dump", "Dump records"
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def dump
+      if options[:help]
+        CLI.task_help(shell, "dump")
+      else
+        cdstk.dump
+      end
+    end
+
+    desc "dir [package1 package2]", "Print project root directory"
+    option :top, :type => :boolean
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def dir(*args)
+      if options[:help]
+        CLI.task_help(shell, "dir")
+      else
+        cdstk.dir(args, options)
+      end
+    end
+
+    desc "setdb [dbpath]", "Set default db to dbpath"
+    option :reset, :type => :boolean, :aliases => '--default', :desc => 'Reset to the system default database.'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def setdb(dbpath = nil)
+      if options[:help]
+        CLI.task_help(shell, "setdb")
+      else
+        cdstk.setdb(dbpath, options)
+      end
+    end
+
+    desc "mcd", "Generate `mcd' command"
+    option :shell, :desc => 'Type of shell. bash or cygwin'
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def mcd
+      if options[:help]
+        CLI.task_help(shell, "mcd")
+      else
+        cdstk.mcd(options)
+      end
+    end
+
+    desc "info", "Information of milkode status"
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def info
+      if options[:help]
+        CLI.task_help(shell, "info")
+      else
+        cdstk.info
+      end
+    end
+
+    desc "ignore [path ...]", "Ignore a file or directory"
+    option :package, :aliases => '-p', :desc => "Package to ignore."
+    option :delete, :type => :boolean, :aliases => '-d', :desc => "Delete ignore setting."
+    option :delete_all, :type => :boolean, :desc => "Delete all ignore setting."
+    option :dry_run, :type => :boolean, :aliases => '-n', :desc => "Ignore setting test."
+    option :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def ignore(*paths)
+      if options[:help]
+        CLI.task_help(shell, "ignore")
+      else
+        begin
+          cdstk.ignore(paths, options)
+        rescue IgnoreError => e
+          $stdout.puts e.message
+        end
+      end
+    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 :help, :type => :boolean, :aliases => '-h', :desc => 'Help message.'
+    def web
+      if options[:help]
+        CLI.task_help(shell, "web")
+      else
+        opts = {
+          :environment => ENV['RACK_ENV'] || "development",
+          :pid         => nil,
+          :Port        => options[:port],
+          :Host        => options[:host],
+          :AccessLog   => [],
+          :config      => "config.ru",
+          # ----------------------------
+          :server        => options[:server],
+          :LaunchBrowser => !options[:no_browser],
+          :DbDir         => options[:db],
+        }
+        opts[:customize] = options[:customize]
+        cdstk(opts[:DbDir]).assert_compatible
+        Milkode::CLI_Cdweb.execute_with_options($stdout, opts)
+      end
+    end
+
+    desc "grep", "Search projects"
+    long_desc "Search projects. See `milk grep -h` for detail."
+    def grep(*args)
+      Milkode::CLI_Grep.execute($stdout, args)
+    end
+
+    # --------------------------------------------------------------------------
+    
+    no_tasks do
+      def shell
+        @shell ||= Thor::Base.shell.new
+      end
+    end
+
+    private
+
+    def cdstk(dir = nil)
+      Cdstk.new($stdout, dir || db_dir)
+    end
+
+    # init からはアクセスしてはいけない
+    def db_dir
+      if (Dbdir.dbdir?('.') || !Dbdir.dbdir?(Dbdir.default_dir))
+        '.'
+      else
+        Dbdir.default_dir
+      end
+    end
+
+  end
+end