ish_models 0.0.33.286 → 0.0.33.291

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9858084eb2be19284f243aac721ab18d5796e734dd0ac5216a600199dde65b6e
-  data.tar.gz: f48ad96c4cef14657a7688090cd7415ecee6c2130cb25694897268eb6680401c
+  metadata.gz: 257cf440b86a79d5147a9e3147ec4606c92e0e2238a6c11e51eae7fa924d35eb
+  data.tar.gz: 9c35232b6ca4a0d026c306576f2916cd7121156626f8aca52c1ff0ac9cc53901
 SHA512:
-  metadata.gz: dc070cf944df807e0c43167ba5083f1d6269778f4fa6a5dfe784467f7e671dfdceb3fc05c3536389332f16fb3be0935bf725b8f60b7311ba3b17c701ac5f266b
-  data.tar.gz: bb0a82434672c5aad1c941e13d5a9e6c4d118c76008d8433929bdf9636cdd8482d5e24cb34b78d180fd5bd4efe933fc2f5fd5a62cf4a53606084c178970ded66
+  metadata.gz: 741ac3cfb2a7f6b2a562266dd88f53f091ccd2dc26c792d4f410036035e4660121df479470dd020a882abba2d84a44170b6dc47139f5c3f7753510a7f10c8053
+  data.tar.gz: 35ca293da5528f2ced972d41342d3f5f305d5f03e539f8fc83a37793acfa304568b0bed4ed73e7ef99d8f3a1a8b1e9f44f55306a9a33f4ac1ee0950006dfc6c4

data/lib/ish/email_context.rb

@@ -75,7 +75,10 @@ class ::Ish::EmailContext
   field :lead_id, type: :integer
   def lead; Lead.find( lead_id ); end
   def to_email; lead[:email]; end ## @TODO: remove, just use the lead. _vp_ 2023-03-27
-
+  # ## no `to` field b/c that's the lead
+  # field :tos, type: :array, default: []
+  field :cc,  type: :string
+  field :ccs, type: :array, default: []
 
   ##
   ## For tracking / utm

data/lib/ish/email_template.rb

@@ -29,6 +29,7 @@ class ::Ish::EmailTemplate
   field :config_exe,                      default: ""      ## unused! _vp_ 2023-09-24
   field :config_json,     type: Object,   default: '{}'
 
+  DEFAULT_FROM_EMAIL = 'Victor Pudeyev <victor@wasya.co>'
   FROM_EMAILS = [
     'Annesque Studio <hello@annesque.studio>',
     'Annesque Studio <no-reply@annesque.studio>',
@@ -45,30 +46,30 @@ class ::Ish::EmailTemplate
     'Oquaney Splicing <hello@oquaney-splicing.com>',
     'Oquaney Splicing <no-reply@oquaney-splicing.com>',
 
-    'Victor Piousbox <piousbox@gmail.com>',
-    'Victor Piousbox <victor@piousbox.com>',
-    'Victor Piousbox <no-reply@piousbox.com>',
+    'Victor Pudeyev <piousbox@gmail.com>',
+    'Victor Pudeyev <victor@piousbox.com>',
+    'Victor Pudeyev <no-reply@piousbox.com>',
     'Victor Pudeyev <victor@pudeyev.com>',
 
-    'Sender Sbs <hello@sender.sbs>',
-    'Sender Sbs <no-reply@sender.sbs>',
+    'Sender SBS <hello@sender.sbs>',
+    'Sender SBS <no-reply@sender.sbs>',
 
     'WasyaCo Consulting <admin@wasya.co>',
-    'Alex <alex@wasya.co>',
-    'Bailey <bailey@wasya.co>',
-    'Cameron <cameron@wasya.co>',
+    'Alex WCo <alex@wasya.co>',
+    'Bailey WCo <bailey@wasya.co>',
+    'Cameron WCo <cameron@wasya.co>',
     'WasyaCo Consulting <hello@wasya.co>',
-    'Jess <jess@wasya.co>',
+    'Jess WCo <jess@wasya.co>',
     'WasyaCo Consulting <no-reply@wasya.co>',
-    'Victor Piousbox <victor@wasya.co>',
+    'Victor Pudeyev <victor@wasya.co>',
 
     'WasyaCo Consulting <admin@wasyaco.com>',
-    'Alex <alex@wasyaco.com>',
-    'Bailey <bailey@wasyaco.com>',
-    'Cameron <cameron@wasyaco.com>',
+    'Alex WCo <alex@wasyaco.com>',
+    'Bailey WCo <bailey@wasyaco.com>',
+    'Cameron WCo <cameron@wasyaco.com>',
     'WasyaCo Consulting <hello@wasyaco.com>',
     'WasyaCo Consulting <no-reply@wasyaco.com>',
-    'Victor <victor@wasyaco.com>',
+    'Victor Pudeyev <victor@wasyaco.com>',
 
     'Wasya Co Mailer <no-reply@wco.com.de>',
     'Wasya Co Mailer <wasyacomailer@gmail.com>',
@@ -78,6 +79,15 @@ class ::Ish::EmailTemplate
     [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
   end
 
+  SIGNATURE = <<~AOL
+    <div>
+    <div><br></div>
+    <div>Regards,</div>
+    <div>-=----- &gt;8 --</div>
+    <div>Victor Pudeyev<br>Director of Engineering<br><a href="mailto:victor@piousbox.com" target="_blank">victor@piousbox.com</a> | <a href="https://tidycal.com/wasya-co/30min" target="_blank">Book a chat</a><br></div>
+    </div><hr /><br /><br /><br />
+  AOL
+
   ## 2023-03-04 _vp_ This works!
   def get_binding
     @lead = Lead.where( email: 'stub@wasya.co' ).first

data/lib/ish_models.rb

@@ -81,6 +81,7 @@ require 'office/scheduled_email_action'
 
 require 'wco/appliance'
 require 'wco/appliance_tmpl'
+require 'wco/leadset'
 require 'wco/price'
 require 'wco/product'
 require 'wco/serverhost'

data/lib/office/email_conversation.rb

@@ -53,6 +53,7 @@ class Office::EmailConversation
       wp_term_id:            tag.id,
     }).first&.delete
   end
+  ## @deprecated, do not use. _vp_ 2023-10-29
   def rmtag which; remove_tag which; end
 
   def in_emailtag? which

data/lib/wco/appliance.rb

@@ -5,7 +5,10 @@ class Wco::Appliance
 
   field :name
   validates :name, uniqueness: { scope: :leadset_id }, presence: true
+
   field :kind
+
+  field :service_name
   field :environment
 
   field :subdomain
@@ -19,7 +22,21 @@ class Wco::Appliance
     Leadset.find leadset_id
   end
 
-  belongs_to :serverhost, class_name: 'Wco::Serverhost'
+  belongs_to :appliance_tmpl, class_name: 'Wco::ApplianceTmpl'
+  def tmpl
+    appliance_tmpl
+  end
+
+  belongs_to :serverhost,     class_name: 'Wco::Serverhost'
+  belongs_to :wco_leadset, class_name: 'Wco::Leadset', inverse_of: :appliances
+
+  # field :ip
+  field :port
+
+  STATE_PENDING = 'state-pending'
+  STATE_LIVE    = 'state-live'
+  STATE_TERM    = 'state-term'
+  field :state, default: STATE_PENDING
 
 end
 

data/lib/wco/appliance_tmpl.rb

@@ -4,12 +4,33 @@ class Wco::ApplianceTmpl
   include Mongoid::Timestamps
 
   field :kind
-  validates :kind, uniqueness: true, presence: true
+  validates :kind, uniqueness: { scope: :version }, presence: true
+
+  field :version, type: :string, default: '0.0.0'
+  validates :version, uniqueness: { scope: :kind }, presence: true
+  index({ kind: -1, version: -1 }, { name: :kind_version })
+
+  field :descr, type: :string
 
   field :image
   validates :image, presence: true
 
+  field :volume_zip
+  validates :volume_zip, presence: true
+
   KIND_CORPHOME1  = 'corphome1'
