mobilize-base 1.1.0 → 1.1.01

data/README.md

@@ -511,13 +511,14 @@ stage. These should be of the for `<key1>: <value1>, <key2>: <value2>`, where
 integer, an array (delimited by square braces), or a hash (delimited by
 curly braces).
     * For mobilize-base, the following stages are available:
-      * 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_stage1.in".
+      * gsheet.read `source: <input_gsheet_path>`, which reads the sheet. 
+        * The gsheet_path should be of the form
+`<gbook_name>/<gsheet_name>` or just `<gsheet_name>` if the target is in
+the Runner itself. The test uses "base1_stage1.in".
       * gsheet.write `source: <stage_name>`,`target: <target_gsheet_path>`,
 which writes the specified stage output to the target_gsheet. 
         * The stage_name should be of the form `<stage_column>`. The test uses "stage1" for the first test
-and "Runner_mobilize(test)/base1.out" for the second test. The first
+and "base1.out" for the second test. The first
 takes the output from the first stage and the second reads it straight
 from the referenced sheet.
         * The test uses "Requestor_mobilize(test)/base1.out" and

data/lib/mobilize-base/extensions/yaml.rb

@@ -0,0 +1,11 @@
+module YAML
+  def YAML.easy_load(string)
+    begin
+      YAML.load(s.param_string)
+    rescue
+      #replace colon w space colon, double space colons w single space
+      gsub_colon_string = string.gsub(":",": ").gsub(":  ",": ")
+      YAML.load("{#{gsub_colon_string}}")
+    end
+  end
+end

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

@@ -38,8 +38,8 @@ module Mobilize
       return false unless gdrive_slot
       s = Stage.where(:path=>stage_path).first
       user = s.job.runner.user.name
-      gsheet_path = s.params['source']
-      out_tsv = Gsheet.find_by_path(gsheet_path,gdrive_slot).read(user)
+      source_dst = s.source_dsts(gdrive_slot).first
+      out_tsv = source_dst.read(user)
       #use Gridfs to cache result
       out_url = "gridfs://#{s.path}/out"
       Dataset.write_by_url(out_url,out_tsv,Gdrive.owner_name)
@@ -52,6 +52,7 @@ module Mobilize
       s = Stage.where(:path=>stage_path).first
       user = s.job.runner.user.name
       target_path = s.params['target']
+      target_path = "#{s.job.runner.title}/#{target_path}" unless target_path.index("/")
       source_dst = s.source_dsts(gdrive_slot).first
       tsv = source_dst.read(user)
       sheet_name = target_path.split("/").last

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

@@ -20,6 +20,11 @@ module Mobilize
       Dataset.find_or_create_by_path(r.path).cached_at
     end
 
+    def title
+      r = self
+      r.path.split("/").first
+    end
+
     def worker
       r = self
       Mobilize::Resque.find_worker_by_path(r.path)

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

@@ -30,16 +30,9 @@ module Mobilize
 
     def params
       s = self
-      #evaluates param_string to ruby hash
-      #using YAML parser
-      #TODO: eliminate ridiculousness
-      begin
-        YAML.load(s.param_string)
-        raise "Must resolve to Hash" unless result.class==Hash
-      rescue
-        sub_param_string = s.param_string.gsub(":\"",": \"").gsub(":'",": '").gsub(":[",": [").gsub(":{",": {").gsub(/(:[0-9])/,'stageparamsgsub\1').gsub('stageparamsgsub:',': ')
-        YAML.load("{#{sub_param_string}}")
-      end
+      p = YAML.easy_load(s.param_string)
+      raise "Must resolve to Hash" unless p.class==Hash
+      return p
     end
 
     def job
@@ -134,7 +127,7 @@ module Mobilize
           else
             #check sheets in runner
             r = s.job.runner
-            runner_sheet = r.gbook.worksheet_by_title(source_path)
+            runner_sheet = r.gbook(gdrive_slot).worksheet_by_title(source_path)
             out_tsv = if runner_sheet
                         runner_sheet.read(user)
                       else

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

@@ -27,6 +27,22 @@ module Mobilize
       return u.runner.jobs
     end
 
+    def creds(gdrive_slot)
+      u = self
+      creds_path = "#{u.runner.path.split("/").first}/creds"
+      begin
+        creds_sheet = Gsheet.find_by_path(creds_path,gdrive_slot)
+        cred_array = creds_sheet.read(u.name).tsv_to_hash_array.map{|h| {h['name']=>{'user'=>h['user'],'password'=>h['password']}}}
+        result = {}
+        cred_array.each do |cred|
+          result[cred.keys.first] = cred.values.first
+        end
+        return result
+      rescue
+        return {}
+      end
+    end
+
     def runner_path
       u = self
       prefix = "Runner_"

data/lib/mobilize-base/tasks.rb

@@ -2,15 +2,13 @@ namespace :mobilize_base do
   desc "Start a Resque worker"
   task :work do
     require 'mobilize-base'
-    begin
-      #require specified mobilize gems
-      Mobilize::Base.config('jobtracker')['extensions'].each do |e|
+    Mobilize::Base.config('jobtracker')['extensions'].each do |e|
+      begin
         require e
+      rescue Exception=>exc
+        #do nothing
       end
-    rescue Exception=>exc
-      #do nothing
     end
-
     begin
       worker = Resque::Worker.new(Mobilize::Resque.config['queue_name'])
     rescue Resque::NoQueueError

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.1.0"
+    VERSION = "1.1.01"
   end
 end

data/lib/mobilize-base.rb

@@ -3,6 +3,7 @@ require "mobilize-base/extensions/array"
 require "mobilize-base/extensions/hash"
 require "mobilize-base/extensions/object"
 require "mobilize-base/extensions/string"
+require "mobilize-base/extensions/yaml"
 #this is the base of the mobilize object, any methods that should be
 #made available application-wide go over here
 #these also define base variables for Rails

data/test/base_job_rows.yml

@@ -2,11 +2,11 @@
   active: true
   trigger: once
   status: ""
-  stage1: gsheet.read source:"Runner_mobilize(test)/base1_stage1.in"
-  stage2: gsheet.write source:"stage1", target:"Runner_mobilize(test)/base1.out"
+  stage1: gsheet.read source:base1_stage1.in
+  stage2: gsheet.write source:stage1, target:base1.out
 
 - name: base2
   active: true
   trigger: after base1
   status: ""
-  stage1: gsheet.write source:"Runner_mobilize(test)/base1.out", target:"Runner_mobilize(test)/base2.out"
+  stage1: gsheet.write source:base1.out, target:base2.out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.01
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -196,6 +196,7 @@ files:
 - lib/mobilize-base/extensions/hash.rb
 - lib/mobilize-base/extensions/object.rb
 - lib/mobilize-base/extensions/string.rb
+- lib/mobilize-base/extensions/yaml.rb
 - lib/mobilize-base/handlers/email.rb
 - lib/mobilize-base/handlers/gbook.rb
 - lib/mobilize-base/handlers/gdrive.rb
@@ -238,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -781501523970053172
+      hash: 3362582751526690476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -781501523970053172
+      hash: 3362582751526690476
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24