ref: refs/heads/master
commit 731ce9da3bd27413576fc21bb88b028b504b1832
Author: Duncan Mac-Vicar P
Date: Tue Jul 21 12:30:51 2009 +0200
Cleaning up the Rake mess, make all stuff use the shared tasks
---
Rakefile | 38 +++++++++++-----------
plugins/commandline/Rakefile | 37 ---------------------
plugins/commandline/tasks/commandline_tasks.rake | 6 +++
plugins/language/Rakefile | 19 -----------
plugins/language/tasks/language_tasks.rake | 10 +++--
plugins/network/Rakefile | 35 --------------------
plugins/patches/Rakefile | 37 ---------------------
plugins/status/Rakefile | 37 ---------------------
plugins/status/tasks/status_tasks.rake | 6 +++
plugins/time/Rakefile | 16 +++------
webservice-tasks/Rakefile | 1 +
webservice-tasks/lib/tasks/audit.rake | 8 ++++
webservice-tasks/lib/tasks/install_policies.rake | 9 +++++
webservice/lib/tasks/checks.rake | 8 ----
webservice/lib/tasks/common.rake | 5 +++
15 files changed, 66 insertions(+), 206 deletions(-)
diff --git a/Rakefile b/Rakefile
index da81cdf..1f8af8a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,28 +13,28 @@ PROJECTS = ['webservice', *plugins]
desc 'Run all tests by default'
task :default => :test
-%w(test rdoc pgem package release install).each do |task_name|
- desc "Run #{task_name} task for all projects"
- task task_name do
- PROJECTS.each do |project|
- system %(cd #{project} && #{env} #{$0} #{task_name})
- end
- end
-end
+#%w(test rdoc pgem package release install).each do |task_name|
+# desc "Run #{task_name} task for all projects"
+# task task_name do
+# PROJECTS.each do |project|
+# system %(cd #{project} && #{env} #{$0} #{task_name})
+# end
+# end
+#end
# the following tasks are defined in the webservice itseld
# but we allow to run them from the root directory
-%w(system_check install_policies).each do |task_name|
- task task_name do
- # now run webservice checks
- system %(cd webservice && #{env} #{$0} #{task_name})
- end
-end
+#%w(system_check install_policies).each do |task_name|
+# task task_name do
+# # now run webservice checks
+# system %(cd webservice && #{env} #{$0} #{task_name})
+# end
+#end
-desc "Check syntax of all Ruby files."
-task :check_syntax do
- `find . -name "*.rb" |xargs -n1 ruby -c |grep -v "Syntax OK"`
- puts "* Done"
-end
+#desc "Check syntax of all Ruby files."
+#task :check_syntax do
+# `find . -name "*.rb" |xargs -n1 ruby -c |grep -v "Syntax OK"`
+# puts "* Done"
+#end
diff --git a/plugins/commandline/Rakefile b/plugins/commandline/Rakefile
index b859030..a793958 100644
--- a/plugins/commandline/Rakefile
+++ b/plugins/commandline/Rakefile
@@ -9,41 +9,4 @@ require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the commandline plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for the commandline plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'YaST commandline'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
- %x[rm -r package/www]
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
-end
-
-desc "install policies"
-task :install do |t|
- Dir.glob("**/*.policy").each do |policy|
- sudo "cp #{policy} /usr/share/PolicyKit/policy"
- end
-end
-
-def sudo(cmd)
- puts "#{cmd}"
- %x[sudo -p "Password: " #{cmd}]
-end
diff --git a/plugins/commandline/tasks/commandline_tasks.rake b/plugins/commandline/tasks/commandline_tasks.rake
new file mode 100644
index 0000000..aaab452
--- /dev/null
+++ b/plugins/commandline/tasks/commandline_tasks.rake
@@ -0,0 +1,6 @@
+begin
+ require 'tasks/webservice'
+rescue LoadError => e
+ $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
+
diff --git a/plugins/language/Rakefile b/plugins/language/Rakefile
index aac07dc..8f4c2f2 100644
--- a/plugins/language/Rakefile
+++ b/plugins/language/Rakefile
@@ -8,22 +8,3 @@ require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-
-desc 'Generate documentation for the language plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Language'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
- %x[rm -rf package/www]
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
- p.package_files.exclude('nbproject')
-end
diff --git a/plugins/language/tasks/language_tasks.rake b/plugins/language/tasks/language_tasks.rake
index c9b6e5c..aaab452 100644
--- a/plugins/language/tasks/language_tasks.rake
+++ b/plugins/language/tasks/language_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :language do
-# # Task goes here
-# end
+begin
+ require 'tasks/webservice'
+rescue LoadError => e
+ $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
+
diff --git a/plugins/network/Rakefile b/plugins/network/Rakefile
index e22857d..eb321a1 100644
--- a/plugins/network/Rakefile
+++ b/plugins/network/Rakefile
@@ -5,40 +5,5 @@ require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
require File.join(RailsParent.parent, 'config', 'boot')
require 'tasks/rails'
-begin
- require 'tasks/webservice'
-rescue LoadError => e
- $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
-end
-
desc 'Default: run unit tests.'
task :default => :test
-
-desc 'Test this plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for this plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.title = 'Services'
- rdoc.rdoc_dir = 'rdoc'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "install policies"
-task :install do |t|
- Dir.glob("**/*.policy").each do |policy|
- sudo "cp #{policy} /usr/share/PolicyKit/policy"
- end
-end
-
-def sudo(cmd)
- puts "#{cmd}"
- %x[sudo -p "Password: " #{cmd}]
-end
diff --git a/plugins/patches/Rakefile b/plugins/patches/Rakefile
index b84aaa9..2c69676 100644
--- a/plugins/patches/Rakefile
+++ b/plugins/patches/Rakefile
@@ -9,40 +9,3 @@ require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the patch_updates plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for the patch_updates plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Patch Updates'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
- %x[rm -r package/www]
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
-end
-
-desc "install policies"
-task :install do |t|
- Dir.glob("**/*.policy").each do |policy|
- sudo "cp #{policy} /usr/share/PolicyKit/policy"
- end
-end
-
-def sudo(cmd)
- puts "#{cmd}"
- %x[sudo -p "Password: " #{cmd}]
-end
diff --git a/plugins/status/Rakefile b/plugins/status/Rakefile
index 3b4fea5..a793958 100644
--- a/plugins/status/Rakefile
+++ b/plugins/status/Rakefile
@@ -9,41 +9,4 @@ require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the status plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for the security plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Status'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
- %x[rm -r package/www]
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
-end
-
-desc "install policies"
-task :install do |t|
- Dir.glob("**/*.policy").each do |policy|
- sudo "cp #{policy} /usr/share/PolicyKit/policy"
- end
-end
-
-def sudo(cmd)
- puts "#{cmd}"
- %x[sudo -p "Password: " #{cmd}]
-end
diff --git a/plugins/status/tasks/status_tasks.rake b/plugins/status/tasks/status_tasks.rake
new file mode 100644
index 0000000..aaab452
--- /dev/null
+++ b/plugins/status/tasks/status_tasks.rake
@@ -0,0 +1,6 @@
+begin
+ require 'tasks/webservice'
+rescue LoadError => e
+ $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
+
diff --git a/plugins/time/Rakefile b/plugins/time/Rakefile
index 9adf6d3..5485326 100644
--- a/plugins/time/Rakefile
+++ b/plugins/time/Rakefile
@@ -6,6 +6,12 @@ require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
require File.join(RailsParent.parent, 'config', 'boot')
require 'tasks/rails'
+begin
+ require 'tasks/webservice'
+rescue LoadError => e
+ $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
+
desc 'Default: run unit tests.'
task :default => :test
@@ -18,13 +24,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_files.include('lib/**/*.rb')
end
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
- %x[rm -r package/www]
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
- p.package_files.exclude('nbproject')
- p.package_files.exclude('coverage')
-end
diff --git a/webservice-tasks/Rakefile b/webservice-tasks/Rakefile
index a7db5b0..6a94848 100644
--- a/webservice-tasks/Rakefile
+++ b/webservice-tasks/Rakefile
@@ -1,4 +1,5 @@
require 'rake'
+require 'rake/rdoctask'
# load the shared rake files from the package itself
# skip 'package-local' task, it's redefined here
diff --git a/webservice-tasks/lib/tasks/audit.rake b/webservice-tasks/lib/tasks/audit.rake
new file mode 100644
index 0000000..3b82dd1
--- /dev/null
+++ b/webservice-tasks/lib/tasks/audit.rake
@@ -0,0 +1,8 @@
+
+desc "Audits source code"
+namespace :audit do
+ task :roodi do
+ system 'find app/ lib/ -name \*.rb | xargs roodi > log/code-analysis/roodi.log'
+ system "echo 'log in webservice/log/roodi.log'"
+ end
+end
diff --git a/webservice-tasks/lib/tasks/install_policies.rake b/webservice-tasks/lib/tasks/install_policies.rake
new file mode 100644
index 0000000..b46ff21
--- /dev/null
+++ b/webservice-tasks/lib/tasks/install_policies.rake
@@ -0,0 +1,9 @@
+
+desc "install policies"
+task :install_policies do |t|
+ puts "Running from #{__FILE__}"
+ Dir.glob("**/*.policy").each do |policy|
+ sudo "cp #{policy} /usr/share/PolicyKit/policy"
+ end
+end
+
diff --git a/webservice/lib/tasks/checks.rake b/webservice/lib/tasks/checks.rake
index 06fb74c..cf5646b 100644
--- a/webservice/lib/tasks/checks.rake
+++ b/webservice/lib/tasks/checks.rake
@@ -39,14 +39,6 @@ end
# Tests
#
-desc "install policies"
-task :install_policies do |t|
- Dir.glob(File.join(Dir.pwd, '..', "**/*.policy")).each do |policy|
- puts "copying #{policy} -> /usr/share/PolicyKit/policy"
- `cp #{policy} /usr/share/PolicyKit/policy`
- end
-end
-
task :system_check do
#
diff --git a/webservice/lib/tasks/common.rake b/webservice/lib/tasks/common.rake
new file mode 100644
index 0000000..332faeb
--- /dev/null
+++ b/webservice/lib/tasks/common.rake
@@ -0,0 +1,5 @@
+begin
+ require 'tasks/webservice'
+rescue LoadError => e
+ $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org