wco_hosting 0.0.0.24 → 0.0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47cf4cc2b388bb3c0caefb58c8f8e54168c1ebddd4a73ecdbce9d2eb8c73b48
-  data.tar.gz: 872ec182cffa5ad7978cc4baa0fd001048664449afc058b14080a361b7bffe45
+  metadata.gz: c74e9e69e8a2eaf81fbfa0397841aa0c26dc8e3e99508889d3d236fbd9752700
+  data.tar.gz: d22fe31571e487240b613b4b8a9ace297db9eca9a29d7cbdecba55db491832a2
 SHA512:
-  metadata.gz: f6338b4e27f91b846c2deb7e4465099ee616412f27e8e2c75735ffc4eb42e19ecc9150769a9d96114505f27ce759d4e435cb29337a4114574642a149bff8271e
-  data.tar.gz: 31819e3656572ef71c9af024a1767de03fe86151a584f61df9e49e69948bf51fedec9fa9a44df9a89c6f7326c62c2e17e095352d5962e2e3ccb8e22493b612f4
+  metadata.gz: '099f34448ff3e40d9f56d0f0a006fe2377dfa2cbf4c1318ec0877aeaf44a029d6ad7375e1b50248f77a57d915fad962a3126ea9d1fc368c3a68c209b4384ba52'
+  data.tar.gz: d304e57b0bdfe790189e012cfaf5e2b7df46de9169cd2f4630330f788616b850e8abd35e68acca2cfecbbf1f5174c1189f9010d6de9381e91521e8294657445e

data/app/assets/stylesheets/wco_hosting/main.scss

@@ -28,3 +28,9 @@ table.bordered {
   }
 }
 
+
+.appliance-tmpls--form {
+  textarea {
+    font-family: monospace;
+  }
+}

data/app/controllers/wco_hosting/appliances_controller.rb

@@ -12,7 +12,6 @@ class WcoHosting::AppliancesController < WcoHosting::ApplicationController
   end
 
   def new
-
     authorize! :new, @new_appliance
   end
 
@@ -21,16 +20,16 @@ class WcoHosting::AppliancesController < WcoHosting::ApplicationController
     authorize! :show, @appliance
   end
 
-  # def update
-  #   @serverhost = WcoHosting::Serverhost.find params[:id]
-  #   authorize! :update, @serverhost
-  #   if @serverhost.update_attributes( params[:serverhost].permit! )
-  #     flash_notice @serverhost
-  #   else
-  #     flash_alert @serverhost
-  #   end
-  #   redirect_to action: :index
-  # end
+  def update
+    @appliance = WcoHosting::Appliance.find params[:id]
+    authorize! :update, @appliance
+    if @appliance.update_attributes( params[:appliance].permit! )
+      flash_notice @appliance
+    else
+      flash_alert @appliance
+    end
+    redirect_to action: :index
+  end
 
   ##
   ## private

data/app/controllers/wco_hosting/domains_controller.rb

@@ -1,9 +1,17 @@
 
 class WcoHosting::DomainsController < WcoHosting::ApplicationController
 
-  def index
-    authorize! :index, WcoHosting::Domain
-    @domains = WcoHosting::Domain.all
+  def create
+    @domain = WcoHosting::Domain.new params[:domain].permit!
+    authorize! :create, @domain
+
+    if @domain.save
+      flash_notice @domain
+    else
+      flash_alert @domain
+    end
+
+    redirect_to action: :index
   end
 
   def edit
@@ -11,12 +19,28 @@ class WcoHosting::DomainsController < WcoHosting::ApplicationController
     authorize! :edit, @domain
   end
 
+  def index
+    authorize! :index, WcoHosting::Domain
+    @domains = WcoHosting::Domain.all
+  end
+
+
+  def new
+    @domain = WcoHosting::Domain.new
+    authorize! :new, @domain
+  end
+
   def show
     @domain = WcoHosting::Domain.find params[:id]
     authorize! :show, @domain
     @subdomains = WcoHosting::Appliance.where( domain: @domain.name ).map( &:subdomain )
   end
 
+  def new
+    @domain = WcoHosting::Domain.new
+    authorize! :new, @domain
+  end
+
   def update
     @domain = WcoHosting::Domain.find params[:id]
     authorize! :update, @domain

data/app/controllers/wco_hosting/environments_controller.rb

@@ -1,9 +1,17 @@
 
 class WcoHosting::EnvironmentsController < WcoHosting::ApplicationController
 
-  def index
-    authorize! :index, WcoHosting::Environment
-    @environments = WcoHosting::Environment.all
+  def create
+    @environment = WcoHosting::Environment.new params[:environment].permit!
+    authorize! :create, @environment
+
+    if @environment.save
+      flash_notice 'success'
+    else
+      flash_alert @environment
+    end
+
+    redirect_to action: :index
   end
 
   def edit
@@ -11,6 +19,17 @@ class WcoHosting::EnvironmentsController < WcoHosting::ApplicationController
     authorize! :edit, @environment
   end
 
+  def index
+    authorize! :index, WcoHosting::Environment
+    @environments = WcoHosting::Environment.all
+  end
+
+
+  def new
+    authorize! :new, WcoHosting::Environment
+    @environment = WcoHosting::Environment.new
+  end
+
   def show
     @environment = WcoHosting::Environment.find params[:id]
     authorize! :show, @environment
@@ -28,5 +47,10 @@ class WcoHosting::EnvironmentsController < WcoHosting::ApplicationController
     redirect_to action: :index
   end
 
+  private
+
+  def set_lists
+    @leadsets_list = Wco::Leadset.list
+  end
 
 end

data/app/controllers/wco_hosting/serverhosts_controller.rb

@@ -5,6 +5,8 @@ class WcoHosting::ServerhostsController < WcoHosting::ApplicationController
     @serverhost = WcoHosting::Serverhost.new params[:serverhost].permit!
     authorize! :create, @serverhost
 
+    @serverhost.do_create_server! unless params[:skip_do_resource]
+
     flag = @serverhost.save
     if flag
       flash[:notice] = 'Success.'
@@ -15,6 +17,23 @@ class WcoHosting::ServerhostsController < WcoHosting::ApplicationController
     end
   end
 
+  def destroy
+    @serverhost = WcoHosting::Serverhost.find params[:id]
+    authorize! :destroy, @serverhost
+    out = HTTParty.delete( "https://api.digitalocean.com/v2/droplets/#{@serverhost.do_id}",
+      headers: { 'Authorization' => "Bearer #{DO_READER_TOKEN}" },
+        :debug_output => $stdout,
+      );
+    puts! out, 'out'
+    flag = @serverhost.destroy!
+    if flag
+      flash_notice @serverhost
+    else
+      flash_alert @serverhost
+    end
+    redirect_to action: :index
+  end
+
   def edit
     @serverhost = WcoHosting::Serverhost.find params[:id]
     authorize! :edit, @serverhost
@@ -22,7 +41,7 @@ class WcoHosting::ServerhostsController < WcoHosting::ApplicationController
 
   def index
     authorize! :index, WcoHosting::Serverhost
-    @serverhosts = WcoHosting::Serverhost.all
+    @serverhosts = WcoHosting::Serverhost.all.order_by name: :asc
     @new_serverhost = WcoHosting::Serverhost.new
   end
 

data/app/views/wco_hosting/_main_header.haml

@@ -20,6 +20,11 @@
           = link_to 'Tasks/Agents', tasks_path
            
           = link_to '[+]', new_task_path
-        %li= link_to 'Domains', domains_path
-        %li= link_to 'Serverhosts', serverhosts_path
+        %li
+          = link_to 'Domains', domains_path
+          = link_to '[+]', new_domain_path
+        %li
+          = link_to 'Serverhosts', serverhosts_path
+          = link_to '[+]', new_serverhost_path
+
 

data/app/views/wco_hosting/appliance_tmpls/_form.haml

@@ -22,7 +22,7 @@
     .actions
       = f.submit 'Go'
     .d-flex
-      %label kind (name)
+      %label kind
       = f.text_field :kind, style: 'flex-grow: 1'
       %label version
       = f.text_field :version
@@ -31,24 +31,35 @@
         .field
           = f.label :descr
           = f.text_area :descr
-    .field
+    .a
       %label :ecs_task_definition_erb
       = f.text_area :ecs_task_definition_erb
 
+    .a
+      %label :docker_compose_erb
+      .comment
+        Available variables: @appliance ,
+      = f.text_area :docker_compose_erb
+
 
     .field
-      = f.label :image
+      %label :image
       = f.text_field :image, class: 'w-100'
 
     .field
       %label volume_zip_url
       = f.text_field :volume_zip_url, class: 'w-100'
+
     .field
       %label volume_zip_exe
       = f.text_field :volume_zip_exe, class: 'w-100'
 
     .field
-      %label deleted_at
+      %label :deleted_at
       = f.text_field :deleted_at
+
     .actions
-      = f.submit 'Go'
+      = f.submit 'Go'
+
+  %hr
+  = appliance_tmpl.inspect

data/app/views/wco_hosting/appliance_tmpls/new.haml

@@ -1,4 +1,4 @@
 
-.appliance-tmpls-new
+.appliance-tmpls-new.maxwidth
   %h5 New ApplianceTmpl `#{@appliance_tmpl}`
   = render 'form', appliance_tmpl: @appliance_tmpl

data/app/views/wco_hosting/appliances/_form.haml

@@ -7,5 +7,11 @@
     .d-flex
       %label environment
       = f.select :environment_id, options_for_select( @environments_list, selected: appliance.environment_id ), {}, { class: 'select2' }
+    .field
+      %label slug
+      = f.text_field :slug
+    .field
+      %label port
+      = f.text_field :port
     .actions
       = f.submit 'Go'

data/app/views/wco_hosting/appliances/edit.haml

@@ -1,32 +1,6 @@
 
 .appliances-edit.maxwidth
