Took the script functionality from populate_dashboard.rb and added it to
generate_report.rb, then renamed the file to generate_sample_reports.rb.
This makes it easier to run the script from any directory without
require & relative paths causing problems.

Paired-with:Matt Robinson

Signed-off-by: Max Martin <[email protected]>
---
Local-branch: feature/next/6531_report_generator
 ...nerate_report.rb => generate_sample_reports.rb} |   27 ++++++++++++++++-
 ext/report_generator/populate_dashboard.rb         |   31 --------------------
 2 files changed, 26 insertions(+), 32 deletions(-)
 rename ext/report_generator/{generate_report.rb => generate_sample_reports.rb} 
(89%)
 delete mode 100755 ext/report_generator/populate_dashboard.rb

diff --git a/ext/report_generator/generate_report.rb 
b/ext/report_generator/generate_sample_reports.rb
similarity index 89%
rename from ext/report_generator/generate_report.rb
rename to ext/report_generator/generate_sample_reports.rb
index e84000e..d3518ff 100755
--- a/ext/report_generator/generate_report.rb
+++ b/ext/report_generator/generate_sample_reports.rb
@@ -1,10 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'erb'
-require 'yaml'
 require 'ostruct'
 require 'rubygems'
 require 'active_support/all'
+require 'YAML'
+require 'fileutils'
+begin
+  require 'puppet/util/zaml'
+  YAML = ZAML
+rescue LoadError
+end
 
 module Puppet; end
 module Puppet::Resource; end
@@ -166,3 +172,22 @@ class Array
     result
   end
 end
+
+FileUtils.mkdir_p('yaml')
+rakefile_if_specified = "-f #{ARGV.first}" unless ARGV.empty?
+
+100.times do
+  report = DataGenerator.generate_report
+  File.open("yaml/#{report.host}.yaml","w") do |f|
+    f.print YAML.dump(report)
+  end
+end
+
+#puts "Importing reports"
+#`rake #{rakefile_if_specified} reports:import REPORT_DIR=yaml`
+
+#puts "Creating unresponsive nodes"
+#10.times do
+#  puts `rake #{rakefile_if_specified} node:add 
name=#{DataGenerator.generate_hostname}`
+#end
+
diff --git a/ext/report_generator/populate_dashboard.rb 
b/ext/report_generator/populate_dashboard.rb
deleted file mode 100755
index 4654ded..0000000
--- a/ext/report_generator/populate_dashboard.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'generate_report'
-require 'rubygems'
-require 'YAML'
-require 'active_support'
-require 'fileutils'
-begin
-  require 'puppet/util/zaml'
-  YAML = ZAML
-rescue LoadError
-end
-
-FileUtils.mkdir_p('yaml')
-rakefile_if_specified = "-f #{ARGV.first}" unless ARGV.empty?
-
-100.times do
-  report = DataGenerator.generate_report
-  File.open("yaml/#{report.host}.yaml","w") do |f|
-    f.print YAML.dump(report)
-  end
-end
-
-#puts "Importing reports"
-#`rake #{rakefile_if_specified} reports:import REPORT_DIR=yaml`
-
-#puts "Creating unresponsive nodes"
-#10.times do
-#  puts `rake #{rakefile_if_specified} node:add 
name=#{DataGenerator.generate_hostname}`
-#end
-
-- 
1.7.4

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to