mutx 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41948713cc0c2ab88b659a0acfccef31685804f
-  data.tar.gz: 866f09627bb94a865d037880282c1f76128df502
+  metadata.gz: 53dd9362c79dd087f0f3342128442c859d9fa8a5
+  data.tar.gz: 6fbbf9e0df11754f8c02f552307f835b911ccc58
 SHA512:
-  metadata.gz: e58c8804ca6e125362a4005b59a78f83e9d4e1a5b2ce66da2911ebbae23ee3b7e1241081fa7cf40c3f5e5a4f660b1c47d07916afb0fde9a07dcf90bfeaaa4cbd
-  data.tar.gz: 8b556913a4cf8e004a6578fe75c461d24f312952904ac360dbf91027c7d2acf1d11c388744af51aabb83f9a3f30c63d0c8479f36b91e683ead1e6aa210eaa0fd
+  metadata.gz: c3447515919f113d8dca7459be9213174710946a8ec48cc4918f4c9bae28db2ef46b578a0b87770004c8096b5c840fbefe510b0b908e1e9d5d0ffe14973a31b6
+  data.tar.gz: d9e63d688b45699cb8f61fb9ba6c1144e480a92cb65600a77094b073e3b06cba06f6687fa30c0f817337b4ebdebd6683e369e1064411ecf37019b953a4021f44

data/lib/generators/templates/mutx.conf.tt

@@ -47,7 +47,7 @@
     "recipients" : "your@email.com",
     "smtp_enable_start_tls_auto" : true,
     "attach_report" : false,
-    "telegram_token" => null
+    "telegram_token" : null
   },
 
   "footer_text" : "The text to display on footer",

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

@@ -7,4 +7,4 @@ include Mutx::Alert::Script
 
 # put your code here!
 
-# write success! warning! or critical! to finish script
+# write ok! warning! or critical! to finish script

data/lib/mutx.rb

@@ -23,27 +23,8 @@ Encoding.default_internal = Encoding::UTF_8
 
 module Mutx
 
-
-  # if Dir.exist? "#{Dir.pwd}/mutx/logs"
-
-  #   # Creates mutx_log if it does not exist
-  #   File.open("#{Dir.pwd}/mutx/logs/mutx.log","a+"){} unless File.exist? "#{Dir.pwd}/mutx/logs/mutx.log"
-
-  #   # Set global conf
-  #   #Mutx::Support::Log.start
-  #   Mutx::Support::Configuration.get
-  #   $NOTIF ||= Support::Notification.new("#{Dir.pwd.split("/").last}", "#{Mutx::Support::IfConfig.ip}:#{Mutx::Support::Configuration.port}")
-
-  # end
-
-
   class Base < Thor
 
-    desc "help","If you cannot start mutx"
-    def help
-      Mutx::Commands.help
-    end
-
     desc "install","Install Mutx on your project"
     def install
       Mutx::Commands.install

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

@@ -18,17 +18,15 @@ module Mutx
               stdout.each do |line|
                 stringio.puts line
               end
-            rescue Errno::EIO => e
-              stringio.puts e.message
-              stringio.puts e.backtrace
+            rescue Errno::EIO
             ensure
               Process.wait pid
               status = $?.exitstatus
             end
           end
         rescue => e
-          stringio.puts e.message
-          stringio.puts e.backtrace
+          puts e.message
+          puts e.backtrace
           raise e
         ensure
           @alert.update_status(status, info: stringio.string)

data/lib/mutx/commands/help.rb

@@ -12,14 +12,8 @@ module Mutx
         - stop
         - restart
         - reset
-
-      Note: If you stop mutx and then you want to get it up and the port you are using is already in use
-            you could use the following commands (Ubunutu OS):
-
-                $sudo netstat -tapen | grep :8080
-
-            In this example we use the port 8080. This command will give you the app that is using the port.
-            Then you could kill it getting its PID previously."
+        - create_alert
+      "
     end
   end
 end

data/lib/mutx/commands/start.rb

@@ -7,7 +7,7 @@ module Mutx
         pids = (Mutx::Support::Processes.sidekiq_pids).concat(Mutx::Support::Processes.mutx_pids)
         
         if pids.size > 0
-            puts "It seems that MuTX is already running. pids found [#{pids}]"
+            puts "It seems that MuTX is already running. pids found #{pids}"
             puts "Please, run `mutx stop` command before starting MuTX"
         else
           Mutx::Support::Log.start
@@ -20,10 +20,10 @@ module Mutx
             Mutx::Support::Log.debug "Starting...\n\n#{Mutx::Support::Logo.logo}" if Mutx::Support::Log
 
             Mutx::Support::Log.debug "Checking config.ru file existance" if Mutx::Support::Log
-            raise "ERROR --- mutx/config.ru file was not found. Try with `mutx prepare` command before `mutx start`" unless File.exist?("#{Dir.pwd}/mutx/config.ru")
+            raise "ERROR --- mutx/config.ru file was not found.`" unless File.exist?("#{Dir.pwd}/mutx/config.ru")
 
             Mutx::Support::Log.debug "Checking unicorn.rb file existance" if Mutx::Support::Log
-            raise "ERROR --- mutx/unicorn.rb file was not found. Try with `mutx prepare` command before `mutx start`" unless File.exist?("#{Dir.pwd}/mutx/unicorn.rb")
+            raise "ERROR --- mutx/unicorn.rb file was not found." unless File.exist?("#{Dir.pwd}/mutx/unicorn.rb")
 
             Mutx::Support::Logo.show
 
@@ -49,7 +49,7 @@ module Mutx
                 end
               rescue
                 # if mac, show option
-                puts "Not Ubuntu OS :(\n xvfb will not work"
+                puts "Not Ubuntu OS...xvfb will not work"
               end
             end
 
@@ -100,17 +100,10 @@ module Mutx
             Mutx::Support::Log.debug "Mutx PIDs saved" if Mutx::Support::Log
             Dir.mkdir "#{Dir.pwd}/mutx/out" unless Dir.exist? "#{Dir.pwd}/mutx/out"
             puts "\n\n* Mutx is succesfully Started!\n".green
-            if $IP_ADDRESS
-                puts "\n\n You can go now to http://#{$IP_ADDRESS}:#{Mutx::Support::Configuration.port}/mutx\n\n"
-                Mutx::Support::Log.debug "You can go now to http://#{$IP_ADDRESS}:#{Mutx::Support::Configuration.port}/mutx" if Mutx::Support::Log
-            end
             
-            ##Mutx::Database::MongoConnector.force_close
-
           rescue => e
             Mutx::Support::Log.error "Error starting Mutx: #{e}#{e.backtrace}" if Mutx::Support::Log
             puts "An error ocurred while starting Mutx. See mutx log for more information.#{e} #{e.backtrace}".red
-            ##Mutx::Database::MongoConnector.force_close
           end
       end
     end

data/lib/mutx/database/mongo_connector.rb

@@ -192,6 +192,20 @@ module Mutx
         $commits.insert_one({"_id" => self.generate_id, "log" => commit_info})
       end
 
+      def self.before_last_commit_webhook
+        data = $commits.find({}).to_a || []
+        unless data.empty?
+          data[data.size - 2]
+        end
+      end
+
+      def self.last_commit_webhook
+        data = $commits.find({}).to_a || []
+        unless data.empty?
+          data.last
+        end
+      end
+
       # Returns last saved commit info
       # $return [Hash] if exist
       def self.last_commit

data/lib/mutx/models/alert.rb

@@ -168,8 +168,7 @@ module Mutx
 
     def notify_telegram(group_id, info)
       return unless group_id
-      Notification.send_telegram(group_id, message: "Alert #{name} is #{status.upcase}")
-      Notification.send_telegram(group_id, message: info)
+      Notification.send_telegram(group_id, message: "Alert *#{name}* is *#{status.upcase}*\n#{info}")
     end
 
     def notify_email(mail_to, info)

data/lib/mutx/routes.rb

@@ -48,19 +48,6 @@ module Mutx
         on('message') { run Mutx::Routes::Message::Routes }
         on('help') { run Mutx::Routes::Help::Routes }
 
-        on post do
-          on "pull" do
-            #Check for updates on the branch and make a pull if its outdated
-            ##Mutx::Support::Git.pull unless Mutx::Support::Git.up_to_date?
-            data_json = JSON.parse req.body.read
-            Mutx::Support::ChangeInspector.is_there_a_change?
-            Mutx::Support::Log.debug "#{data_json}" if Mutx::Support::Log
-            Mutx::Support::Bundle.new.bundle_update if data_json["repository"]["language"].eql? "Ruby"
-            res.status = 200
-            res.write "status 200"
-          end
-        end
-
         on get do
           on "logout" do
             $result = nil
@@ -74,9 +61,7 @@ module Mutx
               $result = false
               res.redirect "http://user@mutx.garba.ninja/"
             end
-          end
-
-          
+          end          
 
           on "screenshot/:file_name" do |file_name|
             template = Mote.parse(File.read("#{Mutx::View.path}/screenshot.mote"),self, [:file_name])

data/lib/mutx/routes/api_routes.rb

@@ -9,6 +9,7 @@ module Mutx
             
             on('input') { run Api::Input::Routes }
             on('repositories') { run Api::Repositories::Routes }
