awscosts 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07920a70ac787605ade0787734dfe9cf2478e1bd
-  data.tar.gz: b10d72a338ac280c3bb9fd393cdec6bd935cd7fe
+  metadata.gz: 3422f781e513dd882c5ab6ad9b15a971c8736ac5
+  data.tar.gz: 968a727c9dfde3c0fd1b4d78a075b53207872284
 SHA512:
-  metadata.gz: 3d47dc558e47f1c2e9bbb546b9ffdf2951a896ac24572f871d5293eff7cf9ab28495fe64e171e3026a46a46041f447d7a35f5b0c22097107a2d5e03e2bb2423d
-  data.tar.gz: d6b2de5d128ac039a36e95883a6c4f8dd191be5d57b74358190fb5950dce1a2eae5d3afb4c956fc7134d59da263cfd57cc546ff3754a7faf3ac6e5fb7a979d8e
+  metadata.gz: 77585d2fcc6712018becb4c93a037bee5136d7d30654703d6e1430ba717c412f93e86d5ffb20be7bc334a661fdd97ec6b53fa751dd03a83ffe4997ae5e64bad6
+  data.tar.gz: 6e7c38273b203fd99c30734e1b3f14226e1e06cc306a098899cef3d2e2aaf3c6e69ca7e6db478a96046f96c7bffedbb69a4552e865d145feadf6512fd6fdac0d

data/fixtures/vcr_cassettes/AWSCosts_EMR.yml

@@ -13,28 +13,30 @@ http_interactions:
       message: Moved Permanently
     headers:
       date:
-      - Wed, 08 Jul 2015 06:40:17 GMT
+      - Thu, 15 Oct 2015 21:25:16 GMT
       server:
       - Server
       x-frame-options:
       - SAMEORIGIN
       x-amz-id-1:
-      - 1TWRTQ8KS9F97X6E5ESJ
+      - 00VMZDYF9XYDZMEW8JS9
       location:
       - "/elasticmapreduce/pricing/pricing-emr.json/"
       cache-control:
       - no-store, no-cache, must-revalidate
       content-length:
       - '0'
+      access-control-allow-origin:
+      - http://aws.amazon.com
       vary:
-      - User-Agent
+      - Accept-Encoding,User-Agent
       content-type:
       - application/json
     body:
       encoding: UTF-8
       string: ''
     http_version: '1.1'
-  recorded_at: Wed, 08 Jul 2015 06:40:42 GMT
+  recorded_at: Thu, 15 Oct 2015 21:25:16 GMT
 - request:
     method: get
     uri: http://aws.amazon.com/elasticmapreduce/pricing/pricing-emr.json/
@@ -48,28 +50,32 @@ http_interactions:
       message: Moved Permanently
     headers:
       date:
-      - Wed, 08 Jul 2015 06:40:18 GMT
+      - Thu, 15 Oct 2015 21:25:17 GMT
       server:
       - Server
       x-frame-options:
       - SAMEORIGIN
       x-amz-id-1:
-      - 0AHZQ9PJGXZ9PF2VPFDC
+      - 1Z554D701710MXZ9D4R5
+      last-modified:
+      - Thu, 08 Oct 2015 20:05:00 GMT
       location:
       - https://a0.awsstatic.com/pricing/1/deprecated/emr/pricing-emr.json
       content-type:
       - text/html;charset=UTF-8
       content-length:
       - '0'
+      access-control-allow-origin:
+      - http://aws.amazon.com
       set-cookie:
       - aws_lang=en; Domain=.amazon.com; Path=/
       vary:
-      - User-Agent
+      - Accept-Encoding,User-Agent
     body:
       encoding: UTF-8
       string: ''
     http_version: '1.1'
-  recorded_at: Wed, 08 Jul 2015 06:40:43 GMT
+  recorded_at: Thu, 15 Oct 2015 21:25:17 GMT
 - request:
     method: get
     uri: https://a0.awsstatic.com/pricing/1/deprecated/emr/pricing-emr.json
@@ -87,27 +93,29 @@ http_interactions:
       content-type:
       - application/json
       content-length:
-      - '128732'
+      - '128751'
       connection:
       - close
       date:
-      - Wed, 08 Jul 2015 05:30:59 GMT
+      - Thu, 15 Oct 2015 21:11:17 GMT
       cache-control:
       - max-age=3600
       last-modified:
-      - Fri, 26 Jun 2015 06:11:27 GMT
+      - Wed, 14 Oct 2015 21:33:52 GMT
       etag:
-      - '"dfe183ca9a820fbd34aea98deaf814c7"'
+      - '"3455961bffe1492b8a3d97169fc4e0f5"'
       accept-ranges:
       - bytes
       server:
       - AmazonS3
+      age:
+      - '843'
       x-cache:
-      - RefreshHit from cloudfront
+      - Hit from cloudfront
       via:
-      - 1.1 9d4e31d14f9ca2b4887f0d5ace789fde.cloudfront.net (CloudFront)
+      - 1.1 be7e14304ffc3b5972e7e225c4a1caf4.cloudfront.net (CloudFront)
       x-amz-cf-id:
-      - oRqS01_gBmwgeSWKKbIyD-USxD0VHgu3vGGe3I1nalWGqiogEKIH2A==
+      - sjLPy8PB_AFrRiQ2EOwAPGPgmSZXT35YwXoDyLg6HxR-NFLM6lPnzQ==
     body:
       encoding: UTF-8
       string: |
@@ -120,7 +128,7 @@ http_interactions:
             ],
             "regions": [
               {
-                "region": "us-east",
+                "region": "us-east-1",
                 "footnotes": {
                 },
                 "instanceTypes": [
@@ -133,7 +141,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.280"
+                              "USD": "0.266"
                             }
                           },
                           {
@@ -150,7 +158,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.560"
+                              "USD": "0.532"
                             }
                           },
                           {
@@ -749,7 +757,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.280"
+                              "USD": "0.266"
                             }
                           },
                           {
@@ -766,7 +774,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.560"
+                              "USD": "0.532"
                             }
                           },
                           {
@@ -1332,7 +1340,7 @@ http_interactions:
                 ]
               },
               {
-                "region": "us-west",
+                "region": "us-west-1",
                 "instanceTypes": [
                   {
                     "type": "General Purpose  - Current Generation",
@@ -1785,7 +1793,7 @@ http_interactions:
                 ]
               },
               {
-                "region": "eu-ireland",
+                "region": "eu-west-1",
                 "instanceTypes": [
                   {
                     "type": "General Purpose  - Current Generation",
@@ -1796,7 +1804,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.308"
+                              "USD": "0.293"
                             }
                           },
                           {
@@ -1813,7 +1821,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.616"
+                              "USD": "0.585"
                             }
                           },
                           {
@@ -2412,7 +2420,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.332"
+                              "USD": "0.315"
                             }
                           },
                           {
@@ -2429,7 +2437,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.665"
+                              "USD": "0.632"
                             }
                           },
                           {
@@ -2732,7 +2740,7 @@ http_interactions:
                 ]
               },
               {
-                "region": "apac-sin",
+                "region": "ap-southeast-1",
                 "instanceTypes": [
                   {
                     "type": "General Purpose  - Current Generation",
@@ -3275,7 +3283,7 @@ http_interactions:
                 ]
               },
               {
-                "region": "apac-tokyo",
+                "region": "ap-northeast-1",
                 "instanceTypes": [
                   {
                     "type": "General Purpose  - Current Generation",
@@ -3286,7 +3294,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.405"
+                              "USD": "0.385"
                             }
                           },
                           {
@@ -3303,7 +3311,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.810"
+                              "USD": "0.770"
                             }
                           },
                           {
@@ -3847,7 +3855,7 @@ http_interactions:
                 ]
               },
               {
-                "region": "apac-syd",
+                "region": "ap-southeast-2",
                 "instanceTypes": [
                   {
                     "type": "General Purpose  - Current Generation",
@@ -3858,7 +3866,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.392"
+                              "USD": "0.372"
                             }
                           },
                           {
@@ -3875,7 +3883,7 @@ http_interactions:
                           {
                             "name": "ec2",
                             "prices": {
-                              "USD": "0.784"
+                              "USD": "0.745"
                             }
                           },
                           {
@@ -4982,5 +4990,5 @@ http_interactions:
           }
         }
     http_version: '1.1'
-  recorded_at: Wed, 08 Jul 2015 06:40:44 GMT
+  recorded_at: Thu, 15 Oct 2015 21:25:19 GMT
 recorded_with: VCR 2.9.3

data/lib/awscosts/region.rb

@@ -4,15 +4,15 @@ class AWSCosts::Region
   attr_reader :name, :full_name, :price_mapping, :emr_mapping
 
   SUPPORTED =  {
-    'us-east-1' => { :full_name => 'US (Northern Virginia)', :price_mapping => 'us-east-1', :emr_mapping => 'us-east' },
-    'us-west-1' => { :full_name => 'US (Northern California)', :price_mapping => 'us-west-1', :emr_mapping => 'us-west' },
-    'us-west-2' => { :full_name => 'US (Oregon)', :price_mapping => 'us-west-2', :emr_mapping => 'us-west-2' },
-    'eu-west-1' => { :full_name => 'EU (Ireland)', :price_mapping => 'eu-west-1', :emr_mapping => 'eu-ireland' },
+    'us-east-1' => { :full_name => 'US (Northern Virginia)' },
+    'us-west-1' => { :full_name => 'US (Northern California)' },
+    'us-west-2' => { :full_name => 'US (Oregon)' },
+    'eu-west-1' => { :full_name => 'EU (Ireland)' },
     'eu-central-1' => { :full_name => 'EU (Frankfurt)' },
-    'ap-southeast-1' => { :full_name => 'Asia Pacific (Singapore)', :price_mapping => 'ap-southeast-1', :emr_mapping => 'apac-sin' },
-    'ap-southeast-2' => { :full_name => 'Asia Pacific (Sydney)', :price_mapping => 'ap-southeast-2', :emr_mapping => 'apac-syd' },
-    'ap-northeast-1' => { :full_name => 'Asia Pacific (Tokyo)', :price_mapping => 'ap-northeast-1', :emr_mapping => 'apac-tokyo' },
-    'sa-east-1' => { :full_name => 'South America (Sao Paulo)', :price_mapping => 'sa-east-1', :emr_mapping => 'sa-east-1' }
+    'ap-southeast-1' => { :full_name => 'Asia Pacific (Singapore)' },
+    'ap-southeast-2' => { :full_name => 'Asia Pacific (Sydney)' },
+    'ap-northeast-1' => { :full_name => 'Asia Pacific (Tokyo)' },
+    'sa-east-1' => { :full_name => 'South America (Sao Paulo)' }
   }
 
   def self.find name
@@ -25,7 +25,7 @@ class AWSCosts::Region
   end
 
   def emr
-    AWSCosts::EMR.fetch(self.emr_mapping)
+    AWSCosts::EMR.fetch(self.name)
   end
 
   def s3

data/lib/awscosts/version.rb

@@ -1,3 +1,3 @@
 module AWSCosts
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awscosts
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Stephen Bartlett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty