plesk_kit 1.0.9 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjRlOTBmNjIzZGNhZTc5NjU2NjVlMjMzMzM3NjhjNzUwODk3MWQ0OQ==
+    ZTQ2MWY4YTVlZDI0MDhhODRmODNhZTU1ZDRmMzczNmMwYzc3NDk4Yw==
   data.tar.gz: !binary |-
-    YjQwOGU4NmNjODkzZTkyYzMxZTBkYzgzMzlmMzc0NDJlNjlmNjQ4NQ==
+    YzJhNzhhYzkyMjljOTZiZDE0ZjU0NGM0NGE4MDM5ZThhOGQ4OTdhMA==
 SHA512:
   metadata.gz: !binary |-
-    YzA5MDdjMTBiZjM5ODEzYTA1OTAwNTAwMTE0Yzk5ODMzZmM0MmJhN2FjZmU5
-    OTE3ZmM4YzE0MDg5NzYwMTlmYjRjYWQwOGQ1MWZhN2Q5OTg1YjEyOGJjYjU1
-    YWQ2M2EwMzc5YTZjN2QwZjE1MGI2NDUyM2E3NDU1Mjc5ZGZkOTM=
+    ZDk5MDRkMTZhMzAwZTA3ZTM3MTJlYjM5M2MyOTRjZjhjNTA3YmVmMGZhNTgw
+    NTZmZDFlNmQ4MDYzYWFiZTExZTRmOTE4ZGE0ODQ3NTlhOGM0MTVlODVkYzU5
+    NzI5NmQ3NTY1ZjQ3ODFkNmU4ZjZiOTQ4ZDFhYjgwY2VkODIwYjI=
   data.tar.gz: !binary |-
-    N2Y2NWZiMWY0ZTZjZWRjNGQ1NmEyOGM5MmRmYWQyMTQyN2M2NjliMzZmNTRm
-    NWZmNWFhYjMyMWY5NDIwNGVkNWZlMzRlZTY3Yzc3NzMwZmUyOTFhMmE4YjI0
-    YjFlOWUxY2YyYmI0YWNkNTIxOWVjNGNkODM3NzAyYzJkNDIwYzQ=
+    N2M2NjRlNmViNDcwZDU5NzYzZjUxMTE3OTlhYzlhNGJiODljOWViMGYxNDAz
+    MDZlNTg2NGY5ZDljOWUyYjlkODVmYmI4M2FkZjQ3ZGY5MmJkN2FiNzZjMTJh
+    NzQzYmY4NjdlZDQyYmExZjFhNzkzNmQ4YzZlOWM0OTYwMDZiY2E=

data/app/models/plesk_kit/communicator.rb

@@ -11,7 +11,7 @@ module PleskKit
     end
 
     def self.pack_and_play_with_customer_or_reseller account
-      server = PleskKit::Server.where(:environment => Rails.env.to_s, :platform => account.platform).first
+      server = PleskKit::Server.most_suitable_for_new_customer(account.platform)
       packet = account.pack_this shell
       response = transportation_for packet,server
       account.analyse response[0], server.id
@@ -24,27 +24,32 @@ module PleskKit
       subscription.analyse response[0],customer_account
     end
 
-    def self.sync_subscription sub, sub_guid
-      server = PleskKit::Server.first
+    def self.sync_subscription sub, sub_guid, customer_account
+      server = customer_account.server
       packet = sub.sync_pack shell,sub_guid
       response = transportation_for packet,server
       sub.analyse response[0]
     end
 
     def self.get_service_plan service_plan, server
-      server = PleskKit::Server.first
       packet = service_plan.build_xml_for_get shell
       response = transportation_for packet, server
       service_plan.analyse response[0], server
     end
 
     def self.push_service_plan service_plan, server
-      server = PleskKit::Server.first
       packet = service_plan.build_xml_for_add shell
       response = transportation_for packet, server
       service_plan.analyse response[0], server
     end
 
