From f3a8a30391eaa832d3c2d0b0fba298a35678be83 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Thu, 23 Aug 2012 08:42:10 +0200
Subject: Rakefile fixed

---
 Rakefile         | 45 +--------------------------------------------
 compound.gemspec |  2 +-
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/Rakefile b/Rakefile
index d43e8f3..2995527 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,44 +1 @@
-require 'rubygems'
-require 'rake'
-require 'opentox-ruby'
-
-@gems = "sinatra rest-client emk-sinatra-url-for sinatra-respond_to"
-
-namespace :openbabel do
-	desc "Install openbabel"
-	task :install do
-		puts `sudo gem sources -a http://gems.github.com`
-		puts `sudo gem install #{@gems}`
-		begin
-			require 'openbabel'
-			puts "Openbabel is already installed"
-		rescue  Exception => exc
-			puts "Trying to install openbabel"
-			Dir.chdir('/tmp')
-			puts `wget http://downloads.sourceforge.net/project/openbabel/openbabel/2.2.2/openbabel-2.2.2.tar.gz` unless File.exists?('openbabel-2.2.2.tar.gz')
-			puts `tar xzf openbabel-2.2.2.tar.gz`  unless File.exists?('openbabel-2.2.2')
-			Dir.chdir('openbabel-2.2.2')
-			puts `./configure`
-			puts "Compiling Openbabel - this may take some time ..."
-			puts `make`
-			puts `sudo make install`
-			Dir.chdir('scripts/ruby')
-			puts `ruby extconf.rb --with-openbabel-include=../../include --with-openbabel-lib=../../src/.libs`
-			puts "Compiling Ruby extension for Openbabel - this may take some time ..."
-			puts `make`
-			puts `sudo make install`
-			begin
-				require 'openbabel'
-				puts "Openbabel sucessfully installed"
-			rescue Exception => exc
-				puts "Failed to install Openbabel - please try manually."
-			end
-		end
-	end
-end
-
-desc "Run tests"
-task :test do
-	load 'test/test.rb'
-end
-
+require "bundler/gem_tasks"
diff --git a/compound.gemspec b/compound.gemspec
index 0d0e9d2..1daf893 100644
--- a/compound.gemspec
+++ b/compound.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "opentox-server", "#{VERSION}"
+  s.add_runtime_dependency "opentox-server", "#{s.version}"
   s.add_runtime_dependency "rjb"
   s.add_runtime_dependency "openbabel"
   s.post_install_message = "Please configure your service in ~/.opentox/config/compound.rb"
-- 
cgit v1.2.3