cleaned up the gemspecs a bit - now all build

8 files changed, 24 insertions, 15 deletions

diff --git a/Rakefile b/Rakefile
index 884c035..8b58316 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,14 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
+require 'rake/packagetask'
+require 'rubygems/package_task'
+
+spec = eval(File.read('leap_web.gemspec'))
+Gem::PackageTask.new(spec) do |p|
+    p.gem_spec = spec
+end
+
 require File.expand_path('../config/application', __FILE__)
 
 LeapWeb::Application.load_tasks
diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec
index db5d04f..14708df 100644
--- a/certs/leap_web_certs.gemspec
+++ b/certs/leap_web_certs.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "Cert distribution for the leap platform"
   s.description = "This plugin for the leap platform distributes certs for the EIP client. It fetches the certs from a pool in CouchDB that is filled by leap-ca."
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "Readme.md"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "~> 3.2.8"
diff --git a/help/Readme.md b/help/Readme.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/help/Readme.md
diff --git a/help/leap_web_help.gemspec b/help/leap_web_help.gemspec
index 7380451..2cc147c 100644
--- a/help/leap_web_help.gemspec
+++ b/help/leap_web_help.gemspec
@@ -7,13 +7,13 @@ require File.expand_path('../../lib/leap_web/version.rb', __FILE__)
 Gem::Specification.new do |s|
   s.name        = "leap_web_help"
   s.version     = LeapWeb::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of LeapWebHelp."
-  s.description = "TODO: Description of LeapWebHelp."
+  s.authors     = ["Jessib"]
+  s.email       = ["jessib@leap.se"]
+  s.homepage    = "http://www.leap.se"
+  s.summary     = "Help Desk for LeapWeb"
+  s.description = "Managing Tickets for a Leap provider"
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "~> 3.2.8"
diff --git a/leap_web.gemspec b/leap_web.gemspec
index cd7a003..44a30e0 100644
--- a/leap_web.gemspec
+++ b/leap_web.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary = 'Leap web framework for Ruby on Rails.'
   s.description = 'Leap is the Leap Encryption Access Project. This is a framework for the web administrative interface. Its components live in separate gems. You can find out more about leap on www.leap.se'
 
-  s.files = Dir['README.md', 'lib/leap_web.rb', 'lib/leap_web/*']
+  s.files = Dir['*.md', 'lib/leap_web.rb', 'lib/leap_web/*']
   s.require_path = 'lib'
   s.requirements << 'none'
   s.required_ruby_version = '>= 1.8.7'
diff --git a/lib/tasks/gems.rake b/lib/tasks/gems.rake
index e185d1b..cfeca1f 100644
--- a/lib/tasks/gems.rake
+++ b/lib/tasks/gems.rake
@@ -1,7 +1,8 @@
+require File.expand_path('../../../lib/leap_web/version', __FILE__)
+
 namespace :gem do
 
   engines = %w(core users certs help)
-  version = File.read(File.expand_path("../../../version", __FILE__)).strip
 
   desc "run rake gem for all gems"
   task :build do
@@ -19,13 +20,13 @@ namespace :gem do
 
     engines.each do |gem_name|
       puts "########################### #{gem_name} #########################"
-      cmd = "rm #{gem_name}/pkg"; puts cmd; system cmd
+      cmd = "rm -rf #{gem_name}/pkg"; puts cmd; system cmd
       cmd = "cd #{gem_name} && bundle exec rake gem"; puts cmd; system cmd
-      cmd = "cd #{gem_name}/pkg && gem install leap_web_#{gem_name}-#{version}.gem"; puts cmd; system cmd
+      cmd = "cd #{gem_name}/pkg && gem install leap_web_#{gem_name}-#{LeapWeb::VERSION}.gem"; puts cmd; system cmd
     end
     cmd = "rm -rf pkg"; puts cmd; system cmd
     cmd = "bundle exec rake gem"; puts cmd; system cmd
-    cmd = "gem install pkg/leap_web-#{version}.gem"; puts cmd; system cmd
+    cmd = "gem install pkg/leap_web-#{LeapWeb::VERSION}.gem"; puts cmd; system cmd
   end
 
   desc "Release all gems to gemcutter. Package leap web components, then push"
@@ -33,8 +34,8 @@ namespace :gem do
 
     engines.each do |gem_name|
       puts "########################### #{gem_name} #########################"
-      cmd = "cd #{gem_name}/pkg && gem push leap_web_#{gem_name}-#{version}.gem"; puts cmd; system cmd
+      cmd = "cd #{gem_name}/pkg && gem push leap_web_#{gem_name}-#{LeapWeb::VERSION}.gem"; puts cmd; system cmd
     end
-    cmd = "gem push pkg/leap_web-#{version}.gem"; puts cmd; system cmd
+    cmd = "gem push pkg/leap_web-#{LeapWeb::VERSION}.gem"; puts cmd; system cmd
   end
 end
diff --git a/users/Readme.md b/users/Readme.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/users/Readme.md
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index e68529a..04d5b8e 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = "User registration and authorization for the leap platform"
   s.description = "This this plugin for the leap platform provides user signup and login. It uses Secure Remote Password for the authentication."
   
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "~> 3.2.8"