tengine_job 1.1.0 → 1.2.0

data/lib/tengine/job/template/ssh_job.rb

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+require 'tengine/job/template'
+
+require 'tengine_resource'
+
+# ルートジョブネットを他のジョブネット内に展開するための特殊なテンプレート用Vertex。
+class Tengine::Job::Template::SshJob < Tengine::Job::Template::NamedVertex
+
+  # Tengine::Job::Runtime::SshJobとTengine::Job::Template::Jobnetでも必要な属性
+  module Settings
+    extend ActiveSupport::Concern
+
+    DEFAULT_KILLING_SIGNAL_INTERVAL = 5
+    DEFAULT_KILLING_SIGNALS = ['KILL'].freeze
+
+    included do
+      require 'tengine/core'
+      include Tengine::Core::CollectionAccessible
+
+      field :script        , :type => String # 実行されるスクリプト
+
+      field :server_name    , :type => String # 接続先となるサーバ名。Tengine::Resource::Server#name を指定します
+      field :credential_name, :type => String # 接続時に必要な認証情報。Tengine::Resource::Credential#name を指定します
+
+      # 強制停止時にプロセスに送るシグナルの配列
+      field :killing_signals, type: Array
+      array_text_accessor :killing_signals
+
+      # 強制停止時にkilling_signalsで定義されるシグナルを順次送信する間隔。
+      field :killing_signal_interval, type: Integer
+    end
+
+    def actual_credential_name
+      credential_name || (runtime? ? nil : parent ? parent.actual_credential_name : nil)
+    end
+
+    def actual_server_name
+      server_name || (runtime? ? nil : parent ? parent.actual_server_name : nil)
+    end
+
+    def actual_credential
+      key = actual_credential_name
+      return nil if key.blank?
+      result = Tengine::Resource::Credential.where({:name => key}).first
+      # TODO 使用する例外クラスはこれで良いのか検討
+      raise Mongoid::Errors::DocumentNotFound.new(Tengine::Resource::Credential, key, []) unless result
+      result
+    end
+
+    def actual_server
+      key = actual_server_name
+      return nil if key.blank?
+      result = Tengine::Resource::Server.where({:name => key}).first
+      # TODO 使用する例外クラスはこれで良いのか検討
+      raise Mongoid::Errors::DocumentNotFound.new(Tengine::Resource::Server, key, []) unless result
+      result
+    end
+
+    def actual_killing_signals
+      killing_signals ? killing_signals :
+        (runtime? ? nil : parent ? parent.actual_killing_signals : DEFAULT_KILLING_SIGNALS.dup)
+    end
+
+    def actual_killing_signal_interval
+      killing_signals ? killing_signal_interval :
+        (runtime? ? nil : parent ? parent.actual_killing_signal_interval : DEFAULT_KILLING_SIGNAL_INTERVAL)
+    end
+  end
+
+  include Settings
+
+  # @override
+  def generating_attrs
+    result = super
+    result[:server_name] = actual_server_name
+    result[:credential_name] = actual_credential_name
+    result
+  end
+
+end

data/lib/tengine/job/template/vertex.rb

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+require 'tengine/job/template'
+
+# Edgeとともにジョブネットを構成するグラフの「頂点」を表すモデル
+# 自身がツリー構造を
+class Tengine::Job::Template::Vertex
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Tengine::Job::Structure::NamePath
+  include Tengine::Job::Structure::Tree
+  include Tengine::Job::Structure::Visitor::Accepter
+
+  self.cyclic = true
+  with_options(:class_name => self.name, :cyclic => true) do |c|
+    # parentにはあえてinverse_ofを設定していません。これはtengine_uiでのrails_adminによる
+    # 画面表示に問題が発生するためです。
+    # またchildrenについてのinverse_ofは必要です。設定しないとDSLのロードが動きません。
+    c.embedded_in :parent # , inverse_of: :children
+    c.embeds_many :children, :validate => false, inverse_of: :parent
+    accepts_nested_attributes_for :children
+  end
+
+  before_validation do |r|
+    r.children.each do |child|
+      child.valid?
+      child.errors.each do |f, error|
+        r.errors.add(:base, error)
+      end
+    end
+  end
+
+#   def short_inspect
+#     "#<%%%-30s id: %s>" % [self.class.name, self.id.to_s]
+#   end
+#   alias_method :long_inspect, :inspect
+#   alias_method :inspect, :short_inspect
+
+  def template?; true; end
+  def runtime?; !template?; end
+
+  class VertexValidations < Mongoid::Errors::Validations
+    def translate(key, options)
+      ::I18n.translate(
+        "#{Mongoid::Errors::MongoidError::BASE_KEY}.validations",
+        {:errors => Tengine::Job::Template::Vertex.flatten_errors(document).to_a.join(', ')})
+    end
+  end
+
+  class << self
+    def flatten_errors(vertex, dest = nil)
+      dest ||= []
+      children_errors = vertex.errors.messages.delete(:children)
+      edges_errors = vertex.errors.messages.delete(:edges)
+      vertex.errors.full_messages.each{|msg| dest << "#{vertex.name_path} #{msg}"}
+      vertex.children.each{|child| flatten_errors(child, dest)}
+      if vertex.respond_to?(:edges)
+        vertex.edges.each do|edge|
+          edge.errors.full_messages.each{|msg| dest << "#{edge.name_for_message} #{msg}"}
+        end
+      end
+      dest
+    end
+
+    def raise_flatten_errors
+      yield if block_given?
+    rescue Mongoid::Errors::Validations => e
+      raise VertexValidations, e.document
+    end
+
+    def create!(*args, &block)
+      raise_flatten_errors{ super(*args, &block) }
+    end
+  end
+
+  def save!(*args)
+    self.class.raise_flatten_errors{ super(*args) }
+  end
+  def update_attributes!(*args)
+    self.class.raise_flatten_errors{ super(*args) }
+  end
+
+  def previous_edges
+    return nil unless parent
+    parent.edges.select{|edge| edge.destination_id == self.id}
+  end
+  alias_method :prev_edges, :previous_edges
+
+  def next_edges
+    return nil unless parent
+    parent.edges.select{|edge| edge.origin_id == self.id}
+  end
+
+
+  def generate(options = {})
+    Tengine::Job::Template::Generator.new.execute(self, options)
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_job
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - taigou
@@ -14,76 +13,67 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tengine_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tengine_resource
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tengine_resource_ec2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,7 +81,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,23 +88,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -123,7 +109,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,39 +116,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -171,15 +151,41 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -187,15 +193,41 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+- !ruby/object:Gem::Dependency
+  name: tengine_job_agent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -203,7 +235,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -212,6 +243,7 @@ description: tengine_job provides jobnet management
 email: tengine-info@groovenauts.jp
 executables:
 - create_indexes_for_tengine_job
+- tengine_job
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -227,75 +259,77 @@ files:
 - examples/0006_retry_three_layer.sh
 - examples/0007_simple_jobnet.rb
 - examples/0021_dynamic_env.rb
+- examples/0027_parallel_ssh_job
+- examples/0027_parallel_ssh_jobs.rb
 - examples/tengine_job_test.sh
 - examples/VERSION
-- lib/tengine/job/category.rb
-- lib/tengine/job/connectable.rb
-- lib/tengine/job/drivers/job_control_driver.rb
-- lib/tengine/job/drivers/job_execution_driver.rb
-- lib/tengine/job/drivers/jobnet_control_driver.rb
-- lib/tengine/job/drivers/schedule_driver.rb
-- lib/tengine/job/dsl_binder.rb
-- lib/tengine/job/dsl_evaluator.rb
-- lib/tengine/job/dsl_loader.rb
-- lib/tengine/job/edge.rb
-- lib/tengine/job/element_selector_notation.rb
-- lib/tengine/job/end.rb
-- lib/tengine/job/executable.rb
-- lib/tengine/job/execution.rb
-- lib/tengine/job/expansion.rb
-- lib/tengine/job/fork.rb
-- lib/tengine/job/job.rb
-- lib/tengine/job/jobnet/builder.rb
-- lib/tengine/job/jobnet/job_state_transition.rb
-- lib/tengine/job/jobnet/jobnet_state_transition.rb
-- lib/tengine/job/jobnet/state_transition.rb
-- lib/tengine/job/jobnet.rb
-- lib/tengine/job/jobnet_actual.rb
-- lib/tengine/job/jobnet_template.rb
-- lib/tengine/job/join.rb
-- lib/tengine/job/junction.rb
-- lib/tengine/job/killing.rb
-- lib/tengine/job/mm_compatibility/connectable.rb
-- lib/tengine/job/mm_compatibility.rb
-- lib/tengine/job/name_path.rb
-- lib/tengine/job/root.rb
-- lib/tengine/job/root_jobnet_actual.rb
-- lib/tengine/job/root_jobnet_template.rb
-- lib/tengine/job/script_executable.rb
-- lib/tengine/job/signal.rb
-- lib/tengine/job/start.rb
-- lib/tengine/job/stoppable.rb
-- lib/tengine/job/vertex.rb
+- lib/tengine/job/dsl/binder.rb
+- lib/tengine/job/dsl/evaluator.rb
+- lib/tengine/job/dsl/loader.rb
+- lib/tengine/job/dsl.rb
+- lib/tengine/job/runtime/drivers/job_control_driver.rb
+- lib/tengine/job/runtime/drivers/job_execution_driver.rb
+- lib/tengine/job/runtime/drivers/jobnet_control_driver.rb
+- lib/tengine/job/runtime/drivers/schedule_driver.rb
+- lib/tengine/job/runtime/edge.rb
+- lib/tengine/job/runtime/executable.rb
+- lib/tengine/job/runtime/execution.rb
+- lib/tengine/job/runtime/job_base.rb
+- lib/tengine/job/runtime/jobnet.rb
+- lib/tengine/job/runtime/junction.rb
+- lib/tengine/job/runtime/named_vertex.rb
+- lib/tengine/job/runtime/root_jobnet.rb
+- lib/tengine/job/runtime/signal.rb
+- lib/tengine/job/runtime/ssh_job.rb
+- lib/tengine/job/runtime/state_transition.rb
+- lib/tengine/job/runtime/stoppable.rb
+- lib/tengine/job/runtime/vertex.rb
+- lib/tengine/job/runtime.rb
+- lib/tengine/job/structure/category.rb
+- lib/tengine/job/structure/edge_builder.rb
+- lib/tengine/job/structure/element_selector_notation.rb
+- lib/tengine/job/structure/jobnet_builder.rb
+- lib/tengine/job/structure/jobnet_finder.rb
+- lib/tengine/job/structure/name_path.rb
+- lib/tengine/job/structure/tree.rb
+- lib/tengine/job/structure/visitor.rb
+- lib/tengine/job/structure.rb
+- lib/tengine/job/template/edge.rb
+- lib/tengine/job/template/expansion.rb
+- lib/tengine/job/template/generator.rb
+- lib/tengine/job/template/jobnet.rb
+- lib/tengine/job/template/junction.rb
+- lib/tengine/job/template/named_vertex.rb
+- lib/tengine/job/template/root_jobnet.rb
+- lib/tengine/job/template/ssh_job.rb
+- lib/tengine/job/template/vertex.rb
+- lib/tengine/job/template.rb
 - lib/tengine/job.rb
 - lib/tengine_job.rb
 - bin/create_indexes_for_tengine_job
+- bin/tengine_job
 homepage: http://github.com/tengine/tengine_job
 licenses:
 - MPL2.0/LGPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1404326031848686310
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: tengine_job provides jobnet management
 test_files: []