tengine_job 0.6.13 → 1.1.0

data/lib/tengine/job/root_jobnet_actual.rb

@@ -18,7 +18,7 @@ class Tengine::Job::RootJobnetActual < Tengine::Job::JobnetActual
     result = Tengine::Job::Execution.new(options)
     result.target_actual_ids ||= []
     result.target_actual_ids += args.flatten
-    result.safely(safemode(Tengine::Job::Execution.collection)).save!
+    result.with(safe: safemode(Tengine::Job::Execution.collection)).save!
     sender.wait_for_connection do
       sender.fire(:'start.execution.job.tengine', :properties => {
           :execution_id => result.id.to_s
@@ -36,4 +36,23 @@ class Tengine::Job::RootJobnetActual < Tengine::Job::JobnetActual
     Tengine::Job.test_harness_hook("after update_with_lock")
   end
 
+  def fire_stop_event(options = Hash.new)
+    root_jobnet_id = self.id.to_s
+    result = Tengine::Job::Execution.create!(
+      options.merge(:root_jobnet_id => root_jobnet_id))
+
+    EM.run do
+      Tengine::Event.fire(:"stop.jobnet.job.tengine",
+        :source_name => name_as_resource,
+        :properties => {
+          :execution_id => result.id.to_s,
+          :root_jobnet_id => root_jobnet_id,
+          :target_jobnet_id => root_jobnet_id.to_s,
+          :stop_reason => "user_stop",
+        })
+    end
+
+    return result
+  end
+
 end

data/lib/tengine/job/root_jobnet_template.rb

@@ -22,9 +22,9 @@ class Tengine::Job::RootJobnetTemplate < Tengine::Job::JobnetTemplate
   def execute(options = {})
     event_sender = options.delete(:sender) || Tengine::Event.default_sender
     actual = generate
-    actual.safely(safemode(actual.class.collection)).save!
-    result = Tengine::Job::Execution.safely(
-                safemode(Tengine::Job::Execution.collection)
+    actual.with(safe: safemode(actual.class.collection)).save!
+    result = Tengine::Job::Execution.with(
+                safe: safemode(Tengine::Job::Execution.collection)
              ).create!(
                (options || {}).update(:root_jobnet_id => actual.id)
              )
@@ -45,7 +45,7 @@ class Tengine::Job::RootJobnetTemplate < Tengine::Job::JobnetTemplate
     # Tengine::Core::FindByName で定義しているクラスメソッドfind_by_nameを上書きしています
     def find_by_name(name, options = {})
       version = options[:version] || Tengine::Core::Setting.dsl_version
-      first(:conditions => {:name => name, :dsl_version => version})
+      where({:name => name, :dsl_version => version}).first
     end
   end
 end

data/lib/tengine/job/signal.rb

@@ -93,7 +93,7 @@ class Tengine::Job::Signal
     options ||= {}
     options[:properties] = properties
     properties.each do |key, value|
-      if value.is_a?(BSON::ObjectId)
+      if value.is_a?(Moped::BSON::ObjectId)
         properties[key] = value.to_s
       end
     end

data/lib/tengine/job/vertex.rb

@@ -12,7 +12,16 @@ class Tengine::Job::Vertex
   self.cyclic = true
   with_options(:class_name => self.name, :cyclic => true) do |c|
     c.embedded_in :parent  , :inverse_of => :children
-    c.embeds_many :children, :inverse_of => :parent
+    c.embeds_many :children, :inverse_of => :parent , :validate => false
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_job
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,132 +14,211 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &2173618900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.27
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2173618900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tengine_core
-  requirement: &2173618420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.39
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2173618420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tengine_resource
-  requirement: &2173617940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.15
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2173617940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2173617460 !ruby/object:Gem::Requirement
+  name: tengine_resource_ec2
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2173617460
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &2173616980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2173616980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2173616500 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2173616500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2173616020 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *2173616020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2173615500 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *2173615500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2173614980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2173614980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2173614500 !ruby/object:Gem::Requirement
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  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
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 3.3.0
   type: :development
   prerelease: false
-  version_requirements: *2173614500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 description: tengine_job provides jobnet management
 email: tengine-info@groovenauts.jp
-executables: []
+executables:
+- create_indexes_for_tengine_job
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
-- Rakefile
-- VERSION
 - examples/0004_retry_one_layer.rb
 - examples/0004_retry_one_layer.sh
 - examples/0005_retry_two_layer.rb
@@ -148,9 +227,8 @@ files:
 - examples/0006_retry_three_layer.sh
 - examples/0007_simple_jobnet.rb
 - examples/0021_dynamic_env.rb
-- examples/VERSION
 - examples/tengine_job_test.sh
-- lib/tengine/job.rb
+- examples/VERSION
 - lib/tengine/job/category.rb
 - lib/tengine/job/connectable.rb
 - lib/tengine/job/drivers/job_control_driver.rb
@@ -168,18 +246,18 @@ files:
 - lib/tengine/job/expansion.rb
 - lib/tengine/job/fork.rb
 - lib/tengine/job/job.rb
-- lib/tengine/job/jobnet.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.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
@@ -189,83 +267,9 @@ files:
 - lib/tengine/job/start.rb
 - lib/tengine/job/stoppable.rb
 - lib/tengine/job/vertex.rb
+- lib/tengine/job.rb
 - lib/tengine_job.rb
-- spec/fixtures/rjn_0001_simple_jobnet_builder.rb
-- spec/fixtures/rjn_0002_simple_parallel_jobnet_builder.rb
-- spec/fixtures/rjn_0003_fork_join_jobnet_builder.rb
-- spec/fixtures/rjn_0004_parallel_jobnet_with_finally_fixture.rb
-- spec/fixtures/rjn_0005_retry_two_layer_fixture.rb
-- spec/fixtures/rjn_0008_expansion_fixture.rb
-- spec/fixtures/rjn_0009_tree_sequential_jobnet_builder.rb
-- spec/fixtures/rjn_0010_2jobs_and_1job_parallel_jobnet_builder.rb
-- spec/fixtures/rjn_0011_nested_fork_jobnet_builder.rb
-- spec/fixtures/rjn_0012_nested_and_finally_builder.rb
-- spec/fixtures/rjn_1004_hadoop_job_in_jobnet_fixture.rb
-- spec/fixtures/rjn_means_root_jobnet
-- spec/fixtures/test_credential_fixture.rb
-- spec/fixtures/test_server_fixture.rb
-- spec/mongoid.yml
-- spec/spec_helper.rb
-- spec/sshd/.gitignore
-- spec/sshd/id_rsa
-- spec/sshd/id_rsa.pub
-- spec/sshd/ssh_host_rsa_key
-- spec/sshd/ssh_host_rsa_key.pub
-- spec/sshd/sshd_config
-- spec/sshd/sshd_config.erb
-- spec/sshd/tengine_job_test.sh
-- spec/support/jobnet_fixture_builder.rb
-- spec/support/mongo_index_key_log.rb
-- spec/tengine/job/category_spec.rb
-- spec/tengine/job/connectable_spec.rb
-- spec/tengine/job/drivers/job_controll_driver/connection_error_spec.rb
-- spec/tengine/job/drivers/job_controll_driver/duplicated_job_start_spec.rb
-- spec/tengine/job/drivers/job_controll_driver/expansion_spec.rb
-- spec/tengine/job/drivers/job_controll_driver/stop_spec.rb
-- spec/tengine/job/drivers/job_controll_driver_spec.rb
-- spec/tengine/job/drivers/job_execution_driver_spec.rb
-- spec/tengine/job/drivers/jobnet_control_driver/nested_and_finally_spec.rb
-- spec/tengine/job/drivers/jobnet_control_driver/nested_jobnet_spec.rb
-- spec/tengine/job/drivers/jobnet_control_driver/stop_jobnet_spec.rb
-- spec/tengine/job/drivers/jobnet_control_driver_spec.rb
-- spec/tengine/job/drivers/schedule_driver_spec.rb
-- spec/tengine/job/dsl_binder_spec.rb
-- spec/tengine/job/dsl_loader_spec.rb
-- spec/tengine/job/dsls/0013_hadoop_job_run.rb
-- spec/tengine/job/dsls/0014_join_and_join.rb
-- spec/tengine/job/dsls/0015_fork_and_fork.rb
-- spec/tengine/job/dsls/0016_complex_fork_and_join.rb
-- spec/tengine/job/dsls/0017_finally.rb
-- spec/tengine/job/dsls/0018_expansion.rb
-- spec/tengine/job/dsls/0019_execute_job_on_event.rb
-- spec/tengine/job/dsls/0020_duplicated_jobnet_name.rb
-- spec/tengine/job/dsls/0021_caption.rb
-- spec/tengine/job/dsls/1060_test_dir1/1060_test_dir2/0013_hadoop_job_run.rb
-- spec/tengine/job/dsls/2003_expansion/expansion_5.rb
-- spec/tengine/job/dsls/VERSION
-- spec/tengine/job/dynamic_env_spec.rb
-- spec/tengine/job/edge_spec.rb
-- spec/tengine/job/element_selector_notation_spec.rb
-- spec/tengine/job/examples_spec.rb
-- spec/tengine/job/execution_spec.rb
-- spec/tengine/job/expansion_spec.rb
-- spec/tengine/job/hadoop_job_run_spec.rb
-- spec/tengine/job/job_spec.rb
-- spec/tengine/job/jobnet/1015_complecated_jobnet_spec.rb
-- spec/tengine/job/jobnet_actual_spec.rb
-- spec/tengine/job/jobnet_spec.rb
-- spec/tengine/job/jobnet_template_spec.rb
-- spec/tengine/job/killing_spec.rb
-- spec/tengine/job/reset_spec.rb
-- spec/tengine/job/reset_spec/4056_1_dump.txt
-- spec/tengine/job/root_jobnet_actual_spec.rb
-- spec/tengine/job/root_jobnet_template_spec.rb
-- spec/tengine/job/script_executable_spec.rb
-- spec/tengine/job/stoppable_spec.rb
-- spec/tengine/job/vertex_spec.rb
-- spec/tengine_job_spec.rb
-- tengine_job.gemspec
-- tmp/log/.gitignore
+- bin/create_indexes_for_tengine_job
 homepage: http://github.com/tengine/tengine_job
 licenses:
 - MPL2.0/LGPLv3
@@ -281,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 115941838970745328
+      hash: 1404326031848686310
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: tengine_job provides jobnet management