rukawa 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b76e6a6b3bab23573723fee0d2c9049d1b5052
-  data.tar.gz: f39e1766871bd26e710edd2868edf39c625f1a0f
+  metadata.gz: ef694d2105bd3b75de436eede093ba3319bec085
+  data.tar.gz: ba02c37e5fa934b2eff3ae26079f3a5f6819bae5
 SHA512:
-  metadata.gz: 9037f65f1a2c502a52cd53b3abc2758f2dcbb9deb43595f67687325c09924a298da2a7b79505a34bed2638128a278a8c5997efe07c4c4ee1884fb8f70620e19c
-  data.tar.gz: 42bb250a6a17de86a9d23f2343352d26426185a176313fdef7befcd4117aa4bac846be2d93393fac3e7970d1d18b115c2dadd87936a0512cb59ace0675b91d28
+  metadata.gz: c028cc8c8d6dd8caf3341f5d637034a17a56e2e6a61775d32003b385bc3484586081cb18629cec53f7ca1ed653b056cc1ceca830c52c5f4adb17f5f8fccb628f
+  data.tar.gz: 6414396c4ceee37a8d2f8e0eea69867f30197ab826ce1f1ea1329ab666e44a31ed573c3e5df86a5b232d27157500ccb77cfa22b32ca15c38e5e45cec2eec4f9c

data/lib/rukawa/cli.rb

@@ -6,6 +6,7 @@ module Rukawa
   class Cli < Thor
     desc "run JOB_NET_NAME [JOB_NAME] [JOB_NAME] ...", "Run jobnet. If JOB_NET is set, resume from JOB_NAME"
     map "run" => "_run"
+    map %w[version -v] => "__print_version"
     method_option :concurrency, aliases: "-c", type: :numeric, default: nil, desc: "Default: cpu count"
     method_option :variables, type: :hash, default: {}
     method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
@@ -15,6 +16,7 @@ module Rukawa
     method_option :stdout, type: :boolean, default: false, desc: "Output log to stdout"
     method_option :syslog, type: :boolean, default: false, desc: "Output log to syslog"
     method_option :dot, aliases: "-d", type: :string, default: nil, desc: "Output job status by dot format"
+    method_option :format, aliases: "-f", type: :string, desc: "Output job status format: png, svg, pdf, ... etc"
     method_option :refresh_interval, aliases: "-r", type: :numeric, default: 3, desc: "Refresh interval for running status information"
     def _run(job_net_name, *job_name)
       load_config
@@ -28,7 +30,7 @@ module Rukawa
       result = Runner.run(job_net, options[:batch], options[:refresh_interval])
 
       if options[:dot]
-        job_net.output_dot(options[:dot])
+        job_net.output_dot(options[:dot], format: options[:format])
       end
 
       exit 1 unless result
@@ -38,6 +40,7 @@ module Rukawa
     method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
     method_option :job_dirs, type: :array, default: []
     method_option :output, aliases: "-o", type: :string, required: true
+    method_option :format, aliases: "-f", type: :string
     def graph(job_net_name, *job_name)
       load_config
       load_job_definitions
@@ -45,7 +48,7 @@ module Rukawa
       job_net_class = get_class(job_net_name)
       job_classes = job_name.map { |name| get_class(name) }
       job_net = job_net_class.new(nil, *job_classes)
-      job_net.output_dot(options[:output])
+      job_net.output_dot(options[:output], format: options[:format])
     end
 
     desc "run_job JOB_NAME [JOB_NAME] ...", "Run specific jobs."
@@ -95,6 +98,11 @@ module Rukawa
       Rukawa::Overview.list_job
     end
 
+    desc "version(-v)", "Print the version"
+    def __print_version
+      puts "rukawa #{Rukawa::VERSION}"
+    end
+
     private
 
     def load_config

data/lib/rukawa/configuration.rb

@@ -10,7 +10,8 @@ module Rukawa
 
     def initialize
       @config = OpenStruct.new(
-        concurrency: Concurrent.processor_count
+        concurrency: Concurrent.processor_count,
+        dot_command: "dot"
       )
       @config.graph = GraphConfig.new.tap { |c| c.rankdir = "LR" }
     end

data/lib/rukawa/job.rb

@@ -62,12 +62,12 @@ module Rukawa
 
     private def do_run(*results)
       @started_at = Time.now
-      check_dependencies(results)
 
       if skip?
         Rukawa.logger.info("Skip #{self.class}")
         set_state(:skipped)
       else
+        check_dependencies(results)
         Rukawa.logger.info("Start #{self.class}")
         set_state(:running)
         run

data/lib/rukawa/job_net.rb

@@ -58,8 +58,14 @@ module Rukawa
       end
     end
 
-    def output_dot(filename)
-      File.open(filename, 'w') { |f| f.write(to_dot) }
+    def output_dot(filename, format: nil)
+      if format && format != "dot"
+        io = IO.popen(["#{Rukawa.config.dot_command}", "-T#{format}", "-o", filename], "w")
+        io.write(to_dot)
+        io.close
+      else
+        File.open(filename, 'w') { |f| f.write(to_dot) }
+      end
     end
 
     def to_dot(subgraph = false)

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport