cloud-instancetype 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e816cc2954520421bf0199595ab06035f262da484fcd046950269cb2b61fc1d
-  data.tar.gz: c01ee4b3979df11673abb3ecc10d8e17e25ed0e79b028c06e6676439610c86aa
+  metadata.gz: 7506186fd6d63d251338d7ccdcd4ee633e9bfe7620c255863401ceba2a658a88
+  data.tar.gz: ba811582102e81d8abc9c45377b71c2c24c5a863591732b26d2502d42c02faaa
 SHA512:
-  metadata.gz: 5f960ac3b96dcf14606bf4784c09151003d9bff80d968cdd5aa9254ac9a9ab009fc735cb535eba3c7088967b941304ce441018c032152584e19067300c5e0bb4
-  data.tar.gz: 1eb60f2260787b5ab9d19859ac4b21dab107c0cf2663bcf6ca964f56f2576a95f9957f774944b39515ac13e982d9bf5d81d839b4c90f4d8ca789b41dfb0070ac
+  metadata.gz: b3fbe546954fdcf4262a44ab37815d9196533035ffb5f41955bb5850665e3c9ac1a12d04dedceb64bea570c4b6384711c7ceb6ed035309bb11c4d79209b28e47
+  data.tar.gz: c584c68de188945974004fee4198ffcb149275e70619f8ba84220d8c9cb7d8c7342ba217876ba892ca6da7aa6140c5f569120a6523b36ec9fd65ae3b1d5bff6b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloud-instancetype (0.0.3)
+    cloud-instancetype (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -35,7 +35,7 @@ Config files are JSON, and contain structured information about both the instanc
 
 ### Rails
 
-Place your instance type data in `config/data/#{cloud}-types.json`.
+Place your default instance type data in `config/data/#{cloud}-types.json`, or override with `vendor/data/#{cloud}-types.json`.
 
 Load your instance types by the framework key:
 

data/lib/cloud/instancetype.rb

@@ -29,7 +29,9 @@ module Cloud
 
     class << self
       def for(cloud)
-        load(rails_data_path(cloud))
+        load(rails_vendor_path(cloud))
+      rescue
+        load(rails_config_path(cloud))
       end
 
       def load(data_path)
@@ -42,10 +44,14 @@ module Cloud
 
       private
 
-      def rails_data_path(cloud)
+      def rails_config_path(cloud)
         Rails.root.join("config", "data", "#{cloud}-types.json")
       end
 
+      def rails_vendor_path(cloud)
+        Rails.root.join("vendor", "data", "#{cloud}-types.json")
+      end
+
       def get_raw_collection(data_path)
         JSON.parse(File.read(data_path))
       end

data/lib/cloud/instancetype/version.rb

@@ -1,5 +1,5 @@
 module Cloud
   class InstanceType
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/rubygem-cloud-instancetype.spec

@@ -1,6 +1,5 @@
 #
 # spec file for package rubygem-cloud-instancetype
-# this code base is under development
 #
 # Copyright (c) 2020 SUSE LLC
 #
@@ -13,9 +12,10 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugzilla.suse.com/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:           rubygem-cloud-instancetype
 Version:        1.0.0
 Release:        0
@@ -25,10 +25,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  %{rubygem gem2rpm}
 BuildRequires:  %{ruby}
 BuildRequires:  ruby-macros >= 5
-Url:            https://github.com/suse-enceladus/rubygem-cloud-instancetype
-Source:         http://rubygems.org/gems/%{mod_full_name}.gem
+URL:            https://github.com/suse-enceladus/rubygem-cloud-instancetype
+Source:         https://rubygems.org/gems/%{mod_full_name}.gem
 Summary:        Describe public cloud instance types
-License:        GPL-3.0
+License:        GPL-3.0-only
+Group:          Development/Languages/Ruby
 
 %description
 Describe public cloud instance types.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud-instancetype
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - James Mason
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler