coreos_ami 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec6d3a6499c010e0a0b9246b331460dfbfe9e38
-  data.tar.gz: 14a86d76afa0d9464aad85bc60ceada01f020e4e
+  metadata.gz: 82df62208b77b08ce79faa18c9abcb5162edcd4b
+  data.tar.gz: 002c0482b7673ba7fb2f51b6e0035b56a8b32eff
 SHA512:
-  metadata.gz: 6ab5d01f5e3e5ba0fadd62212d7f4b8fc53b8643dec12ec55ac9ce0db9a2f8a49f6206085542742e7519dfd65e871b1087413fd5dd3db3c0cc30e6b2f1e39e0f
-  data.tar.gz: 8608ce71d8797e11364d980b8d05cc724f49a539f46759ecdc14dc6b9085b43e522a5321a52ec165c7806d9c37924959f2f675e5259d44d3edf6c01419603d3c
+  metadata.gz: cdf4c5c09611f185f3363aa9ba03e3b7f50bf3e1d93009d4c6d378c56d71324276e7e87d0ce685ceae21747f9fa4da2cc03a8430dc4333d8a414c48ce260649e
+  data.tar.gz: 1e035628ebddcc40cf33b9600e82706ca9a5f8afce25337d6784a5a1ce21898f0633bff136150249e20e4cddf30a7734dbbd34b75c620e1bd34cbefda9940023

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    coreos_ami (0.0.1)
+    coreos_ami (0.0.3)
       trollop
 
 GEM
   remote: https://rubygems.org/
   specs:
     rake (10.4.2)
-    trollop (2.1.1)
+    trollop (2.1.2)
 
 PLATFORMS
   ruby
@@ -17,3 +17,6 @@ DEPENDENCIES
   bundler (~> 1.7)
   coreos_ami!
   rake (~> 10.0)
+
+BUNDLED WITH
+   1.11.2

data/lib/coreos_ami.rb

@@ -4,9 +4,9 @@ require 'json'
 
 class CoreOS
   DEFAULTS = {
-    release: :current,
+    release:        :current,
     virtualization: :hvm,
-    region: ENV['AWS_DEFAULT_REGION'] || ENV['AWS_REGION'] || 'us-east-1'
+    region:         ENV['AWS_DEFAULT_REGION'] || ENV['AWS_REGION'] || 'us-east-1'
   }
 
   def initialize(channel = :stable)
@@ -31,16 +31,24 @@ class CoreOS
 
   ## return hash of all AMIs for release version
   def amis(opt = {})
-    args = DEFAULTS.merge(opt)
-    path = [ base_url, args[:release].to_s, 'coreos_production_ami_all.json' ].join('/')
+    args = defaults_merge(opt)
+    path = [base_url, args[:release].to_s, 'coreos_production_ami_all.json'].join('/')
     JSON.parse(get(path))
   end
 
   ## return AMI name as string
   def ami(opt = {})
-    args = DEFAULTS.merge(opt)
-    path = [ base_url, args[:release].to_s, "coreos_production_ami_#{args[:virtualization]}_#{args[:region]}.txt" ].join('/')
+    args = defaults_merge(opt)
+    path = [base_url, args[:release].to_s, "coreos_production_ami_#{args[:virtualization]}_#{args[:region]}.txt"].join('/')
     get(path)
   end
 
+  private
+
+  ## ignore any nils in passed opts
+  def defaults_merge(opt)
+    DEFAULTS.merge(opt) do |_, from_default, from_opt|
+      from_opt || from_default
+    end
+  end
 end

data/lib/coreos_ami/version.rb

@@ -1,3 +1,3 @@
 module CoreosAmi
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coreos_ami
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Discover CoreOS AMIs.