tengine_job 0.6.11 → 0.6.12

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -61,7 +61,7 @@ GEM
61
61
  simplecov-html (~> 0.5.3)
62
62
  simplecov-html (0.5.3)
63
63
  systemu (2.4.2)
64
- tengine_core (0.5.31)
64
+ tengine_core (0.5.38)
65
65
  activemodel (~> 3.1.0)
66
66
  activesupport (~> 3.1.0)
67
67
  bson (~> 1.5.2)
@@ -88,9 +88,10 @@ GEM
88
88
  tzinfo (0.3.31)
89
89
  uuid (2.3.5)
90
90
  macaddr (~> 1.0)
91
- wakame-adapters-tengine (0.0.7)
91
+ wakame-adapters-tengine (0.0.1)
92
92
  json
93
- right_aws (~> 2.1.0)
93
+ right_aws (= 2.1.0)
94
+ rspec
94
95
  yard (0.7.5)
95
96
 
96
97
  PLATFORMS
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.11
1
+ 0.6.12
@@ -38,6 +38,7 @@ module Tengine::Job::DslLoader
38
38
 
39
39
  def jobnet(name, *args, &block)
40
40
  options = args.extract_options!
41
+ options[:description] = options.delete(:caption) if options[:caption]
41
42
  options = {
42
43
  :name => name,
43
44
  :description => args.first || name,
@@ -95,6 +96,7 @@ module Tengine::Job::DslLoader
95
96
 
96
97
  def job(name, *args)
97
98
  script, description, options = __parse_job_args__(name, args)
99
+ options[:description] = options.delete(:caption) if options[:caption]
98
100
  options = {
99
101
  :name => name,
100
102
  :description => description,
@@ -376,6 +376,40 @@ describe Tengine::Job::DslLoader do
376
376
  end
377
377
  end
378
378
 
379
+ context "0021_caption.rb" do
380
+ before{
381
+ Tengine::Job::JobnetTemplate.delete_all
382
+ load_dsl("0021_caption.rb")
383
+ }
384
+
385
+ it do
386
+ root_jobnet = Tengine::Job::JobnetTemplate.by_name("jobnet0021")
387
+ root_jobnet.should be_a(Tengine::Job::RootJobnetTemplate)
388
+ root_jobnet.tap do |j|
389
+ j.version.should == 0
390
+ j.dsl_version.should == @version
391
+ j.dsl_filepath.should == "0021_caption.rb"
392
+ j.dsl_lineno.should == 5
393
+ j.name.should == "jobnet0021"
394
+ j.description.should == "ジョブネット0021"
395
+ j.server_name.should == "i-11111111"
396
+ j.credential_name.should == "goku-ssh-pk1"
397
+ end
398
+ root_jobnet.children.map(&:class).should == [
399
+ Tengine::Job::Start , # 0
400
+ Tengine::Job::JobnetTemplate, # 1
401
+ Tengine::Job::JobnetTemplate, # 2
402
+ Tengine::Job::JobnetTemplate, # 3
403
+ Tengine::Job::JobnetTemplate, # 4
404
+ Tengine::Job::End , # 5
405
+ ]
406
+ root_jobnet.children[1].tap{|j| j.name.should == "job1"; j.description.should == "ジョブ1"; j.script.should == "job1.sh"}
407
+ root_jobnet.children[2].tap{|j| j.name.should == "job2"; j.description.should == "ジョブ2"; j.script.should == "job2.sh"}
408
+ root_jobnet.children[3].tap{|j| j.name.should == "job3"; j.description.should == "ジョブ3"; j.script.should == "job3.sh"}
409
+ root_jobnet.children[4].tap{|j| j.name.should == "hadoop_job_run4"; j.description.should == "Hadoopジョブ4"; j.script.should == "hadoop_job_run4.sh"}
410
+ end
411
+ end
412
+
379
413
  end
380
414
 
381
415
  context "<バグ>同じDSLバージョンで同一のルートジョブネット名が定義できてしまう" do
data/tengine_job.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "tengine_job"
8
- s.version = "0.6.11"
8
+ s.version = "0.6.12"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "guemon"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tengine_job
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.11
4
+ version: 0.6.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -18,7 +18,7 @@ date: 2012-02-17 00:00:00.000000000Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: tengine_support
21
- requirement: &70296016312400 !ruby/object:Gem::Requirement
21
+ requirement: &70334594712180 !ruby/object:Gem::Requirement
22
22
  none: false
23
23
  requirements:
24
24
  - - ~>
@@ -26,10 +26,10 @@ dependencies:
26
26
  version: 0.3.12
27
27
  type: :runtime
28
28
  prerelease: false
29
- version_requirements: *70296016312400
29
+ version_requirements: *70334594712180
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: tengine_core
32
- requirement: &70296016311800 !ruby/object:Gem::Requirement
32
+ requirement: &70334594711700 !ruby/object:Gem::Requirement
33
33
  none: false
34
34
  requirements:
35
35
  - - ~>
@@ -37,10 +37,10 @@ dependencies:
37
37
  version: 0.5.25
38
38
  type: :runtime
39
39
  prerelease: false
40
- version_requirements: *70296016311800
40
+ version_requirements: *70334594711700
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: tengine_resource
43
- requirement: &70296016311200 !ruby/object:Gem::Requirement
43
+ requirement: &70334594711220 !ruby/object:Gem::Requirement
44
44
  none: false
45
45
  requirements:
46
46
  - - ~>
@@ -48,10 +48,10 @@ dependencies:
48
48
  version: 0.5.4
49
49
  type: :runtime
50
50
  prerelease: false
51
- version_requirements: *70296016311200
51
+ version_requirements: *70334594711220
52
52
  - !ruby/object:Gem::Dependency
53
53
  name: rspec
54
- requirement: &70296016310540 !ruby/object:Gem::Requirement
54
+ requirement: &70334594710740 !ruby/object:Gem::Requirement
55
55
  none: false
56
56
  requirements:
57
57
  - - ~>
@@ -59,10 +59,10 @@ dependencies:
59
59
  version: 2.6.0
60
60
  type: :development
61
61
  prerelease: false
62
- version_requirements: *70296016310540
62
+ version_requirements: *70334594710740
63
63
  - !ruby/object:Gem::Dependency
64
64
  name: factory_girl
65
- requirement: &70296016309940 !ruby/object:Gem::Requirement
65
+ requirement: &70334594710260 !ruby/object:Gem::Requirement
66
66
  none: false
67
67
  requirements:
68
68
  - - ~>
@@ -70,10 +70,10 @@ dependencies:
70
70
  version: 2.1.2
71
71
  type: :development
72
72
  prerelease: false
73
- version_requirements: *70296016309940
73
+ version_requirements: *70334594710260
74
74
  - !ruby/object:Gem::Dependency
75
75
  name: yard
76
- requirement: &70296016309340 !ruby/object:Gem::Requirement
76
+ requirement: &70334594709780 !ruby/object:Gem::Requirement
77
77
  none: false
78
78
  requirements:
79
79
  - - ~>
@@ -81,10 +81,10 @@ dependencies:
81
81
  version: 0.7.2
82
82
  type: :development
83
83
  prerelease: false
84
- version_requirements: *70296016309340
84
+ version_requirements: *70334594709780
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: bundler
87
- requirement: &70296016308740 !ruby/object:Gem::Requirement
87
+ requirement: &70334594709300 !ruby/object:Gem::Requirement
88
88
  none: false
89
89
  requirements:
90
90
  - - ~>
@@ -92,10 +92,10 @@ dependencies:
92
92
  version: 1.0.18
93
93
  type: :development
94
94
  prerelease: false
95
- version_requirements: *70296016308740
95
+ version_requirements: *70334594709300
96
96
  - !ruby/object:Gem::Dependency
97
97
  name: jeweler
98
- requirement: &70296016286360 !ruby/object:Gem::Requirement
98
+ requirement: &70334594741320 !ruby/object:Gem::Requirement
99
99
  none: false
100
100
  requirements:
101
101
  - - ~>
@@ -103,10 +103,10 @@ dependencies:
103
103
  version: 1.6.4
104
104
  type: :development
105
105
  prerelease: false
106
- version_requirements: *70296016286360
106
+ version_requirements: *70334594741320
107
107
  - !ruby/object:Gem::Dependency
108
108
  name: simplecov
109
- requirement: &70296016285760 !ruby/object:Gem::Requirement
109
+ requirement: &70334594740840 !ruby/object:Gem::Requirement
110
110
  none: false
111
111
  requirements:
112
112
  - - ~>
@@ -114,10 +114,10 @@ dependencies:
114
114
  version: 0.5.3
115
115
  type: :development
116
116
  prerelease: false
117
- version_requirements: *70296016285760
117
+ version_requirements: *70334594740840
118
118
  - !ruby/object:Gem::Dependency
119
119
  name: ZenTest
120
- requirement: &70296016285100 !ruby/object:Gem::Requirement
120
+ requirement: &70334594740360 !ruby/object:Gem::Requirement
121
121
  none: false
122
122
  requirements:
123
123
  - - ~>
@@ -125,7 +125,7 @@ dependencies:
125
125
  version: 4.6.2
126
126
  type: :development
127
127
  prerelease: false
128
- version_requirements: *70296016285100
128
+ version_requirements: *70334594740360
129
129
  description: tengine_job provides jobnet management
130
130
  email: tengine@nautilus-technologies.com
131
131
  executables: []
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
286
286
  version: '0'
287
287
  requirements: []
288
288
  rubyforge_project:
289
- rubygems_version: 1.8.16
289
+ rubygems_version: 1.8.17
290
290
  signing_key:
291
291
  specification_version: 3
292
292
  summary: tengine_job provides jobnet management