tengine_job 0.6.11 → 0.6.12

data/Gemfile.lock

@@ -61,7 +61,7 @@ GEM
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     systemu (2.4.2)
-    tengine_core (0.5.31)
+    tengine_core (0.5.38)
       activemodel (~> 3.1.0)
       activesupport (~> 3.1.0)
       bson (~> 1.5.2)
@@ -88,9 +88,10 @@ GEM
     tzinfo (0.3.31)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    wakame-adapters-tengine (0.0.7)
+    wakame-adapters-tengine (0.0.1)
       json
-      right_aws (~> 2.1.0)
+      right_aws (= 2.1.0)
+      rspec
     yard (0.7.5)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/lib/tengine/job/dsl_loader.rb

@@ -38,6 +38,7 @@ module Tengine::Job::DslLoader
 
   def jobnet(name, *args, &block)
     options = args.extract_options!
+    options[:description] = options.delete(:caption) if options[:caption]
     options = {
       :name => name,
       :description => args.first || name,
@@ -95,6 +96,7 @@ module Tengine::Job::DslLoader
 
   def job(name, *args)
     script, description, options = __parse_job_args__(name, args)
+    options[:description] = options.delete(:caption) if options[:caption]
     options = {
       :name => name,
       :description => description,

data/spec/tengine/job/dsl_loader_spec.rb

@@ -376,6 +376,40 @@ describe Tengine::Job::DslLoader do
       end
     end
 
+    context "0021_caption.rb" do
+      before{
+        Tengine::Job::JobnetTemplate.delete_all
+        load_dsl("0021_caption.rb")
+      }
+
+      it do
+        root_jobnet = Tengine::Job::JobnetTemplate.by_name("jobnet0021")
+        root_jobnet.should be_a(Tengine::Job::RootJobnetTemplate)
+        root_jobnet.tap do |j|
+          j.version.should == 0
+          j.dsl_version.should == @version
+          j.dsl_filepath.should == "0021_caption.rb"
+          j.dsl_lineno.should == 5
+          j.name.should == "jobnet0021"
+          j.description.should == "ジョブネット0021"
+          j.server_name.should == "i-11111111"
+          j.credential_name.should == "goku-ssh-pk1"
+        end
+        root_jobnet.children.map(&:class).should == [
+          Tengine::Job::Start         , # 0
+          Tengine::Job::JobnetTemplate, # 1
+          Tengine::Job::JobnetTemplate, # 2
+          Tengine::Job::JobnetTemplate, # 3
+          Tengine::Job::JobnetTemplate, # 4
+          Tengine::Job::End           , # 5
+        ]
+        root_jobnet.children[1].tap{|j| j.name.should == "job1"; j.description.should == "ジョブ1"; j.script.should == "job1.sh"}
+        root_jobnet.children[2].tap{|j| j.name.should == "job2"; j.description.should == "ジョブ2"; j.script.should == "job2.sh"}
+        root_jobnet.children[3].tap{|j| j.name.should == "job3"; j.description.should == "ジョブ3"; j.script.should == "job3.sh"}
+        root_jobnet.children[4].tap{|j| j.name.should == "hadoop_job_run4"; j.description.should == "Hadoopジョブ4"; j.script.should == "hadoop_job_run4.sh"}
+      end
+    end
+
   end
 
   context "<バグ>同じDSLバージョンで同一のルートジョブネット名が定義できてしまう" do

data/tengine_job.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_job"
-  s.version = "0.6.11"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "guemon"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_job
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &70296016312400 !ruby/object:Gem::Requirement
+  requirement: &70334594712180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70296016312400
+  version_requirements: *70334594712180
 - !ruby/object:Gem::Dependency
   name: tengine_core
-  requirement: &70296016311800 !ruby/object:Gem::Requirement
+  requirement: &70334594711700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 0.5.25
   type: :runtime
   prerelease: false
-  version_requirements: *70296016311800
+  version_requirements: *70334594711700
 - !ruby/object:Gem::Dependency
   name: tengine_resource
-  requirement: &70296016311200 !ruby/object:Gem::Requirement
+  requirement: &70334594711220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70296016311200
+  version_requirements: *70334594711220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70296016310540 !ruby/object:Gem::Requirement
+  requirement: &70334594710740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70296016310540
+  version_requirements: *70334594710740
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70296016309940 !ruby/object:Gem::Requirement
+  requirement: &70334594710260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70296016309940
+  version_requirements: *70334594710260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70296016309340 !ruby/object:Gem::Requirement
+  requirement: &70334594709780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70296016309340
+  version_requirements: *70334594709780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70296016308740 !ruby/object:Gem::Requirement
+  requirement: &70334594709300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70296016308740
+  version_requirements: *70334594709300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70296016286360 !ruby/object:Gem::Requirement
+  requirement: &70334594741320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70296016286360
+  version_requirements: *70334594741320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70296016285760 !ruby/object:Gem::Requirement
+  requirement: &70334594740840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70296016285760
+  version_requirements: *70334594740840
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70296016285100 !ruby/object:Gem::Requirement
+  requirement: &70334594740360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,7 +125,7 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70296016285100
+  version_requirements: *70334594740360
 description: tengine_job provides jobnet management
 email: tengine@nautilus-technologies.com
 executables: []
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: tengine_job provides jobnet management