ish_models 0.0.33.287 → 0.0.33.292

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d872b9868c1bc820cbdcbadfde298a034010095e4f19910f1851d35cca00fd
-  data.tar.gz: e1fc95e4a71e17c4486389a83ffcf6b1fada942f9e9a71a488f4842c157878b6
+  metadata.gz: 8106a24a63e76e7d3905e8412c43d2725ea74ccc2e7ec16f8fc9957f1ab2db89
+  data.tar.gz: b2f9624e52ab4087e8e03fc2ba259b48dacee46398dc0826f898b3dc216bb7c0
 SHA512:
-  metadata.gz: 2a44c1b86067b6b62b9d77c0a94f71d60f3264d7549c8e1b848f17e48bef01d0c415871c95886aa0de3b806eca787669c4a87608734f141875591da6d068dc1a
-  data.tar.gz: 960ee95e22f7e124d643d566a4b2052f547f02cefeb67e8c1b7f2a69c2d9f07bc75aaa52a722e276803e87e3a2548ba04868e40b7c9ab7f42ddc272d45e2043d
+  metadata.gz: e7aa35e292ef1b467e8d57b22795742ceed93d14c43bb4774fe0bd6646c9b73691a72b03bec3461a9786516e1d9d15b19fdf8d24622cc4c935b81449bd0b8b46
+  data.tar.gz: d7b5656b4e08cc5d8dd1ba9da5d9dbe9a1980d74fa4c73607aefdfeb790a33cc8ed018c0c7e1c31185540f0f71f3d01c5ff61b70c0a3878a22d39ca5728542bb

data/lib/ish_models.rb

@@ -68,6 +68,7 @@ require 'office/action_tie'
 require 'office/admin_message'
 require 'office/email_action'
 require 'office/email_action_tie'
+require 'office/email_attachment'
 require 'office/email_conversation'
 require 'office/email_conversation_lead'
 require 'office/email_conversation_tag'
@@ -81,6 +82,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_action.rb

@@ -24,5 +24,11 @@ class Office::EmailAction
 
   has_many :email_filters, class_name: 'Office::EmailFilter', inverse_of: :email_action
 
+  field :deleted_at, default: nil, type: :time
+
+  def self.list
+    [[nil,nil]] + Office::EmailAction.where({ :deleted_at => nil }).map { |a| [ a.slug, a.id ] }
+  end
+
 end
 EAct = Office::EmailAction

data/lib/office/email_attachment.rb

@@ -0,0 +1,12 @@
+
+class Office::EmailAttachment
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :email_message, class_name: 'Office::EmailMessage', inverse_of: :email_attachments
+
+  field :content
+  field :content_type
+  field :filename
+
+end

data/lib/office/email_conversation.rb

@@ -10,10 +10,13 @@ class Office::EmailConversation
   field :state
 
   field :subject
+  index({ subject: -1 })
+
   field :latest_at
   index({ latest_at: -1 })
 
   field :from_emails, type: :array, default: []
+  index({ from_emails: -1 })
 
   has_many :lead_ties, class_name: 'Office::EmailConversationLead'
   # def lead_ids

data/lib/office/email_message.rb

@@ -51,6 +51,8 @@ class Office::EmailMessage
     email_conversation
   end
 
+  has_many :email_attachments, class_name: 'Office::EmailAttachment', inverse_of: :email_message
+
   def preview_str
     body = part_html || part_html || 'Neither part_html nor part_txt!'
     body = ::ActionView::Base.full_sanitizer.sanitize( body ).gsub(/\s+/, ' ')

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.287
+  version: 0.0.33.292
 platform: ruby
 authors:
 - piousbox
@@ -218,6 +218,7 @@ files:
 - lib/office/admin_message.rb
 - lib/office/email_action.rb
 - lib/office/email_action_tie.rb
+- lib/office/email_attachment.rb
 - lib/office/email_conversation.rb
 - lib/office/email_conversation_lead.rb
 - lib/office/email_conversation_tag.rb
@@ -233,9 +234,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: