rbbt-study 0.2.12 → 0.2.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NThmMjg1OTZlYzk0NGVhYmU2YmRiMDg2NjI3MGFiNDA5NGY0MDlkOQ==
+    MDEwOTcwMzliOWZlZDBlMmIyOGY5NDdmOTk3N2FlNGY3ZWU5ZWQxMg==
   data.tar.gz: !binary |-
-    M2EzYWE2MTllNGE3NjZkMTMwYjcyYmVjN2FhMjg3Y2VlOGFjNjE1Yw==
+    ZWFhZjg2ZThiYTkwMzdlNzZkYTYwOGRhMGIxZDFkMDYyNTIzMTAyZg==
 SHA512:
   metadata.gz: !binary |-
-    YjZkZmJiNDcyMWI3MTA3MDQ1ODc5ODBmM2E1Y2NhMWY1YTU2ZDFkNzg3MGE4
-    NDZiNTAwOWEyYjFjMzc3NTRmMmYyODYyODFiODIxMDFkMjVkMDBhYTMxMTA4
-    Mjk0NGIzNGZiOWE5NzQxZTY4YzEwZGNjMWVhNzJkZjdmYjg3MzU=
+    OTNjZTBmYzY2ZDUyYjRiNWZhZWZlMDY4OGU3NjA2YzY5ZmU0NGY4NDBjYzMw
+    MWU4OGM5NjhjZTdmNjAwMGNjZjcxMWJkZjEzOTQ0MWExZTk2YTM4YjNmM2Jm
+    ZWU0OTA5YTQ4MGRiZDVhNGMxNDdiNzY3NjJlNWQ4OGRhZmI0ODU=
   data.tar.gz: !binary |-
-    MjRlYmI5YTk1NGUyYWMwOTRmMDZjNDBmZmJjOTE3YWYxMTc5Mjc0ZWRmMDk2
-    YTEyNDJkYWFjYTc1MmRiZjdhYzIxODJkNmIzNTQ4ZmE2ZjNjZTg0NmViNGVl
-    YjA5MmIzZGNmZTMyZTFlMDI4NjY4MGQzOGExZjJhMGYzZGIyN2U=
+    YmM2ODMzODlkZjk2M2Y1N2YzMGVjYTVlZWI2NDg0YTJjMGNlZjdmNThmMGMw
+    ZGM2YjkzYTllMDcwODEwOTdlNTk1YTMyOTE2OTg0ODRiMDAwNTkxNGZiZGRl
+    OGM2ODFmOWQ4MDQxZjdkNTE5ZjFjOGU1ZGUxYThmMzg5M2M1MGI=

data/lib/rbbt/entity/study/samples.rb

@@ -53,7 +53,7 @@ module Study
                        sample_info.keys
                      end
                    end
-                   Sample.setup(samples, self)
+                   Sample.setup(samples, :study => self)
                    samples.study = self
                    samples
                  end

data/lib/rbbt/entity/study.rb

@@ -51,9 +51,9 @@ module Study
       @study_dir ||= begin
                        case
                        when (not defined?(Rbbt))
-                         File.join(ENV["HOME"], '.studies')
+                         Path.setup(File.join(ENV["HOME"], '.studies'))
                        when Rbbt.etc.study_dir.exists?
-                         Rbbt.etc.study_dir.read.chomp
+                         Path.setup(Rbbt.etc.study_dir.read.chomp)
                        else
                          Rbbt.studies.find
                        end
@@ -88,13 +88,16 @@ module Study
   end
 
   def self.extended(base)
-    setup_file = File.join(base.dir, 'setup.rb')
     base.workflow = StudyWorkflow.clone
     base.workflow.study = base
-    if File.exists? setup_file
+
+    if File.exists?(setup_file = File.join(base.dir, 'setup.rb'))
       base.instance_eval Open.read(setup_file), setup_file
     end
+
     base.local_persist_dir = Rbbt.var.cache.studies[base].persistence.find
+
+    base
   end
 
   def self.studies
@@ -103,7 +106,12 @@ module Study
   end
 
   def dir
-    @dir ||= Path === Study.study_dir ? Study.study_dir[self] : Path.setup(File.join(Study.study_dir, self), nil, Study)
+    @dir ||= if Path === Study.study_dir
+               Study.study_dir[self] 
+             else
+               Path.setup(File.join(Study.study_dir.dup, self), nil, Study)
+             end
+    @dir
   end
 
   def metadata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-study
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies: []
 description: This gem add the study entity with suport for NGS, Microarray and other
   types of data