aws-rikanjo 0.0.8 → 0.0.9

data/spec/lib/rikanjo_rds_spec.rb

@@ -1,24 +1,34 @@
 require "spec_helper"
-require "aws/rikanjo/mode/rds"
+require "aws/rikanjo/rds"
 
 include RikanjoSpecHelper
 
-describe 'AWS::Rikanjo::Mode::Rds' do
+describe 'AWS::Rikanjo::Rds' do
 
   describe 'url' do
 
+    it "build previous price url" do
+      a = Aws::RiKanjoo::Rds.new(
+          region        = 'ap-northeast-1',
+          instance_type = 'm1.large',
+          ri_util       = 'light',
+          multiaz       = false,
+      )
+      expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/rds/mysql/previous-generation"
+    end
+
     it "build current price url" do
-      a = Aws::RiKanjoo::Mode::Rds.new(
+      a = Aws::RiKanjoo::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"
+      expect(a.price_url).to eq "http://a0.awsstatic.com/pricing/1/rds/mysql"
     end
 
     it "build current om price file" do
-      a = Aws::RiKanjoo::Mode::Rds.new(
+      a = Aws::RiKanjoo::Rds.new(
           region        = 'ap-northeast-1',
           instance_type = 'm2.xlarge',
           ri_util       = 'medium',
@@ -28,7 +38,7 @@ describe 'AWS::Rikanjo::Mode::Rds' do
     end
 
     it "build current om price file(multiaz)" do
-      a = Aws::RiKanjoo::Mode::Rds.new(
+      a = Aws::RiKanjoo::Rds.new(
           region        = 'ap-northeast-1',
           instance_type = 'm2.xlarge',
           ri_util       = 'medium',
@@ -38,7 +48,7 @@ describe 'AWS::Rikanjo::Mode::Rds' do
     end
 
     it "build current ri price file" do
-      a = Aws::RiKanjoo::Mode::Rds.new(
+      a = Aws::RiKanjoo::Rds.new(
           region        = 'ap-northeast-1',
           instance_type = 'm2.xlarge',
           ri_util       = 'medium',
@@ -54,14 +64,14 @@ describe 'AWS::Rikanjo::Mode::Rds' do
 
     before :all do
       # rikanjo (single-az)
-      a1 = Aws::RiKanjoo::Mode::Rds.new(
+      a1 = Aws::RiKanjoo::Rds.new(
           region        = 'ap-northeast-1',
           instance_type = 'm3.medium',
           ri_util       = 'medium',
           multiaz       = false,
       )
       # rikanjo (multi-az)
-      a2 = Aws::RiKanjoo::Mode::Rds.new(
+      a2 = Aws::RiKanjoo::Rds.new(
           region        = 'ap-northeast-1',
           instance_type = 'm3.medium',
           ri_util       = 'medium',
@@ -74,7 +84,7 @@ describe 'AWS::Rikanjo::Mode::Rds' do
 
     it "is able to get the price(singleaz)" do
       regions.each do |region|
-        a = Aws::RiKanjoo::Mode::Rds.new(
+        a = Aws::RiKanjoo::Rds.new(
             region        = region,
             instance_type = 'm3.large',
             ri_util       = 'medium',
@@ -93,7 +103,7 @@ describe 'AWS::Rikanjo::Mode::Rds' do
 
     it "is able to get the price(multiaz)" do
       regions.each do |region|
-        a = Aws::RiKanjoo::Mode::Rds.new(
+        a = Aws::RiKanjoo::Rds.new(
             region        = region,
             instance_type = 'm3.large',
             ri_util       = 'medium',
@@ -112,7 +122,7 @@ describe 'AWS::Rikanjo::Mode::Rds' do
 
     it "an exception is raised when there are no instance-type" do
       regions.each do |region|
-        a = Aws::RiKanjoo::Mode::Rds.new(
+        a = Aws::RiKanjoo::Rds.new(
             region        = region,
             instance_type = 'm3.large.not.exists',
             ri_util       = 'medium',

metadata

@@ -1,41 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: aws-rikanjo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - kenjiskywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-09-22 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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: AWS RI Cost Calc Tool
@@ -46,8 +88,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .hound.yml
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -55,8 +99,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/base.rb
+- lib/aws/rikanjo/calc.rb
+- lib/aws/rikanjo/cli.rb
+- lib/aws/rikanjo/ec2.rb
+- lib/aws/rikanjo/rds.rb
 - lib/aws/rikanjo/version.rb
 - spec/lib/rikanjo_ec2_spec.rb
 - spec/lib/rikanjo_rds_spec.rb
@@ -72,17 +119,17 @@ 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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: calc 1 year cost. check sweet spot

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

@@ -1,120 +0,0 @@
-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
-
-          abort("[ec2][#{region}][#{@instance_type}] Not found om-price?")
-        end
-
-        def ri_price_from_contents contents
-          region = self.clean_region(@region)
-
-          # parse
-          json = self.parse_contents(contents)
-
-          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"
-                    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
-
-          abort("[ec2][#{region}][#{@instance_type}] Not found ri-price?") unless ri_info
-
-          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 "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"
-          when "ap-southeast-2" then "apac-syd"
-          when "sa-east-1"      then "sa-east-1"
-          end
-        end
-
-        def clean_region region
-          return region.gsub(/^us-east-1$/, 'us-east')
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,117 +0,0 @@
-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
-
-          abort("[rds][#{region}][#{@instance_type}] Not found om-price?")
-        end
-
-        def ri_price_from_contents contents
-          region = self.convert_region(@region)
-          mtype  = (@multiaz) ? 'multiAZdeployRes' : 'stdDeployRes'
-
-          # parse
-          json = self.parse_contents(contents)
-
-          ri_info = nil
-
-          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
-
-                ri_info = ri_info || {}
-                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
-
-          abort("[rds][#{region}][#{@instance_type}] Not found ri-price?") unless ri_info
-
-          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 "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"
-          when "ap-southeast-2" then "apac-syd"
-          when "sa-east-1"      then "sa-east-1"
-          end
-        end
-
-      end
-    end
-  end
-end