sushi_fabric 0.0.5 → 0.0.6

data/lib/sushi_fabric/sushiApp.rb

@@ -1,34 +1,41 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-Version = '20131107-104530'
+# Version = '20131111-112007'
 
 require 'csv'
 require 'fileutils'
-require 'active_record'
 require 'yaml'
 require 'drb/drb'
+gem 'rails', '<=3.2.15'
+require 'rails/all'
 
 module SushiFabric
-CONFIG = 'sushi_configure.yml'
-current_dir = File.dirname(File.expand_path(__FILE__))
-config_yml = File.join(current_dir, CONFIG)
-config = if File.exist?(config_yml)
-           YAML.load(File.read(config_yml))
-         else
-           {}
-         end
-WORKFLOW_MANAGER = config[:workflow_manager]||'druby://localhost:3000'
-GSTORE_DIR = config[:gstore_dir]||'gstore'
-#sushi_app_dir = File.expand_path('../..', __FILE__)
-sushi_app_dir = Dir.pwd
-SUSHI_APP_DIR = config[:sushi_app_dir]||sushi_app_dir
-SCRATCH_DIR = config[:scratch_dir]||'/tmp/scratch'
-no_ror = nil
-begin
-  ::Project
-  no_ror = false
-rescue
-  if File.exist?(File.join(SUSHI_APP_DIR, "app/models"))
+  class Application < Rails::Application
+    # default parameters
+    config.workflow_manager = 'druby://localhost:12345'
+    config.gstore_dir = File.join(Dir.pwd, 'gstore/projects')
+    config.sushi_app_dir = Dir.pwd
+    config.scratch_dir = '/tmp/scratch'
+  end
+
+  # load custmized parameters if there is
+  mode = ENV['RAILS_ENV']||'development'
+  config_file = File.join('./config/environments', mode)
+  if File.exist?(config_file + '.rb')
+    require config_file
+  end
+
+  config = SushiFabric::Application.config
+  WORKFLOW_MANAGER = config.workflow_manager
+  GSTORE_DIR = config.gstore_dir
+  SUSHI_APP_DIR = config.sushi_app_dir
+  SCRATCH_DIR = config.scratch_dir
+
+  # 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"))
+    NO_ROR = false
     ActiveRecord::Base.establish_connection(
                 :adapter  => 'sqlite3',
                 :database => "#{SUSHI_APP_DIR}/db/development.sqlite3" 
@@ -36,48 +43,9 @@ rescue
     require "#{SUSHI_APP_DIR}/app/models/project"
     require "#{SUSHI_APP_DIR}/app/models/data_set"
     require "#{SUSHI_APP_DIR}/app/models/sample"
-    no_ror = false
   else
-    no_ror = true
+    NO_ROR = true
   end
-end
-NO_ROR = no_ror
-
-=begin
-def save_data_set(data_set_arr, headers, rows)
-  data_set_hash = Hash[*data_set_arr]
-  if project = Project.find_by_number(data_set_hash['ProjectNumber'].to_i)
-    data_set = DataSet.new
-    data_set.name = data_set_hash['DataSetName']
-    data_set.project = project
-    if parent_id = data_set_hash['ParentID'] and parent_data_set = DataSet.find_by_id(parent_id.to_i)
-      data_set.data_set = parent_data_set
-    end
-    if comment = data_set_hash['Comment'] and !comment.to_s.empty?
-      data_set.comment = comment
-    end
-
-    sample_hash = {}
-    rows.each do |row|
-      headers.each_with_index do |header, i|
-       sample_hash[header]=row[i]
-      end
-      sample = Sample.new
-      sample.key_value = sample_hash.to_s
-      sample.save unless sample.saved?
-      data_set.samples << sample
-    end
-
-    data_set.md5 = data_set.md5hexdigest
-    unless data_set.saved?
-      project.data_sets << data_set
-      parent_data_set.data_sets << data_set if parent_data_set
-      data_set.save
-    end
-    data_set.id
-  end
-end
-=end
 
 class ::Hash
   attr_reader :defaults

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,6 @@ files:
 - README.md
 - Rakefile
 - lib/sushi_fabric/sushiApp.rb
-- lib/sushi_fabric/sushi_configure.yml
 - lib/sushi_fabric/version.rb
 - lib/sushi_fabric.rb
 - sample/WordCountApp.rb

data/lib/sushi_fabric/sushi_configure.yml

@@ -1,4 +0,0 @@
---- 
-:workflow_manager: druby://localhost:12345
-:gstore_dir: ~/Desktop/gstore/projects
-:scratch_dir: /tmp/scratch