aws-rikanjo 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20547de4100a48c07cedd2e62556660f13d457d
-  data.tar.gz: e4befc2b64921bc3f89ae0f78e48088bd0fc7508
+  metadata.gz: f5befef7edf0fddafadcdc3beaa309c6d0f71df8
+  data.tar.gz: fa83ff4aed6413b0585a65da199529ae84627585
 SHA512:
-  metadata.gz: 6857d213ebbd5e210ec747de6bb3b1e1bb956a0e415c18bd755a88351dd4775000920c02bb32a1c0cdd6fb8b8165ac30d3bbe5fdea34e3e0d16245f2f4529e40
-  data.tar.gz: d5a23f1b7359e50994b79629e5563bccd1b7afcb4cf22cb19c82c66e9a423019219ea4a26e78387bd2198f85deff4bde8922103f369118a95e83c54fa6a80905
+  metadata.gz: d4c6e04838a15bd76a5c08ebeabddbd35a8734c29826e2475483faff98bd1f89feae8b06b570fd0c53c53dbdccae3224c2cad436091b4d596b92c19c01a0bf70
+  data.tar.gz: c98edc88c7502955c1fee87ce792b2b9411a883b4a5c8bb58fa66f3057ae12574e6190222d0cfd1fbbfa819e56b5830d2212c079606fd2da19194360e826bbf4

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.7"
+  spec.version       = "0.0.8"
   spec.authors       = ["kenjiskywalker"]
   spec.email         = ["git@kenjiskywalker.org"]
   spec.description   = %q{AWS RI Cost Calc Tool}

data/lib/aws/rikanjo/mode/ec2.rb

@@ -34,22 +34,26 @@ module Aws
               end
             end
           end
+
+          abort("[ec2][#{region}][#{@instance_type}] Not found om-price?")
         end
 
         def ri_price_from_contents contents
-          region = @region
+          region = self.clean_region(@region)
 
           # parse
           json = self.parse_contents(contents)
 
-          ri_info = {}
+          ri_info = nil
 
           json["config"]["regions"].each do |r|
             next unless r["region"] == region
+
             r["instanceTypes"].each do |type|
               type["sizes"].each do |i|
                 next unless i["size"] == @instance_type
 
+                ri_info = ri_info || {}
                 i["valueColumns"].each do |y|
                   case y["name"]
                   when "yrTerm1"
@@ -62,6 +66,8 @@ module Aws
             end
           end
 
+          abort("[ec2][#{region}][#{@instance_type}] Not found ri-price?") unless ri_info
+
           return ri_info
         end
 
@@ -95,6 +101,7 @@ module Aws
           case region
           when "us-east-1"      then "us-east"
           when "us-west-1"      then "us-west"
+          when "us-west-2"      then "us-west-2"
           when "eu-west-1"      then "eu-ireland"
           when "ap-southeast-1" then "apac-sin"
           when "ap-northeast-1" then "apac-tokyo"
@@ -103,6 +110,10 @@ module Aws
           end
         end
 
+        def clean_region region
+          return region.gsub(/^us-east-1$/, 'us-east')
+        end
+
       end
     end
   end

data/lib/aws/rikanjo/mode/rds.rb

@@ -32,6 +32,8 @@ module Aws
               end
             end
           end
+
+          abort("[rds][#{region}][#{@instance_type}] Not found om-price?")
         end
 
         def ri_price_from_contents contents
@@ -41,7 +43,7 @@ module Aws
           # parse
           json = self.parse_contents(contents)
 
-          ri_info = {}
+          ri_info = nil
 
           json["config"]["regions"].each do |r|
             next unless r["region"] == region
@@ -55,6 +57,7 @@ module Aws
               type["tiers"].each do |i|
                 next unless i["size"] == @instance_type
 
+                ri_info = ri_info || {}
                 i["valueColumns"].each do |y|
                   # beauty
                   y["name"].gsub!(/^year/, 'yr')
@@ -72,6 +75,8 @@ module Aws
             end
           end
 
+          abort("[rds][#{region}][#{@instance_type}] Not found ri-price?") unless ri_info
+
           return ri_info
         end
 
@@ -97,6 +102,7 @@ module Aws
           case region
           when "us-east-1"      then "us-east"
           when "us-west-1"      then "us-west"
+          when "us-west-2"      then "us-west-2"
           when "eu-west-1"      then "eu-ireland"
           when "ap-southeast-1" then "apac-sin"
           when "ap-northeast-1" then "apac-tokyo"
@@ -104,6 +110,7 @@ module Aws
           when "sa-east-1"      then "sa-east-1"
           end
         end
+
       end
     end
   end

data/lib/aws/rikanjo/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Rikanjo
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/spec/lib/rikanjo_ec2_spec.rb

@@ -1,64 +1,129 @@
 require "spec_helper"
 require "aws/rikanjo/mode/ec2"
 
+include RikanjoSpecHelper
+
 describe 'AWS::Rikanjo::Mode::Ec2' do
 
-  it "is previous instance type" do
-    %w{ m1.medium c1.medium m2.xlarge cc2.8xlarge cr1.8xlarge hi1.4xlarge cg1.4xlarge }.each do |t|
-        a = Aws::RiKanjoo::Mode::Ec2.new(
-            region        = 'ap-northeast-1',
-            instance_type = t,
-            ri_util       = 'light',
-        )
-        expect(a.previous_generation_type).to eq true
+  describe 'previous type' do
+    it "is previous instance type" do
+      %w{ m1.medium c1.medium m2.xlarge cc2.8xlarge cr1.8xlarge hi1.4xlarge cg1.4xlarge }.each do |t|
+          a = Aws::RiKanjoo::Mode::Ec2.new(
+              region        = 'ap-northeast-1',
+              instance_type = t,
+              ri_util       = 'light',
+          )
+          expect(a.previous_generation_type).to eq true
+      end
     end
-  end
 
-  it "is current instance type" do
-    %w{ t1.micro m1.small m3.medium c3.medium r3.xlarge i2.xlarge }.each do |t|
-        a = Aws::RiKanjoo::Mode::Ec2.new(
-            region        = 'ap-northeast-1',
-            instance_type = t,
-            ri_util       = 'light',
-        )
-        expect(a.previous_generation_type).to eq false
+    it "is current instance type" do
+      %w{ t1.micro m1.small m3.medium c3.medium r3.xlarge i2.xlarge }.each do |t|
+          a = Aws::RiKanjoo::Mode::Ec2.new(
+              region        = 'ap-northeast-1',
+              instance_type = t,
+              ri_util       = 'light',
+          )
+          expect(a.previous_generation_type).to eq false
+      end
     end
   end
 
-  it "build previous price url" do
-    a = Aws::RiKanjoo::Mode::Ec2.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm1.medium',
-        ri_util       = 'light',
-    )
-    expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/ec2/previous-generation"
-  end
+  describe 'url' do
+    it "build previous price url" do
+      a = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm1.medium',
+          ri_util       = 'light',
+      )
+      expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/ec2/previous-generation"
+    end
 
-  it "build current price url" do
-    a = Aws::RiKanjoo::Mode::Ec2.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm3.medium',
-        ri_util       = 'light',
-    )
-    expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/ec2"
-  end
+    it "build current price url" do
+      a = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.medium',
+          ri_util       = 'light',
+      )
+      expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/ec2"
+    end
+
+    it "build previous ri price file" do
+      a = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm1.medium',
+          ri_util       = 'light',
+      )
+      expect(a.ri_price_file).to eq "light_linux.min.js"
+    end
+
+    it "build current ri price file" do
+      a = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.medium',
+          ri_util       = 'heavy',
+      )
+      expect(a.ri_price_file).to eq "linux-ri-heavy.min.js"
+    end
 
-  it "build previous ri price file" do
-    a = Aws::RiKanjoo::Mode::Ec2.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm1.medium',
-        ri_util       = 'light',
-    )
-    expect(a.ri_price_file).to eq "light_linux.min.js"
   end
 
-  it "build current ri price file" do
-    a = Aws::RiKanjoo::Mode::Ec2.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm3.medium',
-        ri_util       = 'heavy',
-    )
-    expect(a.ri_price_file).to eq "linux-ri-heavy.min.js"
+  describe 'contents validation' do
+
+    before :all do
+      # rikanjo (current)
+      a1 = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.medium',
+          ri_util       = 'medium',
+      )
+      # rikanjo (previous)
+      a2 = Aws::RiKanjoo::Mode::Ec2.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm1.medium',
+          ri_util       = 'medium',
+      )
+      @c_om_current_price = get_sleep("#{a1.price_url}/#{a1.om_price_file}")
+      @c_ri_current_medium_price = get_sleep("#{a1.price_url}/#{a1.ri_price_file}")
+      @c_om_previous_price = get_sleep("#{a2.price_url}/#{a2.om_price_file}")
+      @c_ri_previous_medium_price = get_sleep("#{a2.price_url}/#{a2.ri_price_file}")
+    end
+
+    it "is able to get the price" do
+      regions.each do |region|
+        a = Aws::RiKanjoo::Mode::Ec2.new(
+            region        = region,
+            instance_type = 'm3.large',
+            ri_util       = 'medium',
+        )
+        # om
+        om_info = a.om_price_from_contents(@c_om_current_price)
+        expect(om_info[:hr_price]).not_to be_nil
+        # ri
+        ri_info = a.ri_price_from_contents(@c_ri_current_medium_price)
+        expect(ri_info["medium"][:upfront]).not_to be_nil
+        expect(ri_info["medium"][:hr_price]).not_to be_nil
+      end
+    end
+
+    it "an exception is raised when there are no instance-type" do
+      regions.each do |region|
+        a = Aws::RiKanjoo::Mode::Ec2.new(
+            region        = region,
+            instance_type = 'm3.large.not.exists',
+            ri_util       = 'medium',
+        )
+        # raise om
+        expect do
+          om_info = a.om_price_from_contents(@c_om_current_price)
+        end.to raise_error(SystemExit)
+        # raise ri
+        expect do
+          ri_info = a.ri_price_from_contents(@c_ri_current_medium_price)
+        end.to raise_error(SystemExit)
+      end
+    end
+
   end
 
 end

data/spec/lib/rikanjo_rds_spec.rb

@@ -1,46 +1,133 @@
 require "spec_helper"
 require "aws/rikanjo/mode/rds"
 
+include RikanjoSpecHelper
+
 describe 'AWS::Rikanjo::Mode::Rds' do
 
-  it "build current price url" do
-    a = Aws::RiKanjoo::Mode::Rds.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm3.large',
-        ri_util       = 'light',
-        multiaz       = false,
-    )
-    expect(a.price_url).to eq "https://a0.awsstatic.com/pricing/1/rds/mysql"
-  end
+  describe 'url' do
 
-  it "build current om price file" do
-    a = Aws::RiKanjoo::Mode::Rds.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm2.xlarge',
-        ri_util       = 'medium',
-        multiaz       = false,
-    )
-    expect(a.om_price_file).to eq "pricing-standard-deployments.min.js"
-  end
+    it "build current price url" do
+      a = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.large',
+          ri_util       = 'light',
+          multiaz       = false,
+      )
+      expect(a.price_url).to eq "https://a0.awsstatic.com/pricing/1/rds/mysql"
+    end
+
+    it "build current om price file" do
+      a = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm2.xlarge',
+          ri_util       = 'medium',
+          multiaz       = false,
+      )
+      expect(a.om_price_file).to eq "pricing-standard-deployments.min.js"
+    end
+
+    it "build current om price file(multiaz)" do
+      a = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm2.xlarge',
+          ri_util       = 'medium',
+          multiaz       = true,
+      )
+      expect(a.om_price_file).to eq "pricing-multiAZ-deployments.min.js"
+    end
+
+    it "build current ri price file" do
+      a = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm2.xlarge',
+          ri_util       = 'medium',
+          multiaz       = true,
+      )
+      expect(a.ri_price_file).to eq "pricing-medium-utilization-reserved-instances.min.js"
+    end
 
-  it "build current om price file(multiaz)" do
-    a = Aws::RiKanjoo::Mode::Rds.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm2.xlarge',
-        ri_util       = 'medium',
-        multiaz       = true,
-    )
-    expect(a.om_price_file).to eq "pricing-multiAZ-deployments.min.js"
   end
 
-  it "build current ri price file" do
-    a = Aws::RiKanjoo::Mode::Rds.new(
-        region        = 'ap-northeast-1',
-        instance_type = 'm2.xlarge',
-        ri_util       = 'medium',
-        multiaz       = true,
-    )
-    expect(a.ri_price_file).to eq "pricing-medium-utilization-reserved-instances.min.js"
+
+  describe 'contents validation' do
+
+    before :all do
+      # rikanjo (single-az)
+      a1 = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.medium',
+          ri_util       = 'medium',
+          multiaz       = false,
+      )
+      # rikanjo (multi-az)
+      a2 = Aws::RiKanjoo::Mode::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm3.medium',
+          ri_util       = 'medium',
+          multiaz       = true,
+      )
+      @c_om_singleaz_price = get_sleep("#{a1.price_url}/#{a1.om_price_file}")
+      @c_ri_medium_price   = get_sleep("#{a1.price_url}/#{a1.ri_price_file}")
+      @c_om_multiaz_price  = get_sleep("#{a2.price_url}/#{a2.om_price_file}")
+    end
+
+    it "is able to get the price(singleaz)" do
+      regions.each do |region|
+        a = Aws::RiKanjoo::Mode::Rds.new(
+            region        = region,
+            instance_type = 'm3.large',
+            ri_util       = 'medium',
+            multiaz       = false,
+        )
+        # om
+        om_info = a.om_price_from_contents(@c_om_singleaz_price)
+        expect(om_info[:hr_price]).not_to be_nil
+
+        # ri
+        ri_info = a.ri_price_from_contents(@c_ri_medium_price)
+        expect(ri_info["medium"][:upfront]).not_to be_nil
+        expect(ri_info["medium"][:hr_price]).not_to be_nil
+      end
+    end
+
+    it "is able to get the price(multiaz)" do
+      regions.each do |region|
+        a = Aws::RiKanjoo::Mode::Rds.new(
+            region        = region,
+            instance_type = 'm3.large',
+            ri_util       = 'medium',
+            multiaz       = true,
+        )
+        # om
+        om_info = a.om_price_from_contents(@c_om_multiaz_price)
+        expect(om_info[:hr_price]).not_to be_nil
+
+        # ri
+        ri_info = a.ri_price_from_contents(@c_ri_medium_price)
+        expect(ri_info["medium"][:upfront]).not_to be_nil
+        expect(ri_info["medium"][:hr_price]).not_to be_nil
+      end
+    end
+
+    it "an exception is raised when there are no instance-type" do
+      regions.each do |region|
+        a = Aws::RiKanjoo::Mode::Rds.new(
+            region        = region,
+            instance_type = 'm3.large.not.exists',
+            ri_util       = 'medium',
+            multiaz       = false,
+        )
+        # raise om
+        expect do
+          om_info = a.om_price_from_contents(@c_om_singleaz_price)
+        end.to raise_error(SystemExit)
+        # raise ri
+        expect do
+          ri_info = a.ri_price_from_contents(@c_ri_medium_price)
+        end.to raise_error(SystemExit)
+      end
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -6,3 +6,25 @@ end
 
 RSpec.configure do |config|
 end
+
+module RikanjoSpecHelper
+  def regions
+    return %w{
+      eu-west-1
+      sa-east-1
+      us-east-1
+      ap-northeast-1
+      us-west-2
+      us-west-1
+      ap-southeast-1
+      ap-southeast-2
+    }
+  end
+
+  def get_sleep url
+    contents = Net::HTTP.get(URI.parse(url))
+    sleep 1
+    return contents
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-rikanjo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kenjiskywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler