puppet 0.25.5 → 2.6.0

data/lib/puppet/rails/param_name.rb

@@ -3,23 +3,23 @@ require 'puppet/rails/param_value'
 require 'puppet/util/rails/cache_accumulator'
 
 class Puppet::Rails::ParamName < ActiveRecord::Base
-    include Puppet::Util::CollectionMerger
-    has_many :param_values, :dependent => :destroy
+  include Puppet::Util::CollectionMerger
+  has_many :param_values, :dependent => :destroy
 
-    include Puppet::Util::CacheAccumulator
-    accumulates :name
+  include Puppet::Util::CacheAccumulator
+  accumulates :name
 
-    def to_resourceparam(resource, source)
-        hash = {}
-        hash[:name] = self.name.to_sym
-        hash[:source] = source
-        hash[:value] = resource.param_values.find(:all, :conditions => [ "param_name_id = ?", self.id]).collect { |v| v.value }
-        if hash[:value].length == 1
-            hash[:value] = hash[:value].shift
-        elsif hash[:value].empty?
-            hash[:value] = nil
-        end
-        Puppet::Parser::Resource::Param.new hash
+  def to_resourceparam(resource, source)
+    hash = {}
+    hash[:name] = self.name.to_sym
+    hash[:source] = source
+    hash[:value] = resource.param_values.find(:all, :conditions => [ "param_name_id = ?", self.id]).collect { |v| v.value }
+    if hash[:value].length == 1
+      hash[:value] = hash[:value].shift
+    elsif hash[:value].empty?
+      hash[:value] = nil
     end
+    Puppet::Parser::Resource::Param.new hash
+  end
 end
 

data/lib/puppet/rails/param_value.rb

@@ -1,74 +1,74 @@
 require 'puppet/util/rails/reference_serializer'
 
 class Puppet::Rails::ParamValue < ActiveRecord::Base
-    include Puppet::Util::ReferenceSerializer
-    extend Puppet::Util::ReferenceSerializer
+  include Puppet::Util::ReferenceSerializer
+  extend Puppet::Util::ReferenceSerializer
 
-    belongs_to :param_name
-    belongs_to :resource
+  belongs_to :param_name
+  belongs_to :resource
 
-    # Store a new parameter in a Rails db.
-    def self.from_parser_param(param, values)
-        values = munge_parser_values(values)
+  # Store a new parameter in a Rails db.
+  def self.from_parser_param(param, values)
+    values = munge_parser_values(values)
 
-        param_name = Puppet::Rails::ParamName.find_or_create_by_name(param.to_s)
-        return values.collect do |v|
-            {:value => v, :param_name => param_name}
-        end
+    param_name = Puppet::Rails::ParamName.find_or_create_by_name(param.to_s)
+    return values.collect do |v|
+      {:value => v, :param_name => param_name}
     end
+  end
 
-    # Make sure an array (or possibly not an array) of values is correctly
-    # set up for Rails.  The main thing is that Resource::Reference objects
-    # should stay objects, so they just get serialized.
-    def self.munge_parser_values(value)
-        values = value.is_a?(Array) ? value : [value]
-        values.map do |v|
-            if v.is_a?(Puppet::Resource::Reference)
-                v
-            else
-                v.to_s
-            end
-        end
+  # Make sure an array (or possibly not an array) of values is correctly
+  # set up for Rails.  The main thing is that Resource::Reference objects
+  # should stay objects, so they just get serialized.
+  def self.munge_parser_values(value)
+    values = value.is_a?(Array) ? value : [value]
+    values.map do |v|
+      if v.is_a?(Puppet::Resource)
+        v
+      else
+        v.to_s
+      end
     end
+  end
 
 
-    def value
-        unserialize_value(self[:value])
-    end
+  def value
+    unserialize_value(self[:value])
+  end
 
-    # I could not find a cleaner way to handle making sure that resource references
-    # were consistently serialized and deserialized.
-    def value=(val)
-        self[:value] = serialize_value(val)
-    end
+  # I could not find a cleaner way to handle making sure that resource references
+  # were consistently serialized and deserialized.
+  def value=(val)
+    self[:value] = serialize_value(val)
+  end
 
-    def to_label
-        "#{self.param_name.name}"
-    end
+  def to_label
+    "#{self.param_name.name}"
+  end
 
-    # returns an array of hash containing all the parameters of a given resource
-    def self.find_all_params_from_resource(db_resource)
-        params = db_resource.connection.select_all("SELECT v.id, v.value, v.line, v.resource_id, v.param_name_id, n.name FROM param_values as v INNER JOIN param_names as n ON v.param_name_id=n.id WHERE v.resource_id=%s" % db_resource.id)
-        params.each do |val|
-            val['value'] = unserialize_value(val['value'])
-            val['line'] = val['line'] ? Integer(val['line']) : nil
-            val['resource_id'] = Integer(val['resource_id'])
-        end
-        params
+  # returns an array of hash containing all the parameters of a given resource
+  def self.find_all_params_from_resource(db_resource)
+    params = db_resource.connection.select_all("SELECT v.id, v.value, v.line, v.resource_id, v.param_name_id, n.name FROM param_values v INNER JOIN param_names n ON v.param_name_id=n.id WHERE v.resource_id=#{db_resource.id}")
+    params.each do |val|
+      val['value'] = unserialize_value(val['value'])
+      val['line'] = val['line'] ? Integer(val['line']) : nil
+      val['resource_id'] = Integer(val['resource_id'])
     end
+    params
+  end
 
-    # returns an array of hash containing all the parameters of a given host
-    def self.find_all_params_from_host(db_host)
-        params = db_host.connection.select_all("SELECT v.id, v.value,  v.line, v.resource_id, v.param_name_id, n.name FROM param_values as v INNER JOIN resources r ON v.resource_id=r.id INNER JOIN param_names as n ON v.param_name_id=n.id WHERE r.host_id=%s" % db_host.id)
-        params.each do |val|
-            val['value'] = unserialize_value(val['value'])
-            val['line'] = val['line'] ? Integer(val['line']) : nil
-            val['resource_id'] = Integer(val['resource_id'])
-        end
-        params
+  # returns an array of hash containing all the parameters of a given host
+  def self.find_all_params_from_host(db_host)
+    params = db_host.connection.select_all("SELECT v.id, v.value,  v.line, v.resource_id, v.param_name_id, n.name FROM param_values v INNER JOIN resources r ON v.resource_id=r.id INNER JOIN param_names n ON v.param_name_id=n.id WHERE r.host_id=#{db_host.id}")
+    params.each do |val|
+      val['value'] = unserialize_value(val['value'])
+      val['line'] = val['line'] ? Integer(val['line']) : nil
+      val['resource_id'] = Integer(val['resource_id'])
     end
+    params
+  end
 
-    def to_s
-        "%s => %s" % [self.name, self.value]
-    end
+  def to_s
+    "#{self.name} => #{self.value}"
+  end
 end

data/lib/puppet/rails/puppet_tag.rb

@@ -2,9 +2,9 @@ require 'puppet/rails/resource_tag'
 require 'puppet/util/rails/cache_accumulator'
 
 class Puppet::Rails::PuppetTag < ActiveRecord::Base
-    has_many :resource_tags, :dependent => :destroy
-    has_many :resources, :through => :resource_tags
+  has_many :resource_tags, :dependent => :destroy
+  has_many :resources, :through => :resource_tags
 
-    include Puppet::Util::CacheAccumulator
-    accumulates :name
+  include Puppet::Util::CacheAccumulator
+  accumulates :name
 end

data/lib/puppet/rails/resource.rb

@@ -6,240 +6,226 @@ require 'puppet/rails/benchmark'
 require 'puppet/util/rails/collection_merger'
 
 class Puppet::Rails::Resource < ActiveRecord::Base
-    include Puppet::Util::CollectionMerger
-    include Puppet::Util::ReferenceSerializer
-    include Puppet::Rails::Benchmark
+  include Puppet::Util::CollectionMerger
+  include Puppet::Util::ReferenceSerializer
+  include Puppet::Rails::Benchmark
+
+  has_many :param_values, :dependent => :destroy, :class_name => "Puppet::Rails::ParamValue"
+  has_many :param_names, :through => :param_values, :class_name => "Puppet::Rails::ParamName"
 
-    has_many :param_values, :dependent => :destroy, :class_name => "Puppet::Rails::ParamValue"
-    has_many :param_names, :through => :param_values, :class_name => "Puppet::Rails::ParamName"
+  has_many :resource_tags, :dependent => :destroy, :class_name => "Puppet::Rails::ResourceTag"
+  has_many :puppet_tags, :through => :resource_tags, :class_name => "Puppet::Rails::PuppetTag"
 
-    has_many :resource_tags, :dependent => :destroy, :class_name => "Puppet::Rails::ResourceTag"
-    has_many :puppet_tags, :through => :resource_tags, :class_name => "Puppet::Rails::PuppetTag"
+  belongs_to :source_file
+  belongs_to :host
 
-    belongs_to :source_file
-    belongs_to :host
+  @tags = {}
+  def self.tags
+    @tags
+  end
 
-    @tags = {}
-    def self.tags
-        @tags
+  # Determine the basic details on the resource.
+  def self.rails_resource_initial_args(resource)
+    result = [:type, :title, :line].inject({}) do |hash, param|
+      # 'type' isn't a valid column name, so we have to use another name.
+      to = (param == :type) ? :restype : param
+      if value = resource.send(param)
+        hash[to] = value
+      end
+      hash
     end
 
-    # Determine the basic details on the resource.
-    def self.rails_resource_initial_args(resource)
-        result = [:type, :title, :line].inject({}) do |hash, param|
-            # 'type' isn't a valid column name, so we have to use another name.
-            to = (param == :type) ? :restype : param
-            if value = resource.send(param)
-                hash[to] = value
-            end
-            hash
-        end
-
-        # We always want a value here, regardless of what the resource has,
-        # so we break it out separately.
-        result[:exported] = resource.exported || false
-
-        result
-    end
+    # We always want a value here, regardless of what the resource has,
+    # so we break it out separately.
+    result[:exported] = resource.exported || false
 
-    def add_resource_tag(tag)
-        pt = Puppet::Rails::PuppetTag.accumulate_by_name(tag)
-        resource_tags.build(:puppet_tag => pt)
-    end
+    result
+  end
 
-    def file
-        if f = self.source_file
-            return f.filename
-        else
-            return nil
-        end
-    end
+  def add_resource_tag(tag)
+    pt = Puppet::Rails::PuppetTag.accumulate_by_name(tag)
+    resource_tags.build(:puppet_tag => pt)
+  end
 
-    def file=(file)
-        self.source_file = Puppet::Rails::SourceFile.find_or_create_by_filename(file)
-    end
+  def file
+    (f = self.source_file) ? f.filename : nil
+  end
 
-    def title
-        unserialize_value(self[:title])
-    end
+  def file=(file)
+    self.source_file = Puppet::Rails::SourceFile.find_or_create_by_filename(file)
+  end
 
-    def params_list
-        @params_list ||= []
-    end
+  def title
+    unserialize_value(self[:title])
+  end
 
-    def params_list=(params)
-        @params_list = params
-    end
+  def params_list
+    @params_list ||= []
+  end
 
-    def add_param_to_list(param)
-        params_list << param
-    end
+  def params_list=(params)
+    @params_list = params
+  end
 
-    def tags_list
-        @tags_list ||= []
-    end
+  def add_param_to_list(param)
+    params_list << param
+  end
 
-    def tags_list=(tags)
-        @tags_list = tags
-    end
+  def tags_list
+    @tags_list ||= []
+  end
 
-    def add_tag_to_list(tag)
-        tags_list << tag
-    end
+  def tags_list=(tags)
+    @tags_list = tags
+  end
 
-    def [](param)
-        return super || parameter(param)
-    end
+  def add_tag_to_list(tag)
+    tags_list << tag
+  end
 
-    # Make sure this resource is equivalent to the provided Parser resource.
-    def merge_parser_resource(resource)
-        accumulate_benchmark("Individual resource merger", :attributes) { merge_attributes(resource) }
-        accumulate_benchmark("Individual resource merger", :parameters) { merge_parameters(resource) }
-        accumulate_benchmark("Individual resource merger", :tags) { merge_tags(resource) }
-        save()
-    end
+  def [](param)
+    super || parameter(param)
+  end
 
-    def merge_attributes(resource)
-        args = self.class.rails_resource_initial_args(resource)
-        args.each do |param, value|
-            unless resource[param] == value
-                self[param] = value
-            end
-        end
-
-        # Handle file specially
-        if (resource.file and  (!resource.file or self.file != resource.file))
-            self.file = resource.file
-        end
-    end
+  # Make sure this resource is equivalent to the provided Parser resource.
+  def merge_parser_resource(resource)
+    accumulate_benchmark("Individual resource merger", :attributes) { merge_attributes(resource) }
+    accumulate_benchmark("Individual resource merger", :parameters) { merge_parameters(resource) }
+    accumulate_benchmark("Individual resource merger", :tags) { merge_tags(resource) }
+    save
+  end
 
-    def merge_parameters(resource)
-        catalog_params = {}
-        resource.each do |param, value|
-            catalog_params[param.to_s] = value
-        end
-
-        db_params = {}
-
-        deletions = []
-        params_list.each do |value|
-            # First remove any parameters our catalog resource doesn't have at all.
-            deletions << value['id'] and next unless catalog_params.include?(value['name'])
-
-            # Now store them for later testing.
-            db_params[value['name']] ||= []
-            db_params[value['name']] << value
-        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_params.each do |name, value_hashes|
-            values = value_hashes.collect { |v| v['value'] }
-
-            unless value_compare(catalog_params[name], values)
-                value_hashes.each { |v| deletions << v['id'] }
-            end
-        end
-
-        # Perform our deletions.
-        Puppet::Rails::ParamValue.delete(deletions) unless deletions.empty?
-
-        # Lastly, add any new parameters.
-        catalog_params.each do |name, value|
-            next if db_params.include?(name) && ! db_params[name].find{ |val| deletions.include?( val["id"] ) }
-            values = value.is_a?(Array) ? value : [value]
-
-            values.each do |v|
-                param_values.build(:value => serialize_value(v), :line => resource.line, :param_name => Puppet::Rails::ParamName.accumulate_by_name(name))
-            end
-        end
+  def merge_attributes(resource)
+    args = self.class.rails_resource_initial_args(resource)
+    args.each do |param, value|
+      self[param] = value unless resource[param] == value
     end
 
-    # Make sure the tag list is correct.
-    def merge_tags(resource)
-        in_db = []
-        deletions = []
-        resource_tags = resource.tags
-        tags_list.each do |tag|
-            deletions << tag['id'] and next unless resource_tags.include?(tag['name'])
-            in_db << tag['name']
-        end
-        Puppet::Rails::ResourceTag.delete(deletions) unless deletions.empty?
-
-        (resource_tags - in_db).each do |tag|
-            add_resource_tag(tag)
-        end
+    # Handle file specially
+    self.file = resource.file if (resource.file and  (!resource.file or self.file != resource.file))
+  end
+
+  def merge_parameters(resource)
+    catalog_params = {}
+    resource.each do |param, value|
+      catalog_params[param.to_s] = value
     end
 
-    def value_compare(v,db_value)
-        v = [v] unless v.is_a?(Array)
+    db_params = {}
 
-        v == db_value
-    end
+    deletions = []
+    params_list.each do |value|
+      # First remove any parameters our catalog resource doesn't have at all.
+      deletions << value['id'] and next unless catalog_params.include?(value['name'])
+
+      # Now store them for later testing.
+      db_params[value['name']] ||= []
+      db_params[value['name']] << value
+    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_params.each do |name, value_hashes|
+      values = value_hashes.collect { |v| v['value'] }
 
-    def name
-        ref()
+      value_hashes.each { |v| deletions << v['id'] } unless value_compare(catalog_params[name], values)
     end
 
-    def parameter(param)
-        if pn = param_names.find_by_name(param)
-            if pv = param_values.find(:first, :conditions => [ 'param_name_id = ?', pn])
-                return pv.value
-            else
-                return nil
-            end
-        end
-    end
+    # Perform our deletions.
+    Puppet::Rails::ParamValue.delete(deletions) unless deletions.empty?
+
+    # Lastly, add any new parameters.
+    catalog_params.each do |name, value|
+      next if db_params.include?(name) && ! db_params[name].find{ |val| deletions.include?( val["id"] ) }
+      values = value.is_a?(Array) ? value : [value]
+
+      values.each do |v|
+        param_values.build(:value => serialize_value(v), :line => resource.line, :param_name => Puppet::Rails::ParamName.accumulate_by_name(name))
+      end
+    end
+  end
 
