@@ -1,11 +1,9 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib') require 'vanilla' -Soup.prepare - desc "Open an irb session preloaded with this library" task :console do - sh "irb -Ilib -rvanilla" + sh "irb -Ilib -rvanilla/console" end task :clean do @@ -13,10 +11,12 @@ task :clean do FileUtils.rm "soup.db" if File.exist?("soup.db") end -task :bootstrap do - require 'vanilla/snip_helper' - +task :prepare do Soup.prepare +end + +task :bootstrap => :prepare do + require 'vanilla/snip_helper' Dynasnip.persist_all!(overwrite=true) @@ -35,8 +35,35 @@ task :reset => [:clean, :bootstrap] namespace :upgrade do desc 'Upgrade the dynasnips' - task :dynasnips do - Dynasnip.persist_all! + task :dynasnips => :prepare do + Dynasnip.all.each do |dynasnip| + print "Upgrading #{dynasnip.snip_name}... " + # TODO: our confused Soup interface might return an array. + snip = Soup[dynasnip.snip_name] + if snip.empty? || snip.nil? + # it's a new dyna + Soup << dynasnip.snip_attributes + puts "(new)" + elsif snip.created_at == snip.updated_at + # it's not been changed, let's upgrade + snip.destroy + Soup << dynasnip.snip_attributes + puts "(unedited)" + else + # the dyna exists and has been changed + dynasnip.snip_attributes.each do |name, value| + unless (existing_value = snip.get_value(name)) == value + puts "Conflict in attribute '#{name}':" + puts "> Your soup: '#{existing_value}'" + puts "> New soup: '#{value}" + print "Upgrade? [Y/n]: " + upgrade_value = ["Y", "y", ""].include? STDIN.gets.chomp.strip + snip.set_value(name, value) if upgrade_value + end + end + snip.save + end + end end end Rakefile 70ac35f39d721760a73151a05d1cb23f6fa5089c James Adam lazyatom james@lazyatom.com http://github.com/lazyatom/vanilla-rb/commit/452d4f1d0492c4bd3ce0b02d788d43cae6465ccb 452d4f1d0492c4bd3ce0b02d788d43cae6465ccb 2008-06-04T14:19:18-07:00 2008-06-04T14:19:18-07:00 We should be able to upgrade dynasnips without always clobbering modified attributes. a5139099ed905e414bbdcb97cbd4fe3edb44687b James Adam lazyatom james@lazyatom.com