-  %h5 Appliance `#{@appliance}`
-
-  = form_for @appliance do |f|
-    .actions
-      = f.submit
-    .field
-      %label.bold Leadset:
-      = link_to @appliance.leadset, wco.leadset_path(@appliance.leadset)
-    .field
-      %label.bold Env:
-      = @appliance.environment
-    .field
-      %label.bold Tmpl:
-      = @appliance.appliance_tmpl
-
-    .actions
-      = f.submit
-
-  .logs
-    %h5 Logs
-    %ul
-      - @appliance.logs.each do |log|
-        %li
-          = log.created_at
-          %b= log.label
-          %pre.descr= log.message
-
-  = @appliance.inspect
+  %h5 Edit Appliance `#{@appliance}`
+  = render 'form', appliance: @appliance
 
 

data/app/views/wco_hosting/appliances/index.haml

@@ -4,7 +4,7 @@
     Appliances
     = link_to '[+]', new_appliance_path
 
-  %table.bordered.data-table
+  %table.bordered
     %thead
       %td  
       %td created_at
@@ -12,6 +12,7 @@
       %td host
       -# %td service_name
       %td port
+      %td slug
 
     - @appliances.each do |app|
       %tr
@@ -25,5 +26,5 @@
         %td= app.host
         -# %td= app.service_name
         %td= app.port
-
+        %td= app.slug
 

data/app/views/wco_hosting/domains/new.haml

@@ -0,0 +1,4 @@
+
+.domains-new.maxwidth
+  %h5 New Domain
+  = render 'form', domain: @domain

data/app/views/wco_hosting/environments/_form.haml

@@ -0,0 +1,12 @@
+
+.environments--form
+  = form_for environment do |f|
+    .field
+      %label for
+      = f.select :leadset_id, options_for_select(@leadsets_list, selected: environment.leadset_id || params[:leadset_id])
+    .field
+      %label Name
+      = f.text_field :name
+
+    .actions
+      = f.submit 'Submit'

data/app/views/wco_hosting/environments/index.haml

@@ -0,0 +1,7 @@
+
+.environments-index.maxwidth
+  %h5 Environments
+  %ul
+    - @environments.each do |env|
+
+      %li= env.inspect

data/app/views/wco_hosting/environments/new.haml

@@ -0,0 +1,4 @@
+
+.enrivonments-new.maxwidth
+  %h5 New Environment
+  = render 'form', environment: @environment

data/app/views/wco_hosting/serverhosts/_form.haml

@@ -18,5 +18,9 @@
       = f.label :ssh_host
       = f.text_field :ssh_host
 
+    .field
+      %label skip do resource?
+      = check_box_tag :skip_do_resource
+
     .actions
       = f.submit

data/app/views/wco_hosting/serverhosts/edit.haml

@@ -1,2 +1,4 @@
 
-= render 'form', serverhost: @serverhost
+.maxwidth
+
+  = render 'form', serverhost: @serverhost

data/app/views/wco_hosting/serverhosts/index.haml

@@ -10,14 +10,15 @@
       %th ssh_host
       %th public_ip
       %th next_port
-      -# %td  
+      %th do id
     - @serverhosts.each do |ser|
       %tr
         %td
           = link_to '[~]', edit_serverhost_path(ser)
           = link_to ser.name, serverhost_path(ser)
+          .d-inline-block= button_to 'x', serverhost_path(ser), method: :delete, data: { confirm: 'Are you sure?' }
         %td= ser.ssh_host
         %td= ser.public_ip
         %td= ser.next_port
-        -# %td= ser.inspect
+        %td= ser.do_id
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_hosting
 version: !ruby/object:Gem::Version
-  version: 0.0.0.24
+  version: 0.0.0.27
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -262,16 +262,20 @@ files:
 - app/views/wco_hosting/domains/_form.haml
 - app/views/wco_hosting/domains/edit.haml
 - app/views/wco_hosting/domains/index.haml
+- app/views/wco_hosting/domains/new.haml
 - app/views/wco_hosting/domains/show.haml
+- app/views/wco_hosting/environments/_form.haml
+- app/views/wco_hosting/environments/index.haml
+- app/views/wco_hosting/environments/new.haml
 - app/views/wco_hosting/files/_form.haml
 - app/views/wco_hosting/files/_table.haml
 - app/views/wco_hosting/files/edit.haml
 - app/views/wco_hosting/files/index.haml
 - app/views/wco_hosting/files/new.haml
 - app/views/wco_hosting/files/show.haml
-- app/views/wco_hosting/leadsets/_form.haml
-- app/views/wco_hosting/leadsets/index.haml
-- app/views/wco_hosting/leadsets/show.haml
+- app/views/wco_hosting/leadsets-bk/_form.haml
+- app/views/wco_hosting/leadsets-bk/index.haml-bk
+- app/views/wco_hosting/leadsets-bk/show.haml-bk
 - app/views/wco_hosting/serverhosts/_form.haml
 - app/views/wco_hosting/serverhosts/edit.haml
 - app/views/wco_hosting/serverhosts/index.haml