foreman_fog_proxmox 0.8.0 → 0.8.2

data/app/overrides/compute_resources_vms/form/remove_new_vm_from_removable_layout.rb

@@ -16,9 +16,10 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 Deface::Override.new(
-    :virtual_path => "compute_resources_vms/form/_removable_layout",
-    :name => "remove_new_vm_from_removable_layout",
-    :replace_contents => "div.remove-button",
-    :partial => "compute_resources_vms/form/proxmox/removable_layout",
-    :original => "8b7383e57fbe158fc12bf8bc1003431f2f2cb6f5"
-)
+  :virtual_path => 'compute_resources_vms/form/_removable_layout',
+  :name => 'remove_new_vm_from_removable_layout',
+  :replace_contents => 'div.remove-button',
+  :partial => 'compute_resources_vms/form/proxmox/removable_layout',
+  :original => '8b7383e57fbe158fc12bf8bc1003431f2f2cb6f5',
+  :namespaced => true
+)

data/app/services/foreman_fog_proxmox/node_dashboard/data.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 # Copyright 2018 Tristan Robert
@@ -18,20 +17,21 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-module ForemanFogProxmox::NodeDashboard
+module ForemanFogProxmox
+  module NodeDashboard
     class Data
-
-        def initialize(filter="")
-            @filter = filter
-        end
-
-        def node_id
-            @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
-            @compute_resource.node_id if @compute_resource
-        end
-
-        def statistics            
-            node.statistics('rrddata', { timeframe: 'hour', cf: 'AVERAGE' }) if node_id
-        end
+      def initialize(filter = '')
+        @filter = filter
+      end
+
+      def node_id
+        @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
+        @compute_resource&.node_id
+      end
+
+      def statistics
+        node.statistics('rrddata', timeframe: 'hour', cf: 'AVERAGE') if node_id
+      end
     end
-end
+  end
+end

data/app/views/api/v2/compute_resources/proxmox.json.rabl

@@ -1 +1,3 @@
-attributes :user, :url, :ssl_verify_peer, :disable_proxy
+# frozen_string_literal: true
+
+attributes :user, :url, :ssl_verify_peer, :disable_proxy

data/app/views/compute_resources/form/_proxmox.html.erb

@@ -19,6 +19,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% nodes = f.object.nodes rescue nil %>
 <% node_id = !!f.object.node_id ? f.object.node_id : '' %>
+<% token_expired = f.object.token_expired? %>
+<% token_deadline = f.object.token_deadline %>
+<%= checkbox_f f, :renew, :label => _("Renew expired token ?"), :checked_value => '1', :label_help => _("Token expires on #{token_deadline}") %>
 <%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json"), :help_inline_permanent => load_button_f(f, !!nodes, _("Test failed")) %>
 <%= text_f f, :user , :help_block => _("e.g. root@pam") %>
 <%= password_f f, :password, :keep_value => true, :unset => unset_password? %>

data/app/views/compute_resources/show/_proxmox.html.erb

@@ -23,3 +23,11 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("Version") %></td>
   <td><%= @compute_resource.version%></td>
 </tr>
+<tr>
+  <td><%= _("Token has expired?") %></td>
+  <td><%= @compute_resource.token_expired?%></td>
+</tr>
+<tr>
+  <td><%= _("Token expires on") %></td>
+  <td><%= @compute_resource.token_deadline%></td>
+</tr>

data/app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_compute_attributes_form.html.erb

@@ -14,5 +14,10 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
+<% if @set.compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => "compute_form",
     :locals => { :f => f2, :compute_resource => @set.compute_resource, :selected_cluster => @set.vm_attrs['cluster'], :from_profile => true } %>
+<% else %> 
+<%= render :partial => "compute_form",
+               :locals => { :f => f2, :compute_resource => @set.compute_resource, :selected_cluster => @set.vm_attrs['cluster'] } %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_compute_form.html.erb

@@ -14,5 +14,10 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-        :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true, :from_profile => from_profile }.merge(args_for_compute_resource_partial(@host)) %>
+        :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true, :from_profile => from_profile }.merge(args_for_compute_resource_partial(@host)) %>
+<% else %>
+<%= render :partial => provider_partial(compute_resource, 'base'),
+            :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true }.merge(args_for_compute_resource_partial(@host)) %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_hosts_compute_detail_form.html.erb

@@ -14,5 +14,11 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
+
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
             :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :from_profile => false }.merge(args_for_compute_resource_partial(@host)) %>
+<% else %>
+<%= render :partial => provider_partial(compute_resource, 'base'),
+            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm }.merge(args_for_compute_resource_partial(@host)) %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_form.html.erb

@@ -14,10 +14,14 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
-
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
 
 <%= render :partial => provider_partial(compute_resource, 'network'),
               :locals => { :f => i, :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
               :layout => 'compute_resources_vms/form/deletable_layout' %>
-
+<% else %>
+<%= render :partial => provider_partial(compute_resource, 'network'),
+              :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
+              :layout => 'compute_resources_vms/form/deletable_layout' %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_new_childs_form.html.erb

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
-
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
 
 <%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {
@@ -22,4 +22,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
         :partial => provider_partial(compute_resource, 'network'),
         :form_builder_attrs => { :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface') },
         :layout => 'compute_resources_vms/form/deletable_layout' }) %>
-
+<% else %>
+<%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {
+        :object => compute_resource.new_interface,
+        :partial => provider_partial(compute_resource, 'network'),
+        :form_builder_attrs => { :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface') },
+        :layout => 'compute_resources_vms/form/deletable_layout' }) %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_nic_provider_specific_form.html.erb

@@ -14,10 +14,16 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
+<% if @host.compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% compute_attributes = f.options[:parent_builder].object.compute_attributes %>
 <% vm_type = compute_attributes ? compute_attributes['type'] : f.object.type %>
 
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>
     <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :vm_type => vm_type, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>
 <% end %>
+<% else %>
+<%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>
+    <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>
+<% end %>
+<% end %>
 

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_volumes_edit.html.erb

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
-
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% type = f.object.type %>
 <% server = type == 'qemu' %>
 <% container = type == 'lxc' %>
@@ -52,5 +52,19 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
     <%= add_child_link_typed '+ ' + _("Add Volume"), :volumes, 'server', { :class => "info #{'hide' unless server}", :title => _('add new storage volume') } %>
     <%= add_child_link_typed '+ ' + _("Add Volume"), :volumes, 'container', { :class => "info #{'hide' unless container}", :title => _('add new storage volume') } %>
+<% else %>
+<%= new_child_fields_template(f, :volumes, {
+              :object  => volume,
+              :partial => provider_partial(compute_resource, 'volume'),
+              :form_builder_attrs => { :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
+              :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
+
+<%= f.fields_for :volumes do |i| %>
+    <%= render :partial => provider_partial(compute_resource, 'volume'), :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
+<% end %>
 
+<% if new_vm %>
+    <%= add_child_link '+ ' + _("Add Volume"), :volumes, { :class => "info", :title => _('add new storage volume') } %>
+<% end %>
+<% end %>
 

data/app/views/compute_resources_vms/form/proxmox/_base.html.erb

@@ -31,9 +31,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= render :partial => "compute_resources_vms/form/proxmox/container/advanced", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
 
 <!-- Config Options Settings-->
-<%= f.fields_for :config, compute_resource.new_server_vm(object_to_config_hash(f.object,'qemu')).config, include_id: false do |server_config|%>
+<%= f.fields_for :config, compute_resource.new_server_vm(object_to_config_hash(f.object)).config, include_id: false do |server_config|%>
   <%= render :partial => "compute_resources_vms/form/proxmox/server/config", :locals => { :f => server_config, :compute_resource =>  compute_resource, :host => @host, :new_vm => new_vm, :item_layout => 'removable', :type => f.object.type } %>
 <% end %>
-<%= f.fields_for :config, compute_resource.new_container_vm(object_to_config_hash(f.object,'lxc')).config, include_id: false do |container_config|%>
+<%= f.fields_for :config, compute_resource.new_container_vm(object_to_config_hash(f.object)).config, include_id: false do |container_config|%>
   <%= render :partial => "compute_resources_vms/form/proxmox/container/config", :locals => { :f => container_config, :compute_resource =>  compute_resource, :host => @host, :new_vm => new_vm, :item_layout => 'removable', :type => f.object.type } %>
 <% end %>

data/app/views/compute_resources_vms/form/proxmox/_general.html.erb

@@ -34,4 +34,4 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       :label_size => "col-md-2" %>
     </div>
   <% end %>
-<% end %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_removable_layout.html.erb

@@ -14,9 +14,14 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
-
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% volume_rootfs = f.object.respond_to?(:rootfs?) && f.object.rootfs? %>
 
 <% unless volume_rootfs %>
     <%= remove_child_link('X', f, { :method => :'_delete', :title => local_assigns[:remove_title], :class => 'label label-danger' }) %>
+<% end %>
+<% else %>
+<% if new_vm %>
+    <%= remove_child_link('X', f, { :method => :'_delete', :title => local_assigns[:remove_title], :class => 'label label-danger' }) %>
+<% end %>
 <% end %>

data/app/views/compute_resources_vms/form/proxmox/container/_extended.html.erb

@@ -20,7 +20,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("Extended"), :id => "container_config_ext", :class => ('hide' unless (new_vm && container)), :disabled => (!container || !new_vm) do %>
   <div id="ostemplate_form">
     <%= select_f f, :ostemplate_storage, compute_resource.storages('vztmpl'), :storage, :storage, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('Template storage'), :label_size => "col-md-2", :onchange => 'storageOstemplateSelected(this)' %>
-    <%= select_f f, :ostemplate_file, compute_resource.images_by_storage('vztmpl',f.object.ostemplate_storage), :volid, :volid, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('OS Template'), :label_size => "col-md-2", :required => true %>
+    <%= select_f f, :ostemplate_file, compute_resource.images_by_storage(f.object.ostemplate_storage, 'vztmpl'), :volid, :volid, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('OS Template'), :label_size => "col-md-2", :required => true %>
   </div>
   <%= password_proxmox_f f, :password, :label => _("Root password"), :required => true %>
 <% end %>

data/app/views/compute_resources_vms/form/proxmox/container/_volume_mp.html.erb

@@ -22,6 +22,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= f.hidden_field :volid if !new_vm %>
     <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= text_f f, :mp, :label => _('Path'), :label_size => "col-md-2", :required => true, :help_inline => _("e.g. /path/to/") %>
-    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :class => ('hide' if f.object.rootfs?), :disabled => (!new_volume || f.object.rootfs?), :'data-soft-max' => 10 %>
+    <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :class => ('hide' if f.object.rootfs?), :disabled => (!new_volume || f.object.rootfs?), :'data-soft-max' => 10 %>
     <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
 <% end %>

data/app/views/compute_resources_vms/form/proxmox/server/_config.html.erb

@@ -52,7 +52,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
   <div id='cdrom_image_form' class='<%= 'hide' if %[none cdrom].include? f.object.cdrom %>'>
     <%= select_f f, :cdrom_storage, compute_resource.storages('iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
-    <%= select_f f, :cdrom_iso, compute_resource.images_by_storage('iso',f.object.cdrom_storage), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
+    <%= select_f f, :cdrom_iso, compute_resource.images_by_storage(f.object.cdrom_storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
   </div>
 <% end %>
 <%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'hide', :disabled => !server do %>

data/app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb

@@ -22,7 +22,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= f.hidden_field :volid if !new_vm %>
     <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'controllerSelected(this)' %>
-    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
+    <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
     <%= select_f f, :cache, proxmox_caches_map, :id, :name, { }, :label => _('Cache'), :label_size => "col-md-2" %>
     <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
-<% end %>
+<% end %>

data/config/routes.rb

@@ -18,8 +18,8 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 Rails.application.routes.draw do
-    namespace :foreman_fog_proxmox do
-        match 'isos/:storage', :to => 'compute_resources#isos', :via => 'get'
-        match 'ostemplates/:storage', :to => 'compute_resources#ostemplates', :via => 'get'
-    end
+  namespace :foreman_fog_proxmox do
+    match 'isos/:storage', :to => 'compute_resources#isos', :via => 'get'
+    match 'ostemplates/:storage', :to => 'compute_resources#ostemplates', :via => 'get'
+  end
 end

data/lib/foreman_fog_proxmox/engine.rb

@@ -60,10 +60,11 @@ module ForemanFogProxmox
       app.config.assets.precompile += assets_to_precompile
     end
     initializer 'foreman_fog_proxmox.configure_assets', group: :assets do
-      SETTINGS[:foreman_fog_proxmox] = { 
-        assets: { 
-          precompile: assets_to_precompile 
-        } }
+      SETTINGS[:foreman_fog_proxmox] = {
+        assets: {
+          precompile: assets_to_precompile
+        }
+      }
     end
 
     rake_tasks do
@@ -86,16 +87,15 @@ module ForemanFogProxmox
       require 'fog/compute/proxmox/models/volume'
       require 'fog/compute/proxmox/models/node'
 
-      Fog::Proxmox::Compute::Server.send :include, FogExtensions::Proxmox::Server
-      Fog::Proxmox::Compute::ServerConfig.send :include, FogExtensions::Proxmox::ServerConfig
-      Fog::Proxmox::Compute::Disk.send :include, FogExtensions::Proxmox::Disk
-      Fog::Proxmox::Compute::Interface.send :include, FogExtensions::Proxmox::Interface
-      Fog::Proxmox::Compute::Volume.send :include, FogExtensions::Proxmox::Volume
-      ::ComputeResourcesController.send :include, ForemanFogProxmox::Controller::Parameters::ComputeResource
-      Fog::Proxmox::Compute::Node.send :include, FogExtensions::Proxmox::Node
-      ::Host::Managed.send :include, Orchestration::Proxmox::Compute
-      ::Host::Managed.send :include, HostExt::Proxmox::Interfaces
+      Fog::Proxmox::Compute::Server.include FogExtensions::Proxmox::Server
+      Fog::Proxmox::Compute::ServerConfig.include FogExtensions::Proxmox::ServerConfig
+      Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
+      Fog::Proxmox::Compute::Interface.include FogExtensions::Proxmox::Interface
+      Fog::Proxmox::Compute::Volume.include FogExtensions::Proxmox::Volume
+      ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
+      Fog::Proxmox::Compute::Node.include FogExtensions::Proxmox::Node
+      ::Host::Managed.include Orchestration::Proxmox::Compute
+      ::Host::Managed.include HostExt::Proxmox::Interfaces
     end
-
   end
 end

data/lib/foreman_fog_proxmox/semver.rb

@@ -17,86 +17,86 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-module ForemanFogProxmox::Semver
-    SEMVER_REGEX = /^(\d+)[.]{1}(\d+)[.]{1}(\d+)[-]{0,1}(\w+){0,1}$/
+module ForemanFogProxmox
+  module Semver
+    SEMVER_REGEX = /^(\d+)[.](\d+)([.](\d+))?(-([.\w]+))?$/.freeze
     class SemverClass
-        attr_accessor :major
-        attr_accessor :minor
-        attr_accessor :patch
-        attr_accessor :qualifier
-        def initialize(major,minor,patch, qualifier = '')
-            @major = major.to_i
-            @minor = minor.to_i
-            @patch = patch.to_i
-            @qualifier = qualifier.nil? ? '' : qualifier
-        end
-        def to_s
-            flat = "#{major}.#{minor}.#{patch}"
-            flat += "-#{qualifier}" unless qualifier == ''
-        end
-        def <=(other)
-            raise TypeError unless other.is_a?(SemverClass)
-            if @major == other.major
-                if @minor == other.minor
-                    return @patch <= other.patch
-                else
-                    return @minor <= other.minor
-                end
-            else
-                return @major <= other.major
-            end
-        end
-        def <(other)
-            raise TypeError unless other.is_a?(SemverClass)
-            if @major == other.major
-                if @minor == other.minor
-                    return @patch < other.patch
-                else
-                    return @minor < other.minor
-                end
-            else
-                return @major < other.major
-            end
-        end
-        def >(other)
-            raise TypeError unless other.is_a?(SemverClass)
-            if @major == other.major
-                if @minor == other.minor
-                    return @patch > other.patch
-                else
-                    return @minor > other.minor
-                end
-            else
-                return @major > other.major
-            end
-        end
-        def >=(other)
-            raise TypeError unless other.is_a?(SemverClass)
-            if @major == other.major
-                if @minor == other.minor
-                    return @patch >= other.patch
-                else
-                    return @minor >= other.minor
-                end
-            else
-                return @major >= other.major
-            end
-        end
-        def ==(other)
-            raise TypeError unless other.is_a?(SemverClass)
-            @major == other.major && @minor == other.minor && @patch == other.patch && @qualifier == other.qualifier
-        end
+      attr_accessor :major
+      attr_accessor :minor
+      attr_accessor :patch
+      attr_accessor :qualifier
+
+      def initialize(major, minor, patch, qualifier = '')
+        @major = major.to_i
+        @minor = minor.to_i
+        @patch = patch.to_i
+        @qualifier = qualifier.nil? ? '' : qualifier
+      end
+
+      def to_s
+        flat = "#{major}.#{minor}.#{patch}"
+        flat += "-#{qualifier}" unless qualifier == ''
+        flat
+      end
+
+      def <=(other)
+        raise TypeError unless other.is_a?(SemverClass)
+
+        result = @patch <= other.patch
+        result = @major <= other.major unless @major == other.major
+        result = @minor < other.minor unless @minor == other.minor
+        result
+      end
+
+      def <(other)
+        raise TypeError unless other.is_a?(SemverClass)
+
+        result = @patch < other.patch
+        result = @major < other.major unless @major == other.major
+        result = @minor < other.minor unless @minor == other.minor
+        result
+      end
+
+      def >(other)
+        raise TypeError unless other.is_a?(SemverClass)
+
+        result = @patch > other.patch
+        result = @major > other.major unless @major == other.major
+        result = @minor > other.minor unless @minor > other.minor
+        result
+      end
+
+      def >=(other)
+        raise TypeError unless other.is_a?(SemverClass)
+
+        result = @patch >= other.patch
+        result = @major >= other.major unless @major == other.major
+        result = @minor >= other.minor unless @minor == other.minor
+        result
+      end
+
+      def ==(other)
+        raise TypeError unless other.is_a?(SemverClass)
+
+        @major == other.major && @minor == other.minor && @patch == other.patch && @qualifier == other.qualifier
+      end
     end
-    def self.is_semver?(version)
-        version.is_a?(String) && version.match(SEMVER_REGEX)
+
+    def self.semver?(version)
+      version.is_a?(String) && version.match(SEMVER_REGEX)
     end
+
     def self.to_semver(version)
-        raise ArgumentError unless self.is_semver?(version)
-        version_a = version.scan(SEMVER_REGEX)
-        raise ArgumentError if version_a.empty?
-        semver_a = version_a.first
-        raise ArgumentError if semver_a.empty?
-        raise ArgumentError if semver_a.size < 4
-        SemverClass.new(semver_a[0],semver_a[1],semver_a[2],semver_a[3])
+      raise ArgumentError unless semver?(version)
+
+      version_a = version.scan(SEMVER_REGEX)
+      raise ArgumentError if version_a.empty?
+
+      semver_a = version_a.first
+      raise ArgumentError if semver_a.empty?
+      raise ArgumentError unless semver_a.size == 6
+
+      SemverClass.new(semver_a[0], semver_a[1], semver_a[3], semver_a[5])
     end
-end
+  end
+end