+  KIND_DRUPAL     = 'drupal'
   KIND_HELLOWORLD = 'helloworld'
-  KINDS = [ 'SMT', 'EmailCRM', KIND_CORPHOME1, KIND_HELLOWORLD, 'Drupal', 'Odoo', 'Mautic', 'IroWor', 'eCommStore1' ]
+  # KINDS = [ 'smt', 'emailcrm', KIND_CORPHOME1, KIND_HELLOWORLD, KIND_DRUPAL,
+  #   'mautic', 'matomo',
+  #   'irowor', 'eCommerce' ]
+  KINDS = [ KIND_HELLOWORLD ]
+
+  has_many :appliances, class_name: 'Wco::Appliance'
+
+  def self.latest_of kind
+    where({ kind: kind }).order_by({ version: :desc }).first
+  end
+
 end
+AppTmpl = Wco::ApplianceTmpl

data/lib/wco/leadset.rb

@@ -0,0 +1,17 @@
+
+class Wco::Leadset
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name
+
+  field :domains, type: :string, default: 'orbital.city'
+
+  has_many :serverhosts, class_name: 'Wco::Serverhost', inverse_of: :wco_leadset
+  def next_serverhost
+    serverhosts.first
+  end
+
+  has_many :appliances, class_name: 'Wco::Appliance', inverse_of: :wco_leadset
+
+end

data/lib/wco/serverhost.rb

@@ -1,6 +1,5 @@
 
 require 'net/scp'
-# require 'autoinc'
 
 class Wco::Serverhost
   include Mongoid::Document
@@ -8,17 +7,19 @@ class Wco::Serverhost
   # include Mongoid::Autoinc
 
   field :name, type: :string
-  validates :name, uniqueness: { scope: :leadset_id }, presence: true
+  # validates :name, uniqueness: { scope: :leadset_id }, presence: true
+  validates :name, uniqueness: { scope: :wco_leadset }, presence: true
 
-  field :next_port, type: :integer, default: 8000
-  # increments :next_port
+  # field :leadset_id, type: :integer
+  # has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset', inverse_of: :serverhosts
+  belongs_to :wco_leadset, class_name: 'Wco::Leadset'
 
-  field :leadset_id, type: :integer
+  field :next_port, type: :integer, default: 8000
 
   ## net-ssh, sshkit
   field :ssh_host
-  field :ssh_username
-  field :ssh_key
+  # field :ssh_username
+  # field :ssh_key
   field :nginx_root, default: '/opt/nginx'
 
   has_many :appliances, class_name: 'Wco::Appliance'
@@ -50,49 +51,50 @@ class Wco::Serverhost
 
   end
 
-  def docker_add_service rendered_str=nil, config={}
-    # puts! config, '#docker_add_service'
-    File.write( "/Users/piousbox/projects/docker_demo/dc-#{config[:service_name]}.yml", rendered_str )
-    out = ` mkdir /Users/piousbox/projects/docker_demo/#{config[:service_name]}_data `
-    puts! out, 'out'
-    out = ` cd /Users/piousbox/projects/docker_demo/ ; \
-      docker compose -f dc-#{config[:service_name]}.yml up -d #{config[:service_name]} ; \
-      echo ok
-    `;
-    puts! out, 'out'
-  end
+  WORKDIR = "/opt/projects/docker"
+
+  def add_docker_service app={}
+    puts! app, '#add_docker_service'
+
+    ac   = ActionController::Base.new
+    ac.instance_variable_set( :@app, app )
+    ac.instance_variable_set( :@workdir, WORKDIR )
+    rendered_str = ac.render_to_string("docker-compose/dc-#{app[:kind]}")
+    puts '+++ add_docker_service rendered_str:'
+    print rendered_str
+
+    file = Tempfile.new('prefix')
+    file.write rendered_str
+    file.close
+    puts! file.path, 'file.path'
 
-  def load_data rendered_str=nil, config={}
-    File.write( "/Users/piousbox/projects/docker_demo/#{config[:service_name]}_data/index.html", rendered_str )
+    `scp #{file.path} #{ssh_host}:#{WORKDIR}/dc-#{app[:service_name]}.yml`
+    `ssh #{ssh_host} 'cd #{WORKDIR} ; \
+      docker compose -f dc-#{app[:service_name]}.yml up -d #{app[:service_name]} ; \
+      echo ok #add_docker_service ' `
   end
 
+  def create_volume app={}
+    # puts! app, '#create_volume'
 
-end
+    ac   = ActionController::Base.new
+    ac.instance_variable_set( :@app, app )
+    ac.instance_variable_set( :@workdir, WORKDIR )
+    rendered_str = ac.render_to_string("scripts/create_volume")
+    # puts '+++ create_volume rendered_str:'
+    # print rendered_str
+
+    file = Tempfile.new('prefix')
+    file.write rendered_str
+    file.close
+    # puts! file.path, 'file.path'
 
-# class Instance
-#   def chmod
-#     start do |ssh|
-#       ssh.exec "sudo chmod +x /tmp/provision.sh"
-#       # other operations on ssh
-#     end
-#   end
-#   private
-#   def start
-#     Net::SSH.start(ip, 'ubuntu', keys: "mykey.pem" ) do |ssh|
-#       yield ssh
-#     end
-#   end
-# end
-
-
-## works:
-# nginx_root = '/opt/nginx'
-# config = { service_name: 'abba', }
-# Net::SSH.start( "18.209.12.11", "ubuntu", keys: "access/mac_id_rsa_3.pem" ) do |ssh|
-#   out = ssh.scp.upload! "tmp/#{config[:service_name]}", "/opt/tmp/two.txt" do |ch, name, sent, total|
-#     puts "#{name}: #{sent}/#{total}"
-#   end
-#   puts! out, 'out'
-# end
+    `scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume`
+    `ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
+      #{WORKDIR}/scripts/create_volume ' `
+  end
+  # alias_method :create_volume, :create_volume_2
 
 
+end
+

data/lib/wco/serverhost.rb-trash

@@ -0,0 +1,45 @@
+
+
+
+  # WORKDIR = "/Users/piousbox/projects/docker_wco"
+
+# class Instance
+#   def chmod
+#     start do |ssh|
+#       ssh.exec "sudo chmod +x /tmp/provision.sh"
+#       # other operations on ssh
+#     end
+#   end
+#   private
+#   def start
+#     Net::SSH.start(ip, 'ubuntu', keys: "mykey.pem" ) do |ssh|
+#       yield ssh
+#     end
+#   end
+# end
+
+
+## works:
+# nginx_root = '/opt/nginx'
+# config = { service_name: 'abba', }
+# Net::SSH.start( "18.209.12.11", "ubuntu", keys: "access/mac_id_rsa_3.pem" ) do |ssh|
+#   out = ssh.scp.upload! "tmp/#{config[:service_name]}", "/opt/tmp/two.txt" do |ch, name, sent, total|
+#     puts "#{name}: #{sent}/#{total}"
+#   end
+#   puts! out, 'out'
+# end
+
+
+
+
+  def create_volume_1 config={}
+    puts! config, '#create_volume'
+
+    out = ` cd #{WORKDIR} ; \
+      [ ! -e #{config[:kind]}__prototype.zip ] && wget #{config.tmpl.volume_zip} ; \
+      [ ! -e #{config[:kind]}__prototype     ] && unzip #{config[:kind]}__prototype.zip ; \
+      mv  #{config[:kind]}__prototype #{config[:service_name]}_data ; \
+      echo ok #create_volume
+    `;
+    puts! out, 'out'
+  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.286
+  version: 0.0.33.291
 platform: ruby
 authors:
 - piousbox
@@ -233,9 +233,11 @@ files:
 - lib/video.rb
 - lib/wco/appliance.rb
 - lib/wco/appliance_tmpl.rb
+- lib/wco/leadset.rb
 - lib/wco/price.rb
 - lib/wco/product.rb
 - lib/wco/serverhost.rb
+- lib/wco/serverhost.rb-trash
 - lib/wco/subscription.rb
 homepage: https://wasya.co
 licenses: