amazon-pricing 0.1.135 → 0.1.136

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA256:
-  metadata.gz: 10b7c63f50fa80a65001aa63c92463a23ee353ea9ef818720e90ee197a9aa6c0
-  data.tar.gz: c2b8582a55deb863cd43633fed151c49b81ff2df7c49af84821cedf0789dbd65
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmQ4MjBkNTg3OWExYWFmZDNhYTQ4MzgxNmQ4NDJhMWUwNmNkZTA3Yg==
+  data.tar.gz: !binary |-
+    ZmUzZjE3Yzg1MDNiOGFiNTU0YmNmYTY2ZmU1MWIyODA2YzQ1YTlhOQ==
 SHA512:
-  metadata.gz: 89c637ec8690664d6e31f587608366e4bbe4886530e0c2e54e835f9f82ab319c665aef5c57767dcb76b43bb304c65c1542633e39895d5c02cb313c3e1948c03c
-  data.tar.gz: aeeb9414b090745a2dbb567cf1efe11c3e4a060b2d89499d45f1743933da1423edae3fb8969f0623dac68180dfca17eb02804eb75dc80f42c4d56e8484cf6920
+  metadata.gz: !binary |-
+    YzAxOTk3MTIxZmIyYWMxZTIzOTQwMGUzOGFmYmI4NWRhNTg2Zjk0YjI3NWQw
+    NTUwMTFkNTcxYzk1MGExNDBiMzExMTJjZDUyNzU3MmZkODdlZTRlODM0NmM5
+    ZGRhYmY1YTk0Y2RmNGVhMTU5YmZhMmE3YjRiNDViMjc3ZDI2Yjc=
+  data.tar.gz: !binary |-
+    MzZjOWI5ZDY2ZTEyOTVlYjZjN2Q4YTcyYmE0ODlkNjQxOTdmODRjZjkyMDU5
+    YTU1OGRlZGYyMWVjNWQ4OGMxOGRmNGVhNjhlYmJmZGU5ZWMzNjU1MzE5OTdh
+    ZTE5ZWVmNTI2ZjllOWE1ZjFiNzhjMDI4Y2I0ZTE5ZDIzNTAzZTE=

data/Jenkinsfile

@@ -2,14 +2,12 @@
 @Library('cht-jenkins-pipeline') _
 
 properties([
-    [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
-    compressBuildLog()
+    [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']]
 ]);
 
 if (env.BRANCH_NAME == 'master') {
    properties([pipelineTriggers([cron('H H(8-10) * * 4')]),
-       [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
-       compressBuildLog()
+       [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']]
    ]);
 }
 

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

@@ -195,7 +195,8 @@ module AwsPricing
             type = sizes[-2].split('.').last      # 'metal' already largest, so 2nd largest
           end
         end
-        size_to_nf[type]
+        full_type = type.gsub(/xl$/, 'xlarge')
+        size_to_nf[full_type]
       end
 
       # note: the next smaller type may _not_ be supported for a given family

data/lib/amazon-pricing/version.rb

@@ -9,6 +9,6 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.135' # [major,minor.fix]: Moving instance-type methods to be class methods rather than instance methods
+VERSION = '0.1.136' # [major,minor.fix]: Adding support for xl instance sizes to InstanceType module
 
 end

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

@@ -3,9 +3,6 @@ require 'amazon-pricing/helpers/instance-type'
 require 'amazon-pricing/definitions/ec2-instance-type'
 
 describe 'AwsPricing::Helper::InstanceType' do
-  let(:dummy_class) { Class.new { include AwsPricing::Helper::InstanceType } }
-  let(:helper) {dummy_class.new }
-
   context 'family_members' do
 
     # get a list of supported instance types, and filter out anything with more than 2 parts to its name (to get
@@ -15,8 +12,19 @@ describe 'AwsPricing::Helper::InstanceType' do
     # test that we can get the family member for each type
     types.each do |type|
       it "should be able to get family members for #{type}" do
-        helper.family_members(type).should_not eq(nil)
+        AwsPricing::Helper::InstanceType.family_members(type).should_not eq(nil)
       end
     end
   end
-end
+
+  it 'should lookup *xl instance as *xlarge' do
+    expect(AwsPricing::Helper::InstanceType.api_name_to_nf('xl')).to(
+        eq(AwsPricing::Helper::InstanceType.api_name_to_nf('xlarge')))
+    expect(AwsPricing::Helper::InstanceType.api_name_to_nf('xl')).to_not eq nil
+    [2, 3, 4, 6, 8, 9, 10, 12, 16, 18, 24, 32].each do |size|
+      nf = AwsPricing::Helper::InstanceType.api_name_to_nf("#{size}xl")
+      expect(nf).to_not eq nil
+      expect(nf).to eq(AwsPricing::Helper::InstanceType.api_name_to_nf("#{size}xlarge"))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.135
+  version: 0.1.136
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-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,25 +73,26 @@ 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: []
-rubygems_version: 3.0.2
+rubyforge_project: amazon-pricing
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem