aws-rikanjo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9d90bdadd842bad1a1bbfbbbf486bad44bbcf9
-  data.tar.gz: 1b07ccdb4fd125d4d8483509285ae95245cbf70d
+  metadata.gz: 5e39d0ba3b787883c331691932e51813b98055b2
+  data.tar.gz: 00d5af893daf458683e57d2574901079598e03da
 SHA512:
-  metadata.gz: c3dd0dc3f1144e3dd023ba7402762af14cca987bab740df1d7731322b78e683c05520b24135b6a3a1df600749619e689ade1e18f61d1666ff72396fb053b2a2f
-  data.tar.gz: 3c04911fcc11868799fc96d46d19b30b4e2c46b5797b4f4eae4e1a1ec9e52f94d185fc394539255a17e19f8000ae4d8577c19c69fe8a84ba3d9099a3dba7425c
+  metadata.gz: 3759203ce15dbb3f7d5e28747fba747e72ae7dc581588fa5115c2dcf302d9e5f6790ddc2e0ae0c8d2e4a137acbc590f717be95b0b19094bccf94294d6a8dd45c
+  data.tar.gz: aebb9320d9cbb0212ade33ac3dee3168246e21c69bb83e44f50d4d382ba27c57b46dcc0dde3571724b26350d5dcd0405ba8f14fb0edfa75c67d21da3a260308b

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile

@@ -7,3 +7,4 @@ gem 'net/http'
 gem 'uri'
 gem 'yajl'
 gem 'date'
+gem 'rspec'

data/README.md

@@ -39,6 +39,25 @@ a.total_cost_year
 # "sweet spot price (doller)" : 696.15
 ```
 
+## CLI Usage
+
+help text:
+
+```
+$ rikanjo --help
+Usage: rikanjo [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 -r ap-northeast-1 -t c3.large -u medium
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new("spec")
+task :default => :spec

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

data/lib/aws/rikanjo.rb

@@ -15,6 +15,8 @@ module Aws
       @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
@@ -40,7 +42,7 @@ module Aws
       end
 
        # TODO: merge om and ri
-      uri = URI.parse('http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js')
+      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
@@ -97,13 +99,13 @@ module Aws
       json              = nil
       reservedjson_data = nil
 
-      uri = URI.parse("http://a0.awsstatic.com/pricing/1/ec2/linux-ri-#{ri_util}.min.js")
+      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({vers:0.01,",'{').gsub("\);", '').gsub(/([a-zA-Z]+):/, '"\1":')
+      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|
@@ -181,6 +183,23 @@ module Aws
        puts "\"sweet spot date (date)\" : #{sweet_spot_date}"
        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/lib/aws/rikanjo/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Rikanjo
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/rikanjo_spec.rb

@@ -0,0 +1,64 @@
+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

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rspec'
+
+Dir["./support/**/*.rb"].each do |f|
+      require f
+end
+
+RSpec.configure do |config|
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aws-rikanjo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kenjiskywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-05 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,7 +46,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -55,6 +56,8 @@ files:
 - bin/rikanjo
 - lib/aws/rikanjo.rb
 - lib/aws/rikanjo/version.rb
+- spec/lib/rikanjo_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/kenjiskywalker/aws-rikanjo
 licenses:
 - MIT
@@ -65,18 +68,20 @@ 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: []
+test_files:
+- spec/lib/rikanjo_spec.rb
+- spec/spec_helper.rb