ish_models 0.0.33.303 → 3.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b412037faff703b47b7fa0233f65fdba3a6c1172323c19fbc60ec719c180fa9
-  data.tar.gz: 0c68af161d244280a3cd3a109f5b880dc778c5e2ca03338222a4a1262b1461f8
+  metadata.gz: 7c1a22259e454aa8350407614eb6da60e10cc87fd5b7a349655e8d4fea281632
+  data.tar.gz: 9898d3663b786e614852aaf8be16a4fb1daa3aa5130b1139642550d6aeb8232c
 SHA512:
-  metadata.gz: 7199e68751b9367d9b6ca3a6c9967d8ae0aea6515869f820e34b8c7283b80939e004622f666fdf08ddc13418d7a6b2480af2dea9a399f7171d8933d3911bbd20
-  data.tar.gz: 1a1518f3581dd67a240cb4e333f35ba405523777f048b21e5e91bb432c84d1ed11cf4ca5832234abd213300f99eb8eaec6f81ce2900f604b56eb17f81a66322a
+  metadata.gz: 40579c613c11cdd8db789db9dd0804d1b1ee3e40f46f8abd1cd83b8ada329a99cc35cf330eb44aff2e63274861b815b6e45f560f2ae2e595feafc299dac46a6b
+  data.tar.gz: 55a7d4590ac60a32fcbfc7aa9002b4d46ecb59fbfddeaa38caf5131281ea8407cd9ff2a3070e019716e8fcd0502327dcc41d69a6886d1d4cf9f1325a40fa6de4

data/lib/gameui/asset3d.rb

@@ -8,8 +8,6 @@ class ::Gameui::Asset3d
   include Mongoid::Paperclip
   include Ish::Utils
 
-  field :filename
-
   belongs_to :marker,        class_name: 'Gameui::Marker', optional: true
   belongs_to :invoice,       class_name: 'Ish::Invoice',   optional: true
   belongs_to :email_message, class_name: 'Office::EmailMessage', optional: true, inverse_of: :asset3ds

data/lib/iro/{alert.rb-bk → option_watch.rb}

@@ -2,7 +2,7 @@
 ##
 ## for alerting
 ##
-class Iro::Alert
+class Iro::OptionWatch
   include Mongoid::Document
   include Mongoid::Timestamps
   store_in collection: 'iro_option_watches'

data/lib/ish/user_profile.rb

@@ -28,23 +28,24 @@ class Ish::UserProfile
 
   field :scratchpad, default: ''
 
-  field :fb_access_token
-  field :fb_long_access_token
-  field :fb_expires_in
-
   field :lang, default: 'en'
-  field :leadset_id, type: Integer
-  def organization_name
-    'Some Org'
-    # ::Leadset.find( leadset_id )&.name || 'Some Org'
-  end
-  # def leadset
-  #   ::Leadset.find( leadset_id )
+
+  field :leadset_id, type: Integer ## old sql
+  belongs_to :leadset, class_name: '::Wco::Leadset'
+
+  ##
+  ## PiousboxCRM, Email:
+  ##
+  # has_many :lead_ties, class_name: '::Wco::EmailConversationLead' ## need to name it better.
+
+  ##
+  ## wco hosting:
+  ##
+
+  ## 2023-08-21 _vp_ @TODO: change:
+  # def next_serverhost
+  #   ::Wco::Serverhost.where({ leadset_id: leadset_id }).first
   # end
-  # @TODO: change _vp_ 2023-08-21
-  def next_serverhost
-    Wco::Serverhost.where({ leadset_id: leadset_id }).first
-  end
 
   ROLE_GUY     = :guy
   ROLE_MANAGER = :manager
@@ -69,6 +70,7 @@ class Ish::UserProfile
   has_and_belongs_to_many :friends,   :class_name => '::Ish::UserProfile', inverse_of: :friendeds
   has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', inverse_of: :friends
 
+
   def sudoer?
     %w( piousbox@gmail.com victor@wasya.co ).include?( self.email )
   end
@@ -77,15 +79,15 @@ class Ish::UserProfile
     out = self.all
     [['', nil]] + out.map { |item| [ item.email, item.id ] }
   end
-  def self.list_lg
-    out = self.all
-    [['', nil]] + out.map { |item| [ "#{item.email} :: #{item.name}", item.id ] }
-  end
+  # def self.list_lg
+  #   out = self.all
+  #   [['', nil]] + out.map { |item| [ "#{item.email} :: #{item.name}", item.id ] }
+  # end
 
   field :n_unlocks, type: Integer, default: 0
 
   has_many :payments, :class_name => '::Ish::Payment'
-  has_many :subscriptions, class_name: 'Wco::Subscription', inverse_of: :profile
+  has_many :subscriptions, class_name: '::Wco::Subscription', inverse_of: :profile
 
   def has_premium_purchase item
     payments.confirmed.where( item: item ).exists?
@@ -143,4 +145,5 @@ class Ish::UserProfile
 
 end
 
-Profile = Ish::UserProfile
+Profile   = Ish::UserProfile
+Wco::Lead = Ish::UserProfile

data/lib/ish_models.rb

@@ -40,7 +40,7 @@ require 'gameui/asset3d'
 require 'gameui/map'
 require 'gameui/marker'
 
-# require 'iro/alert'
+require 'iro/option_watch'
 
 require 'ish/cache_key'
 require 'ish/crawler'
@@ -76,6 +76,8 @@ require 'office/email_conversation_tag'
 require 'office/email_filter'
 require 'office/email_message'
 require 'office/email_message_stub'
+require 'office/emailtag'
+require 'office/emailtag_email_conversation'
 require 'office/lead_action'
 require 'office/lead_action_template'
 require 'office/obfuscated_redirect'
@@ -84,6 +86,8 @@ require 'office/scheduled_email_action'
 
 require 'wco/appliance'
 require 'wco/appliance_tmpl'
+require 'wco/dns_domain'
+require 'wco/email_conversation_lead'
 require 'wco/leadset'
 require 'wco/price'
 require 'wco/product'
@@ -93,3 +97,4 @@ require 'wco/subscription'
 
 
 
+

data/lib/office/email_conversation.rb

@@ -20,62 +20,78 @@ class Office::EmailConversation
 
   field :preview, default: ''
 
-  has_many :lead_ties, class_name: 'Office::EmailConversationLead'
-  # def lead_ids
-  #   email_conversation_leads.map( &:lead_id )
-  # end
-  # field :lead_ids, type: :array, default: []
+  # @deprecated, @TODO: remove
+  has_many :lead_ties,     class_name: 'Office::EmailConversationLead'
+  has_many :wco_lead_ties, class_name: '::Wco::EmailConversationLead'
+
+
   def leads
     Lead.find( lead_ties.map( &:lead_id ) )
   end
 
   has_many :email_messages,          class_name: 'Office::EmailMessage'
   has_many :email_conversation_tags, class_name: 'Office::EmailConversationTag'
-
-  def wp_term_ids ## @TODO: remove _vp_ 2023-09-23
-    email_conversation_tags.map( &:wp_term_id )
-  end
+  has_many :emailtag_ties,           class_name: 'Office::EmailtagEmailConversation'
 
   def tags
-    WpTag.find( email_conversation_tags.map( &:wp_term_id ) )
+    Emailtag.find( emailtag_ties.map &:emailtag_id )
   end
 
-  ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
+  # ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
+  # def add_tag which
+  #   tag = WpTag.iso_get which
+  #   # puts!( tag.slug, "Adding tag" ) if DEBUG
+  #   Office::EmailConversationTag.find_or_create_by!({
+  #     email_conversation_id: id,
+  #     wp_term_id:            tag.id,
+  #   })
+  # end
   def add_tag which
-    tag = WpTag.iso_get which
-    # puts!( tag.slug, "Adding tag" ) if DEBUG
-    Office::EmailConversationTag.find_or_create_by!({
-      email_conversation_id: id,
-      wp_term_id:            tag.id,
-    })
+    ::EmailtagTie.create!({ emailtag: which, email_conversation: self })
   end
 
+  # def remove_tag which
+  #   tag = WpTag.iso_get which
+  #   # puts!( tag.slug, "Removing tag" ) if DEBUG
+  #   Office::EmailConversationTag.where({
+  #     email_conversation_id: id,
+  #     wp_term_id:            tag.id,
+  #   }).first&.delete
+  # end
   def remove_tag which
-    tag = WpTag.iso_get which
-    # puts!( tag.slug, "Removing tag" ) if DEBUG
-    Office::EmailConversationTag.where({
-      email_conversation_id: id,
-      wp_term_id:            tag.id,
-    }).first&.delete
+    ::EmailtagTie.find_by({ emailtag: which, email_conversation: self }).delete
   end
-  ## @deprecated, do not use. _vp_ 2023-10-29
   def rmtag which; remove_tag which; end
 
+  # def in_emailtag? which
+  #   tag = WpTag.iso_get( which )
+  #   email_conversation_tags.where({ wp_term_id: tag.id }).present?
+  # end
   def in_emailtag? which
-    tag = WpTag.iso_get( which )
-    email_conversation_tags.where({ wp_term_id: tag.id }).present?
+    if which.class == String
+      which = Office::Emailtag.find_by({ slug: which })
+    end
+    !!::EmailtagTie.where({ emailtag: which, email_conversation: self }).first
   end
 
-  def self.in_emailtag which
-    tag = WpTag.iso_get( which )
-    email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
-    where({ :id.in => email_conversation_tags.map(&:email_conversation_id) })
+  # def self.in_emailtag which
+  #   tag = WpTag.iso_get( which )
+  #   email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
+  #   where({ :id.in => email_conversation_tags.map(&:email_conversation_id) })
+  # end
+  def self.in_emailtag which, page: 1, per: 25
+    conv_ids = ::EmailtagTie.find_by({ emailtag: which }).map( &:email_conversation_id )
+    Conv.where({ id: conv_ids }).order_by({ updated_at: :desc }).page( page ).per( per )
   end
 
-  def self.not_in_emailtag which
-    tag = WpTag.iso_get( which )
-    email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
-    where({ :id.nin => email_conversation_tags.map(&:email_conversation_id) })
+  # def self.not_in_emailtag which
+  #   tag = WpTag.iso_get( which )
+  #   email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
+  #   where({ :id.nin => email_conversation_tags.map(&:email_conversation_id) })
+  # end
+  def self.not_in_emailtag which, page: 1, per: 25
+    conv_ids = ::EmailtagTie.find_by({ emailtag: which }).map( &:email_conversation_id )
+    Conv.where({ :id.nin => conv_ids }).order_by({ updated_at: :desc }).page( page ).per( per )
   end
 
 

data/lib/office/email_message.rb

@@ -135,13 +135,23 @@ class Office::EmailMessage
   # "text/calendar; charset=utf-8; method=REQUEST"
   def churn_subpart part
     if part.content_disposition&.include?('attachment')
-      save_attachment( part, filename: "subpart-attachment" )
+      ## @TODO: attachments !
+      ;
     else
-      if part.content_type.include?("multipart")
+      if part.content_type.include?("multipart/related") ||
+        part.content_type.include?("multipart/alternative")
+
         part.parts.each do |subpart|
           churn_subpart( subpart )
         end
       else
+        # attachment = Office::EmailAttachment.new({
+        #   content:       part.decoded,
+        #   content_type:  part.content_type,
+        #   email_message: self,
+        # })
+        # attachment.save
+
         if part.content_type.include?('text/html')
           self.part_html = part.decoded
 
@@ -149,19 +159,15 @@ class Office::EmailMessage
           self.part_txt = part.decoded
 
         elsif part.content_type.include?("text/calendar")
-          save_attachment( part, filename: 'subpart-calendar.ics' )
-
+          ;
         elsif part.content_type.include?("application/pdf")
-          save_attachment( part, filename: 'subpart.pdf' )
-
+          ;
         elsif part.content_type.include?("image/jpeg")
-          save_attachment( part, filename: 'subpart.jpg' )
-
+          ;
         elsif part.content_type.include?("image/png")
-          save_attachment( part, filename: 'subpart.png' )
+          ;
 
         else
-          save_attachment( part, filename: 'subpart-unspecified' )
           self.logs.push "444 No action for a part with content_type #{part.content_type}"
 
         end
@@ -169,49 +175,6 @@ class Office::EmailMessage
     end
   end
 
-  def save_attachment att, filename: "no-filename-specified"
-    content_type = att.content_type.split(';')[0]
-    if content_type.include? 'image'
-      photo = Photo.new({
-        content_type:      content_type,
-        email_message_id:  @message.id,
-        image_data:        att.body.encoded,
-        original_filename: att.content_type_parameters[:name],
-      })
-      photo.decode_base64_image
-      photo.save
-    else
-
-      filename   = CGI.escape( att.filename || filename )
-      attachment = Office::EmailAttachment.new({
-        content:       att.body.decoded,
-        content_type:  att.content_type,
-        email_message: @message,
-        filename:      filename,
-      })
-      begin
-        attachment.save
-      rescue Encoding::UndefinedConversionError
-        @message.logs.push "Could not save an attachment"
-        @message.save
-      end
-
-      sio = StringIO.new att.body.decoded
-      File.open("/tmp/#{filename}", 'w:UTF-8:ASCII-8BIT') do |f|
-        f.puts(sio.read)
-      end
-      asset3d = ::Gameui::Asset3d.new({
-        email_message: @message,
-        filename:      filename,
-        object:        File.open("/tmp/#{filename}"),
-      })
-      if !asset3d.save
-        @message.logs.push "Could not save an asset3d"
-        @message.save
-      end
-
-    end
-  end
 
   def body_sanitized
     ActionView::Base.full_sanitizer.sanitize( part_html||'' ).squish

data/lib/office/emailtag.rb

@@ -0,0 +1,27 @@
+
+class Office::Emailtag
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  # field :name
+  # validates :name, presence: true
+
+  field :slug
+  validates :slug, presence: true
+
+  INBOX = 'inbox'
+  TRASH = 'trash'
+  EMAILTAGS = [ INBOX, TRASH ]
+
+  def self.inbox
+    Office::Emailtag.find_by({ slug: INBOX })
+  end
+
+  def self.trash
+    Office::Emailtag.find_by({ slug: TRASH })
+  end
+
+  has_many :emailtag_ties, class_name: 'Office::EmailtagEmailConversation'
+
+end
+Tag = Office::Emailtag

data/lib/office/emailtag_email_conversation.rb

@@ -0,0 +1,10 @@
+
+class Office::EmailtagEmailConversation
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :emailtag,           class_name: 'Office::Emailtag'
+  belongs_to :email_conversation, class_name: 'Office::EmailConversation'
+
+end
+EmailtagTie = Office::EmailtagEmailConversation

data/lib/wco/appliance.rb

@@ -3,24 +3,29 @@ class Wco::Appliance
   include Mongoid::Document
   include Mongoid::Timestamps
 
+  field :kind
+  validates :kind, presence: true
+
+  field :environment
+
   field :name
   validates :name, uniqueness: { scope: :leadset_id }, presence: true
 
-  field :kind
+  # field :service_name
+  def service_name
+    # "#{@appliance[:kind]}_#{@appliance[:environment]}_#{@appliance[:name]}"
+    "#{kind}_#{environment}_#{name}"
+  end
 
-  field :service_name
-  field :environment
 
   field :subdomain
   field :domain
-  def host
+  def origin
     "#{subdomain}.#{domain}"
   end
 
-  field :leadset_id
-  def leadset
-    Leadset.find leadset_id
-  end
+  field :leadset_id # old sql
+  belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :appliances
 
   belongs_to :appliance_tmpl, class_name: 'Wco::ApplianceTmpl'
   def tmpl
@@ -28,16 +33,20 @@ class Wco::Appliance
   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'
+  STATES = %w| state-pending state-live state-term |
   field :state, default: STATE_PENDING
 
+  def route53_zone
+    Wco::DnsDomain.find_by({ name: domain })[0].route53_zone
+  end
+
 end
 
 

data/lib/wco/appliance_tmpl.rb

@@ -18,13 +18,33 @@ class Wco::ApplianceTmpl
   field :volume_zip
   validates :volume_zip, presence: true
 
-  KIND_CORPHOME1  = 'corphome1'
+  ## Only underscores! These become variable names.
+  # KIND_CRM        = 'kind_crm'
+  # KIND_DRUPAL     = 'kind_drupal'
+  # KIND_HELLOWORLD = 'kind_helloworld'
+  # KIND_IROWOR     = 'kind_irowor'
+  # KIND_JENKINS    = 'kind_jenkins'
+  # KIND_MATOMO     = 'kind_matomo'
+  # KIND_MOODLE     = 'kind_moodle'
+  # KIND_PRESTASHOP = 'kind_prestashop'
+  # KIND_SMT        = 'kind_smt'
+  # KIND_WORDPRESS  = 'kind_wordpress'
+
+  ## 2023-12-08 :: These names are impossible to change already.
+  KIND_CRM        = 'crm'
   KIND_DRUPAL     = 'drupal'
   KIND_HELLOWORLD = 'helloworld'
-  # KINDS = [ 'smt', 'emailcrm', KIND_CORPHOME1, KIND_HELLOWORLD, KIND_DRUPAL,
-  #   'mautic', 'matomo',
-  #   'irowor', 'eCommerce' ]
-  KINDS = [ KIND_HELLOWORLD ]
+  KIND_IROWOR     = 'irowor'
+  KIND_JENKINS    = 'jenkins'
+  KIND_MATOMO     = 'matomo'
+  KIND_MOODLE     = 'moodle'
+  KIND_PRESTASHOP = 'prestashop'
+  KIND_SMT        = 'smt'
+  KIND_WORDPRESS  = 'wordpress'
+
+  KINDS = [ KIND_CRM, KIND_DRUPAL, KIND_HELLOWORLD, KIND_IROWOR,
+    KIND_JENKINS, KIND_MATOMO, KIND_MOODLE, KIND_PRESTASHOP, KIND_SMT,
+    KIND_WORDPRESS ]
 
   has_many :appliances, class_name: 'Wco::Appliance'
 

data/lib/wco/dns_domain.rb

@@ -0,0 +1,23 @@
+
+class Wco::DnsDomain
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name
+  validates :name, uniqueness: true
+
+  ## orbital.city         : Z0145070C3DD1OJWHTXJ
+  ## oquaney-splicing.com : Z060228025Y0JHUA35GN5
+  field :route53_zone
+  validates :route53_zone, presence: true
+
+  STATE_ACTIVE   = 'active'
+  STATE_INACTIVE = 'inactive'
+  STATES = [ 'active', 'inactive' ]
+  field :state, default: STATE_ACTIVE
+
+  def self.list
+    [[nil,nil]] + all.where({ state: STATE_ACTIVE }).map { |i| [i.name, i.name ] }
+  end
+
+end

data/lib/wco/email_conversation_lead.rb

@@ -0,0 +1,10 @@
+
+class Wco::EmailConversationLead
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :email_conversation, class_name: 'Office::EmailConversation'
+  belongs_to :wco_lead,           class_name: 'Ish::UserProfile'
+
+
+end

data/lib/wco/leadset.rb

@@ -1,11 +1,20 @@
 
+##
+## 2023-11-30 _vp_ For use in hosting!
+## 2023-11-30 _vp_ For future use in email!
+##
 class Wco::Leadset
   include Mongoid::Document
   include Mongoid::Timestamps
 
   field :name
 
-  field :domains, type: :string, default: 'orbital.city'
+  field :company_url
+  validates :company_url, presence: true, uniqueness: true
+
+  has_many :wco_leads, class_name: 'Ish::UserProfile'
+
+  # field :domains, type: :string, default: 'orbital.city'
 
   has_many :serverhosts, class_name: 'Wco::Serverhost', inverse_of: :wco_leadset
   def next_serverhost

data/lib/wco/serverhost.rb

@@ -16,50 +16,54 @@ class Wco::Serverhost
 
   field :next_port, type: :integer, default: 8000
 
+  field :nginx_root, default: '/opt/nginx'
+  field :public_ip
+
   ## net-ssh, sshkit
   field :ssh_host
   # field :ssh_username
   # field :ssh_key
-  field :nginx_root, default: '/opt/nginx'
 
   has_many :appliances, class_name: 'Wco::Appliance'
 
-  # def nginx_add_site rendered_str=nil, config={}
-  #   # puts! config, '#nginx_add_site'
-  #   File.write( "/usr/local/etc/nginx/sites-available/#{config[:service_name]}", rendered_str )
-  #   out = `sudo nginx enable-site #{config[:service_name]} ; \
-  #     nginx -s reload ; \
-  #     echo ok
-  #   `;
-  #   puts! out, 'out'
-  # end
+  def add_nginx_site app
+    ac   = ActionController::Base.new
+    ac.instance_variable_set( :@app, app )
+    rendered_str = ac.render_to_string("scripts/nginx_site.conf")
+    puts '+++ add_nginx_site rendered_str:'
+    print rendered_str
 
-  def nginx_add_site rendered_str=nil, config={}
-    puts! rendered_str, '#nginx_add_site // rendered_str'
-    puts! config, '#nginx_add_site // config'
+    file = Tempfile.new('prefix')
+    file.write rendered_str
+    file.close
 
-    File.write( "tmp/#{config[:service_name]}", rendered_str )
-    Net::SSH.start( ssh_host, ssh_username, keys: ssh_key ) do |ssh|
+    cmd = "scp #{file.path} #{ssh_host}:/etc/nginx/sites-available/#{app.service_name}.conf "
+    puts! cmd, 'cmd'
+    `#{cmd}`
 
-      out = ssh.scp.upload! "tmp/#{config[:service_name]}", "#{nginx_root}/conf/sites-available/"
-      puts! out, 'out'
+    cmd = "ssh #{ssh_host} 'ln -s /etc/nginx/sites-available/#{app.service_name}.conf /etc/nginx/sites-enabled/#{app.service_name}.conf ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
 
-      out = ssh.exec! "#{nginx_root}/nginx enable-site #{config[:service_name]} ; #{nginx_root}/nginx -s reload"
-      puts! out, 'out'
+    cmd = "ssh #{ssh_host} 'nginx -s reload ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
 
-    end
+    cmd = "ssh #{ssh_host} 'certbot run -d #{app.origin} --nginx -n ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
 
   end
 
   WORKDIR = "/opt/projects/docker"
 
-  def add_docker_service app={}
+  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]}")
+    rendered_str = ac.render_to_string("docker-compose/dc-#{app.kind}")
     puts '+++ add_docker_service rendered_str:'
     print rendered_str
 
@@ -68,15 +72,45 @@ class Wco::Serverhost
     file.close
     puts! file.path, 'file.path'
 
-    `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 ' `
+    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/dc-#{app.service_name}.yml "
+    puts! cmd, 'cmd'
+    `#{cmd}`
+
+    cmd = "ssh #{ssh_host} 'cd #{WORKDIR} ; \
+      docker compose -f dc-#{app.service_name}.yml up -d #{app.service_name} ; \
+      echo ok #add_docker_service ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
+
+    puts "ok '#add_docker_service'"
   end
 
-  def create_volume app={}
-    # puts! app, '#create_volume'
+  def create_wordpress_volume app
+    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'
+
+    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume"
+    puts! cmd, 'cmd'
+    `#{cmd}`
 
+    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
+      #{WORKDIR}/scripts/create_volume ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
+
+    puts 'ok #create_volume'
+  end
+
+  def create_volume app
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
@@ -89,11 +123,17 @@ class Wco::Serverhost
     file.close
     # puts! file.path, 'file.path'
 
-    `scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume`
-    `ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
-      #{WORKDIR}/scripts/create_volume ' `
+    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume"
+    puts! cmd, 'cmd'
+    `#{cmd}`
+
+    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
+      #{WORKDIR}/scripts/create_volume ' "
+    puts! cmd, 'cmd'
+    `#{cmd}`
+
+    puts 'ok #create_volume'
   end
-  # alias_method :create_volume, :create_volume_2
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.303
+  version: 3.0.0.1
 platform: ruby
 authors:
 - piousbox
@@ -191,7 +191,7 @@ files:
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
-- lib/iro/alert.rb-bk
+- lib/iro/option_watch.rb
 - lib/ish/cache_key.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb
@@ -226,6 +226,8 @@ files:
 - lib/office/email_filter.rb
 - lib/office/email_message.rb
 - lib/office/email_message_stub.rb
+- lib/office/emailtag.rb
+- lib/office/emailtag_email_conversation.rb
 - lib/office/lead_action.rb
 - lib/office/lead_action_template.rb
 - lib/office/obfuscated_redirect.rb
@@ -235,6 +237,8 @@ files:
 - lib/video.rb
 - lib/wco/appliance.rb
 - lib/wco/appliance_tmpl.rb
+- lib/wco/dns_domain.rb
+- lib/wco/email_conversation_lead.rb
 - lib/wco/leadset.rb
 - lib/wco/price.rb
 - lib/wco/product.rb
@@ -242,7 +246,7 @@ files:
 - lib/wco/subscription.rb
 homepage: https://wasya.co
 licenses:
-- Proprietary
+- CC-BY-NC-SA-4.0
 metadata: {}
 post_install_message:
 rdoc_options: []