elastic-mapreduce 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.2
1
+ 0.0.3
@@ -5,15 +5,14 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{elastic-mapreduce}
8
- s.version = "0.0.2"
8
+ s.version = "0.0.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
- s.authors = ["Amazon.com", "Koichi Fujikawa"]
12
- s.date = %q{2011-06-01}
13
- s.default_executable = %q{elastic-mapreduce}
11
+ s.authors = [%q{Amazon.com}, %q{Koichi Fujikawa}]
12
+ s.date = %q{2011-08-30}
14
13
  s.description = %q{Original is official but this is Unofficial gem.}
15
14
  s.email = %q{fujibee@hapyrus.com}
16
- s.executables = ["elastic-mapreduce"]
15
+ s.executables = [%q{elastic-mapreduce}]
17
16
  s.extra_rdoc_files = [
18
17
  "LICENSE.txt",
19
18
  "README"
@@ -80,13 +79,12 @@ Gem::Specification.new do |s|
80
79
  "tests/example.json"
81
80
  ]
82
81
  s.homepage = %q{http://github.com/hapyrus/elastic-mapreduce}
83
- s.licenses = ["Apache License"]
84
- s.require_paths = ["lib"]
85
- s.rubygems_version = %q{1.3.7}
82
+ s.licenses = [%q{Apache License}]
83
+ s.require_paths = [%q{lib}]
84
+ s.rubygems_version = %q{1.8.8}
86
85
  s.summary = %q{Amazon's commandline client for EMR (Elastic Map-Reduce) invocation (Unofficial Gem and Ruby 1.9 Version)}
87
86
 
88
87
  if s.respond_to? :specification_version then
89
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
90
88
  s.specification_version = 3
91
89
 
92
90
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
data/lib/commands.rb CHANGED
@@ -1051,7 +1051,7 @@ module Commands
1051
1051
 
1052
1052
  class AbstractInstanceGroupCommand < Command
1053
1053
  attr_accessor :instance_group_id, :instance_type, :instance_role,
1054
- :instance_count, :instance_group_name
1054
+ :instance_count, :instance_group_name, :bid_price
1055
1055
 
1056
1056
  def initialize(*args)
1057
1057
  super(*args)
@@ -1067,13 +1067,19 @@ module Commands
1067
1067
  end
1068
1068
 
1069
1069
  def instance_group
1070
- return {
1070
+ ig = {
1071
1071
  "Name" => get_field(:instance_group_name),
1072
- "Market" => get_field(:instance_group_market, "ON_DEMAND"),
1073
1072
  "InstanceRole" => get_field(:instance_role),
1074
1073
  "InstanceCount" => get_field(:instance_count),
1075
1074
  "InstanceType" => get_field(:instance_type)
1076
1075
  }
1076
+ if get_field(:bid_price, nil) != nil
1077
+ ig["BidPrice"] = get_field(:bid_price)
1078
+ ig["Market"] = "SPOT"
1079
+ else
1080
+ ig["Market"] = "ON_DEMAND"
1081
+ end
1082
+ return ig
1077
1083
  end
1078
1084
 
1079
1085
  def require_singleton_array(arr, msg)
@@ -1398,6 +1404,9 @@ module Commands
1398
1404
  [ FlagOption, "--plain-output", "Return the job flow id from create step as simple text", :plain_output ],
1399
1405
  ])
1400
1406
  commands.parse_command(CreateInstanceGroupCommand, "--instance-group ROLE", "Specify an instance group while creating a jobflow")
1407
+ commands.parse_options(["--instance-group", "--add-instance-group"], [
1408
+ [OptionWithArg, "--bid-price PRICE", "The bid price for this instance group", :bid_price]
1409
+ ])
1401
1410
 
1402
1411
  opts.separator "\n Passing arguments to steps\n"
1403
1412
 
@@ -1688,3 +1697,4 @@ module Commands
1688
1697
  end
1689
1698
  end
1690
1699
  end
1700
+
metadata CHANGED
@@ -1,12 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elastic-mapreduce
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 0
7
- - 0
8
- - 2
9
- version: 0.0.2
4
+ prerelease:
5
+ version: 0.0.3
10
6
  platform: ruby
11
7
  authors:
12
8
  - Amazon.com
@@ -15,8 +11,7 @@ autorequire:
15
11
  bindir: bin
16
12
  cert_chain: []
17
13
 
18
- date: 2011-06-01 00:00:00 +09:00
19
- default_executable: elastic-mapreduce
14
+ date: 2011-08-30 00:00:00 Z
20
15
  dependencies:
21
16
  - !ruby/object:Gem::Dependency
22
17
  name: bundler
@@ -25,10 +20,6 @@ dependencies:
25
20
  requirements:
26
21
  - - ~>
27
22
  - !ruby/object:Gem::Version
28
- segments:
29
- - 1
30
- - 0
31
- - 0
32
23
  version: 1.0.0
33
24
  type: :development
34
25
  prerelease: false
@@ -40,10 +31,6 @@ dependencies:
40
31
  requirements:
41
32
  - - ~>
42
33
  - !ruby/object:Gem::Version
43
- segments:
44
- - 1
45
- - 6
46
- - 1
47
34
  version: 1.6.1
48
35
  type: :development
49
36
  prerelease: false
@@ -117,7 +104,6 @@ files:
117
104
  - tests/commands_test.rb
118
105
  - tests/credentials.json
119
106
  - tests/example.json
120
- has_rdoc: true
121
107
  homepage: http://github.com/hapyrus/elastic-mapreduce
122
108
  licenses:
123
109
  - Apache License
@@ -131,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
131
117
  requirements:
132
118
  - - ">="
133
119
  - !ruby/object:Gem::Version
134
- hash: 1872103359245437442
120
+ hash: 3646279698156183608
135
121
  segments:
136
122
  - 0
137
123
  version: "0"
@@ -140,13 +126,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
140
126
  requirements:
141
127
  - - ">="
142
128
  - !ruby/object:Gem::Version
143
- segments:
144
- - 0
145
129
  version: "0"
146
130
  requirements: []
147
131
 
148
132
  rubyforge_project:
149
- rubygems_version: 1.3.7
133
+ rubygems_version: 1.8.8
150
134
  signing_key:
151
135
  specification_version: 3
152
136
  summary: Amazon's commandline client for EMR (Elastic Map-Reduce) invocation (Unofficial Gem and Ruby 1.9 Version)