sushi_fabric 0.4.7 → 0.4.8

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20151009-135017'
+# Version = '20151016-160119'
 
 require 'csv'
 require 'fileutils'
@@ -54,11 +54,19 @@ end
   # check if there is a sqlite3 database of Ruby on Rails
   if defined?(::Project)
     NO_ROR = false
-  elsif File.exist?(File.join(SUSHI_APP_DIR, "app/models"))
+  elsif File.exist?(File.join(SUSHI_APP_DIR, "app/models")) and
+    database_yml = File.join(SUSHI_APP_DIR, "config/database.yml") and
+    File.exist?(database_yml)
+
     NO_ROR = false
+    
+    database_config = YAML.load(File.read(database_yml))
+    db = database_config["production"]
     ActiveRecord::Base.establish_connection(
-                :adapter  => 'sqlite3',
-                :database => "#{SUSHI_APP_DIR}/db/#{mode}.sqlite3" 
+                :adapter => db["adapter"],
+                :database => db["database"],
+                :username => db["username"],
+                :password => db["password"]
             )
     require "#{SUSHI_APP_DIR}/app/models/project"
     require "#{SUSHI_APP_DIR}/app/models/data_set"

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: sushi_fabric
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Functional Genomics Center Zurich
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-10-09 00:00:00 Z
+date: 2015-10-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler