@@ -36,5 +36,4 @@ == TODO - * - * Support 'alias_method' \ No newline at end of file + * remove bookmark if not found file-line README @@ -1,33 +1,27 @@ require File.dirname(__FILE__) + '/config' -require "yaml" +require File.dirname(__FILE__) + '/repository' require "pp" -bookmark_file = EasyOpen::Config[:bookmark_file] file = ENV['TM_FILEPATH'] line = ENV['TM_LINE_NUMBER'] -if File.exist?(bookmark_file) - bookmarks = File.open(bookmark_file) {|yf| YAML.load(yf)} +begin + bookmarks = EasyOpen::BookmarkRepository.load +rescue end bookmarks ||= [] bookmarks.compact! -selected = bookmarks.select{|node| +selected = bookmarks.select{ |node| node[:file] == file and node[:line] == line } if (selected.empty?) - bookmarks.insert(0, {:file=>file, :line=>line}) + bookmarks.insert(0, { :file=>file, :line=>line }) puts "add bookmark" - # puts "file:#{file}" - # puts "line:#{line}" else bookmarks.delete_if {|node| node[:file] == file and node[:line] == line } puts "remove bookmark" - # puts "file:#{file}" - # puts "line:#{line}" end -File.open(bookmark_file,"w") {|out| - YAML.dump(bookmarks, out) -} \ No newline at end of file +EasyOpen::BookmarkRepository.save bookmarks Support/lib/easyopen/add_remove_bookmark.rb @@ -1,24 +1,26 @@ require File.dirname(__FILE__) + '/ui' require File.dirname(__FILE__) + '/config' -require "yaml" +require File.dirname(__FILE__) + '/repository' +file = ENV['TM_FILEPATH'] +line = ENV['TM_LINE_NUMBER'] -bookmark_file = EasyOpen::Config[:bookmark_file] -unless File.exist?(bookmark_file) - puts "Not found bookmark.file => #{bookmark_file}" - exit -end -bookmarks = File.open(bookmark_file) {|ym| - YAML.load(ym) -} -include EasyOpen::UI -bookmark=bookmarks.shift +bookmarks = EasyOpen::BookmarkRepository.load + +bookmark = bookmarks.shift bookmarks << bookmark -File.open(bookmark_file, "w") {|out| - YAML.dump(bookmarks, out) -} +if (file == bookmark[:file] and line == bookmark[:line]) + bookmark = bookmarks.shift + bookmarks << bookmark +end + + +EasyOpen::BookmarkRepository.save bookmarks + unless bookmark puts "bookmark is nil" exit end + +include EasyOpen::UI go_to(bookmark) \ No newline at end of file Support/lib/easyopen/next_bookmark.rb @@ -1,24 +1,24 @@ require File.dirname(__FILE__) + '/ui' require File.dirname(__FILE__) + '/config' -require "yaml" +require File.dirname(__FILE__) + '/repository' -# TODO duplication code next_bookmark.rb -bookmark_file = EasyOpen::Config[:bookmark_file] -unless File.exist?(bookmark_file) - puts "Not found bookmark.file => #{bookmark_file}" - exit -end -bookmarks = File.open(bookmark_file) {|ym| - YAML.load(ym) -} -include EasyOpen::UI -bookmark=bookmarks.pop +file = ENV['TM_FILEPATH'] +line = ENV['TM_LINE_NUMBER'] + +bookmarks = bookmarks = EasyOpen::BookmarkRepository.load + +bookmark = bookmarks.pop bookmarks.insert(0, bookmark) -File.open(bookmark_file, "w") {|out| - YAML.dump(bookmarks, out) -} +if (file == bookmark[:file] and line == bookmark[:line]) + bookmark = bookmarks.pop + bookmarks.insert(0, bookmark) +end + +EasyOpen::BookmarkRepository.save bookmarks unless bookmark puts "bookmark is nil" exit end + +include EasyOpen::UI go_to(bookmark) \ No newline at end of file Support/lib/easyopen/prev_bookmark.rb @@ -1,4 +1,6 @@ require File.dirname(__FILE__) + '/config' +require "yaml" + module EasyOpen class CallStackRepository @@ -50,4 +52,23 @@ module EasyOpen end end end + + class BookmarkRepository + class << self + def save(bookmarks) + bookmark_file = EasyOpen::Config[:bookmark_file] + File.open(bookmark_file, "w") {|out| + YAML.dump(bookmarks, out) + } + end + + def load + bookmark_file = EasyOpen::Config[:bookmark_file] + bookmarks = File.open(bookmark_file) {|ym| + YAML.load(ym) + } + return bookmarks + end + end + end end \ No newline at end of file Support/lib/easyopen/repository.rb b7b9ac5adb05f48228499769c5149d2d46e7eab1 haru01 ienaga@ienaga-no-macbook.local http://github.com/subtleGradient/easy-open-tmbundle/commit/3719f7892ca45df98cc4a2633968e0ea53a3560a 3719f7892ca45df98cc4a2633968e0ea53a3560a 2009-03-06T22:34:48-08:00 2009-03-06T22:34:48-08:00 保存の部分の移動。next prevの微調整 dd1d6f9154fd23a8332833c7d937315da09e63c5 haru01 ienaga@ienaga-no-macbook.local