Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents b5e2070 + c7ba35f commit 8e8dc9478eb3b29eaf20635de9b3daef3408e8a8 @ongaeshi committed Feb 26, 2013
View
@@ -6,7 +6,7 @@ source "http://rubygems.org"
# gemspec
gem 'termcolor','>= 1.2.0', '< 1.2.2'
gem 'rroonga','>= 1.1.0'
-gem 'rack','>=1.3.4'
+gem 'rack','>=1.3.4', '~> 1.4.0'
gem 'sinatra', '>=1.2.6'
gem 'launchy', '>=0.3.7'
gem 'coderay', '>=1.0.5'
View
@@ -1,3 +1,8 @@
+=== 0.9.8 2013/02/27
+
+* Support MyGithub
+ * https://github.com/ongaeshi/mygithub
+
=== 0.9.7 2012/01/29
* Support rroonga 2.1.x
View
@@ -1,3 +1,8 @@
+=== 0.9.8 2013/02/27
+
+* Support MyGithub
+ * https://github.com/ongaeshi/mygithub
+
=== 0.9.7 2012/01/29
* Support rroonga 2.1.x
View
@@ -1 +1 @@
-0.9.7
+0.9.8
View
@@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/grep/cli_grep'
-Version = "0.9.7"
+Version = "0.9.8"
Milkode::CLI_Grep.execute(STDOUT, ARGV)
View
@@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/cli'
-Version = "0.9.7"
+Version = "0.9.8"
Milkode::CLI.start(ARGV)
View
@@ -7,8 +7,8 @@
require 'rubygems'
require 'sinatra'
-require 'haml'
require 'sass'
+require 'haml'
$LOAD_PATH.unshift '../..'
require 'milkode/cdweb/lib/database'
@@ -22,7 +22,7 @@
get '/' do
@setting = WebSetting.new
- @version = "0.9.7"
+ @version = "0.9.8"
@package_num = Database.instance.yaml_package_num
@file_num = Database.instance.totalRecords
@package_list = PackageList.new(Database.instance.grndb)
@@ -103,10 +103,10 @@ def package_path(path)
haml :help
end
-get '*' do
- @setting = WebSetting.new
- @path = ''
- haml :error
+begin
+ NO_REQUIRE_APP_ERROR
+rescue NameError
+ require 'milkode/cdweb/app_error'
end
# -- helper function --
@@ -288,6 +288,11 @@ def update_result_str(result, before)
r << "#{result.update_count} update"
"#{r.join(', ')} (#{Time.now - before} sec)"
end
+
+ # .search-summary に追加情報を表示したい時はこの関数をオーバーライド
+ def search_summary_hook(path)
+ ""
+ end
end
class Array
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+#
+# @file
+# @brief
+# @author ongaeshi
+# @date 2013/02/17
+
+get '*' do
+ @setting = WebSetting.new
+ @path = ''
+ haml :error
+end
+
+
+
@@ -46,7 +46,12 @@ def start
server.run wrapped_app, options do
if (options[:LaunchBrowser])
host = options[:Host] || options[:BindAddress] # options[:BindAddress] for WEBrick
- Launchy.open("http://#{host}:#{options[:Port]}")
+
+ if (options[:LaunchURL])
+ Launchy.open("http://#{host}:#{options[:Port]}#{options[:LaunchURL]}")
+ else
+ Launchy.open("http://#{host}:#{options[:Port]}")
+ end
end
end
end
Oops, something went wrong.

0 comments on commit 8e8dc94

Please sign in to comment.