aws-rikanjo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2d3d01c61253d1f8db3b929ed67d9a93109e28
-  data.tar.gz: 78ca9a220637d4d719eea99fea9a4c7ca9f62d61
+  metadata.gz: daa77e004f4b668aef3d910d5b129efeb540e5ae
+  data.tar.gz: 481daec3b7273fbdc99fb4d88727a89dd4ecbbc2
 SHA512:
-  metadata.gz: d83cb8bf705f0696673e4327266cc1dfb3c02899818ad537ff93b5ba0a44bcd9ac45a798cd45a6ed2fa248dfa8ab7504839b41d132f55dac0978a8cc9381deb4
-  data.tar.gz: e1681fb5fbb41a63f5c86758e40cc43a09be31f7524a7b68370d66166058269e7181162c3c21f91ce2d9e7e8bc9656c4061cf783adbdb89f65ac8cbb19f4d5cf
+  metadata.gz: a50d3161f154d7e08793b58d58dd64aba54ebbc2c90b6c1d1d6ac0b2c6290c477b5a502d9edf3d9698c77e776fb3d36a0f078e90101c70e5685d7f6c5a407de8
+  data.tar.gz: 9649d72be60061a381a4e2559d4d5d9509d14b96a83631ed50ed16bbc3d8a58248b8da1d6cdbbeff9cc36cc82cadc64d77e35f9fc92c36592b75534c2b68482a

data/README.md

@@ -1,6 +1,6 @@
 # Aws::Rikanjo
 
-RI Cost Calc Tool.
+RI Cost Calc Tool( Only new price ).
 
 ## Installation
 
@@ -21,9 +21,9 @@ Or install it yourself as:
 example
 
 ```
-require "./aws-rikanjo/lib/aws/rikanjo"
+require "aws/rikanjo"
 
-a = Aws::RiKanjoo.new(region = "ap-northeast-1", instance_type = "m1.large", ri_util = "light")
+a = Aws::RiKanjoo.new(region = "ap-northeast-1", instance_type = "m3.large", ri_util = "medium")
 a.total_cost_year
 
 # "region" : ap-northeast-1
@@ -36,7 +36,7 @@ a.total_cost_year
 # "reserved year price (doller)" : 2074.56
 # "reserved upfront (doller)" : 270
 # "sweet spot day (day)" : 78
-# "sweet spot date (date)" : 2014-07-16
+# "sweet spot date (date)" : 2014-07-17
 # "sweet spot price (doller)" : 660.58
 ```
 

data/aws-rikanjo.gemspec

@@ -5,7 +5,7 @@ require 'aws/rikanjo/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "aws-rikanjo"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["kenjiskywalker"]
   spec.email         = ["git@kenjiskywalker.org"]
   spec.description   = %q{AWS RI Cost Calc Tool}

data/lib/aws/rikanjo/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Rikanjo
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/aws/rikanjo.rb

@@ -40,25 +40,25 @@ module Aws
       end
 
        # TODO: merge om and ri
-      uri = URI.parse('http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/linux-od.js')
+      uri = URI.parse('http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js')
       Net::HTTP.start(uri.host, uri.port) do |http|
         response = http.get(uri.request_uri)
         json = response.body
       end
 
       # parse
-      json = json.gsub(/^callback\(\n  /,'').gsub(/\n\)/, '')
-      ondemandjson_data = Yajl::Parser.parse(json)
+      json = json.gsub("/*\n * This file is intended for use only on aws.amazon.com. We do not guarantee its availability or accuracy.\n *\n * Copyright 2014 Amazon.com, Inc. or its affiliates. All rights reserved.\n */\ncallback({vers:0.01,",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
+      ondemand_json_data = Yajl::Parser.parse(json)
 
       # select 'region' and 'instance_type'
-      ondemandjson_data["config"]["regions"].each do |r|
+      ondemand_json_data["config"]["regions"].each do |r|
         # r = {"region"=>"us-east", "instanceTypes"=>[{"type"=>"generalCurrentGen", ...
         next unless r["region"] == region
         r["instanceTypes"].each do |type|
           # type = {"type"=>"generalCurrentGen", "sizes"=>[{"size"=>"m3.medium", "vCPU"=>"1" ...
           type["sizes"].each do |i|
             next unless i["size"] == instance_type
-            @om_info = {:hr_price => i["valueColumns"][0]["prices"]["USD"] }
+            @om_info = {:hr_price => i["valueColumns"][0]["prices"]["USD"]}
           end
         end
       end
@@ -97,13 +97,13 @@ module Aws
       json              = nil
       reservedjson_data = nil
 
-      uri = URI.parse("http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/linux-ri-#{ri_util}.js")
+      uri = URI.parse("http://a0.awsstatic.com/pricing/1/ec2/linux-ri-#{ri_util}.min.js")
       Net::HTTP.start(uri.host, uri.port) do |http|
         response = http.get(uri.request_uri)
         json = response.body
       end
 
-      json = json.gsub(/callback\(\n/,'').gsub(/\n\)/, '')
+      json = json.gsub("/*\n * This file is intended for use only on aws.amazon.com. We do not guarantee its availability or accuracy.\n *\n * Copyright 2014 Amazon.com, Inc. or its affiliates. All rights reserved.\n */\ncallback({vers:0.01,",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
       reservedjson_data = Yajl::Parser.parse(json)
 
       reservedjson_data["config"]["regions"].each do |r|
@@ -157,7 +157,6 @@ module Aws
       # exp. @om_info = {:hr_price=>"0.350", :yr_price=>3066.0}
       # exp. @ri_info = {"ri_util"=>{:upfront=>"NNN", :hr_price=>"NNN",
       #                  :sweet_spot_price=>NNN, :sweet_spot_start_day=>78, :yr_price=>2074.56}}
-
       return @om_info, @ri_info
     end
 
@@ -185,9 +184,8 @@ module Aws
   end
 end
 
-# m = Aws::RiKanjoo.new(region = "ap-northeast-1", instance_type = "m1.large", ri_util = "light")
+# m = Aws::RiKanjoo.new(region = "ap-northeast-1", instance_type = "m3.large", ri_util = "medium")
 # m.total_cost_year
-#
 # "region" : ap-northeast-1
 # "instance_type" : m1.large
 # "ri_util" : light

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-rikanjo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kenjiskywalker