ref: refs/heads/master
commit 33121220720f55bed1c9c24022e32c442cfc7bc0
Author: Duncan Mac-Vicar P
Date: Tue Jul 21 16:18:56 2009 +0200
find rails parent and use shared tasks
---
plugins/language/Rakefile | 37 ---------------
plugins/language/tasks/language_tasks.rake | 22 +++++++--
plugins/network/Rakefile | 19 +-------
plugins/network/tasks/plugin_tasks.rake | 10 +++--
plugins/patch_updates/Rakefile | 43 +----------------
plugins/patch_updates/config/rails_parent.rb | 15 ++++++
.../patch_updates/tasks/patch_updates_tasks.rake | 10 +++--
plugins/permissions/Rakefile | 43 +----------------
plugins/permissions/config/rails_parent.rb | 15 ++++++
plugins/permissions/tasks/permissions_tasks.rake | 10 +++--
plugins/samba_server/Rakefile | 47 +------------------
plugins/samba_server/config/rails_parent.rb | 15 ++++++
plugins/samba_server/tasks/samba_server_tasks.rake | 10 +++--
plugins/securities/Rakefile | 42 +----------------
plugins/securities/config/rails_parent.rb | 15 ++++++
plugins/securities/tasks/security_tasks.rake | 10 +++--
plugins/services/Rakefile | 38 +--------------
plugins/services/config/rails_parent.rb | 15 ++++++
plugins/services/tasks/services_tasks.rake | 10 +++--
plugins/status/Rakefile | 43 +----------------
plugins/status/config/rails_parent.rb | 15 ++++++
plugins/status/tasks/status_tasks.rake | 10 +++--
plugins/systemtime/Rakefile | 34 --------------
plugins/systemtime/tasks/systemtime_tasks.rake | 10 +++--
plugins/users/Rakefile | 48 +------------------
plugins/users/config/rails_parent.rb | 15 ++++++
plugins/users/tasks/users_tasks.rake | 10 +++--
27 files changed, 201 insertions(+), 410 deletions(-)
diff --git a/plugins/language/Rakefile b/plugins/language/Rakefile
index 3a3414a..7580e6a 100644
--- a/plugins/language/Rakefile
+++ b/plugins/language/Rakefile
@@ -5,40 +5,3 @@ require 'rake/packagetask'
require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
require File.join(RailsParent.parent, 'config', 'boot')
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 -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('locale')
- p.package_files.exclude('nbproject')
-end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_language", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient language 1.0.0")
-end
-
diff --git a/plugins/language/tasks/language_tasks.rake b/plugins/language/tasks/language_tasks.rake
index c9b6e5c..3f425a8 100644
--- a/plugins/language/tasks/language_tasks.rake
+++ b/plugins/language/tasks/language_tasks.rake
@@ -1,4 +1,18 @@
-# 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
+
+desc "Create mo-files for L10n"
+task :makemo do
+ require 'gettext_rails/tools'
+ GetText.create_mofiles
+end
+
+desc "Update pot/po files to match new version."
+task :updatepo do
+ require 'gettext_rails/tools'
+ GetText.update_pofiles("yast_webclient_language", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
+ "yast_webclient language 1.0.0")
+end
diff --git a/plugins/network/Rakefile b/plugins/network/Rakefile
index 5b63e8f..ca63e76 100644
--- a/plugins/network/Rakefile
+++ b/plugins/network/Rakefile
@@ -1,23 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the plugin 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 plugin plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'PLUGIN'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff --git a/plugins/network/tasks/plugin_tasks.rake b/plugins/network/tasks/plugin_tasks.rake
index aee3b8a..1568c54 100644
--- a/plugins/network/tasks/plugin_tasks.rake
+++ b/plugins/network/tasks/plugin_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :plugin 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/patch_updates/Rakefile b/plugins/patch_updates/Rakefile
index f0bd74f..ca63e76 100644
--- a/plugins/patch_updates/Rakefile
+++ b/plugins/patch_updates/Rakefile
@@ -1,47 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the patch 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 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')
- p.package_files.exclude('locale')
-end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_patch_updates", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient patch_updates 1.0.0")
-end
diff --git a/plugins/patch_updates/config/rails_parent.rb b/plugins/patch_updates/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/patch_updates/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/patch_updates/tasks/patch_updates_tasks.rake b/plugins/patch_updates/tasks/patch_updates_tasks.rake
index 48cf11b..1568c54 100644
--- a/plugins/patch_updates/tasks/patch_updates_tasks.rake
+++ b/plugins/patch_updates/tasks/patch_updates_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :patch_updates 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/permissions/Rakefile b/plugins/permissions/Rakefile
index c10da17..ca63e76 100644
--- a/plugins/permissions/Rakefile
+++ b/plugins/permissions/Rakefile
@@ -1,47 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the permissions 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 permissions plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Permissions'
- 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')
- p.package_files.exclude('locale')
-end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_permission", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient permission 1.0.0")
-end
diff --git a/plugins/permissions/config/rails_parent.rb b/plugins/permissions/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/permissions/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/permissions/tasks/permissions_tasks.rake b/plugins/permissions/tasks/permissions_tasks.rake
index a1bfeb4..1568c54 100644
--- a/plugins/permissions/tasks/permissions_tasks.rake
+++ b/plugins/permissions/tasks/permissions_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :permissions 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/samba_server/Rakefile b/plugins/samba_server/Rakefile
index 3512ff8..ca63e76 100644
--- a/plugins/samba_server/Rakefile
+++ b/plugins/samba_server/Rakefile
@@ -1,51 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the samba_server 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 samba_server plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'SambaServer'
- 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|
- p.need_tar_bz2 = true
- p.package_dir = 'package'
- p.package_files.include('**/*')
- p.package_files.exclude('package')
- p.package_files.exclude('locale')
-end
-
-#
-# Added for Ruby-GetText-Package
-#
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_samba_server", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient_samba_server 1.0.0")
-end
-
diff --git a/plugins/samba_server/config/rails_parent.rb b/plugins/samba_server/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/samba_server/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/samba_server/tasks/samba_server_tasks.rake b/plugins/samba_server/tasks/samba_server_tasks.rake
index 741ebf7..1568c54 100644
--- a/plugins/samba_server/tasks/samba_server_tasks.rake
+++ b/plugins/samba_server/tasks/samba_server_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :samba_server 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/securities/Rakefile b/plugins/securities/Rakefile
index b97e581..ca63e76 100644
--- a/plugins/securities/Rakefile
+++ b/plugins/securities/Rakefile
@@ -1,46 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the security 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 = 'Security'
- 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/securities/config/rails_parent.rb b/plugins/securities/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/securities/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/securities/tasks/security_tasks.rake b/plugins/securities/tasks/security_tasks.rake
index 85ba067..1568c54 100644
--- a/plugins/securities/tasks/security_tasks.rake
+++ b/plugins/securities/tasks/security_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :security 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/services/Rakefile b/plugins/services/Rakefile
index 18e431a..ca63e76 100644
--- a/plugins/services/Rakefile
+++ b/plugins/services/Rakefile
@@ -1,42 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-
-begin
- require 'tasks/webservice'
-rescue LoadError => e
- $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
-end
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the services 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 "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_services", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient services 1.0.0")
-end
diff --git a/plugins/services/config/rails_parent.rb b/plugins/services/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/services/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/services/tasks/services_tasks.rake b/plugins/services/tasks/services_tasks.rake
index 6d8f7ab..1568c54 100644
--- a/plugins/services/tasks/services_tasks.rake
+++ b/plugins/services/tasks/services_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :services 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/status/Rakefile b/plugins/status/Rakefile
index 1ea727c..ca63e76 100644
--- a/plugins/status/Rakefile
+++ b/plugins/status/Rakefile
@@ -1,47 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+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 status 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')
- p.package_files.exclude('locale')
-end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_status", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient status 1.0.0")
-end
diff --git a/plugins/status/config/rails_parent.rb b/plugins/status/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/status/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/status/tasks/status_tasks.rake b/plugins/status/tasks/status_tasks.rake
index 0858ee8..1568c54 100644
--- a/plugins/status/tasks/status_tasks.rake
+++ b/plugins/status/tasks/status_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :status 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/systemtime/Rakefile b/plugins/systemtime/Rakefile
index e5c470a..ca63e76 100644
--- a/plugins/systemtime/Rakefile
+++ b/plugins/systemtime/Rakefile
@@ -1,7 +1,6 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
require File.join(RailsParent.parent, 'config', 'boot')
require 'tasks/rails'
@@ -9,36 +8,3 @@ require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Generate documentation for the systemtime plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Systemtime'
- 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')
- p.package_files.exclude('locale')
- p.package_files.exclude('nbproject')
-end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_systemtime", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient systemtime 1.0.0")
-end
-
diff --git a/plugins/systemtime/tasks/systemtime_tasks.rake b/plugins/systemtime/tasks/systemtime_tasks.rake
index 7dbe4c7..1568c54 100644
--- a/plugins/systemtime/tasks/systemtime_tasks.rake
+++ b/plugins/systemtime/tasks/systemtime_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :systemtime 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/users/Rakefile b/plugins/users/Rakefile
index dcaa480..ca63e76 100644
--- a/plugins/users/Rakefile
+++ b/plugins/users/Rakefile
@@ -1,52 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
-desc 'Test the users 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 users plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'Users'
- 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')
- p.package_files.exclude('locale')
-end
-
-#
-# Added for Ruby-GetText-Package
-#
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_users", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient users 1.0.0")
-end
-
diff --git a/plugins/users/config/rails_parent.rb b/plugins/users/config/rails_parent.rb
new file mode 100644
index 0000000..59e7892
--- /dev/null
+++ b/plugins/users/config/rails_parent.rb
@@ -0,0 +1,15 @@
+class RailsParent
+
+ def RailsParent.parent
+ parent = ENV["RAILS_PARENT"]
+ unless parent
+ parent = File.expand_path(File.join('..','..','..', 'webclient'), File.dirname(__FILE__))
+ unless File.directory?( parent || "" )
+ $stderr.puts "Nope: #{parent}\nPlease set RAILS_PARENT environment"
+ exit 1
+ end
+ end
+ parent
+ end
+
+end
diff --git a/plugins/users/tasks/users_tasks.rake b/plugins/users/tasks/users_tasks.rake
index 48362a0..1568c54 100644
--- a/plugins/users/tasks/users_tasks.rake
+++ b/plugins/users/tasks/users_tasks.rake
@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :users do
-# # Task goes here
-# end
+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