git-restart 0.0.1.pre.dev → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d328a8601625a761e52bce62d042e047403c2eef
-  data.tar.gz: e5fe83b3019317b259f91ddb31e6841b6b30e050
+  metadata.gz: d2731a1fddf96cb0555902773ea66010ae28ec5a
+  data.tar.gz: ba700b8d5c346ac619ff1f848706b4d7f3e8a7b9
 SHA512:
-  metadata.gz: 229b49c059c88712e46f35f79466a3442992045b334a1f6fe5f03b620bee9cba408436548170982947e39484e27e3f5e757c1fa1082692231dfd4f586403f054
-  data.tar.gz: b4938804dc08b11107088aba4b7ab57f5e429431c580c9368bdef86918e024ed44fb0bae264aad225ab56bca666bc9ec94346cbddba07221bd7506c7e8db151b
+  metadata.gz: e58995f9e245b556d013fd96044fd30372e8bb823ec2c13f17c8e1c7890421b0e1766e255dfb08a3620191c4f58dcc0973f66cc9b10e649946d834b1ec8b5b70
+  data.tar.gz: 760c16c44d23c4e54e586e6969682e9b8079dbd600c12197e5e60dc1d90b3810fcf3833e039c85acee28d02dfb54a88edc7bca47faa2e19fc4dfdde615016fd2

data/bin/git-restart

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

data/lib/git-restart/runner.rb

@@ -1,6 +1,8 @@
 
 require 'mqtt/sub_handler'
+
 require 'git'
+require 'octokit'
 
 require_relative "task.rb"
 
@@ -9,12 +11,16 @@ 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();
@@ -23,9 +29,15 @@ module GitRestart
 			@current_modified;
 		end
 
-		def initialize()
+		def initialize(fileList = nil)
+			raise ArgumentError, "File list needs to be nil or an Array!" unless (fileList.is_a? Array or fileList.nil?)
+
 			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();
 
@@ -38,16 +50,15 @@ 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];
@@ -55,16 +66,29 @@ 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()
@@ -72,8 +96,6 @@ module GitRestart
 				loop do
 					newData = @branchQueue.pop;
 
-					puts "Popped data: #{newData}"
-
 					@current_modified = newData[:touched];
 					_switch_to(newData[:branch], newData[:head_commit]);
 				end
@@ -106,23 +128,28 @@ module GitRestart
 				t.gsub!(/^\.\//,"");
 				@current_task_file = t;
 
-				# TODO Add proper error reporting
+				unless(@allowed_tasks.empty?)
+					next unless @allowed_tasks.include? @current_task_file
+				end
+
 				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 are: #{@next_tasks}"
+			puts "Finished loading! Next tasks: #{@next_tasks.keys}"
 		end
 
 		def _start_next_tasks()
 			_generate_next_tasks();
 
-			puts "Starting next tasks!"
+			puts "\nStarting next tasks!"
 			@next_tasks.each do |name, t|
 				next unless t.active;
 				next unless t.triggered?
@@ -133,19 +160,24 @@ module GitRestart
 		end
 
 		def _switch_to(branch, commit = nil)
-			puts "Switching to branch: #{branch}, commit: #{commit}"
-			@git.fetch();
+			puts "\n\nSwitching to branch: #{branch}#{commit ? ",commit: #{commit}" : ""}"
+
+			begin
+				@git.fetch();
+			rescue
+			end
 
 			if(branch != current_branch())
 				_stop_all_tasks();
 			else
 				_stop_triggered_tasks();
 			end
+			@git.reset_hard();
 			@git.checkout(branch);
-			@git.reset_hard(commit);
-
 			@git.merge("origin/#{branch}");
 
+			@git.reset_hard(commit);
+
 			_start_next_tasks();
 		end
 

data/lib/git-restart/task.rb

@@ -17,8 +17,6 @@ module GitRestart
 		attr_reader		:lastStatus
 		attr_reader		:status_message
 
-		attr_reader		:mqtt
-
 		def self.runner=(runner)
 			@runner = runner;
 		end
@@ -32,6 +30,9 @@ module GitRestart
 		def branch()
 			runner().current_branch();
 		end
+		def current_commit()
+			runner().current_commit();
+		end
 		def modified()
 			runner().current_modified();
 		end
@@ -69,6 +70,8 @@ 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
@@ -82,8 +85,12 @@ module GitRestart
 
 			@watched.each do |regEx|
 				modified().each do |f|
-					next unless f =~ /#{Regexp.quote(@chdir)}(.*)/
-					return true if $1 =~ regEx;
+					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
 				end
 			end
 
@@ -100,21 +107,39 @@ 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| sMsg = l; end
+			end
+
+			return sMsg;
+		end
+
 		def _report_status(status, message = nil)
-			@status_message = ""
+			message ||= _get_statusline();
+			@status_message = 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}"
 
-			return if @targets.empty?
-			sleep 0.01
+			if @targets.empty?
+				_report_status(:success, "No tasks to run!");
+				return
+			end
 
 			@executionThread = Thread.new do
 				_report_status(:pending);
@@ -122,8 +147,9 @@ module GitRestart
 				@targets.each do |target|
 					@statuschange_mutex.synchronize {
 						break if @exiting
+						_rm_logfile();
 						options = {
-							[:in, :out, :err] => "/dev/null"
+							[:out, :err] => "/tmp/TaskLog_#{@name}_#{current_commit()}"
 						}
 						options[:chdir] = @chdir if @chdir
 
@@ -139,11 +165,14 @@ 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.1.pre.dev
+  version: 0.0.1
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ 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
@@ -84,7 +98,8 @@ description: |-
   This gem can be used to (re)start scripts whenever a GitHub push event is recorded.
   The exit status of scripts can be monitored, and a failure can be sent back, making this capable of running simple tests too!
 email: 
-executables: []
+executables:
+- git-restart
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1