amazon-pricing 0.1.134 → 0.1.135

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmE5MzcwYmI2YjhjZmRlN2JiMWQ3NGZhNGQ2NzhjZTU5M2M0N2NlZA==
-  data.tar.gz: !binary |-
-    NDhjODczMGIyN2E1ZGViZWE3YjZiYTc0ODRkOTUyNDJlMmY0M2Q1Yg==
+SHA256:
+  metadata.gz: 10b7c63f50fa80a65001aa63c92463a23ee353ea9ef818720e90ee197a9aa6c0
+  data.tar.gz: c2b8582a55deb863cd43633fed151c49b81ff2df7c49af84821cedf0789dbd65
 SHA512:
-  metadata.gz: !binary |-
-    YWQyZjY3MTU4M2JmYmVmNTA2NGY2YmUwZTFjODQ1ZDViMmFiZWMxOGZhOGQ1
-    ODY3YTg5Y2MxZWRjM2Q2ZTA2Y2Y2MjJhNzNjOTU1OWZjMTFiMzFlMGZmM2U2
-    ZjJhNmQzOGM5MzY0OWY4ZDQyNjQ4MDRmYzZhNzQzYmEyMDM2NDU=
-  data.tar.gz: !binary |-
-    MmU2MDM3YzE0MmZlNTczMzRlMjVkMjg0MGJiNzMzNDY2OTdlN2RiM2I2MjY3
-    MzdjM2MwYmZkYzEzNThmNzQ5ODI3NDFjNmI0OTIyZDcwNzBlZmNlYzA1ZGUw
-    M2Y0YzM2M2EwNjdhYThlMWNhMmFmNzc5NjEwNDdkYTZlOGUzM2E=
+  metadata.gz: 89c637ec8690664d6e31f587608366e4bbe4886530e0c2e54e835f9f82ab319c665aef5c57767dcb76b43bb304c65c1542633e39895d5c02cb313c3e1948c03c
+  data.tar.gz: aeeb9414b090745a2dbb567cf1efe11c3e4a060b2d89499d45f1743933da1423edae3fb8969f0623dac68180dfca17eb02804eb75dc80f42c4d56e8484cf6920

data/lib/amazon-pricing/helpers/instance-type.rb

@@ -11,14 +11,14 @@ module AwsPricing
         'GeneralPurpose' => {
             'CurrentGen' => {
                 'A1' => ['a1.medium', 'a1.large', 'a1.xlarge', 'a1.2xlarge', 'a1.4xlarge'],
-                'M3' => ['m3.medium', 'm3.large', 'm3.xlarge', 'm3.2xlarge'],
                 'M4' => ['m4.large', 'm4.xlarge', 'm4.2xlarge', 'm4.4xlarge', 'm4.10xlarge', 'm4.16xlarge'],
                 'M5' => ['m5.large', 'm5.xlarge', 'm5.2xlarge', 'm5.4xlarge', 'm5.12xlarge', 'm5.24xlarge', 'm5.metal'],
                 'M5D' => ['m5d.large', 'm5d.xlarge', 'm5d.2xlarge', 'm5d.4xlarge', 'm5d.12xlarge', 'm5d.24xlarge', 'm5d.metal'],
                 'M5A' => ['m5a.large', 'm5a.xlarge', 'm5a.2xlarge', 'm5a.4xlarge', 'm5a.12xlarge', 'm5a.24xlarge'],
             },
             'PreviousGen' => {
-                'M1' => ['m1.small', 'm1.medium', 'm1.large', 'm1.xlarge']
+                'M1' => ['m1.small', 'm1.medium', 'm1.large', 'm1.xlarge'],
+                'M3' => ['m3.medium', 'm3.large', 'm3.xlarge', 'm3.2xlarge'],
             }
         },
         'BurstableInstances' => {
@@ -95,39 +95,39 @@ module AwsPricing
 
       # Important: Members of a family must be kept in 'size' order (small, medium, large, etc.)
       # AWS Docs: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
-      def instance_types
+      def self.instance_types
         @@INSTANCE_TYPES_BY_CLASSIFICATION
       end
 
-      def general_purpose_instances
+      def self.general_purpose_instances
         instance_types['GeneralPurpose']
       end
 
-      def burstable_instances
+      def self.burstable_instances
         instance_types['BurstableInstances']
       end
 
-      def compute_optimized_instances
+      def self.compute_optimized_instances
         instance_types['ComputeOptimized']
       end
 
-      def memory_optimized_instances
+      def self.memory_optimized_instances
         instance_types['MemoryOptimized']
       end
 
-      def storage_optimized_instances
+      def self.storage_optimized_instances
         instance_types['StorageOptimized']
       end
 
-      def gpu_instances
+      def self.gpu_instances
         instance_types['GPUInstances']
       end
 
-      def micro_instances
+      def self.micro_instances
         instance_types['MicroInstances']
       end
 
-      def previous_generation_instances
+      def self.previous_generation_instances
         [
           general_purpose_instances['PreviousGen'],
           compute_optimized_instances['PreviousGen'],
@@ -142,7 +142,7 @@ module AwsPricing
         end
       end
 
-      def current_generation_instances
+      def self.current_generation_instances
         [
           general_purpose_instances['CurrentGen'],
           burstable_instances['CurrentGen'],
@@ -157,7 +157,7 @@ module AwsPricing
         end
       end
 
-      def all_instances
+      def self.all_instances
         @all_instances ||= begin
           [previous_generation_instances, current_generation_instances].inject({}) do |instances, family|
             instances.merge(family)
@@ -165,15 +165,15 @@ module AwsPricing
         end
       end
 
-      def family(api_name)
+      def self.family(api_name)
         all_instances.select { |family, instances| instances.include?(api_name) }.keys.first
       end
 
-      def family_members(api_name)
+      def self.family_members(api_name)
         all_instances.select { |family, instances| instances.include?(api_name) }.values.first
       end
 
-      def api_name_to_nf(name)
+      def self.api_name_to_nf(name)
         type = name.split('.').last
         if (type == METAL)
           # See if our metal instance has a hard-coded nf value
@@ -190,7 +190,7 @@ module AwsPricing
           type = sizes[-1].split('.').last        # 'metal' defaults to largest size
           if sizes[-1].split('.').last == METAL
             if sizes.size == 1 # We have an instance family with only metals but no NF associated; raise an error
-              raise UnknownTypeError, "Unknown metal type #{name}", caller
+              return nil
             end
             type = sizes[-2].split('.').last      # 'metal' already largest, so 2nd largest
           end
@@ -218,20 +218,14 @@ module AwsPricing
         ["#{fam}.#{new_type}" , nf]
       end
 
-      def size_to_nf
+      def self.size_to_nf
         SIZE_TO_NF_TABLE
       end
 
-      def nf_to_size
-        NF_TO_SIZE_TABLE
-      end
-
-      def metal_to_nf
+      def self.metal_to_nf
         METAL_TO_NF_TABLE
       end
 
-
-      # Remove metal from this array? force adoption of this
       # NB: 'metal' is not in this table (since it's family specific), see #api_name_to_nf
       SIZE_TO_NF_TABLE = {
           "nano"    => 0.25,

data/lib/amazon-pricing/version.rb

@@ -9,5 +9,6 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.134' # [major,minor.fix]: Support for db.r5 and db.t3 rds instances
+VERSION = '0.1.135' # [major,minor.fix]: Moving instance-type methods to be class methods rather than instance methods
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.134
+  version: 0.1.135
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -73,26 +73,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - amazon-pricing documentation
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 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: amazon-pricing
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem