puppet 0.25.5 → 2.6.0

data/lib/puppet/rails/benchmark.rb

@@ -1,69 +1,63 @@
 require 'benchmark'
 module Puppet::Rails::Benchmark
-    $benchmarks = {:accumulated => {}}
+  $benchmarks = {:accumulated => {}}
 
-    def time_debug?
-        Puppet::Rails::TIME_DEBUG
-    end
+  def time_debug?
+    Puppet::Rails::TIME_DEBUG
+  end
 
-    def railsmark(message)
-        result = nil
-        seconds = Benchmark.realtime { result = yield }
-        Puppet.debug(message + " in %0.2f seconds" % seconds)
+  def railsmark(message)
+    result = nil
+    seconds = Benchmark.realtime { result = yield }
+    Puppet.debug(message + " in %0.2f seconds" % seconds)
 
-        $benchmarks[message] = seconds if time_debug?
-        result
-    end
+    $benchmarks[message] = seconds if time_debug?
+    result
+  end
 
-    def debug_benchmark(message)
-        unless Puppet::Rails::TIME_DEBUG
-            return yield
-        end
+  def debug_benchmark(message)
+    return yield unless Puppet::Rails::TIME_DEBUG
 
-        railsmark(message) { yield }
-    end
+    railsmark(message) { yield }
+  end
 
-    # Collect partial benchmarks to be logged when they're
-    # all done.
-    #   These are always low-level debugging so we only
-    # print them if time_debug is enabled.
-    def accumulate_benchmark(message, label)
-        unless time_debug?
-            return yield
-        end
+  # Collect partial benchmarks to be logged when they're
+  # all done.
+  #   These are always low-level debugging so we only
+  # print them if time_debug is enabled.
+  def accumulate_benchmark(message, label)
+    return yield unless time_debug?
 
-        $benchmarks[:accumulated][message] ||= Hash.new(0)
-        $benchmarks[:accumulated][message][label] += Benchmark.realtime { yield }
-    end
+    $benchmarks[:accumulated][message] ||= Hash.new(0)
+    $benchmarks[:accumulated][message][label] += Benchmark.realtime { yield }
+  end
 
-    # Log the accumulated marks.
-    def log_accumulated_marks(message)
-        return unless time_debug?
+  # Log the accumulated marks.
+  def log_accumulated_marks(message)
+    return unless time_debug?
 
-        if $benchmarks[:accumulated].empty? or $benchmarks[:accumulated][message].nil? or $benchmarks[:accumulated][message].empty?
-            return
-        end
+    return if $benchmarks[:accumulated].empty? or $benchmarks[:accumulated][message].nil? or $benchmarks[:accumulated][message].empty?
 
-        $benchmarks[:accumulated][message].each do |label, value|
-            Puppet.debug(message + ("(%s)" % label) + (" in %0.2f seconds" % value))
-        end
+    $benchmarks[:accumulated][message].each do |label, value|
+      Puppet.debug(message + ("(#{label})") + (" in %0.2f seconds" % value))
     end
+  end
 
-    def write_benchmarks
-        return unless time_debug?
+  def write_benchmarks
+    return unless time_debug?
 
-        branch = %x{git branch}.split("\n").find { |l| l =~ /^\*/ }.sub("* ", '')
+    branch = %x{git branch}.split("\n").find { |l| l =~ /^\*/ }.sub("* ", '')
 
-        file = "/tmp/time_debugging.yaml"
+    file = "/tmp/time_debugging.yaml"
 
-        require 'yaml'
+    require 'yaml'
 
-        if FileTest.exist?(file)
-            data = YAML.load_file(file)
-        else
-            data = {}
-        end
-        data[branch] = $benchmarks
-        Puppet::Util.secure_open(file, "w") { |f| f.print YAML.dump(data) }
+    if FileTest.exist?(file)
+      data = YAML.load_file(file)
+    else
+      data = {}
     end
+    data[branch] = $benchmarks
+    Puppet::Util.secure_open(file, "w") { |f| f.print YAML.dump(data) }
+  end
 end

data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb

@@ -1,17 +1,13 @@
 class AddCreatedAtToAllTables < ActiveRecord::Migration
-    def self.up
-        ActiveRecord::Base.connection.tables.each do |t|
-            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-                add_column t.to_s, :created_at, :datetime
-            end
-        end
+  def self.up
+    ActiveRecord::Base.connection.tables.each do |t|
+      add_column t.to_s, :created_at, :datetime unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
     end
+  end
 
-    def self.down
-        ActiveRecord::Base.connection.tables.each do |t|
-            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-                remove_column t.to_s, :created_at
-            end
-        end
+  def self.down
+    ActiveRecord::Base.connection.tables.each do |t|
+      remove_column t.to_s, :created_at unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
     end
+  end
 end

data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb

@@ -1,17 +1,13 @@
 class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration
-    def self.up
-        ActiveRecord::Base.connection.tables.each do |t|
-            if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
-                remove_index t.to_s, :id
-            end
-        end
+  def self.up
+    ActiveRecord::Base.connection.tables.each do |t|
+      remove_index t.to_s, :id if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
     end
+  end
 
-    def self.down
-        ActiveRecord::Base.connection.tables.each do |t|
-            unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
-                add_index t.to_s, :id, :integer => true
-            end
-        end
+  def self.down
+    ActiveRecord::Base.connection.tables.each do |t|
+      add_index t.to_s, :id, :integer => true unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
     end
+  end
 end

data/lib/puppet/rails/database/003_add_environment_to_host.rb

@@ -1,13 +1,9 @@
 class AddEnvironmentToHost < ActiveRecord::Migration
-    def self.up
-        unless ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment")
-            add_column :hosts, :environment, :string
-        end
-    end
+  def self.up
+    add_column :hosts, :environment, :string unless ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment")
+  end
 
-    def self.down
-        if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment")
-            remove_column :hosts, :environment
-        end
-    end
+  def self.down
+    remove_column :hosts, :environment if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment")
+  end
 end

data/lib/puppet/rails/database/schema.rb

@@ -1,111 +1,114 @@
 class Puppet::Rails::Schema
-    def self.init
-        oldout = nil
-        Puppet::Util.benchmark(Puppet, :notice, "Initialized database") do
-            # We want to rewrite stdout, so we don't get migration messages.
-            oldout = $stdout
-            $stdout = File.open("/dev/null", "w")
-            ActiveRecord::Schema.define do
-                create_table :resources do |t|
-                    t.column :title, :text, :null => false
-                    t.column :restype,  :string, :null => false
-                    t.column :host_id, :integer
-                    t.column :source_file_id, :integer
-                    t.column :exported, :boolean
-                    t.column :line, :integer
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :resources, :host_id, :integer => true
-                add_index :resources, :source_file_id, :integer => true
+  def self.init
+    oldout = nil
+    Puppet::Util.benchmark(Puppet, :notice, "Initialized database") do
+      # We want to rewrite stdout, so we don't get migration messages.
+      oldout = $stdout
+      $stdout = File.open("/dev/null", "w")
+      ActiveRecord::Schema.define do
+        create_table :resources do |t|
+          t.column :title, :text, :null => false
+          t.column :restype,  :string, :null => false
+          t.column :host_id, :integer
+          t.column :source_file_id, :integer
+          t.column :exported, :boolean
+          t.column :line, :integer
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :resources, :host_id, :integer => true
+        add_index :resources, :source_file_id, :integer => true
 
-                # Thanks, mysql!  MySQL requires a length on indexes in text fields.
-                # So, we provide them for mysql and handle everything else specially.
-                if Puppet[:dbadapter] == "mysql"
-                    execute "CREATE INDEX typentitle ON resources (restype,title(50));"
-                else
-                    add_index :resources, [:title, :restype]
-                end
+        # Thanks, mysql!  MySQL requires a length on indexes in text fields.
+        # So, we provide them for mysql and handle everything else specially.
+        # Oracle doesn't index on CLOB fields, so we skip it
+        if Puppet[:dbadapter] == "mysql"
+          execute "CREATE INDEX typentitle ON resources (restype,title(50));"
+        elsif Puppet[:dbadapter] != "oracle_enhanced"
+          add_index :resources, [:title, :restype]
+        end
 
-                create_table :source_files do |t|
-                    t.column :filename, :string
-                    t.column :path, :string
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :source_files, :filename
+        create_table :source_files do |t|
+          t.column :filename, :string
+          t.column :path, :string
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :source_files, :filename
+
+        create_table :resource_tags do |t|
+          t.column :resource_id, :integer
+          t.column :puppet_tag_id, :integer
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :resource_tags, :resource_id, :integer => true
+        add_index :resource_tags, :puppet_tag_id, :integer => true
 
-                create_table :resource_tags do |t|
-                    t.column :resource_id, :integer
-                    t.column :puppet_tag_id, :integer
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :resource_tags, :resource_id, :integer => true
-                add_index :resource_tags, :puppet_tag_id, :integer => true
+        create_table :puppet_tags do |t|
+          t.column :name, :string
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
 
-                create_table :puppet_tags do |t|
-                    t.column :name, :string
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :puppet_tags, :id, :integer => true
+        # Oracle automatically creates a primary key index
+        add_index :puppet_tags, :id, :integer => true if Puppet[:dbadapter] != "oracle_enhanced"
 
-                create_table :hosts do |t|
-                    t.column :name, :string, :null => false
-                    t.column :ip, :string
-                    t.column :environment, :string
-                    t.column :last_compile, :datetime
-                    t.column :last_freshcheck, :datetime
-                    t.column :last_report, :datetime
-                    #Use updated_at to automatically add timestamp on save.
-                    t.column :updated_at, :datetime
-                    t.column :source_file_id, :integer
-                    t.column :created_at, :datetime
-                end
-                add_index :hosts, :source_file_id, :integer => true
-                add_index :hosts, :name
+        create_table :hosts do |t|
+          t.column :name, :string, :null => false
+          t.column :ip, :string
+          t.column :environment, :text
+          t.column :last_compile, :datetime
+          t.column :last_freshcheck, :datetime
+          t.column :last_report, :datetime
+          #Use updated_at to automatically add timestamp on save.
+          t.column :updated_at, :datetime
+          t.column :source_file_id, :integer
+          t.column :created_at, :datetime
+        end
+        add_index :hosts, :source_file_id, :integer => true
+        add_index :hosts, :name
 
-                create_table :fact_names do |t|
-                    t.column :name, :string, :null => false
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :fact_names, :name
+        create_table :fact_names do |t|
+          t.column :name, :string, :null => false
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :fact_names, :name
 
-                create_table :fact_values do |t|
-                    t.column :value, :text, :null => false
-                    t.column :fact_name_id, :integer, :null => false
-                    t.column :host_id, :integer, :null => false
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :fact_values, :fact_name_id, :integer => true
-                add_index :fact_values, :host_id, :integer => true
+        create_table :fact_values do |t|
+          t.column :value, :text, :null => false
+          t.column :fact_name_id, :integer, :null => false
+          t.column :host_id, :integer, :null => false
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :fact_values, :fact_name_id, :integer => true
+        add_index :fact_values, :host_id, :integer => true
 
-                create_table :param_values do |t|
-                    t.column :value,  :text, :null => false
-                    t.column :param_name_id, :integer, :null => false
-                    t.column :line, :integer
-                    t.column :resource_id, :integer
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :param_values, :param_name_id, :integer => true
-                add_index :param_values, :resource_id, :integer => true
+        create_table :param_values do |t|
+          t.column :value,  :text, :null => false
+          t.column :param_name_id, :integer, :null => false
+          t.column :line, :integer
+          t.column :resource_id, :integer
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
+        end
+        add_index :param_values, :param_name_id, :integer => true
+        add_index :param_values, :resource_id, :integer => true
 
-                create_table :param_names do |t|
-                    t.column :name, :string, :null => false
-                    t.column :updated_at, :datetime
-                    t.column :created_at, :datetime
-                end
-                add_index :param_names, :name
-            end
+        create_table :param_names do |t|
+          t.column :name, :string, :null => false
+          t.column :updated_at, :datetime
+          t.column :created_at, :datetime
         end
-    ensure
-        $stdout.close
-        $stdout = oldout if oldout
-        oldout = nil
+        add_index :param_names, :name
+      end
     end
+  ensure
+    $stdout.close
+    $stdout = oldout if oldout
+    oldout = nil
+  end
 end
 

data/lib/puppet/rails/fact_name.rb

@@ -1,7 +1,7 @@
 require 'puppet/rails/fact_value'
 
 class Puppet::Rails::FactName < ActiveRecord::Base
-    has_many :fact_values, :dependent => :destroy
+  has_many :fact_values, :dependent => :destroy
 end
 
 # $Id: fact_name.rb 1952 2006-12-19 05:47:57Z luke $

data/lib/puppet/rails/fact_value.rb

@@ -1,10 +1,10 @@
 class Puppet::Rails::FactValue < ActiveRecord::Base
-    belongs_to :fact_name
-    belongs_to :host
+  belongs_to :fact_name
+  belongs_to :host
 
-    def to_label
-      "#{self.fact_name.name}"
-    end
+  def to_label
+    "#{self.fact_name.name}"
+  end
 end
 
 # $Id: fact_value.rb 1952 2006-12-19 05:47:57Z luke $

data/lib/puppet/rails/host.rb

@@ -5,315 +5,318 @@ require 'puppet/rails/benchmark'
 require 'puppet/util/rails/collection_merger'
 
 class Puppet::Rails::Host < ActiveRecord::Base
-    include Puppet::Rails::Benchmark
-    extend Puppet::Rails::Benchmark
-    include Puppet::Util
-    include Puppet::Util::CollectionMerger
-
-    has_many :fact_values, :dependent => :destroy, :class_name => "Puppet::Rails::FactValue"
-    has_many :fact_names, :through => :fact_values, :class_name => "Puppet::Rails::FactName"
-    belongs_to :source_file
-    has_many :resources, :dependent => :destroy, :class_name => "Puppet::Rails::Resource"
-
-    # If the host already exists, get rid of its objects
-    def self.clean(host)
-        if obj = self.find_by_name(host)
-            obj.rails_objects.clear
-            return obj
-        else
-            return nil
-        end
+  include Puppet::Rails::Benchmark
+  extend Puppet::Rails::Benchmark
+  include Puppet::Util
+  include Puppet::Util::CollectionMerger
+
+  has_many :fact_values, :dependent => :destroy, :class_name => "Puppet::Rails::FactValue"
+  has_many :fact_names, :through => :fact_values, :class_name => "Puppet::Rails::FactName"
+  belongs_to :source_file
+  has_many :resources, :dependent => :destroy, :class_name => "Puppet::Rails::Resource"
+
+  # If the host already exists, get rid of its objects
+  def self.clean(host)
+    if obj = self.find_by_name(host)
+      obj.rails_objects.clear
+      return obj
+    else
+      return nil
     end
+  end
 
-    def self.from_puppet(node)
-        host = find_by_name(node.name) || new(:name => node.name)
-
-        {"ipaddress" => "ip", "environment" => "environment"}.each do |myparam, itsparam|
-            if value = node.send(myparam)
-                host.send(itsparam + "=", value)
-            end
-        end
+  def self.from_puppet(node)
+    host = find_by_name(node.name) || new(:name => node.name)
 
-        host
+    {"ipaddress" => "ip", "environment" => "environment"}.each do |myparam, itsparam|
+      if value = node.send(myparam)
+        host.send(itsparam + "=", value)
+      end
     end
 
-    # Store our host in the database.
-    def self.store(node, resources)
-        args = {}
-
-        host = nil
-        railsmark "Stored node" do
-            transaction do
-                #unless host = find_by_name(name)
+    host
+  end
 
-                debug_benchmark("Searched for host")do
-                    unless host = find_by_name(node.name)
-                        host = new(:name => node.name)
-                    end
-                end
-                if ip = node.parameters["ipaddress"]
-                    host.ip = ip
-                end
+  # Store our host in the database.
+  def self.store(node, resources)
+    args = {}
 
-                if env = node.environment
-                    host.environment = env
-                end
+    host = nil
+    railsmark "Stored node" do
+      transaction do
+        #unless host = find_by_name(name)
 
-                # Store the facts into the database.
-                host.merge_facts(node.parameters)
+        debug_benchmark("Searched for host")do
+          unless host = find_by_name(node.name)
+            host = new(:name => node.name)
+          end
+        end
+        if ip = node.parameters["ipaddress"]
+          host.ip = ip
+        end
 
-                debug_benchmark("Handled resources") {
-                    host.merge_resources(resources)
-                }
+        if env = node.environment
+          host.environment = env
+        end
 
-                host.last_compile = Time.now
+        # Store the facts into the database.
+        host.merge_facts(node.parameters)
 
-                debug_benchmark("Saved host") {
-                    host.save
-                }
-            end
+        debug_benchmark("Handled resources") {
+          host.merge_resources(resources)
+        }
 
-        end
+        host.last_compile = Time.now
 
-        # This only runs if time debugging is enabled.
-        write_benchmarks
+        debug_benchmark("Saved host") {
+          host.save
+        }
+      end
 
-        return host
     end
 
-    # Return the value of a fact.
-    def fact(name)
-        if fv = self.fact_values.find(:all, :include => :fact_name,
-                                      :conditions => "fact_names.name = '#{name}'")
-            return fv
-        else
-            return nil
-        end
-    end
+    # This only runs if time debugging is enabled.
+    write_benchmarks
 
-    # returns a hash of fact_names.name => [ fact_values ] for this host.
-    # Note that 'fact_values' is actually a list of the value instances, not
-    # just actual values.
-    def get_facts_hash
-        fact_values = self.fact_values.find(:all, :include => :fact_name)
-        return fact_values.inject({}) do | hash, value |
-            hash[value.fact_name.name] ||= []
-            hash[value.fact_name.name] << value
-            hash
-        end
-    end
+    host
+  end
 
+  # Return the value of a fact.
+  def fact(name)
 
-    # This is *very* similar to the merge_parameters method
-    # of Puppet::Rails::Resource.
-    def merge_facts(facts)
-        db_facts = {}
+    if fv = self.fact_values.find(
+      :all, :include => :fact_name,
 
-        deletions = []
-        self.fact_values.find(:all, :include => :fact_name).each do |value|
-            deletions << value['id'] and next unless facts.include?(value['name'])
-            # Now store them for later testing.
-            db_facts[value['name']] ||= []
-            db_facts[value['name']] << value
-        end
+        :conditions => "fact_names.name = '#{name}'")
+      return fv
+    else
+      return nil
+    end
+  end
+
+  # returns a hash of fact_names.name => [ fact_values ] for this host.
+  # Note that 'fact_values' is actually a list of the value instances, not
+  # just actual values.
+  def get_facts_hash
+    fact_values = self.fact_values.find(:all, :include => :fact_name)
+    return fact_values.inject({}) do | hash, value |
+      hash[value.fact_name.name] ||= []
+      hash[value.fact_name.name] << value
+      hash
+    end
+  end
 
-        # Now get rid of any parameters whose value list is different.
-        # This might be extra work in cases where an array has added or lost
-        # a single value, but in the most common case (a single value has changed)
-        # this makes sense.
-        db_facts.each do |name, value_hashes|
-            values = value_hashes.collect { |v| v['value'] }
 
-            unless values == facts[name]
-                value_hashes.each { |v| deletions << v['id'] }
-            end
-        end
+  # This is *very* similar to the merge_parameters method
+  # of Puppet::Rails::Resource.
+  def merge_facts(facts)
+    db_facts = {}
 
-        # Perform our deletions.
-        Puppet::Rails::FactValue.delete(deletions) unless deletions.empty?
+    deletions = []
+    self.fact_values.find(:all, :include => :fact_name).each do |value|
+      deletions << value['id'] and next unless facts.include?(value['name'])
+      # Now store them for later testing.
+      db_facts[value['name']] ||= []
+      db_facts[value['name']] << value
+    end
 
-        # Lastly, add any new parameters.
-        facts.each do |name, value|
-            next if db_facts.include?(name)
-            values = value.is_a?(Array) ? value : [value]
+    # Now get rid of any parameters whose value list is different.
+    # This might be extra work in cases where an array has added or lost
+    # a single value, but in the most common case (a single value has changed)
+    # this makes sense.
+    db_facts.each do |name, value_hashes|
+      values = value_hashes.collect { |v| v['value'] }
 
-            values.each do |v|
-                fact_values.build(:value => v, :fact_name => Puppet::Rails::FactName.find_or_create_by_name(name))
-            end
-        end
+      unless values == facts[name]
+        value_hashes.each { |v| deletions << v['id'] }
+      end
     end
 
-    # Set our resources.
-    def merge_resources(list)
-        # keep only exported resources in thin_storeconfig mode
-        list = list.select { |r| r.exported? } if Puppet.settings[:thin_storeconfigs]
-
-        resources_by_id = nil
-        debug_benchmark("Searched for resources") {
-            resources_by_id = find_resources()
-        }
+    # Perform our deletions.
+    Puppet::Rails::FactValue.delete(deletions) unless deletions.empty?
 
-        debug_benchmark("Searched for resource params and tags") {
-            find_resources_parameters_tags(resources_by_id)
-        } if id
+    # Lastly, add any new parameters.
+    facts.each do |name, value|
+      next if db_facts.include?(name)
+      values = value.is_a?(Array) ? value : [value]
 
-        debug_benchmark("Performed resource comparison") {
-            compare_to_catalog(resources_by_id, list)
-        }
+      values.each do |v|
+        fact_values.build(:value => v, :fact_name => Puppet::Rails::FactName.find_or_create_by_name(name))
+      end
     end
+  end
 
-    def find_resources
-        condition = { :exported => true } if Puppet.settings[:thin_storeconfigs]
+  # Set our resources.
+  def merge_resources(list)
+    # keep only exported resources in thin_storeconfig mode
+    list = list.select { |r| r.exported? } if Puppet.settings[:thin_storeconfigs]
 
-        resources.find(:all, :include => :source_file, :conditions => condition || {}).inject({}) do | hash, resource |
-            hash[resource.id] = resource
-            hash
-        end
-    end
+    resources_by_id = nil
+    debug_benchmark("Searched for resources") {
+      resources_by_id = find_resources
+    }
 
-    def find_resources_parameters_tags(resources)
-        find_resources_parameters(resources)
-        find_resources_tags(resources)
-    end
+    debug_benchmark("Searched for resource params and tags") {
+      find_resources_parameters_tags(resources_by_id)
+    } if id
 
-    def compare_to_catalog(existing, list)
-        compiled = list.inject({}) do |hash, resource|
-            hash[resource.ref] = resource
-            hash
-        end
+    debug_benchmark("Performed resource comparison") {
+      compare_to_catalog(resources_by_id, list)
+    }
+  end
 
-        resources = nil
-        debug_benchmark("Resource removal") {
-            resources = remove_unneeded_resources(compiled, existing)
-        }
+  def find_resources
+    condition = { :exported => true } if Puppet.settings[:thin_storeconfigs]
 
-        # Now for all resources in the catalog but not in the db, we're pretty easy.
-        additions = nil
-        debug_benchmark("Resource merger") {
-            additions = perform_resource_merger(compiled, resources)
-        }
+    resources.find(:all, :include => :source_file, :conditions => condition || {}).inject({}) do | hash, resource |
+      hash[resource.id] = resource
+      hash
+    end
+  end
 
-        debug_benchmark("Resource addition") {
-            additions.each do |resource|
-                build_rails_resource_from_parser_resource(resource)
-            end
+  def find_resources_parameters_tags(resources)
+    find_resources_parameters(resources)
+    find_resources_tags(resources)
+  end
 
-            log_accumulated_marks "Added resources"
-        }
+  def compare_to_catalog(existing, list)
+    compiled = list.inject({}) do |hash, resource|
+      hash[resource.ref] = resource
+      hash
     end
 
-    def add_new_resources(additions)
-        additions.each do |resource|
-            Puppet::Rails::Resource.from_parser_resource(self, resource)
-        end
+    resources = nil
+    debug_benchmark("Resource removal") {
+      resources = remove_unneeded_resources(compiled, existing)
+    }
+
+    # Now for all resources in the catalog but not in the db, we're pretty easy.
+    additions = nil
+    debug_benchmark("Resource merger") {
+      additions = perform_resource_merger(compiled, resources)
+    }
+
+    debug_benchmark("Resource addition") {
+      additions.each do |resource|
+        build_rails_resource_from_parser_resource(resource)
+      end
+
+      log_accumulated_marks "Added resources"
+    }
+  end
+
+  def add_new_resources(additions)
+    additions.each do |resource|
+      Puppet::Rails::Resource.from_parser_resource(self, resource)
     end
+  end
 
-    # Turn a parser resource into a Rails resource.
-    def build_rails_resource_from_parser_resource(resource)
-        db_resource = nil
-        accumulate_benchmark("Added resources", :initialization) {
-            args = Puppet::Rails::Resource.rails_resource_initial_args(resource)
-
-            db_resource = self.resources.build(args)
+  # Turn a parser resource into a Rails resource.
+  def build_rails_resource_from_parser_resource(resource)
+    db_resource = nil
+    accumulate_benchmark("Added resources", :initialization) {
+      args = Puppet::Rails::Resource.rails_resource_initial_args(resource)
 
-            # Our file= method does the name to id conversion.
-            db_resource.file = resource.file
-        }
+      db_resource = self.resources.build(args)
 
+      # Our file= method does the name to id conversion.
+      db_resource.file = resource.file
+    }
 
-        accumulate_benchmark("Added resources", :parameters) {
-            resource.each do |param, value|
-                Puppet::Rails::ParamValue.from_parser_param(param, value).each do |value_hash|
-                    db_resource.param_values.build(value_hash)
-                end
-            end
-        }
 
-        accumulate_benchmark("Added resources", :tags) {
-            resource.tags.each { |tag| db_resource.add_resource_tag(tag) }
-        }
+    accumulate_benchmark("Added resources", :parameters) {
+      resource.each do |param, value|
+        Puppet::Rails::ParamValue.from_parser_param(param, value).each do |value_hash|
+          db_resource.param_values.build(value_hash)
+        end
+      end
+    }
 
-        db_resource.save
+    accumulate_benchmark("Added resources", :tags) {
+      resource.tags.each { |tag| db_resource.add_resource_tag(tag) }
+    }
 
-        return db_resource
-    end
+    db_resource.save
 
+    db_resource
+  end
 
-    def perform_resource_merger(compiled, resources)
-        return compiled.values if resources.empty?
 
-        # Now for all resources in the catalog but not in the db, we're pretty easy.
-        additions = []
-        compiled.each do |ref, resource|
-            if db_resource = resources[ref]
-                db_resource.merge_parser_resource(resource)
-            else
-                additions << resource
-            end
-        end
-        log_accumulated_marks "Resource merger"
+  def perform_resource_merger(compiled, resources)
+    return compiled.values if resources.empty?
 
-        return additions
+    # Now for all resources in the catalog but not in the db, we're pretty easy.
+    additions = []
+    compiled.each do |ref, resource|
+      if db_resource = resources[ref]
+        db_resource.merge_parser_resource(resource)
+      else
+        additions << resource
+      end
     end
-
-    def remove_unneeded_resources(compiled, existing)
-        deletions = []
-        resources = {}
-        existing.each do |id, resource|
-            # it seems that it can happen (see bug #2010) some resources are duplicated in the
-            # database (ie logically corrupted database), in which case we remove the extraneous
-            # entries.
-            if resources.include?(resource.ref)
-                deletions << id
-                next
-            end
-
-            # If the resource is in the db but not in the catalog, mark it
-            # for removal.
-            unless compiled.include?(resource.ref)
-                deletions << id
-                next
-            end
-
-            resources[resource.ref] = resource
-        end
-        # We need to use 'destroy' here, not 'delete', so that all
-        # dependent objects get removed, too.
-        Puppet::Rails::Resource.destroy(deletions) unless deletions.empty?
-
-        return resources
+    log_accumulated_marks "Resource merger"
+
+    additions
+  end
+
+  def remove_unneeded_resources(compiled, existing)
+    deletions = []
+    resources = {}
+    existing.each do |id, resource|
+      # it seems that it can happen (see bug #2010) some resources are duplicated in the
+      # database (ie logically corrupted database), in which case we remove the extraneous
+      # entries.
+      if resources.include?(resource.ref)
+        deletions << id
+        next
+      end
+
+      # If the resource is in the db but not in the catalog, mark it
+      # for removal.
+      unless compiled.include?(resource.ref)
+        deletions << id
+        next
+      end
+
+      resources[resource.ref] = resource
     end
+    # We need to use 'destroy' here, not 'delete', so that all
+    # dependent objects get removed, too.
+    Puppet::Rails::Resource.destroy(deletions) unless deletions.empty?
 
-    def find_resources_parameters(resources)
-        params = Puppet::Rails::ParamValue.find_all_params_from_host(self)
+    resources
+  end
 
-        # assign each loaded parameters/tags to the resource it belongs to
-        params.each do |param|
-            resources[param['resource_id']].add_param_to_list(param) if resources.include?(param['resource_id'])
-        end
+  def find_resources_parameters(resources)
+    params = Puppet::Rails::ParamValue.find_all_params_from_host(self)
+
+    # assign each loaded parameters/tags to the resource it belongs to
+    params.each do |param|
+      resources[param['resource_id']].add_param_to_list(param) if resources.include?(param['resource_id'])
     end
+  end
 
-    def find_resources_tags(resources)
-        tags = Puppet::Rails::ResourceTag.find_all_tags_from_host(self)
+  def find_resources_tags(resources)
+    tags = Puppet::Rails::ResourceTag.find_all_tags_from_host(self)
 
-        tags.each do |tag|
-            resources[tag['resource_id']].add_tag_to_list(tag) if resources.include?(tag['resource_id'])
-        end
+    tags.each do |tag|
+      resources[tag['resource_id']].add_tag_to_list(tag) if resources.include?(tag['resource_id'])
     end
-
-    def update_connect_time
-        self.last_connect = Time.now
-        save
+  end
+
+  def update_connect_time
+    self.last_connect = Time.now
+    save
+  end
+
+  def to_puppet
+    node = Puppet::Node.new(self.name)
+    {"ip" => "ipaddress", "environment" => "environment"}.each do |myparam, itsparam|
+      if value = send(myparam)
+        node.send(itsparam + "=", value)
+      end
     end
 
-    def to_puppet
-        node = Puppet::Node.new(self.name)
-        {"ip" => "ipaddress", "environment" => "environment"}.each do |myparam, itsparam|
-            if value = send(myparam)
-                node.send(itsparam + "=", value)
-            end
-        end
-
-        node
-    end
+    node
+  end
 end