summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/autoload/file_cache.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
commit3180b9d9b2c844dade1d361326600f7001ec66dd (patch)
tree98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /lib/puppet/util/autoload/file_cache.rb
parent543225970225de5697734bfaf0a6eee996802c04 (diff)
downloadpuppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.gz
puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.xz
puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.zip
Code smell: Two space indentation
Replaced 106806 occurances of ^( +)(.*$) with The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people who learned ruby in the 1900s) uses two-space indentation. 3 Examples: The code: end # Tell getopt which arguments are valid def test_get_getopt_args element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") becomes: end # Tell getopt which arguments are valid def test_get_getopt_args element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") The code: assert_equal(str, val) assert_instance_of(Float, result) end # Now test it with a passed object becomes: assert_equal(str, val) assert_instance_of(Float, result) end # Now test it with a passed object The code: end assert_nothing_raised do klass[:Yay] = "boo" klass["Cool"] = :yayness end becomes: end assert_nothing_raised do klass[:Yay] = "boo" klass["Cool"] = :yayness end
Diffstat (limited to 'lib/puppet/util/autoload/file_cache.rb')
-rw-r--r--lib/puppet/util/autoload/file_cache.rb142
1 files changed, 71 insertions, 71 deletions
diff --git a/lib/puppet/util/autoload/file_cache.rb b/lib/puppet/util/autoload/file_cache.rb
index ce30eed73..b55547362 100644
--- a/lib/puppet/util/autoload/file_cache.rb
+++ b/lib/puppet/util/autoload/file_cache.rb
@@ -1,92 +1,92 @@
module Puppet::Util::Autoload::FileCache
- @found_files = {}
- @missing_files = {}
- class << self
- attr_reader :found_files, :missing_files
- end
+ @found_files = {}
+ @missing_files = {}
+ class << self
+ attr_reader :found_files, :missing_files
+ end
- # Only used for testing.
- def self.clear
- @found_files.clear
- @missing_files.clear
- end
+ # Only used for testing.
+ def self.clear
+ @found_files.clear
+ @missing_files.clear
+ end
- def found_files
- Puppet::Util::Autoload::FileCache.found_files
- end
+ def found_files
+ Puppet::Util::Autoload::FileCache.found_files
+ end
- def missing_files
- Puppet::Util::Autoload::FileCache.missing_files
- end
+ def missing_files
+ Puppet::Util::Autoload::FileCache.missing_files
+ end
- def directory_exist?(path)
- cache = cached_data?(path, :directory?)
- return cache unless cache.nil?
+ def directory_exist?(path)
+ cache = cached_data?(path, :directory?)
+ return cache unless cache.nil?
- protect(path) do
- stat = File.lstat(path)
- if stat.directory?
- found_file(path, stat)
- return true
- else
- missing_file(path)
- return false
- end
- end
+ protect(path) do
+ stat = File.lstat(path)
+ if stat.directory?
+ found_file(path, stat)
+ return true
+ else
+ missing_file(path)
+ return false
+ end
end
+ end
- def file_exist?(path)
- cache = cached_data?(path)
- return cache unless cache.nil?
+ def file_exist?(path)
+ cache = cached_data?(path)
+ return cache unless cache.nil?
- protect(path) do
- stat = File.lstat(path)
- found_file(path, stat)
- return true
- end
+ protect(path) do
+ stat = File.lstat(path)
+ found_file(path, stat)
+ return true
end
+ end
- def found_file?(path, type = nil)
- if data = found_files[path] and ! data_expired?(data[:time])
- return(type and ! data[:stat].send(type)) ? false : true
- else
- return false
- end
+ def found_file?(path, type = nil)
+ if data = found_files[path] and ! data_expired?(data[:time])
+ return(type and ! data[:stat].send(type)) ? false : true
+ else
+ return false
end
+ end
- def found_file(path, stat)
- found_files[path] = {:stat => stat, :time => Time.now}
- end
+ def found_file(path, stat)
+ found_files[path] = {:stat => stat, :time => Time.now}
+ end
- def missing_file?(path)
- !!(time = missing_files[path] and ! data_expired?(time))
- end
+ def missing_file?(path)
+ !!(time = missing_files[path] and ! data_expired?(time))
+ end
- def missing_file(path)
- missing_files[path] = Time.now
- end
+ def missing_file(path)
+ missing_files[path] = Time.now
+ end
- private
+ private
- def cached_data?(path, type = nil)
- if found_file?(path, type)
- return true
- elsif missing_file?(path)
- return false
- else
- return nil
- end
+ def cached_data?(path, type = nil)
+ if found_file?(path, type)
+ return true
+ elsif missing_file?(path)
+ return false
+ else
+ return nil
end
+ end
- def data_expired?(time)
- Time.now - time > 15
- end
+ def data_expired?(time)
+ Time.now - time > 15
+ end
- def protect(path)
- yield
- rescue => detail
- raise unless detail.class.to_s.include?("Errno")
- missing_file(path)
- return false
- end
+ def protect(path)
+ yield
+ rescue => detail
+ raise unless detail.class.to_s.include?("Errno")
+ missing_file(path)
+ return false
+ end
end