beaker-hostgenerator 1.2.6 → 1.3.0

data/lib/beaker-hostgenerator/hypervisor/abs.rb

@@ -20,7 +20,16 @@ module BeakerHostGenerator
         # any given platform will have *either* :vmpooler data or :abs data
         # so we're not worried about one overriding the other when we merge
         # the hashes together.
-        return base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
+        base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
+
+        case node_info['ostype']
+        when /^centos/
+          base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
+        when /^fedora/
+          base_config['template'] = base_config['platform']
+        end
+
+        base_config
       end
     end
   end

data/lib/beaker-hostgenerator/hypervisor/docker.rb

@@ -10,6 +10,7 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config['docker_cmd'] = ['/sbin/init']
         base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
+        base_config['image'].sub!(/(\w+)/, '\1/leap') if node_info['ostype'] =~ /^opensuse/
         base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
 
         return base_generate_node(node_info, base_config, bhg_version, :docker)

data/lib/beaker-hostgenerator/hypervisor/vagrant.rb

@@ -11,7 +11,7 @@ module BeakerHostGenerator
         if node_info['ostype'] =~ /^centos/
           base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
         elsif node_info['ostype'] =~ /^fedora/
-          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + 'cloud-base'
+          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
         else
           base_config['box'] = "generic/#{node_info['ostype']}"
         end

data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb

@@ -17,6 +17,13 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
 
+        case node_info['ostype']
+        when /^centos/
+          base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
+        when /^fedora/
+          base_config['template'] = base_config['platform']
+        end
+
         # Some vmpooler/vsphere platforms have special requirements.
         # We munge the node host config here if that is necessary.
         fixup_node base_config

data/lib/beaker-hostgenerator/parser.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/exceptions'
-require 'uri'
+require 'cgi'
 
 module BeakerHostGenerator
   # Functions for parsing the raw user input host layout string and turning
@@ -75,7 +75,7 @@ module BeakerHostGenerator
     # @returns [String] Input string with transformations necessary for
     #                   tokenization.
     def prepare(spec)
-      URI.decode(spec)
+      CGI.unescape(spec)
     end
 
     # Breaks apart the host input string into chunks suitable for processing
@@ -260,7 +260,7 @@ module BeakerHostGenerator
           current_depth = current_depth.pred
           next
         end
-        
+
         # When there is assignment happening, we need to create a new
         # corresponding data structure, add it to the object depth, and
         # then change the current depth

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.2.6'
+    STRING = '1.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -58,36 +58,36 @@ dependencies:
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
@@ -233,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Beaker Host Generator Utility