Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 5e088cf + ad9730f commit bf1c1f8ae174f47b2b6597256f6ea038e9f08535 @ongaeshi committed Oct 14, 2012
Showing with 20 additions and 7 deletions.
  1. +5 −0 HISTORY.ja.rdoc
  2. +5 −0 HISTORY.rdoc
  3. +1 −1 VERSION
  4. +1 −1 bin/gmilk
  5. +1 −1 bin/milk
  6. +1 −1 lib/milkode/cdweb/app.rb
  7. +4 −2 lib/milkode/cli.rb
  8. +2 −1 test/test_updater.rb
View
@@ -1,3 +1,8 @@
+=== 0.9.3.1 2012/10/14
+
+* 'milk plugins' add gem-milkode, bundle-milkode
+* Support removing by path
+
=== 0.9.3 2012/10/06
* milk web
View
@@ -1,3 +1,8 @@
+=== 0.9.3.1 2012/10/14
+
+* 'milk plugins' add gem-milkode, bundle-milkode
+* Support removing by path
+
=== 0.9.3 2012/10/06
* milk web
View
@@ -1 +1 @@
-0.9.3
+0.9.3.1
View
@@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/grep/cli_grep'
-Version = "0.9.3"
+Version = "0.9.3.1"
Milkode::CLI_Grep.execute(STDOUT, ARGV)
View
@@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/cli'
-Version = "0.9.3"
+Version = "0.9.3.1"
Milkode::CLI.start(ARGV)
View
@@ -22,7 +22,7 @@
get '/' do
@setting = WebSetting.new
- @version = "0.9.3"
+ @version = "0.9.3.1"
@package_num = Database.instance.yaml_package_num
@file_num = Database.instance.totalRecords
@package_list = PackageList.new(Database.instance.grndb)
View
@@ -173,10 +173,12 @@ def grep(*args)
long_desc "Display plugin list."
def plugins(*args)
$stdout.puts <<EOF
+bundle-milkode https://github.com/kou/bundle-milkode
+emacs-milkode https://github.com/ongaeshi/emacs-milkode
+gem-milkode https://github.com/kou/gem-milkode
Gitomb https://github.com/tomykaira/gitomb
-redmine_milkode https://github.com/suer/redmine_milkode
Milkode_Sublime https://github.com/tsurushuu/Milkode_Sublime
-emacs-milkode https://github.com/ongaeshi/emacs-milkode
+redmine_milkode https://github.com/suer/redmine_milkode
EOF
end
View
@@ -95,7 +95,8 @@ def t_no_auto_ignore
updater = Updater.new(@grndb, 'ignore_test')
updater.enable_no_auto_ignore
updater.exec
- result_test updater.result, 6, 2, 0
+ # result_test updater.result, 6, 2, 0
+ result_test updater.result, 5, 1, 0
end
def t_silent_mode

0 comments on commit bf1c1f8

Please sign in to comment.