Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ongaeshi committed Jul 26, 2011
2 parents af56460 + 479e518 commit 078455e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions HISTORY.rdoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=== 0.1.2 2011/07/26

* milk web --host, default value "127.0.0.1" (for Windows).
* to update all packages at 'milk update' (no arg).

=== 0.1.1 2011/07/25

* Add comment.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
0.1.2
2 changes: 1 addition & 1 deletion bin/milk
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/cdstk/cli_cdstk'

Version = "0.1.1"
Version = "0.1.2"
Milkode::CLI_Cdstk.execute(STDOUT, ARGV)
4 changes: 2 additions & 2 deletions lib/milkode/cdstk/cdstk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def init
def update(args = nil)
print_result do
yaml = yaml_load
query = args ? CdstkYaml::Query.new(args) : nil
update_list = yaml_load.list(query)

update_list = (!args || args.empty?) ? yaml_load.list : yaml_load.list(CdstkYaml::Query.new(args))

db_open(db_file)

Expand Down
4 changes: 2 additions & 2 deletions lib/milkode/cdstk/cli_cdstksub.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def self.setup_web
:environment => ENV['RACK_ENV'] || "development",
:pid => nil,
:Port => 9292,
:Host => "0.0.0.0",
:Host => "127.0.0.1",
:AccessLog => [],
:config => "config.ru",
# ----------------------------
Expand All @@ -85,7 +85,7 @@ def self.setup_web

opts = OptionParser.new("#{File.basename($0)} web")
opts.on('--db DB_DIR', 'Database dir (default : current_dir)') {|v| options[:DbDir] = v }
opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") {|host| options[:Host] = host }
opts.on("-o", "--host HOST", "listen on HOST (default: 127.0.0.1)") {|host| options[:Host] = host }
opts.on('-p', '--port PORT', 'use PORT (default: 9292)') {|v| options[:Port] = v }
opts.on("-s", "--server SERVER", "serve using SERVER (default : thin)") {|s| options[:server] = s }
opts.on('-n', '--no-browser', 'No launch browser.') {|v| options[:LaunchBrowser] = false }
Expand Down
2 changes: 1 addition & 1 deletion lib/milkode/cdweb/app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
set :haml, :format => :html5

get '/' do
@version = "0.1.1"
@version = "0.1.2"
@package_num = Database.instance.fileList('').size
@file_num = Database.instance.fileNum
haml :index
Expand Down

0 comments on commit 078455e

Please sign in to comment.