aws-rikanjo 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5befef7edf0fddafadcdc3beaa309c6d0f71df8
-  data.tar.gz: fa83ff4aed6413b0585a65da199529ae84627585
+  metadata.gz: 8953135308c2709a6b820c95d653585028303427
+  data.tar.gz: 79cbab1f693c606da4383cd12a0b377c5a038d5e
 SHA512:
-  metadata.gz: d4c6e04838a15bd76a5c08ebeabddbd35a8734c29826e2475483faff98bd1f89feae8b06b570fd0c53c53dbdccae3224c2cad436091b4d596b92c19c01a0bf70
-  data.tar.gz: c98edc88c7502955c1fee87ce792b2b9411a883b4a5c8bb58fa66f3057ae12574e6190222d0cfd1fbbfa819e56b5830d2212c079606fd2da19194360e826bbf4
+  metadata.gz: 890ff68ab047bfc5f827551766c9b88af6ce2f3bb003a8ea440fab619a1fd60ea47bb17d36553177b1109f5461110f2cb479b84d107d50beee373a98208f938e
+  data.tar.gz: 7a762a60a45a02b354c9ef0acb68032e1b529795acfec1187692e34562d9a06147465cb1ad02f79417514a07b9951242be080e15ef247d9e587858e303ab9448

data/.hound.yml

@@ -0,0 +1,6 @@
+LineLength:
+  Description: 'Limit lines to 130 characters.'
+  Max: 130
+
+RedundantBegin
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 2.1.1
+
+gemfile:
+  - Gemfile

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aws-rikanjo.gemspec
 gemspec
-
-gem 'net/http'
-gem 'uri'
-gem 'yajl'
-gem 'date'
-gem 'rspec'

data/README.md

@@ -1,5 +1,4 @@
-# Aws::Rikanjo
-
+# Aws::Rikanjo [![Build Status](https://travis-ci.org/kenjiskywalker/aws-rikanjo.svg?branch=master)](https://travis-ci.org/kenjiskywalker/aws-rikanjo)
 RI Cost Calc Tool( Only new price ).
 
 ## Installation
@@ -23,20 +22,22 @@ example
 ```
 require "aws/rikanjo"
 
-a = Aws::RiKanjoo.new(region = "ap-northeast-1", instance_type = "m3.large", ri_util = "medium")
+a = Aws::RiKanjoo::Base.new('ec2', 'ap-northeast-1', 'm3.xlarge', 'medium')
 a.total_cost_year
-# "region" : ap-northeast-1
-# "instance_type" : m3.large
-# "ri_util" : medium
-# "discont percent (percent)" : 35.09
-# "ondemand hour price (doller)" : 0.203
-# "reserved hour price (doller)" : 0.086
-# "ondemand year price (doller)" : 1778.28
-# "reserved year price (doller)" : 1154.36
-# "reserved upfront (doller)" : 401
-# "sweet spot day (day)" : 142
-# "sweet spot date (date)" : 2014-09-19
-# "sweet spot price (doller)" : 696.15
+{
+  "sweet spot price (doller)": "269.08",
+  "sweet spot date (date)": "2015-02-17",
+  "sweet spot day (day)": "254",
+  "reserved upfront (doller)": "61",
+  "region": "us-east-1",
+  "instance_type": "m1.small",
+  "ri_util": "light",
+  "discont percent (percent)": "6.9",
+  "ondemand hour price (doller)": "0.044",
+  "reserved hour price (doller)": "0.034",
+  "ondemand year price (doller)": "385.44",
+  "reserved year price (doller)": "358.84"
+}
 ```
 
 ## CLI Usage
@@ -51,6 +52,7 @@ 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)
+    -j, --output_json                specify output_json flg
     -h, --help
 ```
 
@@ -71,6 +73,7 @@ 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)
+    -j, --output_json                specify output_json flg
     -h, --help
 ```
 

data/aws-rikanjo.gemspec

@@ -4,22 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aws/rikanjo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "aws-rikanjo"
-  spec.version       = "0.0.8"
-  spec.authors       = ["kenjiskywalker"]
-  spec.email         = ["git@kenjiskywalker.org"]
+  spec.name          = 'aws-rikanjo'
+  spec.version       = '0.0.9'
+  spec.authors       = ['kenjiskywalker']
+  spec.email         = ['git@kenjiskywalker.org']
   spec.description   = %q{AWS RI Cost Calc Tool}
   spec.summary       = %q{calc 1 year cost. check sweet spot}
-  spec.homepage      = "https://github.com/kenjiskywalker/aws-rikanjo"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/kenjiskywalker/aws-rikanjo'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_dependency 'rake'
+  spec.add_dependency 'yajl-ruby'
 
   spec.bindir = 'bin'
   spec.executables << 'rikanjo'

data/bin/rikanjo

@@ -1,78 +1,6 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-$:.unshift(File.join(File.dirname(File.dirname(__FILE__)), 'lib'))
+require 'aws/rikanjo/cli'
 
-require 'rubygems'
-require 'optparse'
-
-options = { }
-
-optparse = OptionParser.new do |opts|
-
-  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|
-    options[:region] = value
-  end
-
-  opts.on("-t", "--instance_type=VALUE", "specify ec2-instance-type") do |value|
-    options[:instance_type] = value
-  end
-
-  ri_util_values = %w[light medium heavy]
-  opts.on("-u", "--ri_util=VALUE", ri_util_values, "specify ri-util (#{ri_util_values.join('/')})") do |value|
-    options[:ri_util] = value
-  end
-
-  opts.on("-h", "--help") do
-    puts opts
-    exit
-  end
-
-end
-
-
-
-# validation
-begin
-  optparse.parse!
-  require_args = [:region, :instance_type, :ri_util]
-  error_args = require_args.select{ |param| options[param].nil? }
-  if not error_args.empty?
-    puts "require arguments: #{error_args.join(', ')}"
-    puts
-    puts optparse
-    exit
-  end
-rescue
-  puts $!.to_s
-  puts
-  puts optparse
-  exit
-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
+Aws::RiKanjoo::CLI.new.start

data/lib/aws/rikanjo.rb

@@ -1,133 +1,13 @@
 #!/usr/bin/env ruby
 
-require 'net/http'
-require 'uri'
-require 'yajl'
-require 'date'
-require_relative 'rikanjo/mode/ec2'
-require_relative 'rikanjo/mode/rds'
+require 'aws/rikanjo/base'
+require 'aws/rikanjo/ec2'
+require 'aws/rikanjo/rds'
+require 'aws/rikanjo/calc'
 
 module Aws
-  class RiKanjoo
-    attr_reader :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
-    end
-
-    def om_get_hr_price
-       # TODO: merge om and ri
-      uri = URI.parse("#{@mode_class.price_url}/#{@mode_class.om_price_file}")
-      contents = Net::HTTP.get(uri)
-
-      # parse om info
-      @om_info = @mode_class.om_price_from_contents(contents)
-    end
-
-    def ri_get_hr_price_and_upfront
-      uri = URI.parse("#{@mode_class.price_url}/#{@mode_class.ri_price_file}")
-      contents = Net::HTTP.get(uri)
-
-      # parse ri info
-      @ri_info = @mode_class.ri_price_from_contents(contents)
+  module RiKanjoo
+    class Base
     end
-
-    def calc_year_cost
-
-      om_hr_price = @om_info[:hr_price].to_f
-      ri_hr_price = @ri_info[@ri_util][:hr_price].to_f
-      upfront    = @ri_info[@ri_util][:upfront].to_f
-
-      om_day_paid = (om_hr_price * 24).to_f
-      ri_day_paid = (ri_hr_price * 24).to_f
-
-      sum_om_price = om_day_paid
-      sum_ri_price = ri_day_paid + upfront
-      365.times.each do |d|
-        d = d + 1
-        sum_om_price = sum_om_price + om_day_paid
-        sum_ri_price = sum_ri_price + ri_day_paid
-
-        if sum_ri_price < sum_om_price
-          @ri_info[@ri_util].store(:sweet_spot_price, sum_ri_price.round(2))
-          @ri_info[@ri_util].store(:sweet_spot_start_day, d)
-          break 
-        end
-      end
-      total_om_price = (om_day_paid * 365).round(2)
-      @om_info.store(:yr_price, total_om_price)
-      total_ri_price = ((ri_day_paid * 365) + upfront).round(2)
-      @ri_info[@ri_util].store(:yr_price, total_ri_price)
-
-      # 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
-
-    def total_cost_year
-       om_get_hr_price
-       ri_get_hr_price_and_upfront
-       calc_year_cost 
-
-       discount_per = (100 - ((@ri_info[@ri_util][:yr_price] / @om_info[:yr_price]) * 100)).round(2)
-
-       # If the Reserved Instance does not become cheaper than the On-demand Instance.
-       if @ri_info[@ri_util][:sweet_spot_start_day].nil?
-         puts "\"Price of the Reserved Instance is higher than the price of On-Demand Instances.\""
-         puts "\"region\" : #{@region}"
-         puts "\"instance_type\" : #{@instance_type}"
-         puts "\"ri_util\" : #{@ri_util}"
-         puts "\"discont percent (percent)\" : #{discount_per}"
-         puts "\"ondemand hour price (doller)\" : #{@om_info[:hr_price]}"
-         puts "\"reserved hour price (doller)\" : #{@ri_info[@ri_util][:hr_price]}"
-         puts "\"ondemand year price (doller)\" : #{@om_info[:yr_price]}"
-         puts "\"reserved year price (doller)\" : #{@ri_info[@ri_util][:yr_price]}"
-         puts "\"reserved upfront (doller)\" : #{@ri_info[@ri_util][:upfront]}"
-
-         exit 1
-       end
-
-       sweet_spot_date = Date.today + @ri_info[@ri_util][:sweet_spot_start_day]
-
-       puts "\"region\" : #{@region}"
-       puts "\"instance_type\" : #{@instance_type}"
-       puts "\"ri_util\" : #{@ri_util}"
-       puts "\"discont percent (percent)\" : #{discount_per}"
-       puts "\"ondemand hour price (doller)\" : #{@om_info[:hr_price]}"
-       puts "\"reserved hour price (doller)\" : #{@ri_info[@ri_util][:hr_price]}"
-       puts "\"ondemand year price (doller)\" : #{@om_info[:yr_price]}"
-       puts "\"reserved year price (doller)\" : #{@ri_info[@ri_util][:yr_price]}"
-       puts "\"reserved upfront (doller)\" : #{@ri_info[@ri_util][:upfront]}"
-       puts "\"sweet spot day (day)\" : #{@ri_info[@ri_util][:sweet_spot_start_day]}"
-       puts "\"sweet spot date (date)\" : #{sweet_spot_date}"
-       puts "\"sweet spot price (doller)\" : #{@ri_info[@ri_util][:sweet_spot_price]}"
-    end
-
   end
 end
-
-# 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" : m3.large
-#  "ri_util" : medium
-#  "discont percent (percent)" : 35.09
-#  "ondemand hour price (doller)" : 0.203
-#  "reserved hour price (doller)" : 0.086
-#  "ondemand year price (doller)" : 1778.28
-#  "reserved year price (doller)" : 1154.36
-#  "reserved upfront (doller)" : 401
-#  "sweet spot day (day)" : 142
-#  "sweet spot date (date)" : 2014-09-19
-#  "sweet spot price (doller)" : 696.15

data/lib/aws/rikanjo/base.rb

@@ -0,0 +1,40 @@
+require 'aws/rikanjo/ec2'
+require 'aws/rikanjo/rds'
+require 'aws/rikanjo/calc'
+
+module Aws
+  module RiKanjoo
+    class Base < Calc
+      attr_reader :region, :instance_type, :ri_util, :multiaz
+
+      def initialize(mode = 'ec2', region, instance_type, ri_util, multiaz)
+        if mode == 'ec2'
+          @mode = Aws::RiKanjoo::Ec2.new(region, instance_type, ri_util)
+        elsif mode == 'rds'
+          @mode = Aws::RiKanjoo::Rds.new(region, instance_type, ri_util, multiaz)
+        end
+        @region        = region
+        @instance_type = instance_type
+        @ri_util       = ri_util
+        @om_info       = {}
+        @ri_info       = {}
+      end
+    end
+  end
+end
+
+# 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" : m3.large
+#  "ri_util" : medium
+#  "discont percent (percent)" : 35.09
+#  "ondemand hour price (doller)" : 0.203
+#  "reserved hour price (doller)" : 0.086
+#  "ondemand year price (doller)" : 1778.28
+#  "reserved year price (doller)" : 1154.36
+#  "reserved upfront (doller)" : 401
+#  "sweet spot day (day)" : 142
+#  "sweet spot date (date)" : 2014-09-19
+#  "sweet spot price (doller)" : 696.15

data/lib/aws/rikanjo/calc.rb

@@ -0,0 +1,103 @@
+require 'net/http'
+require 'uri'
+require 'yajl'
+require 'date'
+require 'json'
+
+module Aws
+  module RiKanjoo
+    class Calc
+      def om_get_hr_price
+         # TODO: merge om and ri
+        uri = URI.parse("#{@mode.price_url}/#{@mode.om_price_file}")
+        contents = Net::HTTP.get(uri)
+
+        # parse om info
+        @om_info = @mode.om_price_from_contents(contents)
+      end
+
+      def ri_get_hr_price_and_upfront
+        uri = URI.parse("#{@mode.price_url}/#{@mode.ri_price_file}")
+        contents = Net::HTTP.get(uri)
+
+        # parse ri info
+        @ri_info = @mode.ri_price_from_contents(contents)
+      end
+
+      def calc_year_cost
+        om_hr_price = @om_info[:hr_price].to_f
+        ri_hr_price = @ri_info[@ri_util][:hr_price].to_f
+        upfront    = @ri_info[@ri_util][:upfront].to_f
+
+        om_day_paid = (om_hr_price * 24).to_f
+        ri_day_paid = (ri_hr_price * 24).to_f
+
+        sum_om_price = om_day_paid
+        sum_ri_price = ri_day_paid + upfront
+        365.times.each do |d|
+          d += 1
+          sum_om_price += om_day_paid
+          sum_ri_price += ri_day_paid
+
+          if sum_ri_price < sum_om_price
+            @ri_info[@ri_util].store(:sweet_spot_price, sum_ri_price.round(2))
+            @ri_info[@ri_util].store(:sweet_spot_start_day, d)
+            break
+          end
+        end
+        total_om_price = (om_day_paid * 365).round(2)
+        @om_info.store(:yr_price, total_om_price)
+        total_ri_price = ((ri_day_paid * 365) + upfront).round(2)
+        @ri_info[@ri_util].store(:yr_price, total_ri_price)
+
+        # 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
+
+      def total_cost_year
+        om_get_hr_price
+        ri_get_hr_price_and_upfront
+        calc_year_cost
+
+        discount_per = (100 - ((@ri_info[@ri_util][:yr_price] / @om_info[:yr_price]) * 100)).round(2)
+
+        # If the Reserved Instance does not become cheaper than the On-demand Instance.
+        if @ri_info[@ri_util][:sweet_spot_start_day].nil?
+          message = {
+            "Price of the Reserved Instance is higher than the price of On-Demand Instances." => nil,
+            "region"                       => "#{@region}",
+            "instance_type"                => "#{@instance_type}",
+            "ri_util"                      => "#{@ri_util}",
+            "discont percent (percent)"    => "#{discount_per}",
+            "ondemand hour price (doller)" => "#{@om_info[:hr_price]}",
+            "reserved hour price (doller)" => "#{@ri_info[@ri_util][:hr_price]}",
+            "ondemand year price (doller)" => "#{@om_info[:yr_price]}",
+            "reserved year price (doller)" => "#{@ri_info[@ri_util][:yr_price]}",
+            "reserved upfront (doller)"    => "#{@ri_info[@ri_util][:upfront]}",
+          }
+          puts message.to_json
+          exit 1
+        end
+
+        sweet_spot_date = Date.today + @ri_info[@ri_util][:sweet_spot_start_day]
+        message = {
+          "region"                       => "#{@region}",
+          "instance_type"                => "#{@instance_type}",
+          "ri_util"                      => "#{@ri_util}",
+          "discont percent (percent)"    => "#{discount_per}",
+          "ondemand hour price (doller)" => "#{@om_info[:hr_price]}",
+          "reserved hour price (doller)" => "#{@ri_info[@ri_util][:hr_price]}",
+          "ondemand year price (doller)" => "#{@om_info[:yr_price]}",
+          "reserved year price (doller)" => "#{@ri_info[@ri_util][:yr_price]}",
+          "reserved upfront (doller)"    => "#{@ri_info[@ri_util][:upfront]}",
+          "sweet spot day (day)"         => "#{@ri_info[@ri_util][:sweet_spot_start_day]}",
+          "sweet spot date (date)"       => "#{sweet_spot_date}",
+          "sweet spot price (doller)"    => "#{@ri_info[@ri_util][:sweet_spot_price]}",
+        }
+        return message
+      end
+    end
+  end
+end