+    def self.get_server_stats server
+      packet = server.pack_this shell
+      response = transportation_for(packet,server)
+      server.analyse_this response[0]
+      #response[0]
+    end
+
     # Sends packet to plesk
     def self.transportation_for packet, server
       c = PleskKit::Client.new(server)

data/app/models/plesk_kit/server.rb

@@ -1,6 +1,6 @@
 module PleskKit
   class Server < ActiveRecord::Base
-    attr_accessible :environment, :ghostname, :host, :password, :username
+    attr_accessible :environment, :ghostname, :host, :password, :username, :platform
 
     has_many :customer_accounts
     has_many :reseller_accounts
@@ -8,17 +8,12 @@ module PleskKit
     validates :environment, :host, :username, :password, :presence => {:message => 'Cannot be blank! Requires, at minimum, environment (dev,staging,production), host without a port, username, and password'}
 
 
-    def self.most_suitable_for_new_customer
-      servers = 'collect_ram_info_for_servers'
-      servers = 'sort_by_available_ram_descending(servers)'
-      until servers.blank?
-        if servers.first.starved_of_resources?
-          'remove from array of servers'
-          'throw error'
-        else
-          return s
-        end
-      end
+    def self.most_suitable_for_new_customer(platform)
+      server_list = PleskKit::Server.where(:environment => Rails.env.to_s, :platform => platform)
+      servers = []
+      server_list.each { |s| servers << PleskKit::Communicator.get_server_stats(server=s) }
+      servers = servers.sort_by { |hsh| hsh[:ram] }.reverse
+      PleskKit::Server.find servers.first[:id]
     end
 
     def starved_of_resources?
@@ -26,5 +21,32 @@ module PleskKit
       false
     end
 
+    def pack_this shell
+      xml = shell
+      xml.instruct!
+      xml.packet(:version => '1.6.3.5') {
+        xml.server{
+          xml.get{
+            xml.stat()
+          }
+        }
+      }
+      return xml.target!
+    end
+
+    def analyse_this response
+      xml = REXML::Document.new(response)
+      free_ram = cpu = nil
+      ram = xml.root.elements['//mem']
+      ram.each do |r|
+        if r.name == 'free'
+          free_ram = r.text
+        end
+      end
+      cpu = xml.root.elements['//l15'].text
+      return {id:self.id,ram:free_ram,cpu:cpu}
+    end
+
+
   end
 end

data/app/models/plesk_kit/subscription.rb

@@ -25,7 +25,7 @@ module PleskKit
           self.customer_account_id = account.id
         end
         guid = PleskKit::Communicator.pack_and_play_with_subscription self, account
-        PleskKit::Communicator.sync_subscription self, guid
+        PleskKit::Communicator.sync_subscription self, guid, account
         self.id
       else
         return false
@@ -47,7 +47,7 @@ module PleskKit
               xml.vrt_hst{
                 xml.property{
                   xml.name('ftp_login')
-                  xml.value("#{customer.login}#{rand(99).to_s}")     #rand(36**8).to_s(36)
+                  xml.value("#{customer.login}#{rand(99).to_s}#{(0...2).map { (65 + rand(26)).chr }.join}")     #rand(36**8).to_s(36)
                 }
                 xml.property{
                   xml.name('ftp_password')

data/lib/plesk_kit/version.rb

@@ -1,3 +1,3 @@
 module PleskKit
-  VERSION = "1.0.9"
+  VERSION = "2.0.0"
 end

data/test/dummy/db/migrate/20130925230903_add_platform_to_customer_account.plesk_kit.rb

@@ -0,0 +1,6 @@
+# This migration comes from plesk_kit (originally 20130925025125)
+class AddPlatformToCustomerAccount < ActiveRecord::Migration
+  def change
+    add_column :plesk_kit_customer_accounts, :platform, :string
+  end
+end

data/test/dummy/db/migrate/20130925230904_add_platform_to_reseller_account.plesk_kit.rb

@@ -0,0 +1,6 @@
+# This migration comes from plesk_kit (originally 20130925025132)
+class AddPlatformToResellerAccount < ActiveRecord::Migration
+  def change
+    add_column :plesk_kit_reseller_accounts, :platform, :string
+  end
+end

data/test/dummy/db/migrate/20130925230905_add_platform_to_server.plesk_kit.rb

@@ -0,0 +1,6 @@
+# This migration comes from plesk_kit (originally 20130925030540)
+class AddPlatformToServer < ActiveRecord::Migration
+  def change
+    add_column :plesk_kit_servers, :platform, :string
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130917020158) do
+ActiveRecord::Schema.define(:version => 20130925230905) do
 
   create_table "plesk_kit_customer_accounts", :force => true do |t|
     t.string   "cname"
@@ -21,6 +21,7 @@ ActiveRecord::Schema.define(:version => 20130917020158) do
     t.integer  "server_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.string   "platform"
   end
 
   create_table "plesk_kit_customers", :force => true do |t|
@@ -39,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20130917020158) do
     t.string   "plan_name"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.string   "platform"
   end
 
   create_table "plesk_kit_servers", :force => true do |t|
@@ -49,6 +51,7 @@ ActiveRecord::Schema.define(:version => 20130917020158) do
     t.string   "ghostname"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.string   "platform"
   end
 
   create_table "plesk_kit_service_plans", :force => true do |t|

data/test/dummy/log/development.log

@@ -9420,3 +9420,39 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (18.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePleskKitCustomerAccounts (20130906035255)
+Migrating to CreatePleskKitResellerAccounts (20130906035256)
+Migrating to CreatePleskKitSubscriptions (20130906035257)
+Migrating to CreatePleskKitServers (20130906040830)
+Migrating to CreatePleskKitServicePlans (20130917020158)
+Migrating to AddPlatformToCustomerAccount (20130925230903)
+   (0.0ms)  select sqlite_version(*)
+   (0.0ms)  begin transaction
+   (0.3ms)  ALTER TABLE "plesk_kit_customer_accounts" ADD "platform" varchar(255)
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130925230903')
+   (1.6ms)  commit transaction
+Migrating to AddPlatformToResellerAccount (20130925230904)
+   (0.0ms)  begin transaction
+   (0.3ms)  ALTER TABLE "plesk_kit_reseller_accounts" ADD "platform" varchar(255)
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130925230904')
+   (1.7ms)  commit transaction
+Migrating to AddPlatformToServer (20130925230905)
+   (0.0ms)  begin transaction
+   (0.2ms)  ALTER TABLE "plesk_kit_servers" ADD "platform" varchar(255)
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130925230905')
+   (1.5ms)  commit transaction
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plesk_kit
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Dionne Saunders
@@ -136,6 +136,9 @@ files:
 - test/dummy/db/migrate/20130906035257_create_plesk_kit_subscriptions.plesk_kit.rb
 - test/dummy/db/migrate/20130906040830_create_plesk_kit_servers.plesk_kit.rb
 - test/dummy/db/migrate/20130917020158_create_plesk_kit_service_plans.plesk_kit.rb
+- test/dummy/db/migrate/20130925230903_add_platform_to_customer_account.plesk_kit.rb
+- test/dummy/db/migrate/20130925230904_add_platform_to_reseller_account.plesk_kit.rb
+- test/dummy/db/migrate/20130925230905_add_platform_to_server.plesk_kit.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -261,6 +264,9 @@ test_files:
 - test/dummy/db/migrate/20130906035257_create_plesk_kit_subscriptions.plesk_kit.rb
 - test/dummy/db/migrate/20130906040830_create_plesk_kit_servers.plesk_kit.rb
 - test/dummy/db/migrate/20130917020158_create_plesk_kit_service_plans.plesk_kit.rb
+- test/dummy/db/migrate/20130925230903_add_platform_to_customer_account.plesk_kit.rb
+- test/dummy/db/migrate/20130925230904_add_platform_to_reseller_account.plesk_kit.rb
+- test/dummy/db/migrate/20130925230905_add_platform_to_server.plesk_kit.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log