task-orchestrator 0.0.13 → 0.0.14

data/lib/orchestrator/cli.rb

@@ -19,20 +19,23 @@ module Orchestrator
         options.args.instance_variable_set(:@config,config)
       end
 
-      options.statefile = nil
       options.name = nil
       parser.on( '--name NAME', 'Name of the cron job to run' ) do |name|
         options.name = name
         options.args.instance_variable_set(:@name,name)
       end
 
+      options.statefile = nil
       parser.on( '--statefile PATH', String, 'Path to state file yaml' ) do |statefile|
         options.statefile = statefile
         options.args.instance_variable_set(:@statefile,statefile)
       end
 
       options.reset = false
-      parser.on( '--reset', 'Do not use state file if it exists' ) { options.reset = true }
+      parser.on( '--reset', 'Delete state file if it exists' ) { options.reset = true }
+
+      options.resume = false
+      parser.on( '--resume', 'Resume from statefile if it exists' ) { options.resume = true }
 
       options.kill = false
       parser.on( '--kill', 'Kill running task based on statefile pid then lock can not be acquired' ) { options.kill = true }
@@ -65,6 +68,16 @@ module Orchestrator
         exit 1 
       end
 
+      if options.reset && options.resume
+        Formatador.display_line("[red]ERROR[/]: --resume or --reset options are mutualy exclusive")
+        exit 1
+      end
+
+      if options.wait && options.kill
+        Formatador.display_line("[red]ERROR[/]: --wait or --kill options are mutualy exclusive")
+        exit 1
+      end
+
       options
     end
 

data/lib/orchestrator/task.rb

@@ -65,7 +65,18 @@ module Orchestrator
           end
         end
 
-        @state = (File.exist?(@options.statefile) && !@options.reset) ? YAML.load_file(@options.statefile) : @settings['orchestrator'][@options.name]
+        if File.exist?(@options.statefile)
+          if @options.reset
+            @state = @settings['orchestrator'][@options.name]
+          elsif @options.resume
+            @state = YAML.load_file(@options.statefile)
+          else
+            Formatador.display_line("[red]ERROR[/]: statefile #{@options.statefile} already exists, use --resume or --reset")
+            exit 1
+          end
+        else
+          @state = @settings['orchestrator'][@options.name]
+        end
 
         @state['pid'] = Process.pid
 

data/lib/orchestrator/version.rb

@@ -1,3 +1,3 @@
 module Orchestrator
-  VERSION ||= '0.0.13'
+  VERSION ||= '0.0.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-orchestrator
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors: