Merge branch 'development' into feature/task

5 files changed, 6 insertions, 105 deletions

diff --git a/.gitignore b/.gitignore
index f6e834a..9821c6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ Gemfile.lock
 *.gem
 .bundle
 pkg/*
+Gemfile.lock
+*~
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..08d2402
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+v0.0.3 2012-05-07
+* switch from v0.0.2pre to v0.0.3
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 2f9d8a2..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-PATH
-  remote: .
-  specs:
-    opentox-server (0.0.2pre)
-      opentox-client
-      rack
-      rack-contrib
-      rdf-n3
-      roo
-      sinatra
-      sinatra-contrib
-      unicorn
-
-PATH
-  remote: ~/opentox-client
-  specs:
-    opentox-client (0.0.2pre)
-      bundler
-      open4
-      rdf
-      rdf-raptor
-      rest-client
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.7)
-    backports (2.5.1)
-    choice (0.1.6)
-    eventmachine (0.12.10)
-    faraday (0.8.0)
-      multipart-post (~> 1.1)
-    ffi (1.0.11)
-    google-spreadsheet-ruby (0.1.8)
-      nokogiri (>= 1.4.3.1)
-      oauth (>= 0.3.6)
-      oauth2 (>= 0.5.0)
-    httpauth (0.1)
-    kgio (2.7.4)
-    log4r (1.1.10)
-    mime-types (1.18)
-    multi_json (1.3.2)
-    multipart-post (1.1.5)
-    nokogiri (1.5.2)
-    oauth (0.4.6)
-    oauth2 (0.7.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      multi_json (~> 1.0)
-      rack (~> 1.4)
-    open4 (1.3.0)
-    rack (1.4.1)
-    rack-contrib (1.1.0)
-      rack (>= 0.9.1)
-    rack-protection (1.2.0)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    raindrops (0.8.0)
-    rdf (0.3.5.2)
-      addressable (>= 2.2.6)
-    rdf-n3 (0.3.6)
-      rdf (>= 0.3.4)
-    rdf-raptor (0.4.1)
-      ffi (>= 1.0)
-      rdf (~> 0.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    roo (1.10.1)
-      choice (>= 0.1.4)
-      google-spreadsheet-ruby (>= 0.1.5)
-      nokogiri (>= 1.5.0)
-      rubyzip (>= 0.9.4)
-      spreadsheet (> 0.6.4)
-      todonotes (>= 0.1.0)
-    ruby-ole (1.2.11.3)
-    rubyzip (0.9.8)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-contrib (1.3.1)
-      backports (>= 2.0)
-      eventmachine
-      rack-protection
-      rack-test
-      sinatra (~> 1.3.0)
-      tilt (~> 1.3)
-    spreadsheet (0.6.8)
-      ruby-ole (>= 1.0)
-    tilt (1.3.3)
-    todonotes (0.1.0)
-      log4r
-    unicorn (4.3.0)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  opentox-client!
-  opentox-server!
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..bcab45a
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.0.3
diff --git a/opentox-server.gemspec b/opentox-server.gemspec
index cb09ca9..1074fbf 100644
--- a/opentox-server.gemspec
+++ b/opentox-server.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "opentox-server"
-  s.version     = "0.0.2pre"
+  s.version     = "0.0.3"
   s.authors     = ["Christoph Helma, Martin Guetlein, Andreas Maunz, Micha Rautenberg, David Vorgrimmler"]
   s.email       = ["helma@in-silico.ch"]
   s.homepage    = "http://github.com/opentox/opentox-server"