mobilize-base 1.0.6 → 1.0.7

data/README.md

@@ -493,22 +493,24 @@ name>))` and enter values under each header:
   * Tasks have this syntax: <handler>.<call> <params>.
     * handler specifies the file that should receive the task
     * the call specifies the method within the file. The method should
-be called `"<Handler>.<call>_by_task_path"`
+be called `"<handler>.<call>_by_task_path"`
     * the params the method accepts, which are custom to each
-task. These should be a comma-delimited list, with each param in
-quotes.
+task. These should be of the for `<key1>: <value1>, <key2>: <value2>`, where
+`<key>` is an unquoted string and `<value>` is a quoted string, an
+integer, an array (delimited by square braces), or a hash (delimited by
+curly braces).
     * For mobilize-base, the following tasks are available:
-      * gsheet.read `<input_gsheet_full_path>`, which reads the sheet. 
-        * The gsheet_path should be of the form `<gbook_name>/<gsheet_name>`. The test uses
+      * gsheet.read `source: <input_gsheet_full_path>`, which reads the sheet. 
+        * The gsheet_full_path should be of the form `<gbook_name>/<gsheet_name>`. The test uses
 "Requestor_mobilize(test)/base1_task1.in".
-      * gsheet.write `<task_relative_path>`,`<output_gsheet_path>`,
-which writes the specified task output to the output_gsheet. 
-        * The task_path should be of the form `<task_column>` or
+      * gsheet.write `source: <task_relative_path>`,`target: <target_gsheet_path>`,
+which writes the specified task output to the target_gsheet. 
+        * The task_relative_path should be of the form `<task_column>` or
 `<job_name/task_column>`. The test uses "base1/task1" for the first test
 and simply "task1" for the second test. Both of these take the output
 from the first task.
         * The test uses "Requestor_mobilize(test)/base1.out" and
-"Requestor_mobilize(test)/base2.out" for output sheets.
+"Requestor_mobilize(test)/base2.out" for target sheets.
 
 <a name='section_Start_Run_Test'></a>
 ### Run Test

data/lib/mobilize-base/extensions/google_drive/file.rb

@@ -54,7 +54,11 @@ module GoogleDrive
           raise "Invalid role #{role}"
         end
       else
-        f.acl.push({:scope_type=>"user",:scope=>email,:role=>role})
+        begin
+          f.acl.push({:scope_type=>"user",:scope=>email,:role=>role})
+        rescue => exc
+          raise exc unless exc.to_s.index("user already has access")
+        end
       end
       return true
     end

data/lib/mobilize-base/handlers/gfile.rb

@@ -27,7 +27,7 @@ module Mobilize
       gdrive_slot = Gdrive.slot_worker_by_path(t.path)
       return false unless gdrive_slot
       t = Task.where(:path=>task_path)
-      gfile_path = t.params.first
+      gfile_path = t.params['file']
       Gfile.find_by_path(gfile_path,gdrive_slot).read
     end
   end

data/lib/mobilize-base/handlers/gsheet.rb

@@ -37,7 +37,7 @@ module Mobilize
       gdrive_slot = Gdrive.slot_worker_by_path(task_path)
       return false unless gdrive_slot
       t = Task.where(:path=>task_path).first
-      gsheet_path = t.params.first
+      gsheet_path = t.params['source']
       Gsheet.find_by_path(gsheet_path,gdrive_slot).to_tsv
     end
 
@@ -46,8 +46,8 @@ module Mobilize
       #return false if there are no emails available
       return false unless gdrive_slot
       t = Task.where(:path=>task_path).first
-      source = t.params.first
-      target_path = t.params.second
+      source = t.params['source']
+      target_path = t.params['target']
       source_job_name, source_task_name = if source.index("/")
                                             source.split("/")
                                           else

data/lib/mobilize-base/models/task.rb

@@ -36,11 +36,15 @@ module Mobilize
 
     def params
       t = self
-      t.param_string.split(",").map do |p|
-        ps = p.strip
-        ps = ps[1..-1] if ['"',"'"].include?(ps[0])
-        ps = ps[0..-2] if ['"',"'"].include?(ps[-1])
-        ps
+      #evaluates param_string to ruby hash
+      #using YAML parser
+      #TODO: eliminate ridiculousness
+      begin
+        YAML.load(t.param_string)
+        raise "Must resolve to Hash" unless result.class==Hash
+      rescue
+        sub_param_string = t.param_string.gsub(":\"",": \"").gsub(":'",": '").gsub(":[",": [").gsub(":{",": {").gsub(/(:[0-9])/,'taskparamsgsub\1').gsub('taskparamsgsub:',': ')
+        YAML.load("{#{sub_param_string}}")
       end
     end
 

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/test/base_job_rows.yml

@@ -2,12 +2,12 @@
   active: true
   trigger: once
   status: ""
-  task1: 'gsheet.read "Runner_mobilize(test)/base1_task1.in"'
-  task2: 'gsheet.write "base1/task1", "Runner_mobilize(test)/base1.out"'
+  task1: 'gsheet.read source:"Runner_mobilize(test)/base1_task1.in"'
+  task2: 'gsheet.write source:"base1/task1", target:"Runner_mobilize(test)/base1.out"'
 
 - name: "base2"
   active: true
   trigger: "after base1"
   status: ""
-  task1: 'gsheet.read "Runner_mobilize(test)/base1.out"'
-  task2: 'gsheet.write "task1", "Runner_mobilize(test)/base2.out"'
+  task1: 'gsheet.read source:"Runner_mobilize(test)/base1.out"'
+  task2: 'gsheet.write source:"task1", target:"Runner_mobilize(test)/base2.out"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3010357704785525623
+      hash: 889890289433038495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3010357704785525623
+      hash: 889890289433038495
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24