@@ -13,6 +13,7 @@ cache/themes.dump cache/tmp.command cache/snippets/*.dump cache/preferences/*.dump +cache/cache.dump custom/arrangements.yaml custom/preferences.yaml .gitignore @@ -1,6 +1,7 @@ Redcar is copyrighted free software by Daniel B. Lucraft -<dan at fluentradical dot com> and contributors. You can redistribute it -and/or modify it under either the terms of the GPL2 or the conditions below: +<dan@fluentradical.com> and contributors. You can redistribute it +and/or modify it under either the terms of the GPL2 or the conditions +below: 1. You may make and give away verbatim copies of the source form of the software without restriction, provided that you duplicate all of the @@ -9,45 +10,21 @@ and/or modify it under either the terms of the GPL2 or the conditions below: 2. You may modify your copy of the software in any way, provided that you do at least ONE of the following: - a) place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet or an - equivalent medium, or by allowing the author to include your - modifications in the software. + a) redistribute your modifications with original source under this + license, b) use the modified software only within your corporation or - organization. + organization, - c) rename any non-standard executables so the names do not conflict with - standard executables, which must also be provided. + c) make other distribution arrangements with the author. - d) make other distribution arrangements with the author. - -3. You may distribute the software in object code or executable - form, provided that you do at least ONE of the following: - - a) distribute the executables and library files of the software, - together with instructions (in the manual page or equivalent) on where - to get the original distribution. - - b) accompany the distribution with the machine-readable source of the - software. - - c) give non-standard executables non-standard names, with - instructions on where to get the original software distribution. - - d) make other distribution arrangements with the author. - -4. You may modify and include the part of the software into any other - software (possibly commercial). But some files in the distribution - are not written by the author, so that they are not under this terms. - -5. The scripts and library files supplied as input to or produced as +3. The scripts and library files supplied as input to or produced as output from the software do not automatically fall under the copyright of the software, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this software. -6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR +4. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. LICENSE @@ -1,3 +1,3 @@ * Refactor Keymap into Keymap and Dispatcher - * Tab definitions can declare themselves singleton + * Tab definitions can declare themselves singleton ....DONE! TODO @@ -11,5 +11,5 @@ properties: ~ - version: '' "|": - major: 0 - - minor: 0 - - release: 1 + - minor: 1 + - release: 0 config/default.yaml @@ -108,22 +108,26 @@ module Redcar # Load a Marshalled object from the cache. def self.with_cache(dir, name) cache_dir = Redcar::ROOT + "/cache/" - unless File.exist? cache_dir - FileUtils.mkdir cache_dir + unless File.exist?(cache_dir) + FileUtils.mkdir(cache_dir) end - unless File.exist?(cache_dir + "#{dir}/") - FileUtils.mkdir cache_dir + "#{dir}/" + cache_file = cache_dir + "/cache.dump" + if @cache.nil? and File.exist?(cache_file) + @cache = Marshal.load(File.read(cache_file)) + else + @cache ||= {} end - if File.exist?(cache_dir + "#{dir}/#{name}.dump") - str = File.read(cache_dir + "#{dir}/#{name}.dump") - obj = Marshal.load(str) + + if @cache[dir] and @cache[dir][name] + @cache[dir][name] else - obj = yield - File.open(cache_dir + "#{dir}/#{name}.dump", "w") do |fout| - fout.puts Marshal.dump(obj) + @cache[dir] ||= {} + @cache[dir][name] = yield + File.open(cache_file, "w") do |fout| + fout.puts Marshal.dump(@cache) end - obj - end + end + @cache[dir][name] end def self.clipboard plugins/core/lib/core/app.rb 278f00cc7c3f45793f35718f324332a64e7740ee Daniel Lucraft dan@fluentradical.com http://github.com/danlucraft/redcar/commit/90dd2cc092c225b0e197a2e200d12107a9a9ec21 90dd2cc092c225b0e197a2e200d12107a9a9ec21 2009-04-08T14:19:35-07:00 2009-04-08T14:19:35-07:00 There is now a single cache for all bundles 33eadb0548d6dd075e7b857d3b3d6fab070ee90b Daniel Lucraft dan@fluentradical.com