amazon-pricing 0.1.101 → 0.1.102

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.
Files changed (5) hide show
  1. checksums.yaml +8 -8
  2. data/lib/amazon-pricing/definitions/category-type.rb +23 -3
  3. data/lib/amazon-pricing/definitions/ec2-instance-type.rb +2 -0
  4. data/lib/amazon-pricing/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MTU2NDFjMzQyMmJiYWM1ODQ4ZDUyMTY3ODg2MTJiZWNhNmI4ZmM3ZA==
4
+ NDk2YzFkNTk1M2Y3MDMwNTI5NzIzYmIxMTBhYmU1YjliMTA5Y2IzNg==
5
5
  data.tar.gz: !binary |-
6
- OWNjODFmZGViN2Q5NjMwYjk3OGE3MWZmZDA4NDk3ZDJlZTJmODZjZA==
6
+ MDkyYWZlOWQ1NDVhOTE4ZWY3ZTdjNWI2NDA5OTc4NDQ3MmZhZDZmYg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YTc2ODc0OTgyY2UyYjlkYjg1OWYyNDZmOTZmYjRjMmEzOGQwOWVmNjRmYWU4
10
- NWQ0M2U5NWY5NmZmZTRiNDY0ODYzMWE1OGVhMzJhMDdjY2U1YmY0ZGMwNGYx
11
- Mjk1NmE5MGI3YTg4ODZlNjQ4N2FjZTI4ODgxZTVjMzI1NTdlOWU=
9
+ MjNlMTI3ZWI1YzgzMDk4OTIyOTQyMGMyOWNkN2YxNjY3MGNlM2MxODg3ZTVi
10
+ MWRlNWIxODM4NDM2NmQyMmJiMDJhMzA2OGVhMzlkYTBlMzU2YWExM2VlYWE4
11
+ MGY4ZmY3MTE2OTRkMmFiMjcxMzI2MTM2ZDg5ODNlMGJjNGZiMDQ=
12
12
  data.tar.gz: !binary |-
13
- MWFjZTE0ZTY4Mzk5NGY3YmY5MDJiODYwZDNjMjM2NjA0ODllZDA4YmZjZWVj
14
- ZjY1N2EyOTRkN2MyY2NjNjhhZTQ5YTlmN2MzM2JkZDFmODE4Yjg0NGRiYWQ4
15
- NjkzYzk5NjliZTBhOTI2NGFjNWY3YWI3YzE0MTEzYzgyOGQzNDE=
13
+ MDRiZTZiN2M2MWEyNTdjMzIzMzlmZGI0YzE4NTc3MWM4ZmQxMGQ5MmFmMjcz
14
+ NTM2ODdkNmY2N2NjNjIxNTllYTQ4N2M4OWY1ZjkzYjVlYzMyYzY2NjczNjMx
15
+ ZDg4Mjk2MmNjNjAxZDhiNjQ2ZDhhYjlmODVjZWMyODdjNDI3OWU=
data/lib/amazon-pricing/definitions/category-type.rb CHANGED
@@ -16,9 +16,13 @@ module AwsPricing
16
16
  :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year,
17
17
  :allupfront_prepay_1_year, :allupfront_prepay_3_year,
18
18
  :partialupfront_price_per_hour_1_year, :partialupfront_prepay_1_year, :partialupfront_price_per_hour_3_year, :partialupfront_prepay_3_year,
19
- :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year, :convertible_allupfront_prepay_3_year,
20
- :convertible_partialupfront_price_per_hour_3_year, :convertible_partialupfront_prepay_3_year,
21
- :convertible_noupfront_price_per_hour_3_year
19
+ :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year,
20
+ :convertible_allupfront_prepay_3_year,
21
+ :convertible_partialupfront_price_per_hour_3_year, :convertible_partialupfront_prepay_3_year,
22
+ :convertible_noupfront_price_per_hour_3_year,
23
+ :convertible_allupfront_prepay_1_year,
24
+ :convertible_partialupfront_price_per_hour_1_year, :convertible_partialupfront_prepay_1_year,
25
+ :convertible_noupfront_price_per_hour_1_year
22
26
 
23
27
  def allupfront_effective_rate_1_year
24
28
  (allupfront_prepay_1_year / 365 / 24).round(4)
@@ -78,6 +82,8 @@ module AwsPricing
78
82
  when :allupfront
79
83
  if term == :year1
80
84
  @allupfront_prepay_1_year
85
+ elsif term == :year1_convertible
86
+ @convertible_allupfront_prepay_1_year
81
87
  elsif term == :year3
82
88
  @allupfront_prepay_3_year
83
89
  elsif term == :year3_convertible
@@ -86,6 +92,8 @@ module AwsPricing
86
92
  when :partialupfront
87
93
  if term == :year1
88
94
  @partialupfront_prepay_1_year
95
+ elsif term == :year1_convertible
96
+ @convertible_partialupfront_prepay_1_year
89
97
  elsif term == :year3
90
98
  @partialupfront_prepay_3_year
91
99
  elsif term == :year3_convertible
@@ -119,6 +127,8 @@ module AwsPricing
119
127
  when :allupfront
120
128
  if term == :year1
121
129
  @allupfront_prepay_1_year = price
130
+ elsif term == :year1_convertible
131
+ @convertible_allupfront_prepay_1_year = price
122
132
  elsif term == :year3
123
133
  @allupfront_prepay_3_year = price
124
134
  elsif term == :year3_convertible
@@ -127,6 +137,8 @@ module AwsPricing
127
137
  when :partialupfront
128
138
  if term == :year1
129
139
  @partialupfront_prepay_1_year = price
140
+ elsif term == :year1_convertible
141
+ @convertible_partialupfront_prepay_1_year = price
130
142
  elsif term == :year3
131
143
  @partialupfront_prepay_3_year = price
132
144
  elsif term == :year3_convertible
@@ -164,6 +176,8 @@ module AwsPricing
164
176
  when :partialupfront
165
177
  if term == :year1
166
178
  @partialupfront_price_per_hour_1_year
179
+ elsif term == :year1_convertible
180
+ @convertible_partialupfront_price_per_hour_1_year
167
181
  elsif term == :year3
168
182
  @partialupfront_price_per_hour_3_year
169
183
  elsif term == :year3_convertible
@@ -172,6 +186,8 @@ module AwsPricing
172
186
  when :noupfront
173
187
  if term == :year1
174
188
  @noupfront_price_per_hour_1_year
189
+ elsif term == :year1_convertible
190
+ @convertible_noupfront_price_per_hour_1_year
175
191
  elsif term == :year3
176
192
  @noupfront_price_per_hour_3_year
177
193
  elsif term == :year3_convertible
@@ -209,6 +225,8 @@ module AwsPricing
209
225
  when :partialupfront
210
226
  if term == :year1
211
227
  @partialupfront_price_per_hour_1_year = price_per_hour
228
+ elsif term == :year1_convertible
229
+ @convertible_partialupfront_price_per_hour_1_year = price_per_hour
212
230
  elsif term == :year3
213
231
  @partialupfront_price_per_hour_3_year = price_per_hour
214
232
  elsif term == :year3_convertible
@@ -217,6 +235,8 @@ module AwsPricing
217
235
  when :noupfront
218
236
  if term == :year1
219
237
  @noupfront_price_per_hour_1_year = price_per_hour
238
+ elsif term == :year1_convertible
239
+ @convertible_noupfront_price_per_hour_1_year = price_per_hour
220
240
  elsif term == :year3
221
241
  @noupfront_price_per_hour_3_year = price_per_hour
222
242
  elsif term == :year3_convertible
data/lib/amazon-pricing/definitions/ec2-instance-type.rb CHANGED
@@ -36,6 +36,8 @@ module AwsPricing
36
36
  case term
37
37
  when "yrTerm1", "yrTerm1Standard"
38
38
  years = :year1
39
+ when "yrTerm1Convertible"
40
+ years = :year1_convertible
39
41
  when "yrTerm3", "yrTerm3Standard"
40
42
  years = :year3
41
43
  when "yrTerm3Convertible"
data/lib/amazon-pricing/version.rb CHANGED
@@ -8,5 +8,5 @@
8
8
  # Home:: http://github.com/CloudHealth/amazon-pricing
9
9
  #++
10
10
  module AwsPricing
11
- VERSION = '0.1.101' # [major,minor.fix]: c5 instance type returned
11
+ VERSION = '0.1.102' # [major,minor.fix]: adding convertible 1year prices
12
12
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amazon-pricing
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.101
4
+ version: 0.1.102
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joe Kinsella
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-11-13 00:00:00.000000000 Z
11
+ date: 2017-11-15 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: A Ruby library for retrieving pricing for Amazon Web Services
14
14
  email: