aws-rikanjo 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c067004f10a46d44863269eb50b313ca8a9704
-  data.tar.gz: c8e0260f8f12941aa39a736d3a6664ff6a5e3c0e
+  metadata.gz: d20547de4100a48c07cedd2e62556660f13d457d
+  data.tar.gz: e4befc2b64921bc3f89ae0f78e48088bd0fc7508
 SHA512:
-  metadata.gz: e7d4125e4f7f0ec49087e7fbca65803058689d28c352bfcf8e3ccf5fdf274185ebb799d17a60cd09a659c70470c38a6853177d0d1108109580ec42be9318dcc1
-  data.tar.gz: 950c8dbdd2fb0b382107c5fcff7c7d0f47350f59d2841a0bf6c22842ec02ad88f4434ca2b4c503964b40184337707c1978c9f4b7b9a5b143c0c520079eb7b02c
+  metadata.gz: 6857d213ebbd5e210ec747de6bb3b1e1bb956a0e415c18bd755a88351dd4775000920c02bb32a1c0cdd6fb8b8165ac30d3bbe5fdea34e3e0d16245f2f4529e40
+  data.tar.gz: d5a23f1b7359e50994b79629e5563bccd1b7afcb4cf22cb19c82c66e9a423019219ea4a26e78387bd2198f85deff4bde8922103f369118a95e83c54fa6a80905

data/README.md

@@ -41,11 +41,33 @@ a.total_cost_year
 
 ## CLI Usage
 
+### EC2
+
+help text:
+
+```
+$ rikanjo ec2 --help
+Usage: rikanjo ec2/rds [options]
+    -r, --region=VALUE               specify aws-region (us-east-1/us-west-1/us-west-2/eu-west-1/ap-southeast-1/ap-northeast-1/ap-southeast-2/sa-east-1)
+    -t, --instance_type=VALUE        specify ec2-instance-type
+    -u, --ri_util=VALUE              specify ri-util (light/medium/heavy)
+    -h, --help
+```
+
+example:
+
+```
+$ rikanjo ec2 -r ap-northeast-1 -t c3.large -u medium
+```
+
+### RDS
+
 help text:
 
 ```
-$ rikanjo --help
-Usage: rikanjo [options]
+$ rikanjo rds --help
+Usage: rikanjo ec2/rds [options]
+        --multiaz                    enable multi-az
     -r, --region=VALUE               specify aws-region (us-east-1/us-west-1/us-west-2/eu-west-1/ap-southeast-1/ap-northeast-1/ap-southeast-2/sa-east-1)
     -t, --instance_type=VALUE        specify ec2-instance-type
     -u, --ri_util=VALUE              specify ri-util (light/medium/heavy)
@@ -55,9 +77,11 @@ Usage: rikanjo [options]
 example:
 
 ```
-$ rikanjo -r ap-northeast-1 -t c3.large -u medium
+$ rikanjo rds -r ap-northeast-1 -t m2.xlarge -u heavy --multiaz
 ```
 
+
+
 ## Contributing
 
 1. Fork it

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

data/bin/rikanjo

@@ -9,7 +9,21 @@ options = { }
 
 optparse = OptionParser.new do |opts|
 
-  opts.banner = "Usage: rikanjo [options]"
+  opts.banner = "Usage: rikanjo ec2/rds [options]"
+
+  # subcommand
+  mode = ARGV.shift
+  if mode == 'ec2'
+  elsif mode == 'rds'
+    opts.on("--multiaz", "enable multi-az") do |value|
+      options[:multiaz] = value
+    end
+  else
+    $stderr.puts "no such subcommand: #{mode}"
+    puts opts
+    exit 1
+  end
+  options[:mode] = mode
 
   region_values = %w[us-east-1 us-west-1 us-west-2 eu-west-1 ap-southeast-1 ap-northeast-1 ap-southeast-2 sa-east-1 ]
   opts.on("-r", "--region=VALUE", region_values, "specify aws-region (#{region_values.join('/')})") do |value|
@@ -32,6 +46,8 @@ optparse = OptionParser.new do |opts|
 
 end
 
+
+
 # validation
 begin
   optparse.parse!
@@ -53,8 +69,10 @@ end
 # rikanjo
 require "aws/rikanjo"
 a = Aws::RiKanjoo.new(
+    mode = options[:mode],
     region = options[:region],
     instance_type = options[:instance_type],
     ri_util = options[:ri_util],
+    multiaz = options[:multiaz],
 )
 a.total_cost_year

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

@@ -0,0 +1,109 @@
+require 'yajl'
+
+module Aws
+  class RiKanjoo
+    class Mode
+      class Ec2
+        attr_reader :region, :instance_type, :ri_util
+
+        def initialize(region, instance_type, ri_util)
+          @region             = region
+          @instance_type      = instance_type
+          @ri_util            = ri_util
+          @os                 = 'linux'
+          @current_price_url  = 'http://a0.awsstatic.com/pricing/1/ec2'
+          @previous_price_url = 'http://a0.awsstatic.com/pricing/1/ec2/previous-generation'
+        end
+
+        def om_price_from_contents contents
+          region = self.convert_region(@region)
+
+          # parse
+          json = self.parse_contents(contents)
+
+          # select 'region' and 'instance_type'
+          json["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
+
+                return {:hr_price => i["valueColumns"][0]["prices"]["USD"]}
+              end
+            end
+          end
+        end
+
+        def ri_price_from_contents contents
+          region = @region
+
+          # parse
+          json = self.parse_contents(contents)
+
+          ri_info = {}
+
+          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
+
+                i["valueColumns"].each do |y|
+                  case y["name"]
+                  when "yrTerm1"
+                    ri_info[@ri_util] = {:upfront => y["prices"]["USD"]}
+                  when "yrTerm1Hourly"
+                    ri_info[@ri_util].store(:hr_price, y["prices"]["USD"])
+                  end
+                end
+              end
+            end
+          end
+
+          return ri_info
+        end
+
+        def price_url
+          return (self.previous_generation_type) ? @previous_price_url : @current_price_url
+        end
+
+        def om_price_file
+          return "#{@os}-od.min.js"
+        end
+
+        def ri_price_file
+          return (self.previous_generation_type) ? "#{@ri_util}_#{@os}.min.js" : "#{@os}-ri-#{@ri_util}.min.js"
+        end
+
+        def previous_generation_type
+          case @instance_type
+          when /^(c1|m2|cc2\.8xlarge|cr1\.8xlarge|hi1\.4xlarge|cg1\.4xlarge)/ then true
+          when /^m1/ then (@instance_type == "m1.small") ? false : true
+          else false
+          end
+        end
+
+        def parse_contents data
+          data = data.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({",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
+          return Yajl::Parser.parse(data)
+        end
+
+        def convert_region region
+          # not same om region
+          case region
+          when "us-east-1"      then "us-east"
+          when "us-west-1"      then "us-west"
+          when "eu-west-1"      then "eu-ireland"
+          when "ap-southeast-1" then "apac-sin"
+          when "ap-northeast-1" then "apac-tokyo"
+          when "ap-southeast-2" then "apac-syd"
+          when "sa-east-1"      then "sa-east-1"
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+module Aws
+  class RiKanjoo
+    class Mode
+      class Rds
+        attr_reader :region, :instance_type, :ri_util
+
+        def initialize(region, instance_type, ri_util, multiaz)
+          @region         = region
+          @instance_type  = "db.#{instance_type}"
+          @ri_util        = ri_util
+          @rdbms          = 'mysql'
+          @price_url      = "https://a0.awsstatic.com/pricing/1/rds/#{@rdbms}"
+          @multiaz        = multiaz
+        end
+
+        def om_price_from_contents contents
+          region = self.convert_region(@region)
+
+          # parse
+          json = self.parse_contents(contents)
+
+          # select 'region' and 'instance_type'
+          json["config"]["regions"].each do |r|
+            # r = {"region"=>"us-east", "instanceTypes"=>[{"type"=>"generalCurrentGen", ...
+            next unless r["region"] == region
+            r["types"].each do |type|
+              # type = {"type"=>"generalCurrentGen", "sizes"=>[{"size"=>"m3.medium", "vCPU"=>"1" ...
+              type["tiers"].each do |i|
+                next unless i["name"] == @instance_type
+
+                return {:hr_price => i["prices"]["USD"]}
+              end
+            end
+          end
+        end
+
+        def ri_price_from_contents contents
+          region = self.convert_region(@region)
+          mtype  = (@multiaz) ? 'multiAZdeployRes' : 'stdDeployRes'
+
+          # parse
+          json = self.parse_contents(contents)
+
+          ri_info = {}
+
+          json["config"]["regions"].each do |r|
+            next unless r["region"] == region
+
+            r["instanceTypes"].each do |type|
+              # beauty
+              type["type"].gsub!(/Single-AZ Deployment \(Reserved\)/, 'stdDeployRes')
+
+              next unless type["type"] == mtype
+
+              type["tiers"].each do |i|
+                next unless i["size"] == @instance_type
+
+                i["valueColumns"].each do |y|
+                  # beauty
+                  y["name"].gsub!(/^year/, 'yr')
+                  y["prices"]["USD"].gsub!(/,/, '')
+
+                  case y["name"]
+                  when "yrTerm1"
+                    ri_info[@ri_util] = {:upfront => y["prices"]["USD"]}
+                  when "yrTerm1Hourly"
+                    ri_info[@ri_util].store(:hr_price, y["prices"]["USD"])
+                  end
+                end
+
+              end
+            end
+          end
+
+          return ri_info
+        end
+
+        def price_url
+          @price_url
+        end
+
+        def om_price_file
+          return (@multiaz) ? "pricing-multiAZ-deployments.min.js" : "pricing-standard-deployments.min.js"
+        end
+
+        def ri_price_file
+          return "pricing-#{@ri_util}-utilization-reserved-instances.min.js"
+        end
+
+        def parse_contents data
+          data = data.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({",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
+          return Yajl::Parser.parse(data)
+        end
+
+        def convert_region region
+          # not same om region
+          case region
+          when "us-east-1"      then "us-east"
+          when "us-west-1"      then "us-west"
+          when "eu-west-1"      then "eu-ireland"
+          when "ap-southeast-1" then "apac-sin"
+          when "ap-northeast-1" then "apac-tokyo"
+          when "ap-southeast-2" then "apac-syd"
+          when "sa-east-1"      then "sa-east-1"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aws/rikanjo/version.rb

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

data/lib/aws/rikanjo.rb

@@ -4,132 +4,41 @@ require 'net/http'
 require 'uri'
 require 'yajl'
 require 'date'
+require_relative 'rikanjo/mode/ec2'
+require_relative 'rikanjo/mode/rds'
 
 module Aws
   class RiKanjoo
     attr_reader :region, :instance_type, :ri_util
 
-    def initialize(region, instance_type, ri_util)
+    def initialize(mode='ec2', region, instance_type, ri_util, multiaz)
+      if mode == 'ec2'
+        @mode_class = Aws::RiKanjoo::Mode::Ec2.new(region, instance_type, ri_util)
+      elsif mode == 'rds'
+        @mode_class = Aws::RiKanjoo::Mode::Rds.new(region, instance_type, ri_util, multiaz)
+      end
       @region        = region
       @instance_type = instance_type
       @ri_util       = ri_util
       @om_info       = Hash.new
       @ri_info       = Hash.new
-      @current_price_url  = 'http://a0.awsstatic.com/pricing/1/ec2'
-      @previous_price_url = 'http://a0.awsstatic.com/pricing/1/ec2/previous-generation'
     end
 
     def om_get_hr_price
-      region             = @region
-      instance_type      = @instance_type
-      json               = nil
-
-      # not same ri region
-      case region
-      when "us-east-1"
-        region = "us-east"
-      when "us-west-1"
-        region = "us-west"
-      when "eu-west-1"
-        region = "eu-ireland"
-      when "ap-southeast-1"
-        region = "apac-sin"
-      when "ap-northeast-1"
-        region = "apac-tokyo"
-      when "ap-southeast-2"
-        region = "apac-syd"
-      when "sa-east-1"
-        region = "sa-east-1"
-      end
-
        # TODO: merge om and ri
-      uri = URI.parse("#{price_url}/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("/*\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'
-      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"]}
-          end
-        end
-      end
+      uri = URI.parse("#{@mode_class.price_url}/#{@mode_class.om_price_file}")
+      contents = Net::HTTP.get(uri)
 
-      # :hr_price => price
-      return @om_info
+      # parse om info
+      @om_info = @mode_class.om_price_from_contents(contents)
     end
 
     def ri_get_hr_price_and_upfront
-      region = @region
-
-      # not same om region
-      case region
-      when "us-east-1"
-        region = "us-east"
-      when "us-west"
-        region = "us-west-1"
-      when "eu-ireland"
-        region = "eu-west-1"
-      when "apac-sin"
-        region = "ap-southeast-1"
-      when "apac-tokyo"
-        region = "ap-northeast-1"
-      when "apac-syd"
-        region = "ap-southeast-2"
-      when "sa-east-1"
-        region = "sa-east-1"
-      end
+      uri = URI.parse("#{@mode_class.price_url}/#{@mode_class.ri_price_file}")
+      contents = Net::HTTP.get(uri)
 
-      get_ri_price(region)
-    end
-
-    def get_ri_price(region)
-      ri_util = @ri_util
-
-      region            = region
-      instance_type     = @instance_type
-      json              = nil
-      reservedjson_data = nil
-
-      uri = URI.parse("#{price_url}/#{ri_price_file}")
-      Net::HTTP.start(uri.host, uri.port) do |http|
-        response = http.get(uri.request_uri)
-        json = response.body
-      end
-
-      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({",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
-      reservedjson_data = Yajl::Parser.parse(json)
-
-      reservedjson_data["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
-
-            i["valueColumns"].each do |y|
-              case y["name"]
-              when "yrTerm1"
-                @ri_info[ri_util] = {:upfront => y["prices"]["USD"]}
-              when "yrTerm1Hourly"
-                @ri_info[ri_util].store(:hr_price, y["prices"]["USD"])
-              end
-            end
-          end
-        end
-      end
-      # exp. {"light"=>{:upfront=>"270", :hr_price=>"0.206"}}
-      return @ri_info
+      # parse ri info
+      @ri_info = @mode_class.ri_price_from_contents(contents)
     end
 
     def calc_year_cost
@@ -204,22 +113,6 @@ module Aws
        puts "\"sweet spot price (doller)\" : #{@ri_info[@ri_util][:sweet_spot_price]}"
     end
 
-    def price_url
-      return (previous_generation_type) ? @previous_price_url : @current_price_url
-    end
-
-    def ri_price_file
-      return (previous_generation_type) ? "#{@ri_util}_linux.min.js" : "linux-ri-#{@ri_util}.min.js"
-    end
-
-    def previous_generation_type
-      case @instance_type
-      when /^(c1|m2|cc2\.8xlarge|cr1\.8xlarge|hi1\.4xlarge|cg1\.4xlarge)/ then true
-      when /^m1/ then (@instance_type == "m1.small") ? false : true
-      else false
-      end
-    end
-
   end
 end
 

data/spec/lib/rikanjo_ec2_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+require "aws/rikanjo/mode/ec2"
+
+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
+    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
+    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
+
+  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
+
+end

data/spec/lib/rikanjo_rds_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+require "aws/rikanjo/mode/rds"
+
+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
+
+  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
+
+end

data/spec/lib/rikanjo_spec.rb

@@ -2,63 +2,4 @@ require "spec_helper"
 require "aws/rikanjo"
 
 describe 'AWS::Rikanjo' 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.new(
-            region        = 'ap-northeast-1',
-            instance_type = t,
-            ri_util       = 'light',
-        )
-        expect(a.previous_generation_type).to eq true
-    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.new(
-            region        = 'ap-northeast-1',
-            instance_type = t,
-            ri_util       = 'light',
-        )
-        expect(a.previous_generation_type).to eq false
-    end
-  end
-
-  it "build previous price url" do
-    a = Aws::RiKanjoo.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.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.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.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
-
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aws-rikanjo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kenjiskywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: AWS RI Cost Calc Tool
@@ -46,8 +46,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -55,7 +55,11 @@ files:
 - aws-rikanjo.gemspec
 - bin/rikanjo
 - lib/aws/rikanjo.rb
+- lib/aws/rikanjo/mode/ec2.rb
+- lib/aws/rikanjo/mode/rds.rb
 - lib/aws/rikanjo/version.rb
+- spec/lib/rikanjo_ec2_spec.rb
+- spec/lib/rikanjo_rds_spec.rb
 - spec/lib/rikanjo_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kenjiskywalker/aws-rikanjo
@@ -68,20 +72,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: calc 1 year cost. check sweet spot
 test_files:
+- spec/lib/rikanjo_ec2_spec.rb
+- spec/lib/rikanjo_rds_spec.rb
 - spec/lib/rikanjo_spec.rb
 - spec/spec_helper.rb