-    def ref(dummy_argument=:work_arround_for_ruby_GC_bug)
-        "%s[%s]" % [self[:restype].split("::").collect { |s| s.capitalize }.join("::"), self.title.to_s]
-    end
+  # Make sure the tag list is correct.
+  def merge_tags(resource)
+    in_db = []
+    deletions = []
+    resource_tags = resource.tags
+    tags_list.each do |tag|
+      deletions << tag['id'] and next unless resource_tags.include?(tag['name'])
+      in_db << tag['name']
+    end
+    Puppet::Rails::ResourceTag.delete(deletions) unless deletions.empty?
 
-    # Returns a hash of parameter names and values, no ActiveRecord instances.
-    def to_hash
-        Puppet::Rails::ParamValue.find_all_params_from_resource(self).inject({}) do |hash, value|
-            hash[value['name']] ||= []
-            hash[value['name']] << value.value
-            hash
-        end
+    (resource_tags - in_db).each do |tag|
+      add_resource_tag(tag)
+    end
+  end
+
+  def value_compare(v,db_value)
+    v = [v] unless v.is_a?(Array)
+
+    v == db_value
+  end
+
+  def name
+    ref
+  end
+
+  def parameter(param)
+    if pn = param_names.find_by_name(param)
+      return (pv = param_values.find(:first, :conditions => [ 'param_name_id = ?', pn])) ? pv.value : nil
+    end
+  end
+
+  def ref(dummy_argument=:work_arround_for_ruby_GC_bug)
+    "#{self[:restype].split("::").collect { |s| s.capitalize }.join("::")}[#{self.title}]"
+  end
+
+  # Returns a hash of parameter names and values, no ActiveRecord instances.
+  def to_hash
+    Puppet::Rails::ParamValue.find_all_params_from_resource(self).inject({}) do |hash, value|
+      hash[value['name']] ||= []
+      hash[value['name']] << value.value
+      hash
     end
+  end
+
+  # Convert our object to a resource.  Do not retain whether the object
+  # is exported, though, since that would cause it to get stripped
+  # from the configuration.
+  def to_resource(scope)
+    hash = self.attributes
+    hash["type"] = hash["restype"]
+    hash.delete("restype")
 
-    # Convert our object to a resource.  Do not retain whether the object
-    # is exported, though, since that would cause it to get stripped
-    # from the configuration.
-    def to_resource(scope)
-        hash = self.attributes
-        hash["type"] = hash["restype"]
-        hash.delete("restype")
-
-        # FIXME At some point, we're going to want to retain this information
-        # for logging and auditing.
-        hash.delete("host_id")
-        hash.delete("updated_at")
-        hash.delete("source_file_id")
-        hash.delete("created_at")
-        hash.delete("id")
-        hash.each do |p, v|
-            hash.delete(p) if v.nil?
-        end
-        hash[:scope] = scope
-        hash[:source] = scope.source
-        hash[:params] = []
-        names = []
-        self.param_names.each do |pname|
-            # We can get the same name multiple times because of how the
-            # db layout works.
-            next if names.include?(pname.name)
-            names << pname.name
-            hash[:params] << pname.to_resourceparam(self, scope.source)
-        end
-        obj = Puppet::Parser::Resource.new(hash)
-
-        # Store the ID, so we can check if we're re-collecting the same resource.
-        obj.rails_id = self.id
-
-        return obj
+    # FIXME At some point, we're going to want to retain this information
+    # for logging and auditing.
+    hash.delete("host_id")
+    hash.delete("updated_at")
+    hash.delete("source_file_id")
+    hash.delete("created_at")
+    hash.delete("id")
+    hash.each do |p, v|
+      hash.delete(p) if v.nil?
     end
+    hash[:scope] = scope
+    hash[:source] = scope.source
+    hash[:parameters] = []
+    names = []
+    self.param_names.each do |pname|
+      # We can get the same name multiple times because of how the
+      # db layout works.
+      next if names.include?(pname.name)
+      names << pname.name
+      hash[:parameters] << pname.to_resourceparam(self, scope.source)
+    end
+    obj = Puppet::Parser::Resource.new(hash.delete("type"), hash.delete("title"), hash)
+
+    # Store the ID, so we can check if we're re-collecting the same resource.
+    obj.rails_id = self.id
+
+    obj
+  end
 end