summaryrefslogtreecommitdiffstats
path: root/lib/puppet/rails
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/rails')
-rw-r--r--lib/puppet/rails/database/001_add_created_at_to_all_tables.rb10
-rw-r--r--lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb4
-rw-r--r--lib/puppet/rails/database/003_add_environment_to_host.rb2
-rw-r--r--lib/puppet/rails/database/schema.rb16
-rw-r--r--lib/puppet/rails/fact_value.rb2
-rw-r--r--lib/puppet/rails/host.rb8
-rw-r--r--lib/puppet/rails/param_name.rb2
-rw-r--r--lib/puppet/rails/param_value.rb2
-rw-r--r--lib/puppet/rails/resource.rb2
-rw-r--r--lib/puppet/rails/resource_tag.rb2
-rw-r--r--lib/puppet/rails/source_file.rb2
11 files changed, 26 insertions, 26 deletions
diff --git a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
index d1035b0db..138f9f151 100644
--- a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
+++ b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
@@ -2,16 +2,16 @@ 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
+ add_column t.to_s, :created_at, :datetime
+ end
+ 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
+ end
+ end
end
end
diff --git a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
index 3873a13e2..050ca7f43 100644
--- a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
+++ b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
@@ -4,7 +4,7 @@ class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration
if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
remove_index t.to_s, :id
end
- end
+ end
end
def self.down
@@ -12,6 +12,6 @@ class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration
unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id")
add_index t.to_s, :id, :integer => true
end
- end
+ end
end
end
diff --git a/lib/puppet/rails/database/003_add_environment_to_host.rb b/lib/puppet/rails/database/003_add_environment_to_host.rb
index 3ed10e946..4ab2fbc63 100644
--- a/lib/puppet/rails/database/003_add_environment_to_host.rb
+++ b/lib/puppet/rails/database/003_add_environment_to_host.rb
@@ -4,7 +4,7 @@ class AddEnvironmentToHost < ActiveRecord::Migration
add_column :hosts, :environment, :string
end
end
-
+
def self.down
if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment")
remove_column :hosts, :environment
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb
index 246bec482..d8fcbb418 100644
--- a/lib/puppet/rails/database/schema.rb
+++ b/lib/puppet/rails/database/schema.rb
@@ -27,7 +27,7 @@ class Puppet::Rails::Schema
add_index :resources, [:title, :restype]
end
- create_table :source_files do |t|
+ create_table :source_files do |t|
t.column :filename, :string
t.column :path, :string
t.column :updated_at, :datetime
@@ -44,7 +44,7 @@ class Puppet::Rails::Schema
add_index :resource_tags, :resource_id, :integer => true
add_index :resource_tags, :puppet_tag_id, :integer => true
- create_table :puppet_tags do |t|
+ create_table :puppet_tags do |t|
t.column :name, :string
t.column :updated_at, :datetime
t.column :created_at, :datetime
@@ -66,20 +66,20 @@ class Puppet::Rails::Schema
add_index :hosts, :source_file_id, :integer => true
add_index :hosts, :name
- create_table :fact_names do |t|
+ 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|
+ 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
+ end
add_index :fact_values, :fact_name_id, :integer => true
add_index :fact_values, :host_id, :integer => true
@@ -93,14 +93,14 @@ class Puppet::Rails::Schema
end
add_index :param_values, :param_name_id, :integer => true
add_index :param_values, :resource_id, :integer => true
-
- create_table :param_names do |t|
+
+ 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
+ end
end
ensure
$stdout.close
diff --git a/lib/puppet/rails/fact_value.rb b/lib/puppet/rails/fact_value.rb
index b53591d7e..e4cc6dd3c 100644
--- a/lib/puppet/rails/fact_value.rb
+++ b/lib/puppet/rails/fact_value.rb
@@ -4,7 +4,7 @@ class Puppet::Rails::FactValue < ActiveRecord::Base
def to_label
"#{self.fact_name.name}"
- end
+ end
end
# $Id: fact_value.rb 1952 2006-12-19 05:47:57Z luke $
diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb
index 1ddc01244..14ad5e6aa 100644
--- a/lib/puppet/rails/host.rb
+++ b/lib/puppet/rails/host.rb
@@ -84,13 +84,13 @@ class Puppet::Rails::Host < ActiveRecord::Base
# Return the value of a fact.
def fact(name)
if fv = self.fact_values.find(:all, :include => :fact_name,
- :conditions => "fact_names.name = '#{name}'")
+ :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.
@@ -102,7 +102,7 @@ class Puppet::Rails::Host < ActiveRecord::Base
hash
end
end
-
+
# This is *very* similar to the merge_parameters method
# of Puppet::Rails::Resource.
@@ -208,7 +208,7 @@ class Puppet::Rails::Host < ActiveRecord::Base
end
end
- # Turn a parser resource into a Rails resource.
+ # Turn a parser resource into a Rails resource.
def build_rails_resource_from_parser_resource(resource)
db_resource = nil
accumulate_benchmark("Added resources", :initialization) {
diff --git a/lib/puppet/rails/param_name.rb b/lib/puppet/rails/param_name.rb
index b4eb1df05..69e2fb6e2 100644
--- a/lib/puppet/rails/param_name.rb
+++ b/lib/puppet/rails/param_name.rb
@@ -4,7 +4,7 @@ require 'puppet/util/rails/cache_accumulator'
class Puppet::Rails::ParamName < ActiveRecord::Base
include Puppet::Util::CollectionMerger
- has_many :param_values, :dependent => :destroy
+ has_many :param_values, :dependent => :destroy
include Puppet::Util::CacheAccumulator
accumulates :name
diff --git a/lib/puppet/rails/param_value.rb b/lib/puppet/rails/param_value.rb
index 46d7fc1fb..21415ef4b 100644
--- a/lib/puppet/rails/param_value.rb
+++ b/lib/puppet/rails/param_value.rb
@@ -67,7 +67,7 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base
end
params
end
-
+
def to_s
"%s => %s" % [self.name, self.value]
end
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index 758df64b1..12d321143 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -150,7 +150,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base
end
end
end
-
+
# Make sure the tag list is correct.
def merge_tags(resource)
in_db = []
diff --git a/lib/puppet/rails/resource_tag.rb b/lib/puppet/rails/resource_tag.rb
index 57649b959..8aeec0ee8 100644
--- a/lib/puppet/rails/resource_tag.rb
+++ b/lib/puppet/rails/resource_tag.rb
@@ -4,7 +4,7 @@ class Puppet::Rails::ResourceTag < ActiveRecord::Base
def to_label
"#{self.puppet_tag.name}"
- end
+ end
# returns an array of hash containing tags of resource
def self.find_all_tags_from_resource(db_resource)
diff --git a/lib/puppet/rails/source_file.rb b/lib/puppet/rails/source_file.rb
index 3ccf87ac6..de95f755a 100644
--- a/lib/puppet/rails/source_file.rb
+++ b/lib/puppet/rails/source_file.rb
@@ -4,5 +4,5 @@ class Puppet::Rails::SourceFile < ActiveRecord::Base
def to_label
"#{self.filename}"
- end
+ end
end
generated by cgit (git 2.34.1) at 2025-09-12 19:13:13 +0000