git-restart 0.0.6.pre.dev → 0.0.7dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ed2f0ac7e53f499ea6129928d6735ef155761f
-  data.tar.gz: '0079d01e8926c4e706dd9cd28f51763bafbd8a0a'
+  metadata.gz: ef8189ec5b0c60dd0d7f4c0bc87f7723f9896d09
+  data.tar.gz: 58bc594f1edf63ef4f4ea23a3cb5f4325433f6e3
 SHA512:
-  metadata.gz: a3ad76a2c5b3c180a771f45d88bd5823a4a127ac5e41fc354a8e3afb172f63f2c408992e572c73b9152b895cf0d1d4e579eab4f1765b4702d99535019de46fa8
-  data.tar.gz: 3d510191a2a96af5edff470bde9f07dfc92a342b7df67d3256d77cce0cd9e5bb6de16e2fa5b026733aa3afe79a6f51d69890294f3b02936a4fa4c0e82a80b3dd
+  metadata.gz: ec3fe1dd06650361126af62d93efab95bb30b9bfbe971c34be9c45332dbf8955e26f8e521df3b6fdb2b9784d4ee3c6e99b464a01592c47687caefa999f56f21b
+  data.tar.gz: 33fe46f6b69d6c534ad4ee362edd6c18b0665b5a606872efe3e78c9b13b70a90a58db9473cb254c02c105b6f805e7d8f13db53b3fea3906983f54116d8f3ba4d

data/lib/git-restart/runner.rb

@@ -1,6 +1,8 @@
 
 require 'mqtt/sub_handler'
+
 require 'git'
+require 'octokit'
 
 require_relative "task.rb"
 
@@ -14,6 +16,7 @@ module GitRestart
 		attr_reader		:current_task_file
 
 		attr_reader		:mqtt
+		attr_accessor	:octokit
 
 		def current_commit()
 			@git.object("HEAD^").sha;
@@ -41,15 +44,12 @@ module GitRestart
 			yield(self);
 
 			@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];
@@ -57,8 +57,6 @@ module GitRestart
 					next if @exclude_branches.include? data[:branch];
 				end
 
-				puts "Queueing data!"
-
 				@branchQueue << data;
 			end
 
@@ -67,6 +65,15 @@ module GitRestart
 		end
 
 		def update_status(name, newStatus, message = nil)
+			return unless @octokit;
+
+			begin
+			@octokit.create_status(@repo, current_commit, newStatus, {
+					context: "#{@name}/#{name}".gsub(" ", "_"),
+					description: message,
+				})
+			rescue
+			end
 		end
 
 		def _start_task_thread()
@@ -74,8 +81,6 @@ module GitRestart
 				loop do
 					newData = @branchQueue.pop;
 
-					puts "Popped data: #{newData}"
-
 					@current_modified = newData[:touched];
 					_switch_to(newData[:branch], newData[:head_commit]);
 				end
@@ -108,23 +113,24 @@ module GitRestart
 				t.gsub!(/^\.\//,"");
 				@current_task_file = t;
 
-				# 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 are: #{@next_tasks}"
+			puts "Finished loading! Next tasks: #{@next_tasks.keys}"
 		end
 
 		def _start_next_tasks()
 			_generate_next_tasks();
 
-			puts "Starting next tasks!"
+			puts "\n\nStarting next tasks!"
 			@next_tasks.each do |name, t|
 				next unless t.active;
 				next unless t.triggered?
@@ -135,8 +141,12 @@ module GitRestart
 		end
 
 		def _switch_to(branch, commit = nil)
-			puts "Switching to branch: #{branch}, commit: #{commit}"
-			@git.fetch();
+			puts "\nSwitching to branch: #{branch}#{commit ? ",commit: #{commit}" : ""}"
+
+			begin
+				@git.fetch();
+			rescue
+			end
 
 			if(branch != current_branch())
 				_stop_all_tasks();
@@ -144,10 +154,10 @@ module GitRestart
 				_stop_triggered_tasks();
 			end
 			@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

@@ -111,8 +111,10 @@ module GitRestart
 		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);
@@ -142,6 +144,8 @@ module GitRestart
 				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.6.pre.dev
+  version: 0.0.7dev
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler
@@ -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
@@ -112,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: "(Re)start scripts and monitor them on a GitHub push"