mutx 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec27620584c5620e905be634b13ad27f2d14e5e4
-  data.tar.gz: 2e865d1c7d2a12f616c59ba129cb6751555ab2e5
+  metadata.gz: e856163b512f027c00a5f1e005ae1837f4dd2319
+  data.tar.gz: d9f7dfca99da92ceb2cf57559ec71ebe4d508fa7
 SHA512:
-  metadata.gz: 897ba5af6f53a3d4651aacc04e694fbd89eee26f869cec40eb1e07d72093eb9eba523a11c88301d23c4ea3d278fb776626632dff84831596f4aa6ecb56109b3a
-  data.tar.gz: 0732a8468743e137d139b15ac38fcca3e31e075eeb1d9263c23eba3458d10369ec0b2f7bd15e357fcc7f5321a86c6230bc1f8cb33aab0eff34c842888adb5f2a
+  metadata.gz: cedb4fe27800291ce61fb7834f1bffc157af1a9f796d940ef37bd5d40a1e1a9b7af16863378963df0019b370dac16aac4fb787a6edbd95d40438e2cf314cafd4
+  data.tar.gz: dcd49bf7ecb6d34ac8d8e3e882d765866931053dce7c0d85c71677996dad492f09cb9d82778dec8e3908eae96e2801fa098d6a3eed5e75082468c9109722a8d7

data/lib/generators/templates/cron.rb.tt

@@ -1,24 +1,74 @@
 require 'mutx'
+require 'chronic'
 
 module Cron
 	class Tasks
 
 		def self.cron_jobs
+			@days = [:mo,:tu,:we,:th,:fr,:sa,:su]  
 		  cron_tasks_list = Mutx::Database::MongoConnector.cron_tasks
+      @none_day = true
+      @today = day_name #name of today
+
+      @now_time = Time.now.hour.to_s+":"+Time.now.min.to_s
 
 		  cron_tasks_list.each do |task|
-		  	if (((!task[:cron_time].eql? "") && (!task[:cron_time].eql? "0")) && (((Time.now.utc - task[:last_exec_time].utc) + 1) >= (task[:cron_time].to_i * 60)))
+		  	@days.detect{|day| @none_day = "task_with_day" if task[:"#{day}"]}
+
+		  	# If no day execution is seted, works as always
+		  	if (((!task[:cron_time].eql? "") && (!task[:cron_time].eql? "0")) &&
+		  	   (((Time.now.utc - task[:last_exec_time].utc) + 1) >= (task[:cron_time].to_i * 60)) &&
+		  	   (@none_day.eql? true))
+
 		  		  query_string = {}
 		  		  query_string = {"execution_name"=>"CRONNED-#{task[:cron_time]}-min"}
 		  		  task_name = task[:name]
 		        task_name.gsub!("%20"," ")
 		        puts Mutx::API::Tasks.cron_update task
 		        Mutx::API::Execution.start task_name, query_string
-		    end
+        # If there is a day seted, and that day is today, and no execution time is seted
+		    elsif (((!task[:cron_time].eql? "") && (!task[:cron_time].eql? "0")) &&
+		          (((Time.now.utc - task[:last_exec_time].utc) + 1) >= (task[:cron_time].to_i * 60)) &&
+		          (@none_day.eql? "task_with_day") && (task[:"#{@today}"].eql? "on") && 
+		          (task[:start_time].empty?) && (task[:stop_time].empty?))
+
+					query_string = {}
+					query_string = {"execution_name"=>"CRONNED-#{task[:cron_time]}-min"}
+					task_name = task[:name]
+					task_name.gsub!("%20"," ")
+					puts Mutx::API::Tasks.cron_update task
+					Mutx::API::Execution.start task_name, query_string
+
+        # If there is a day seted, and that day is today, and execution range time is seted
+		    elsif (((!task[:cron_time].eql? "") && (!task[:cron_time].eql? "0")) &&
+		          (((Time.now.utc - task[:last_exec_time].utc) + 1) >= (task[:cron_time].to_i * 60)) &&
+		          (@none_day.eql? "task_with_day") && (task[:"#{@today}"].eql? "on") && 
+		          (@now_time.between? task[:start_time], task[:stop_time]))
+
+					query_string = {}
+					query_string = {"execution_name"=>"CRONNED-#{task[:cron_time]}-min"}
+					task_name = task[:name]
+					task_name.gsub!("%20"," ")
+					puts Mutx::API::Tasks.cron_update task
+					Mutx::API::Execution.start task_name, query_string
+		    end#if
+
 		  end
 		  Mutx::Database::MongoConnector.force_close
 		end
+
+
+		def self.day_name()
+			num = Chronic.parse("today").wday
+			return "mo" if num.eql? 1
+			return "tu" if num.eql? 2
+			return "we" if num.eql? 3
+			return "th" if num.eql? 4
+      return "fr" if num.eql? 5
+      return "sa" if num.eql? 6
+      return "su" if num.eql? 7
+		end
 	end#class
 end#module
 
-Cron::Tasks.cron_jobs
+Cron::Tasks.cron_jobs

data/mutx.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'cuba'
   spec.add_dependency 'unicorn'
-  spec.add_dependency 'mongo', '2.2.5'
+  spec.add_dependency 'mongoid', '~> 5.1.0'
   spec.add_dependency 'redis'
   spec.add_dependency 'sidekiq'
   spec.add_dependency 'bson_ext'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -360,7 +360,6 @@ files:
 - lib/mutx/API/task.rb
 - lib/mutx/API/tasks.rb
 - lib/mutx/background_jobs/.DS_Store
-- lib/mutx/background_jobs/sender_mail.rb
 - lib/mutx/background_jobs/sidekiq.rb
 - lib/mutx/background_jobs/workers/.DS_Store
 - lib/mutx/background_jobs/workers/email_sender.rb
@@ -400,6 +399,7 @@ files:
 - lib/mutx/support/log.rb
 - lib/mutx/support/logo.rb
 - lib/mutx/support/logs.rb
+- lib/mutx/support/mail_sender.rb
 - lib/mutx/support/notification.rb
 - lib/mutx/support/processes.rb
 - lib/mutx/support/query_string.rb