git-restart 0.0.10.dev → 0.0.11.pre.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8e58b89cbcdd5c205bef33a5237e9d8274c6bc
-  data.tar.gz: dbb9a101aeee442a316ef6f2ce0843c9cec6469d
+  metadata.gz: 1a0602539b39f373497f2c7f0c83cd68babd3864
+  data.tar.gz: 760387660b687fb183e2de28c72a8631fcd190d6
 SHA512:
-  metadata.gz: 69216dee83081739ce3f5a37359fd33a49fa4ff08c0f56e369ee017e9be44583f731ad3d18c22561d9c1f57ec753be3a014283d13dbba93dd949d8566a62713e
-  data.tar.gz: e83304bc8153d4c11280d300676c180ab83e8d35b7170dce9b0009f2fb295630b79e939ae1a75001285a3e57b7c2f7059969ffabccb867361c1ee4514e679e39
+  metadata.gz: 4c0cb6c02b073a56c0a4ca364756f0043701497a6f028d247cc5ffcc6b8dd5d576d302b5d775ad273811a7078e0a11e05687c64f88f4fe09c40da2e631f7a7cb
+  data.tar.gz: f58686e48ac26a080bf7d3a7a42a445f17f2d2b98491ab256684a23e6689566f2099aa492a87aec0e776d73d158c6165230338f24224055cc972afae6b53b4e9

data/bin/git-restart

@@ -5,10 +5,17 @@ require 'git-restart/runner.rb'
 
 puts "Starting runner ..."
 
-target = ARGV[0]
-target ||= ".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
 

data/lib/git-restart/runner.rb

@@ -11,6 +11,7 @@ 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
@@ -19,7 +20,7 @@ module GitRestart
 		attr_accessor	:octokit
 
 		def current_commit()
-			@git.object("HEAD").sha;
+			@git.object("HEAD^").sha;
 		end
 		def current_branch()
 			@git.current_branch();
@@ -28,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();
 
@@ -43,6 +50,8 @@ module GitRestart
 
 			yield(self);
 
+			@allowed_tasks.flatten!
+
 			@listenedSub = @mqtt.subscribe_to "GitHub/#{@repo}" do |data|
 				begin
 					data = JSON.parse(data, symbolize_names: true);
@@ -65,12 +74,10 @@ module GitRestart
 		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, {
+			@octokit.create_status(@repo, current_commit, newStatus, {
 					context: "#{@name}/#{name}".gsub(" ", "_"),
 					description: message,
 				})
@@ -115,6 +122,10 @@ module GitRestart
 				t.gsub!(/^\.\//,"");
 				@current_task_file = t;
 
+				unless(@allowed_tasks.empty?)
+					next unless @allowed_tasks.include? @current_task_file
+				end
+
 				begin
 					load(t);
 				rescue ScriptError, StandardError
@@ -132,7 +143,7 @@ module GitRestart
 		def _start_next_tasks()
 			_generate_next_tasks();
 
-			puts "\nStarting next tasks!"
+			puts "\n\nStarting next tasks!"
 			@next_tasks.each do |name, t|
 				next unless t.active;
 				next unless t.triggered?
@@ -143,7 +154,7 @@ module GitRestart
 		end
 
 		def _switch_to(branch, commit = nil)
-			puts "\n\nSwitching to branch: #{branch}#{commit ? ",commit: #{commit}" : ""}"
+			puts "\nSwitching to branch: #{branch}#{commit ? ",commit: #{commit}" : ""}"
 
 			begin
 				@git.fetch();

data/lib/git-restart/task.rb

@@ -104,6 +104,7 @@ module GitRestart
 			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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-restart
 version: !ruby/object:Gem::Version
-  version: 0.0.10.dev
+  version: 0.0.11.pre.dev
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       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"