mutx 0.1.63 → 0.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18864110b5fce7d741a7c69be950a5208445100c
-  data.tar.gz: 0e5a3a91f9d06fb81a6f81f1636a378d7a5042f2
+  metadata.gz: 9b257730c4744554045a3ddfb825e14e9d7803c1
+  data.tar.gz: c89992c76350f4b3a3bae1090e2c8011cdc0d348
 SHA512:
-  metadata.gz: 02062fe7716c174576880e11e27e97088ea0d8f3a4ec0043e28f5dc188180aa74f87e9020939dca8165ffd131858614dcb94fd809b3b6223361201f6d0463007
-  data.tar.gz: e4a20c6e03e918c0acdc810ab858655c863aea3f84e028818dc1e4bba9d4eac06ff6e325092f16f2b0abe90627e89ebc25e0fbf2513acecb100fbda721aed085
+  metadata.gz: 651690d6f668b7862f460dc19fa5946f06239f827143fbf0be9ba25f316aacab191b50b0910b14299d0feb3b1826b804a59d432b6fde228f00849b16883ae3c6
+  data.tar.gz: 350d922f8ee3a4b03d9a776d6afc189e2add57ba58a868d2685947693d3de6f4afffe34664a31e1b5924635e24bcbc3a4e058bfa9fe29bc7217f70f5391d541e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mutx (0.1.63)
+    mutx (0.1.64)
       basica
       bson_ext
       byebug
@@ -95,7 +95,7 @@ GEM
     raindrops (0.17.0)
     rake (12.0.0)
     redcarpet (3.4.0)
-    redis (3.3.2)
+    redis (3.3.3)
     require_all (1.4.0)
     rufus-scheduler (3.3.2)
       tzinfo

data/lib/mutx/API/tasks.rb

@@ -29,6 +29,11 @@ module Mutx
         data["information"] = nil if data["information"].nil?
         data["last_exec_time"] = Time.now.utc
         data["stop_bots"] = data["stop_bots"] 
+        if data["task_status"] == "off" 
+          data["task_status"] = "off"
+        else
+          data["task_status"] = "on"
+        end
         data
       end
 

data/lib/mutx/background_jobs/workers/mutx_cron.rb

@@ -13,6 +13,7 @@ module Mutx
       recurrence { minutely(1) }
 
         def perform
+        #def self.checker
           Mutx::Database::MongoConnector.new Mutx::Support::Configuration.db_connection_data
           running_task = []
           #running_task = Mutx::Database::MongoConnector.running_now
@@ -20,7 +21,7 @@ module Mutx
           puts "######### STARTING CRON ##########"
 
           if running_task.eql? []
-
+            
             @days = [:mo,:tu,:we,:th,:fr,:sa,:su]
             @today = day_name #name of today
 
@@ -30,7 +31,7 @@ module Mutx
 
             puts "#{cron_tasks_list.size} cronned task searched"
 
-            cron_tasks_list.select{|line| cron_tasks << line if (((Time.now.utc - line[:last_exec_time].utc) + 1) >= (line[:cron_time].to_i * 60))}
+            cron_tasks_list.select{|line| cron_tasks << line if ( (((Time.now.utc - line[:last_exec_time].utc) + 1) >= (line[:cron_time].to_i * 60)) && (line[:task_status].eql? "on") )}
             cron_tasks_list = []
             cron_tasks_list = cron_tasks
             puts "#{cron_tasks_list.size} POSSIBLE cronned task on time to run"
@@ -71,13 +72,14 @@ module Mutx
 
             end#cron_task
 
-            ##Mutx::Database::MongoConnector.force_close
+            Mutx::Database::MongoConnector.close
             puts "######### ENDING CRON ##########"
           else ## si hay algo corriendo deja pasar toda la ejecucion hasta que finalice
             puts
             puts "HAY EJECUCIONES EN RUNNING O STARTED, SE ESPERA A QUE TERMINEN..."
             puts
             puts "######### ENDING CRON ##########"
+            Mutx::Database::MongoConnector.close
           end
 
         end #perform

data/lib/mutx/database/mongo_connector.rb

@@ -369,6 +369,10 @@ module Mutx
         $results.update_one({"_id" => result_id}, {"$set" => {"file_attached" => "yes"}})
       end
 
+      def self.update_status task_id, status
+        $tasks.update_one({"_id" => task_id}, {"$set" => {"task_status" => status}})
+      end
+
       def self.active_tasks
         self.all_tasks
       end

data/lib/mutx/routes.rb

@@ -490,6 +490,44 @@ Cuba.define do
         res.redirect path
       end
 
+      on "task/status/:task_name" do |task_name|
+        task = Mutx::Tasks::Task.get_task_with task_name.gsub(/%20/, " ")
+        if task.blocked.eql? "on"
+          $result = basic_auth(env) do |user, pass|
+           user == "mutx" && pass == "mutxAdmin"
+          end
+          if $result.eql? true
+            query_string = Mutx::Support::QueryString.new req
+            task_name = task_name.gsub!("%20"," ") if task_name.include? "%20"
+            task = Mutx::Database::MongoConnector.task_data_for_name(task_name)
+            if task["task_status"].eql? "off"
+              status = "on"
+            else
+              status = "off"
+            end
+            Mutx::Database::MongoConnector.update_status(task["_id"], status)
+            res.redirect "/tasks"
+          else
+           on default do
+             res.status = 401
+             res.headers["WWW-Authenticate"] = 'Basic realm="MyApp"'
+             res.write "Access Denied, Mutx don't let you STOP/START this execution without authorization"
+           end
+          end
+        else
+          query_string = Mutx::Support::QueryString.new req
+          task_name = task_name.gsub!("%20"," ") if task_name.include? "%20"
+          task = Mutx::Database::MongoConnector.task_data_for_name(task_name)
+          if task["task_status"].eql? "off"
+            status = "on"
+          else
+            status = "off"
+          end
+          Mutx::Database::MongoConnector.update_status(task["_id"], status)
+          res.redirect "/tasks"
+        end
+      end
+
 
       on "message/task/:result_id" do |result_id|
         query_string = Mutx::Support::QueryString.new req
@@ -860,7 +898,7 @@ Cuba.define do
 
     end
 
-  ##Mutx::Database::MongoConnector.force_close
+  ##Mutx::Database::MongoConnector.close
 
   rescue => e
     Mutx::Support::Log.error "Cuba: #{e} #{e.backtrace}" if Mutx::Support::Log

data/lib/mutx/support/mail_sender.rb

@@ -143,6 +143,7 @@ module Mutx
         else
           puts "Misconfiguration on email settings"
         end
+        Mutx::Database::MongoConnector.close
       end
     end
   end

data/lib/mutx/tasks/task.rb

@@ -44,7 +44,8 @@ module Mutx
       :su,
       :start_time,
       :stop_time,
-      :stop_bots
+      :stop_bots,
+      :task_status
 
       REGEX_VALID_VALUES = ["failed","passed","none"]
       NOTIFY_VALID_VALUES = ["any","passed","failed"]
@@ -93,6 +94,7 @@ module Mutx
           @stop_time        = task_data["stop_time"]
           @notify_on        = task_data["notify_on"] || "any"
           @stop_bots        = task_data["stop_bots"]
+          @task_status      = task_data["task_status"] || "off"
         else
           Mutx::Support::Log.error "Creting task object. Argument is not a hash" if Mutx::Support::Log
           raise "Task data not defined correctly. Expecting info about task"
@@ -159,7 +161,8 @@ module Mutx
           "stop_time" => data["stop_time"],
           "value_for_regex" => data["value_for_regex"],
           "notify_on" => data["notify_on"],
-          "stop_bots" => data["stop_bots"]
+          "stop_bots" => data["stop_bots"],
+          "task_status" => data["task_status"]
         }
         self.new(task_data)
       end
@@ -300,7 +303,8 @@ module Mutx
           "stop_time" => stop_time,
           "value_for_regex" => value_for_regex,
           "notify_on" => notify_on,
-          "stop_bots" => stop_bots
+          "stop_bots" => stop_bots,
+          "task_status" => task_status          
         }
       end
 
@@ -367,4 +371,4 @@ module Mutx
     end
 
   end
-end
+end

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.1.63"
+  VERSION = "0.1.64"
 end

data/lib/mutx/view/body.mote

@@ -2,6 +2,11 @@
   # encoding: utf-8  
   query_string = args[:query_string]
 
+  msg = if query_string.msg
+          message_file_path = File.read("#{Mutx::View.path}/message.mote")
+          Mote.parse(message_file_path, self, [:query_string]).call(query_string: query_string)
+        end
+
   clean = query_string.clean || false
 
   message = section =~ /message/i ? " onload=\"javascript:startTimer();\"" : nil
@@ -54,14 +59,14 @@
 
       {{navigation_bar}}
 
-
+      {{msg}}
 
       <div class='container'>
       <br>
       {{git_information}}
       </div>
       <div class='container'>
-
+        
         <p>{{content}}</p>
 
         {{footer}}

data/lib/mutx/view/last_notified.mote

@@ -0,0 +1,13 @@
+<?
+
+output = Mutx::API::Result.last_notified
+
+?>
+
+<div class="well">
+  <div style='width: 100%; display: table;'>
+    <div style='display: table-row'>
+      <div style='width: 600px; display: table-cell;'>{{output}}</div>
+    </div>
+  </div>
+</div>

data/lib/mutx/view/message.mote

@@ -0,0 +1,8 @@
+<div  style="padding: 20px; z-index: 9999; position: absolute; top: 20px; right: 20px;">
+	<div class="alert alert-info alert-dismissible fade in" role="alert">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true"> × </span>
+		</button>
+		<strong>{{query_string.msg[0..30]}}</strong>
+	</div>
+</div>

data/lib/mutx/view/tasks/task_item.mote

@@ -35,6 +35,11 @@ color = Mutx::View.color(status)
         </h3>
     </div>
       <div class="panel-body">
+      % if (task["task_status"].eql? "off")
+          <a href="task/status/{{task["name"].gsub(' ','%20')}}" title= "Click to allow task to be cronned" class="label label-danger" aria-hidden="true">&nbsp;<i <span class="glyphicon glyphicon-off"></span> OFF </i></a>
+      % elsif (task["task_status"].eql? "on")
+          <a href="task/status/{{task["name"].gsub(' ','%20')}}" title= "Click to stop task and cannot be cronned" class="label label-success" aria-hidden="true">&nbsp;<i <span class="glyphicon glyphicon-play-circle"></span> ON </i></a>
+      % end
         <a href='/{{task["type"]}}s/{{task["name"].gsub(' ','%20')}}' class='label label-success'>
           Open</a>
         <a href='/results/task/{{task["name"].gsub(' ','%20')}}' class='label label-info'>
@@ -69,4 +74,4 @@ color = Mutx::View.color(status)
   width: auto;
   padding: 10px;
 }
-</style>
+</style>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.1.63
+  version: 0.1.64
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -493,9 +493,11 @@ files:
 - lib/mutx/view/help/page.mote
 - lib/mutx/view/help/search_result.mote
 - lib/mutx/view/javascript.mote
+- lib/mutx/view/last_notified.mote
 - lib/mutx/view/list_repos.mote
 - lib/mutx/view/logs/log.mote
 - lib/mutx/view/logs/logs.mote
+- lib/mutx/view/message.mote
 - lib/mutx/view/modals.mote
 - lib/mutx/view/navigation_bar.mote
 - lib/mutx/view/not_found.mote