pit 0.0.4 → 0.0.5

data/ChangeLog

@@ -1,5 +1,19 @@
+2008-01-06  cho45
+
+	* [r4144] lib/pit.rb:
+	  
+	  Fix config merge bug.
+
+	* [r4141] Rakefile:
+	  
+	  follow removing Step::Ask
+
 2008-01-05  cho45
 
+	* [r4072] ChangeLog, lib/pit.rb:
+	  
+	  Release 0.0.4
+
 	* [r4067] Rakefile, bin/pit, lib/pit.rb:
 	  
 	  shipit つかうように

data/Rakefile

@@ -117,7 +117,6 @@ Rake::ShipitTask.new do |s|
 	s.Step.new {
 		system("svn", "up")
 	}.and {}
-	s.Ask
 	s.Task :rubyforge
 	s.Step.new {
 		raise "svn2cl.sh is not found" unless system("svn2cl.sh", "--version")

data/lib/pit.rb

@@ -4,7 +4,7 @@ require "pathname"
 require "tempfile"
 
 module Pit
-	VERSION   = "0.0.4"
+	VERSION   = "0.0.5"
 	Directory = Pathname.new("~/.pit").expand_path
 	@@config  = Directory + "pit.yaml"
 	@@profile = Directory + "default.yaml"
@@ -36,7 +36,7 @@ module Pit
 		ret = self.load[name] || {}
 		if opts[:require]
 			unless opts[:require].keys.all? {|k| ret[k] }
-				ret.update(opts[:require])
+				ret = opts[:require].update(ret)
 				ret = self.set(name, :config => ret)
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pit
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: pit
 bindir: bin
 cert_chain: []
 
-date: 2008-01-06 00:00:00 +09:00
+date: 2008-01-07 00:00:00 +09:00
 default_executable: 
 dependencies: []