+            on('git') { run Api::Git::Routes }
             on('results') { run Api::Results::Routes }
             on('tasks') { run Api::Tasks::Routes }
             on('tests') { run Api::Tasks::Routes }

data/lib/mutx/routes/api_routes/git_routes.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+module Mutx
+  module Routes
+    module Api
+      module Git
+        class Routes < App
+          define do
+
+            on get do
+              on "pull" do
+                result = Mutx::Database::MongoConnector.last_commit_webhook
+                result_parsed = result["log"]["commits"].join.gsub('=>', ':')
+                last = JSON.parse result_parsed #hash
+
+                result = Mutx::Database::MongoConnector.before_last_commit_webhook
+                result_parsed = result["log"]["commits"].join.gsub('=>', ':')
+                before_last = JSON.parse result_parsed #hash
+                
+                output = {:last_commit => last, :before_last_commit => before_last}
+                res.write output.to_json
+              end
+            end
+
+            on post do
+              on "pull" do
+                #Check for updates on the branch and make a pull if its outdated
+                ##Mutx::Support::Git.pull unless Mutx::Support::Git.up_to_date?
+                data_json = JSON.parse req.body.read
+                Mutx::Support::ChangeInspector.is_there_a_change? data_json
+                Mutx::Support::Log.debug "#{data_json}" if Mutx::Support::Log
+                Mutx::Support::Bundle.new.bundle_update if data_json["repository"]["language"].eql? "Ruby"
+                res.status = 200
+                res.write "status 200"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mutx/support/change_inspector.rb

@@ -9,9 +9,9 @@ module Mutx
       # Consider true if git usage is false
       # @return [Boolean]
 
-      def self.is_there_a_change?
+      def self.is_there_a_change? data_json
         if Mutx::Support::Configuration.use_git?
-          if Mutx::Database::MongoConnector.last_commit != (last_repo_commit  = Mutx::Support::Git.last_remote_commit)
+          if Mutx::Database::MongoConnector.last_commit != (last_repo_commit  = data_json)#(last_repo_commit  = Mutx::Support::Git.last_remote_commit)
             Mutx::Support::Log.debug "Git has been changed. Perform code update" if Mutx::Support::Log
             Mutx::Support::Git.reset_hard_and_pull
             Mutx::Database::MongoConnector.insert_commit(last_repo_commit)

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/mutx/view/results/console.mote

@@ -44,7 +44,11 @@ end
           <a href='#' onclick="window.open('{{ path_for(:api_results_show, result_id: result.id) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
             JSON Data</a>
           <a href='#' onclick="window.open('{{ path_for(:api_results_data, result_id: result.id) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
-            Execution Data</a>
+            Execution Data</a> 
+          % if result.is_cucumber? and result.has_report?
+            <a href='#' onclick="window.open('{{ path_for(:results_report, result_id: result.id) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
+              Html report</a>
+            % end
         </div>
       </h6>
     </div>
@@ -52,25 +56,17 @@ end
       <h4>Console Output</h4>
     </div>
     <div id='result'>
-      % if size_of_lines > 15
-        <button type='button' class='btn btn-default' title='Go down' onclick='goToBottom()' style='float: right'><span class='glyphicon glyphicon-chevron-down' aria-hidden='true'></span> Go down</button>
-        <br>
-      % end
-      <h3>
-        <small>
-          <pre style="height:400px; overflow:scroll; white-space:pre; word-wrap:normal;">
-            <b style='color:Black'>{{text}}</b>
-          </pre>
-        </small>
-      </h3>
+      <small>
+        <pre style="height:400px; overflow:scroll; white-space:pre; word-wrap:normal;">
+          {{text}}
+        </pre>
+      </small>
+      
     % if size_of_lines > 15
       <button type='button' class='btn btn-default' title='Go up' onclick='goToTop()' style='float: right'><span class='glyphicon glyphicon-chevron-up' aria-hidden='true'></span> Go up</button><br><br>
     % end
     </div>
     <br>
-    <div>
-      <a onclick="goClean('{{ path_for(:tasks_show, task_name: result.task['name']) }}');" style="cursor:pointer;" class='label label-default' >Return to task</a>
-    </div>
       <br>
       <br>
 % else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -424,14 +424,10 @@ files:
 - lib/mutx/background_jobs/sidekiq.rb
 - lib/mutx/background_jobs/workers/.DS_Store
 - lib/mutx/background_jobs/workers/alerts_worker.rb
-- lib/mutx/background_jobs/workers/connectivity_check.rb
 - lib/mutx/background_jobs/workers/email_sender.rb
 - lib/mutx/background_jobs/workers/executor.rb
-- lib/mutx/background_jobs/workers/garbage_cleaner.rb
-- lib/mutx/background_jobs/workers/listener.rb
 - lib/mutx/background_jobs/workers/mutx_cron.rb
 - lib/mutx/background_jobs/workers/notificator.rb
-- lib/mutx/background_jobs/workers/update_started.rb
 - lib/mutx/commands/.DS_Store
 - lib/mutx/commands/bye.rb
 - lib/mutx/commands/create_alert.rb
@@ -480,6 +476,7 @@ files:
 - lib/mutx/routes/alerts_routes.rb
 - lib/mutx/routes/api_routes.rb
 - lib/mutx/routes/api_routes/custom_params_routes.rb
+- lib/mutx/routes/api_routes/git_routes.rb
 - lib/mutx/routes/api_routes/input_routes.rb
 - lib/mutx/routes/api_routes/repos_routes.rb
 - lib/mutx/routes/api_routes/results_routes.rb

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

@@ -1,36 +0,0 @@
-# encoding: utf-8
-require 'mutx'
-require 'sidetiq'
-require 'open-uri'
-#require 'sidekiq/testing/inline'
-
-module Mutx
-  module Workers
-    class ConnectivityCheck
-      include Sidekiq::Worker
-      include Sidetiq::Schedulable
-        recurrence { minutely(2) }
-        def perform
-        #def self.check
-          #Mutx::Database::MongoConnector.new Mutx::Support::Configuration.db_connection_data
-          path = "#{Dir.pwd}/mutx/temp/connectivity_check.txt"
-          message_lost = "Internet connection lost!"
-          begin
-            if open("http://www.google.com/")
-              puts "HAY INTERNET..."
-              contents = File.read("#{path}") if File.file?("#{path}")
-              Mutx::Support::MailSender.new.sender(nil, "No internet connection for a while, now is ready again", "ohamra@gmail.com", "Prueba", nil, nil, nil, nil, nil) if ( (!contents.nil?) && (contents.include? "#{message_lost}") )
-              File.delete("#{path}") if File.file?("#{path}")
-            else
-              raise StandardError.new "#{message_lost}"
-            end
-          rescue StandardError => e
-            output = File.open("#{path}", "a+")
-            text = "#{Time.now} - #{e.message}"
-            output.puts "#{text}"
-            output.close
-          end
-        end
-    end#class
-  end
-end

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

@@ -1,33 +0,0 @@
-# encoding: utf-8
-require 'mutx'
-
-module Mutx
-  module Workers
-    class GarbageCleaner
-
-      # This worker delete all zombies files
-      include Sidekiq::Worker
-        def perform
-
-          Mutx::Support::Configuration.get
-          Mutx::Database::MongoConnector.new(Mutx::Support::Configuration.db_connection_data)
-
-          get_present_output_files = Dir["#{Dir.pwd}/mutx/temp/*.out"].select{|file|  file.start_with? "mutx_co_"}
-          get_present_report_files = Dir["#{Dir.pwd}/mutx/temp/*.html"].select{|file|  file.start_with? "mutx_report_"}
-
-          get_present_output_files.each do |output_file|
-            if result = Mutx::Results::Result.get(output_file.scan(/\d+/).first)
-              File.delete("#{Dir.pwd}/mutx/temp/#{output_file}") if result.finished?
-            end
-          end
-
-          get_present_report_files.each do |report_file|
-            if result = Mutx::Results::Result.get(report_file.scan(/\d+/).first)
-              File.delete("#{Dir.pwd}/mutx/temp/#{report_file}") if result.finished?
-            end
-          end
-          ##Mutx::Database::MongoConnector.force_close
-        end
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-# encoding: utf-8
-require 'mutx'
-require 'socket'
-
-module Mutx
-  module Workers
-    class Listener
-      include Sidekiq::Worker
-        def perform(result_id)
-
-
-          tcp_port = result.id.to_s[-4..-1].to_i
-
-          #server = TCPServer.new tcp_port # Server bound to port tcp_port
-
-          ###########################
-          #begin
-          #
-
-          server = TCPServer.new tcp_port # Server bound to port tcp_port
-
-          @running = true
-
-          Thread.start("#{result.mutx_command}") do |command|
-
-
-          end
-
-
-        end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# encoding: utf-8
-require 'mutx'
-require 'sidetiq'
-#require 'sidekiq/testing/inline'
-
-module Mutx
-  module Workers
-	class UpdateStarted
-      include Sidekiq::Worker
-      include Sidetiq::Schedulable
-      recurrence { minutely(2) }
-      def perform
-        started_result = nil
-        started_result = Mutx::Database::MongoConnector.started!
-        started_result.each do |line|
-          puts Mutx::API::Execution.reset(line["_id"])
-        end
-        puts "- ==== NO Started Results Founded ====" if started_result.eql? []
-        ##Mutx::Database::MongoConnector.force_close
-      end
-	end#class
-  end
-end