git-restart 0.0.3 → 0.0.4.pre.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e1ed81be5f1e1b88b5f03998ed168bb3cea967
-  data.tar.gz: 64ecf291feb17510fdaf4e95eb310da327bfa0dd
+  metadata.gz: c99d1fbfa58de92874eb59f9b49e6ca080e0b5a1
+  data.tar.gz: 8651e7bcf6fa826f158e0dfd15bcd82a66a7f703
 SHA512:
-  metadata.gz: 5fed7452a908ac52db44e2b32ae5d5c773d839ffdeb7f956b44f1dbbbd409fc3e1a7bf4ce8d8587c05bd1a4ee14c5b1acd6c29eaf77c633c98b3c3aa340c7191
-  data.tar.gz: d1779c9e0efedceeb64fc65c34901d659beec6ab3c1cbb80734328a2f9754a76f106343ff7b04f76bd80f79b74a5cef62b4d0d6b2886e28cb1063609ae118e8e
+  metadata.gz: 7e0c1e3adf4b6ebe1317a276a104363e4b27e617f646ec5f283f75303822d2d1afa75179aac180b5daf9ab591aea25e48be06ef639eb7e09933e0d6bf0d29663
+  data.tar.gz: 615bbed3fad0442ac9b988d0333d126bd9b52ab4e562a90454400a9a158bacd16f7065c8b7822d5871f6b4f48c6a37ec19f363ca3b074afe6809d402c918503e

data/bin/git-restart

@@ -5,18 +5,11 @@ require 'git-restart/runner.rb'
 
 puts "Starting runner ..."
 
-$taskfiles = Array.new();
-target = ".gitrun"
-ARGV.each do |t|
-	if(t =~ /\.gitrun$/)
-		target = t;
-	else
-		$taskfiles << t;
-	end
-end
+target = ARGV[0]
+target ||= ".gitrun"
 
-raise ArgumentError, "No valid runner file specified!" unless File.exist? target
+raise ArgumentError, "No valid task file specified!" unless File.exist? target
 
 load target
 
-GitRestart::Task.runner.mqtt.lockAndListen
+GitRestart::Task.runner.mqtt.lock_and_listen

data/lib/git-restart/runner.rb

@@ -1,8 +1,6 @@
 
 require 'mqtt/sub_handler'
-
 require 'git'
-require 'octokit'
 
 require_relative "task.rb"
 
@@ -11,16 +9,12 @@ module GitRestart
 		attr_accessor :name
 
 		attr_accessor :repo, :branches, :exclude_branches, :start_on
-		attr_accessor :allowed_tasks
 
 		attr_reader	  	:next_tasks
 		attr_reader		:current_task_file
 
-		attr_reader		:mqtt
-		attr_accessor	:octokit
-
 		def current_commit()
-			@git.object("HEAD").sha;
+			@git.object("HEAD^").sha;
 		end
 		def current_branch()
 			@git.current_branch();
@@ -29,15 +23,9 @@ module GitRestart
 			@current_modified;
 		end
 
-		def initialize(fileList = nil)
-			raise ArgumentError, "File list needs to be nil or an Array!" unless (fileList.is_a? Array or fileList.nil?)
-
+		def initialize()
 			GitRestart::Task.runner = self;
 
-			@allowed_tasks = Array.new();
-			@allowed_tasks << fileList if(fileList);
-			@allowed_tasks << $taskfiles unless($taskfiles.empty?)
-
 			@current_tasks = Hash.new();
 			@next_tasks		= Hash.new();
 
@@ -50,15 +38,16 @@ module GitRestart
 
 			yield(self);
 
-			@allowed_tasks.flatten!
-
 			@listenedSub = @mqtt.subscribe_to "GitHub/#{@repo}" do |data|
+				puts "Received data: #{data}"
 				begin
 					data = JSON.parse(data, symbolize_names: true);
 				rescue
 					next;
 				end
 
+				puts "Processing data #{data}"
+
 				next unless data[:branch];
 				if(not @branches.empty?)
 					next unless @branches.include? data[:branch];
@@ -66,29 +55,16 @@ module GitRestart
 					next if @exclude_branches.include? data[:branch];
 				end
 
+				puts "Queueing data!"
+
 				@branchQueue << data;
 			end
 
 			autostart();
 			_start_task_thread();
-
-			at_exit {
-				_stop_all_tasks();
-			}
 		end
 
 		def update_status(name, newStatus, message = nil)
-			puts "Task #{@name} assumed a new status: #{newStatus}#{message ? " MSG:#{message}" : ""}"
-
-			return unless @octokit;
-
-			begin
-			@octokit.create_status(@repo, current_commit(), newStatus, {
-					context: "#{@name}/#{name}".gsub(" ", "_"),
-					description: message,
-				})
-			rescue
-			end
 		end
 
 		def _start_task_thread()
@@ -96,6 +72,8 @@ module GitRestart
 				loop do
 					newData = @branchQueue.pop;
 
+					puts "Popped data: #{newData}"
+
 					@current_modified = newData[:touched];
 					_switch_to(newData[:branch], newData[:head_commit]);
 				end
@@ -128,28 +106,23 @@ module GitRestart
 				t.gsub!(/^\.\//,"");
 				@current_task_file = t;
 
-				unless(@allowed_tasks.empty?)
-					next unless @allowed_tasks.include? @current_task_file
-				end
-
+				# TODO Add proper error reporting
 				begin
 					load(t);
 				rescue ScriptError, StandardError
-					update_status("File #{t}", :failure, "File could not be parsed!")
 					puts("File #{t} could not be loaded!");
 				rescue GitRestart::TaskValidityError
-					update_status("File #{t}", :failure, "Task-file not configured properly!")
 					puts("Task-File #{t} is not configured properly!");
 				end
 			end
 
-			puts "Finished loading! Next tasks: #{@next_tasks.keys}"
+			puts "Finished loading! Next tasks are: #{@next_tasks}"
 		end
 
 		def _start_next_tasks()
 			_generate_next_tasks();
 
-			puts "\nStarting next tasks!"
+			puts "Starting next tasks!"
 			@next_tasks.each do |name, t|
 				next unless t.active;
 				next unless t.triggered?
@@ -160,24 +133,19 @@ module GitRestart
 		end
 
 		def _switch_to(branch, commit = nil)
-			puts "\n\nSwitching to branch: #{branch}#{commit ? ",commit: #{commit}" : ""}"
-
-			begin
-				@git.fetch();
-			rescue
-			end
+			puts "Switching to branch: #{branch}, commit: #{commit}"
+			@git.fetch();
 
 			if(branch != current_branch())
 				_stop_all_tasks();
 			else
 				_stop_triggered_tasks();
 			end
-			@git.reset_hard();
 			@git.checkout(branch);
-			@git.merge("origin/#{branch}");
-
 			@git.reset_hard(commit);
 
+			@git.merge("origin/#{branch}");
+
 			_start_next_tasks();
 		end
 

data/lib/git-restart/task.rb

@@ -1,58 +1,27 @@
 
-# @author Xasin
 module GitRestart
-	# The Error-Class used to signal when a Task is set up wrong
 	class TaskValidityError < StandardError
 	end
 
-	# This class is used to define "Tasks". Each task represents
-	# a set of commands, which it executes in chronological order, or until
-	# a task errors.
-	# Additionally, it will kill execution of tasks with a specified kill-signal
-	# when an update was detected from GitHub.
-	# The failure-status of the tasks can also be reported via Octokit, allowing this
-	# to be used as a simple CI or Test system for various languages.
 	class Task
-		# The array of tasks to execute. Each target will be executed in the given
-		# order via `Process.spawn`.
-		# @return [Array<String>]
 		attr_reader 	:targets
 
-		# The signal (as String, like Signal.list) to use to kill the process.
-		# Can be nil to disable killing
 		attr_accessor 	:signal
-		# Whether or not to report failure if the currently running target
-		# has a non-zero exit status after having been killed. Only makes sense
-		# together with report_status
 		attr_accessor	:expect_clean_exit
-		# Whether or not to report failure/success status to GitHub using Octokit
 		attr_accessor	:report_status
-		# Defines this as a "CI_Task". Such a task will always run on an update,
-		# regardless what files changed. Useful if you always want a status report
-		# on GitHub.
 		attr_accessor  :ci_task
-		# Name of the Task. *Required*. Used as *unique* ID, and to report status to GitHub
-		attr_accessor	:name
-		# The file to use to retrieve a single-line status info for the "description"
-		# string of the GitHub status. Only the last *non-indented* line is used,
-		# which allows the output of Minitest to be used directly.
-		attr_accessor  :status_file
-
-		# Whether or not this task is active. Usually set via #on_branches,
-		# but can be used to manually disable or enable this task based on
-		# config files, ENV variables etc.
+		attr_accessor	:name, :status_file
+
 		attr_accessor	:active
 
-		# The last status-code of this Task. Used internally.
 		attr_reader		:lastStatus
-		# The last status-message of this task. Used internally.
 		attr_reader		:status_message
 
-		# @api private
+		attr_reader		:mqtt
+
 		def self.runner=(runner)
 			@runner = runner;
 		end
-		# @api private
 		def self.runner()
 			return @runner;
 		end
@@ -63,10 +32,6 @@ module GitRestart
 		def branch()
 			runner().current_branch();
 		end
-		def current_commit()
-			runner().current_commit();
-		end
-
 		def modified()
 			runner().current_modified();
 		end
@@ -104,8 +69,6 @@ module GitRestart
 
 			valid?
 
-			@status_file ||= "/tmp/TaskLog_#{@name}_#{current_commit()}";
-
 			if(runner().next_tasks[@name])
 				raise TaskValidityError, "A task of name #{@name} already exists!"
 			else
@@ -119,12 +82,8 @@ module GitRestart
 
 			@watched.each do |regEx|
 				modified().each do |f|
-					if regEx.to_s =~ /^\(\?\-mix:\\\/(.*)\)$/ then
-						return true if f =~ Regexp.new($1);
-					else
-						next unless f =~ /#{Regexp.quote(@chdir)}(.*)/
-						return true if $1 =~ regEx;
-					end
+					next unless f =~ /#{Regexp.quote(@chdir)}(.*)/
+					return true if $1 =~ regEx;
 				end
 			end
 
@@ -141,55 +100,30 @@ module GitRestart
 			end
 		end
 
-		def _rm_logfile()
-			if File.exist?("/tmp/TaskLog_#{@name}_#{current_commit()}") then
-				File.delete("/tmp/TaskLog_#{@name}_#{current_commit()}");
-			end
-		end
-		def _get_statusline()
-			return "No status specified" unless File.exist? @status_file
-
-			sMsg = ""
-			File.open(@status_file, "r") do |sFile|
-				sFile.each_line do |l|
-					l.chomp!
-					next if l == "";
-					next if l =~ /^\s+/;
-
-					sMsg = l;
-				end
-			end
-
-			return sMsg;
-		end
-
 		def _report_status(status, message = nil)
-			message ||= _get_statusline();
-			@status_message = message;
+			@status_message = ""
 
 			return unless @report_status
 
 			runner().update_status(@name, status, message);
+			puts "Task #{@name} assumed a new status: #{status}#{message ? " MSG:#{message}" : ""}"
 		end
 		private :_report_status
 
 		def start()
 			puts "Starting Task: #{@name}"
 
-			if @targets.empty?
-				_report_status(:success, "No tasks to run!");
-				return
-			end
+			return if @targets.empty?
+			sleep 0.01
 
 			@executionThread = Thread.new do
 				_report_status(:pending);
 
-				_rm_logfile();
 				@targets.each do |target|
 					@statuschange_mutex.synchronize {
 						break if @exiting
 						options = {
-							[:out, :err] => "/tmp/TaskLog_#{@name}_#{current_commit()}"
+							[:out, :err] => "/dev/null"
 						}
 						options[:chdir] = @chdir if @chdir
 
@@ -205,14 +139,11 @@ module GitRestart
 
 				if(@lastStatus == 0)
 					_report_status(:success);
-					_rm_logfile();
 				elsif(!@exiting || @expect_clean_exit)
 					_report_status(:failure);
 				end
 			end
 			@executionThread.abort_on_exception = true;
-
-			sleep 0.01
 		end
 
 		def stop()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-restart
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.pre.dev
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -121,12 +107,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: "(Re)start scripts and monitor them on a GitHub push"