tengine_job 0.6.13 → 1.1.0

data/Gemfile

@@ -1,23 +1,4 @@
 # -*- coding: utf-8 -*-
 source "http://rubygems.org"
 
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-gem "tengine_support", "~> 0.3.27"
-gem "tengine_core", "~> 0.5.39"
-gem "tengine_resource", "~> 0.5.15"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.6.0"
-  gem "factory_girl", "~> 2.1.2"
-  gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.1.3"
-  gem "jeweler", "~> 1.6.4"
-  # gem "rcov", ">= 0"
-  gem "simplecov", "~> 0.5.3"
-  gem "ZenTest", "~> 4.6.2"
-end
+gemspec

data/Gemfile.lock

@@ -1,12 +1,20 @@
+PATH
+  remote: .
+  specs:
+    tengine_job (1.1.0)
+      tengine_core (~> 1.1.0)
+      tengine_resource (~> 1.1.0)
+      tengine_support (~> 1.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
+    ZenTest (4.8.2)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
+    activesupport (3.2.8)
       i18n (~> 0.6)
-    activesupport (3.1.4)
       multi_json (~> 1.0)
     amq-client (0.8.7)
       amq-protocol (>= 0.8.4)
@@ -16,94 +24,84 @@ GEM
       amq-client (~> 0.8.7)
       amq-protocol (~> 0.8.4)
       eventmachine
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    builder (3.0.0)
-    daemons (1.1.8)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    builder (3.0.4)
+    daemons (1.1.9)
     diff-lcs (1.1.3)
-    eventmachine (0.12.10)
-    factory_girl (2.1.2)
-      activesupport
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.7.0)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongoid (2.3.5)
-      activemodel (~> 3.1.0)
-      mongo (~> 1.3)
+    eventmachine (1.0.0)
+    factory_girl (3.3.0)
+      activesupport (>= 3.0.0)
+    i18n (0.6.1)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    mongoid (3.0.15)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    net-ssh (2.2.2)
+    moped (1.3.1)
+    multi_json (1.3.6)
+    net-ssh (2.5.2)
+    origin (1.0.11)
     rake (0.9.2.2)
+    rdiscount (1.6.8)
     right_aws (2.1.0)
       right_http_connection (>= 1.2.5)
     right_http_connection (1.3.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    selectable_attr (0.3.15)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    selectable_attr (0.3.17)
       i18n
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    systemu (2.5.0)
-    tengine_core (0.5.39)
-      activemodel (~> 3.1.0)
-      activesupport (~> 3.1.0)
-      bson (~> 1.5.2)
-      bson_ext (~> 1.5.2)
+    systemu (2.5.2)
+    tengine_core (1.1.0)
+      activemodel (>= 3.1.0)
+      activesupport (>= 3.1.0)
       daemons (~> 1.1.4)
-      mongo (~> 1.5.2)
-      mongoid (~> 2.3.3)
+      mongoid (~> 3.0.0)
       selectable_attr (~> 0.3.15)
-      tengine_event (~> 0.4.9)
-      tengine_support (~> 0.3.27)
-    tengine_event (0.4.9)
+      tengine_event (~> 1.1.0)
+      tengine_support (~> 1.1.0)
+    tengine_event (1.1.0)
       activesupport (>= 3.0.0)
       amqp (~> 0.8.0)
-      tengine_support (>= 0.3.27)
+      tengine_support (~> 1.1.0)
       uuid (~> 2.3.4)
-    tengine_resource (0.5.15)
-      net-ssh (~> 2.2.1)
+    tengine_resource (1.1.0)
+      net-ssh (~> 2.5.2)
+      tengine_core (~> 1.1.0)
+      tengine_support (~> 1.1.0)
+    tengine_resource_ec2 (1.1.0)
       right_aws (~> 2.1.0)
-      tengine_core (~> 0.5.39)
-      tengine_support (~> 0.3.27)
-      wakame-adapters-tengine (~> 0.0.0)
-    tengine_support (0.3.27)
+      tengine_resource (~> 1.1.0)
+    tengine_support (1.1.0)
       activesupport (>= 3.0.0)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    wakame-adapters-tengine (0.0.7)
-      json
-      right_aws (~> 2.1.0)
-    yard (0.7.5)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (~> 4.6.2)
-  bundler (~> 1.1.3)
-  factory_girl (~> 2.1.2)
-  jeweler (~> 1.6.4)
-  rspec (~> 2.6.0)
-  simplecov (~> 0.5.3)
-  tengine_core (~> 0.5.39)
-  tengine_resource (~> 0.5.15)
-  tengine_support (~> 0.3.27)
-  yard (~> 0.7.2)
+  autotest
+  bundler
+  factory_girl (~> 3.3.0)
+  rake (~> 0.9.2.2)
+  rdiscount
+  rspec (~> 2.10.0)
+  simplecov (~> 0.6.4)
+  tengine_job!
+  tengine_resource_ec2 (~> 1.1.0)
+  yard (~> 0.8.1)

data/README.rdoc

@@ -3,7 +3,7 @@
 Description goes here.
 
 == Contributing to tengine_job
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -13,7 +13,7 @@ Description goes here.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 == License
-tengine_event is distributed under the MPL2.0 or LGPLv3 or the dual license of MPL2.0/LGPLv3
+tengine_job is distributed under the MPL2.0 or LGPLv3 or the dual license of MPL2.0/LGPLv3
 
 == Copyright
 

data/bin/create_indexes_for_tengine_job

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+# Use to create indexes. Sample is below.
+#  create_indexes_for_tengine_job localhost:27017/tengine_production
+#
+# Default options
+#  hostname localhost
+#  port     27017
+#  database tengine_production
+#
+require 'tengine_support'
+require 'tengine_job'
+
+include Tengine::Support::Mongoid
+
+target = File.expand_path('../lib', File.dirname(__FILE__))
+Tengine::Support::Mongoid.create_indexes(target, ARGV.shift)

data/lib/tengine/job/connectable.rb

@@ -23,18 +23,18 @@ module Tengine::Job::Connectable
     def actual_credential
       key = actual_credential_name
       return nil if key.blank?
-      result = Tengine::Resource::Credential.first(:conditions => {:name => key})
+      result = Tengine::Resource::Credential.where({:name => key}).first
       # TODO 使用する例外クラスはこれで良いのか検討
-      raise Mongoid::Errors::DocumentNotFound.new(Tengine::Resource::Credential, key) unless result
+      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.first(:conditions => {:name => key})
+      result = Tengine::Resource::Server.where({:name => key}).first
       # TODO 使用する例外クラスはこれで良いのか検討
-      raise Mongoid::Errors::DocumentNotFound.new(Tengine::Resource::Server, key) unless result
+      raise Mongoid::Errors::DocumentNotFound.new(Tengine::Resource::Server, key, []) unless result
       result
     end
 

data/lib/tengine/job/drivers/job_execution_driver.rb

@@ -15,7 +15,7 @@ driver :job_execution_driver do
       signal.reset
       execution.transmit(signal)
     end
-    execution.safely(safemode(Tengine::Job::Execution.collection)).save!
+    execution.with(safe: safemode(Tengine::Job::Execution.collection)).save!
     signal.reservations.each{|r| fire(*r.fire_args)}
     submit
   end
@@ -41,7 +41,7 @@ driver :job_execution_driver do
       signal.reset
       execution.stop(signal)
     end
-    execution.safely(safemode(Tengine::Job::Execution.collection)).save!
+    execution.with(safe: safemode(Tengine::Job::Execution.collection)).save!
     signal.reservations.each{|r| fire(*r.fire_args)}
     submit
   end

data/lib/tengine/job/drivers/jobnet_control_driver.rb

@@ -26,7 +26,7 @@ driver :jobnet_control_driver do
         target_jobnet.activate(signal)
       end
     end
-    signal.execution.safely(safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
+    signal.execution.with(safe: safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
     signal.reservations.each{|r| fire(*r.fire_args)}
     submit
   end
@@ -151,7 +151,7 @@ driver :jobnet_control_driver do
         end
       end
     end
-    signal.execution.safely(safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
+    signal.execution.with(sage: safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
     signal.reservations.each{|r| fire(*r.fire_args)}
     submit
   end
@@ -196,7 +196,7 @@ driver :jobnet_control_driver do
       #   target_parent.end_vertex.transmit(signal)
       # end
     end
-    signal.execution.safely(safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
+    signal.execution.with(safe: safemode(Tengine::Job::Execution.collection)).save! if event[:root_jobnet_id] == event[:target_jobnet_id]
     signal.reservations.each{|r| fire(*r.fire_args)}
     submit
   end

data/lib/tengine/job/drivers/schedule_driver.rb

@@ -10,16 +10,16 @@ driver :schedule_driver do
     status = Tengine::Core::Schedule::SCHEDULED
     if exec.actual_base_timeout_alert && !exec.actual_base_timeout_alert.zero?
       t1 = Time.now + (exec.actual_base_timeout_alert * 60.0)
-      Tengine::Core::Schedule.safely(
-        safemode(Tengine::Core::Schedule.collection)
+      Tengine::Core::Schedule.with(
+        safe: safemode(Tengine::Core::Schedule.collection)
       ).create(
         event_type_name: "alert.execution.job.tengine", scheduled_at: t1, source_name: name, status: status , properties: event.properties
       )
     end
     if exec.actual_base_timeout_termination && !exec.actual_base_timeout_termination.zero?
       t2 = Time.now + (exec.actual_base_timeout_termination * 60.0)
-      Tengine::Core::Schedule.safely(
-        safemode(Tengine::Core::Schedule.collection)
+      Tengine::Core::Schedule.with(
+        safe: safemode(Tengine::Core::Schedule.collection)
       ).create(
         event_type_name: "stop.execution.job.tengine", scheduled_at: t2, source_name: name, status: status, properties: event.properties.merge(stop_reason: 'timeout')
       )
@@ -40,16 +40,16 @@ driver :schedule_driver do
     status = Tengine::Core::Schedule::SCHEDULED
     if exec.actual_base_timeout_alert && !exec.actual_base_timeout_alert.zero? && Tengine::Core::Schedule.where(event_type_name: "alert.execution.job.tengine", source_name: name).count.zero?
       t1 = Time.now + (exec.actual_base_timeout_alert * 60.0)
-      Tengine::Core::Schedule.safely(
-        safemode(Tengine::Core::Schedule.collection)
+      Tengine::Core::Schedule.with(
+        safe: safemode(Tengine::Core::Schedule.collection)
       ).create(
         event_type_name: "alert.execution.job.tengine", scheduled_at: t1, source_name: name, status: status , properties: orig.properties
       )
     end
     if exec.actual_base_timeout_termination && !exec.actual_base_timeout_termination.zero? && Tengine::Core::Schedule.where(event_type_name: "stop.execution.job.tengine", source_name: name).count.zero?
       t2 = Time.now + (exec.actual_base_timeout_termination * 60.0)
-      Tengine::Core::Schedule.safely(
-        safemode(Tengine::Core::Schedule.collection)
+      Tengine::Core::Schedule.with(
+        safe: safemode(Tengine::Core::Schedule.collection)
       ).create(
         event_type_name: "stop.execution.job.tengine", scheduled_at: t2, source_name: name, status: status, properties: orig.properties.merge(stop_reason: 'timeout')
       )
@@ -59,8 +59,8 @@ driver :schedule_driver do
 
   on :'success.execution.job.tengine' do
     name = Tengine::Job::Signal.new(event).execution.name_as_resource
-    Tengine::Core::Schedule.safely(
-      safemode(Tengine::Core::Schedule.collection)
+    Tengine::Core::Schedule.with(
+      safe: safemode(Tengine::Core::Schedule.collection)
     ).where(
       source_name: name, status: Tengine::Core::Schedule::SCHEDULED
     ).update_all(status: Tengine::Core::Schedule::INVALID)
@@ -69,8 +69,8 @@ driver :schedule_driver do
 
   on :'error.execution.job.tengine' do
     name = Tengine::Job::Signal.new(event).execution.name_as_resource
-    Tengine::Core::Schedule.safely(
-      safemode(Tengine::Core::Schedule.collection)
+    Tengine::Core::Schedule.with(
+      safe: safemode(Tengine::Core::Schedule.collection)
     ).where(
       source_name: name, status: Tengine::Core::Schedule::SCHEDULED
     ).update_all(status: Tengine::Core::Schedule::INVALID)

data/lib/tengine/job/edge.rb

@@ -16,8 +16,8 @@ class Tengine::Job::Edge
   embedded_in :owner, :class_name => "Tengine::Job::Jobnet", :inverse_of => :edges
 
   field :phase_cd     , :type => Integer, :default => 0 # ステータス。とりうる値は後述を参照してください。詳しくはtengine_jobパッケージ設計書の「edge状態遷移」を参照してください。
-  field :origin_id     , :type => BSON::ObjectId # 辺の遷移元となるvertexのid
-  field :destination_id, :type => BSON::ObjectId # 辺の遷移先となるvertexのid
+  field :origin_id     , :type => Moped::BSON::ObjectId # 辺の遷移元となるvertexのid
+  field :destination_id, :type => Moped::BSON::ObjectId # 辺の遷移先となるvertexのid
 
   validates :origin_id, :presence => true
   validates :destination_id, :presence => true

data/lib/tengine/job/expansion.rb

@@ -9,7 +9,7 @@ class Tengine::Job::Expansion < Tengine::Job::Job
   def root_jobnet_template
     unless @root_jobnet_template
       cond = {:dsl_version => root.dsl_version, :name => name}
-      @root_jobnet_template = Tengine::Job::RootJobnetTemplate.first(:conditions => cond)
+      @root_jobnet_template = Tengine::Job::RootJobnetTemplate.where(cond).first
     end
     @root_jobnet_template
   end

data/lib/tengine/job/jobnet.rb

@@ -30,11 +30,21 @@ class Tengine::Job::Jobnet < Tengine::Job::Job
   end
   def chained_box?; jobnet_type_entry[:chained_box]; end
 
-  embeds_many :edges, :class_name => "Tengine::Job::Edge", :inverse_of => :owner
+  embeds_many :edges, :class_name => "Tengine::Job::Edge", :inverse_of => :owner , :validate => false
+
+  before_validation do |r|
+    r.edges.each do |edge|
+      unless edge.valid?
+        edge.errors.each do |f, error|
+          r.errors.add(:base, "#{edge.name_for_message} #{f.to_s.humanize} #{error}")
+        end
+      end
+    end
+  end
 
   class << self
     def by_name(name)
-      first(:conditions => {:name => name})
+      where({:name => name}).first
     end
   end
 

data/lib/tengine/job/jobnet_actual.rb

@@ -52,4 +52,33 @@ class Tengine::Job::JobnetActual < Tengine::Job::Jobnet
     end
   end
 
+  def fire_stop_event(root_jobnet, options = Hash.new)
+    root_jobnet_id = root_jobnet.id.to_s
+    result = Tengine::Job::Execution.create!(
+      options.merge(:root_jobnet_id => root_jobnet_id))
+    properties = {
+      :execution_id => result.id.to_s,
+      :root_jobnet_id => root_jobnet_id,
+      :stop_reason => "user_stop"
+    }
+
+    target_id = self.id.to_s
+    # if target.children.blank?
+    if script_executable?
+      event = :"stop.job.job.tengine"
+      properties[:target_job_id] = target_id
+      properties[:target_jobnet_id] = parent.id.to_s
+    else
+      event = :"stop.jobnet.job.tengine"
+      properties[:target_jobnet_id] = target_id
+    end
+
+    EM.run do
+      Tengine::Event.fire(event,
+        :source_name => name_as_resource,
+        :properties => properties)
+    end
+
+    return result
+  end
 end