mobilize-base 1.2 → 1.3

data/lib/mobilize-base/tasks.rb

@@ -40,17 +40,17 @@ namespace :mobilize_base do
     Mobilize::Jobtracker.prep_workers
   end
   desc "Stop Jobtracker"
-  task :stop do
+  task :stop_jobtracker do
     require 'mobilize-base'
     Mobilize::Jobtracker.stop!
   end
   desc "Start Jobtracker"
-  task :start do
+  task :start_jobtracker do
     require 'mobilize-base'
     Mobilize::Jobtracker.start
   end
   desc "Restart Jobtracker"
-  task :restart do
+  task :restart_jobtracker do
     require 'mobilize-base'
     Mobilize::Jobtracker.restart!
   end
@@ -66,6 +66,19 @@ namespace :mobilize_base do
     resque_redis_port_args = if Mobilize::Base.env == 'test'
                                " -r localhost:#{Mobilize::Base.config('resque')['redis_port']}"
                              end.to_s
+    #determine view folder and override queues and working erbs
+    require 'resque/server'
+    view_dir = ::Resque::Server.views + "/"
+    old_queues_erb_path = view_dir + "queues.erb"
+    old_working_erb_path = view_dir + "working.erb"
+    gem_dir = Gem::Specification.find_by_name("mobilize-base").gem_dir
+    new_queues_erb_path = gem_dir + "/lib/mobilize-base/extensions/resque-server/views/queues.erb"
+    new_working_erb_path = gem_dir + "/lib/mobilize-base/extensions/resque-server/views/working.erb"
+    [old_queues_erb_path,old_working_erb_path].each{|p| File.delete(p) if File.exists?(p)}
+    require 'fileutils'
+    FileUtils.copy(new_queues_erb_path,old_queues_erb_path)
+    FileUtils.copy(new_working_erb_path,old_working_erb_path)
+    sleep 5 #give them time to die
     command = "bundle exec resque-web -p #{port.to_s} #{resque_web_extension_path} #{resque_redis_port_args}"
     `#{command}`
   end

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.2"
+    VERSION = "1.3"
   end
 end

data/lib/mobilize-base.rb

@@ -60,14 +60,18 @@ module Mobilize
 end
 mongoid_config_path = "#{Mobilize::Base.root}/#{Mobilize::Base.config_dir}mongoid.yml"
 if File.exists?(mongoid_config_path)
-  require 'mongo'
   require 'mongoid'
+  require 'mongoid-grid_fs'
   Mongoid.load!(mongoid_config_path, Mobilize::Base.env)
   require "mobilize-base/models/dataset"
   require "mobilize-base/models/user"
+  require "mobilize-base/helpers/runner_helper"
   require "mobilize-base/models/runner"
+  require "mobilize-base/helpers/job_helper"
   require "mobilize-base/models/job"
+  require "mobilize-base/helpers/stage_helper"
   require "mobilize-base/models/stage"
+
 end
 require 'google_drive'
 require 'resque'

data/lib/samples/gridfs.yml

@@ -1,10 +1,7 @@
 ---
 development:
-  max_versions: 10 #number of versions of cache to keep in gridfs
   max_compressed_write_size: 1000000000 #~1GB
 test:
-  max_versions: 10 #number of versions of cache to keep in gridfs
   max_compressed_write_size: 1000000000 #~1GB
 production:
-  max_versions: 10 #number of versions of cache to keep in gridfs
   max_compressed_write_size: 1000000000 #~1GB

data/lib/samples/gsheet.yml

@@ -1,17 +1,17 @@
 ---
 development:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 test:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 staging:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 production:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets

data/mobilize-base.gemspec

@@ -22,12 +22,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'bson','1.6.1'
-  s.add_runtime_dependency 'bson_ext','1.6.1'
-  s.add_runtime_dependency 'mongo', '1.6.1'
+  s.add_runtime_dependency 'bson','1.8.4'
+  s.add_runtime_dependency 'bson_ext','1.8.4'
   s.add_runtime_dependency "mongoid", "~>3.0.0"
-  s.add_runtime_dependency 'redis',"~>3.0.0"
-  s.add_runtime_dependency 'resque','1.21.0'
+  s.add_runtime_dependency 'mongoid-grid_fs'
+  s.add_runtime_dependency 'resque', '1.24.0'
   s.add_runtime_dependency 'google_drive','0.3.2'
   s.add_runtime_dependency 'popen4','0.1.2'
   s.add_runtime_dependency 'actionmailer','3.1.1'

data/test/mobilize-base_test.rb

@@ -64,6 +64,7 @@ describe "Mobilize" do
     test_1_tsv = Mobilize::Dataset.read_by_url(test_target_sheet_1_url,user_name,gdrive_slot)
     test_2_tsv = Mobilize::Dataset.read_by_url(test_target_sheet_1_url,user_name,gdrive_slot)
 
+    assert test_1_tsv.to_s.length>0
     assert test_1_tsv == test_2_tsv
 
     puts "change first job to fail, wait for stages"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -92,21 +76,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: mongoid-grid_fs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +179,8 @@ files:
 - lib/mobilize-base/extensions/google_drive/worksheet.rb
 - lib/mobilize-base/extensions/hash.rb
 - lib/mobilize-base/extensions/object.rb
+- lib/mobilize-base/extensions/resque-server/views/queues.erb
+- lib/mobilize-base/extensions/resque-server/views/working.erb
 - lib/mobilize-base/extensions/string.rb
 - lib/mobilize-base/extensions/yaml.rb
 - lib/mobilize-base/handlers/email.rb
@@ -204,6 +190,9 @@ files:
 - lib/mobilize-base/handlers/gridfs.rb
 - lib/mobilize-base/handlers/gsheet.rb
 - lib/mobilize-base/handlers/resque.rb
+- lib/mobilize-base/helpers/job_helper.rb
+- lib/mobilize-base/helpers/runner_helper.rb
+- lib/mobilize-base/helpers/stage_helper.rb
 - lib/mobilize-base/jobtracker.rb
 - lib/mobilize-base/models/dataset.rb
 - lib/mobilize-base/models/job.rb
@@ -239,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718067622627955864
+      hash: -3969243247461811352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,10 +237,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718067622627955864
+      hash: -3969243247461811352
 requirements: []
 rubyforge_project: mobilize-base
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Moves datasets and schedules data transfers using MongoDB, Resque and Google