superhosting 0.0.1 → 0.0.2

data/bootstrap/etc/sx/muxs/php/site/config_templates/php_fpm_pool.erb

@@ -0,0 +1,22 @@
+[<%= container.name %>_<%= site.name %>]
+
+user = <%= [container.name, site.php.user].compact.join '_' %>
+group = <%= container.name %>
+listen = <%= site.web.path %>.sock
+listen.owner = www-data
+listen.group = www-data
+
+chdir = <%= site.web.path.join(site.document_root) %>
+
+pm = <% site.php.pm %>
+pm.max_children = <%= site.php.pm_max_children %>
+<% if site.php.pm == 'dynamic' %>pm.start_servers = <%= site.php.pm_start_servers %>
+pm.min_spare_servers = <%= site.php.pm_min_spare_servers %>
+pm.max_spare_servers = <%= site.php.pm_max_spare_servers %>
+<% end %>
+
+<% %w{admin_value admin_flag value flag}.select{|p| site.php.f(p) }.each do |param_type|
+  site.php.f(param_type).lines {|l| l.split /\s*=\s*/, 2 }.each do |param_name, param_value| %>
+php_<%= param_type %>[<%= param_name %>] = <%= param_value %>
+<% end
+end %>

data/bootstrap/etc/sx/muxs/php/site/php/pm

@@ -0,0 +1 @@
+ondemand

data/bootstrap/etc/sx/muxs/php/site/php/pm_max_children

@@ -0,0 +1 @@
+2

data/bootstrap/etc/sx/muxs/php/site/use_apache

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/muxs/test/container/docker/image

@@ -0,0 +1 @@
+superhosting/almostbase

data/bootstrap/etc/sx/muxs/test/docker/command

@@ -0,0 +1 @@
+/bin/bash -lec 'while true ; do date ; sleep 1; done'

data/bootstrap/etc/sx/muxs/test/docker/image

@@ -0,0 +1 @@
+superhosting/mux

data/bootstrap/etc/sx/muxs/test/inherit

@@ -0,0 +1 @@
+base

data/bootstrap/etc/sx/password_strength

@@ -0,0 +1 @@
+15

data/bootstrap/etc/sx/smtp_hostname

@@ -0,0 +1 @@
+host1.example.com

data/dockerfile/almost_base

@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+MAINTAINER flant <256@flant.com>
+
+RUN apt-get update -q
+RUN apt-get install -y supervisor
+RUN apt-get install -y tree
+
+RUN /bin/bash -lec "\
+mkdir /.config; \
+cp /etc/passwd /.config/etc-passwd; \
+ln -fs /.config/etc-passwd /etc/passwd; \
+cp /etc/group /.config/etc-group; \
+ln -fs /.config/etc-group /etc/group; \
+mkdir /.config/ssmtp; \
+ln -fs /.config/ssmtp /etc/ssmtp; \
+mkdir /web; \
+rm -rf /etc/supervisor/conf.d; \
+mkdir /.config/supervisor; \
+ln -fs /.config/supervisor /etc/supervisor/conf.d"

data/dockerfile/base

@@ -0,0 +1,18 @@
+FROM ubuntu:14.04
+MAINTAINER flant <256@flant.com>
+
+RUN apt-get update -q
+RUN apt-get install -y supervisor
+
+RUN /bin/bash -lec "\
+mkdir /.config; \
+cp /etc/passwd /.config/etc-passwd; \
+ln -fs /.config/etc-passwd /etc/passwd; \
+cp /etc/group /.config/etc-group; \
+ln -fs /.config/etc-group /etc/group; \
+mkdir /.config/ssmtp; \
+ln -fs /.config/ssmtp /etc/ssmtp; \
+mkdir /web; \
+rm -rf /etc/supervisor/conf.d; \
+mkdir /.config/supervisor; \
+ln -fs /.config/supervisor /etc/supervisor/conf.d"

data/dockerfile/mux

@@ -0,0 +1,6 @@
+FROM ubuntu:14.04
+MAINTAINER flant <256@flant.com>
+
+RUN apt-get update -q
+RUN apt-get install -y supervisor
+RUN apt-get install -y php5-fpm

data/lib/superhosting.rb

@@ -5,31 +5,65 @@ require 'pathname'
 require 'excon'
 require 'json'
 require 'etc'
-require 'erb'
-require 'ostruct'
 require 'pry-byebug'
+require 'securerandom'
+require 'unix_crypt'
+require 'highline/import'
+require 'i18n'
+require 'unicode'
+require 'punycode'
+require 'digest/md5'
+require 'polling'
+require 'strong_password'
 
 require 'path_mapper'
 require 'net_status'
 
 require 'superhosting/version'
+
+require 'superhosting/helper/file'
+require 'superhosting/helper/cmd'
+require 'superhosting/helper/i18n'
+require 'superhosting/helper/logger'
+require 'superhosting/helper/states'
+require 'superhosting/helper/config'
 require 'superhosting/helpers'
 
+require 'superhosting/patches/string/punycode'
+require 'superhosting/patches/path_mapper/dir_node'
+require 'superhosting/patches/path_mapper/file_node'
+require 'superhosting/patches/path_mapper/null_node'
+
 require 'superhosting/base'
 require 'superhosting/controller/admin'
 require 'superhosting/controller/admin/container'
 require 'superhosting/controller/container'
 require 'superhosting/controller/container/admin'
+require 'superhosting/controller/container/states'
 require 'superhosting/controller/mysql'
 require 'superhosting/controller/mysql/db'
 require 'superhosting/controller/mysql/user'
 require 'superhosting/controller/site'
 require 'superhosting/controller/site/alias'
+require 'superhosting/controller/site/states'
 require 'superhosting/controller/user'
+require 'superhosting/controller/mux'
+require 'superhosting/controller/model'
+require 'superhosting/controller/base'
+
+require 'superhosting/composite_mapper'
+require 'superhosting/composite_mapper/base'
+require 'superhosting/composite_mapper/container'
+require 'superhosting/composite_mapper/site'
+
+require 'superhosting/config_executor'
+require 'superhosting/config_executor/base'
+require 'superhosting/config_executor/container'
+require 'superhosting/config_executor/site'
 
-require 'superhosting/script_executor/base'
-require 'superhosting/script_executor/container'
-require 'superhosting/script_executor/site'
+require 'superhosting/mapper_inheritance/base'
+require 'superhosting/mapper_inheritance/model'
+require 'superhosting/mapper_inheritance/mux'
 
 require 'superhosting/docker_api'
 

data/lib/superhosting/base.rb

@@ -2,36 +2,30 @@ module Superhosting
   class Base
     include Helpers
 
-    def initialize(config_path: '/etc/sx', lib_path: '/var/lib/sx', logger: nil, docker_socket: nil)
+    attr_reader :config, :lib
+
+    def initialize(config_path: '/etc/sx', lib_path: '/var/sx', logger: nil, docker_api: nil, dry_run: nil, debug: nil, **kwargs)
       @config_path = Pathname.new(config_path)
       @lib_path = Pathname.new(lib_path)
       @config = PathMapper.new(config_path)
       @lib = PathMapper.new(lib_path)
-      @logger = logger
-
-      @docker_api = DockerApi.new(socket: docker_socket)
-    end
+      Thread.current[:logger] ||= logger
+      Thread.current[:debug] ||= debug
+      Thread.current[:dry_run] ||= dry_run
 
-    def debug(*a, &b)
-      @logger.debug(*a, &b) unless @logger.nil?
+      @docker_api = docker_api || DockerApi.new(socket: @config.f('docker_socket', default: nil))
     end
 
-    def command!(*command_args)
-      cmd = Mixlib::ShellOut.new(*command_args)
-      cmd.run_command
-      if cmd.status.success?
-        debug([cmd.stdout, cmd.stderr].join("\n"))
-        cmd
-      else
-        raise NetStatus::Exception.new(error: :error, message: [cmd.stdout, cmd.stderr].join("\n"))
-      end
+    def get_base_controller_options
+      {
+          config_path: @config_path.to_s,
+          lib_path: @lib_path.to_s,
+          docker_api: @docker_api,
+      }
     end
 
-    def command(*command_args)
-      cmd = Mixlib::ShellOut.new(*command_args)
-      cmd.run_command
-      debug([cmd.stdout, cmd.stderr].join("\n"))
-      cmd
+    def get_controller(controller, **kwargs)
+      controller.new(**self.get_base_controller_options.merge!(kwargs))
     end
   end
 end

data/lib/superhosting/cli/base.rb

@@ -3,10 +3,13 @@ module Superhosting
     module Cmd; end
     class Base
       include Mixlib::CLI
+      extend Helper::I18n
+      include Helper::Logger
+      extend Helper::Logger
 
       COMMANDS_MODULE = Cmd
       CONTROLLERS_MODULE = Superhosting::Controller
-      CONTROLLER_BASE_OPTIONS = [:config_path, :lib_path, :docker_socket]
+      CONTROLLER_BASE_OPTIONS = [:dry_run, :debug]
 
       banner "#{?= * 50}\n#{?- * 19}SUPERHOSTING#{?- * 19}\n#{?= * 50}\n\n"
 
@@ -20,28 +23,33 @@ module Superhosting
              :boolean      => true,
              :on           => :tail
 
-      option :config_path,
-             :long         => '--config-path PATH',
-             :on           => :tail
-
-      option :lib_path,
-             :long         => '--lib-path PATH',
+      option :verbose,
+             :long         => '--verbose',
+             :boolean      => true,
              :on           => :tail
 
-      option :docker_socket,
-             :long         => '--docker-socket PATH',
+      option :dry_run,
+             :long         => '--dry-run',
+             :boolean      => true,
              :on           => :tail
 
       def initialize(argv, node)
         self.class.options.merge!(Base::options)
         super()
 
-        @pos_args = parse_options(argv)
+        begin
+          @pos_args = parse_options(argv)
+        rescue OptionParser::InvalidOption => e
+          raise NetStatus::Exception, error: :input_error, code: :invalid_cli_option, data: { message: e.message }
+        end
+
         @node = node
+        @node_class = node.values.first
 
         @logger = Logger.new(STDOUT)
-        @logger.level = config[:debug] ? Logger::DEBUG : Logger::INFO
-        @logger.formatter = proc {|severity, datetime, progname, msg| sprintf("%s\n", msg.to_s.strip) }
+        @logger.level = (config[:debug] or config[:dry_run] or config[:verbose]) ? Logger::DEBUG : Logger::INFO
+        @logger.formatter = proc {|severity, datetime, progname, msg| sprintf("%s\n", msg.to_s) }
+        self.__logger = @logger
 
         self.help if config[:help] or self.class == Base
       end
@@ -61,7 +69,7 @@ module Superhosting
           end
         end
 
-        @logger.info("#{opt_parser.to_s}\n#{get_childs_banners(@node) if self.class == Base}")
+        self.info("#{opt_parser.to_s}\n#{get_childs_banners(@node) if self.class == Base}")
 
         exit 1
       end
@@ -72,8 +80,11 @@ module Superhosting
           net_status ||= {}
 
           raise Error::Controller, net_status unless net_status[:error].nil?
-          @logger.info(net_status[:data]) unless net_status[:data].nil?
-          @logger.debug('Done!')
+          self.debug('Done!')
+
+          unless (data = net_status[:data]).nil?
+            @node_class.after_action(data, config) if @node_class.respond_to? :after_action
+          end
         rescue NetStatus::Exception => e
           raise Error::Controller, e.net_status
         end
@@ -85,7 +96,7 @@ module Superhosting
         method.parameters.each do |req, name|
           if req.to_s.start_with? 'key'
             opt = config[name]
-            self.help unless opt = @pos_args.shift if name == :name
+            self.help unless (opt = @pos_args.shift) if name == :name
             opts.merge!(name => opt)
           end
         end
@@ -96,12 +107,32 @@ module Superhosting
 
       def get_controller
         def get_subcontroller_option
-          key = :"#{self.class.get_split_class_name.first}_name"
+          key = :"#{self.class.get_splited_class_name.first}_name"
           config[key] unless config[key].nil?
         end
 
-        node = CONTROLLERS_MODULE
-        names = self.class.get_split_class_name
+        def get_method(m_name, node)
+          params = node.instance_method(:initialize).parameters
+
+          opts = {}
+          params.each do |req, name|
+            if req.to_s.start_with? 'key'
+              if name == :name
+                opt = get_subcontroller_option
+              elsif config.key? name
+                opt = config[name]
+              end
+              opts.merge!(name => opt) unless opt.nil?
+            end
+          end
+
+          CONTROLLER_BASE_OPTIONS.each { |opt| opts.merge!(opt => config[opt]) unless config[opt].nil? }
+          opts.merge!(logger: self.__logger)
+          node.new(**opts).method(m_name)
+        end
+
+        names = self.class.get_splited_class_name
+        node = names.one? ? CONTROLLERS_MODULE::Base : CONTROLLERS_MODULE
 
         names.each do |n|
           c_name = n.capitalize.to_sym
@@ -110,26 +141,10 @@ module Superhosting
           if node.respond_to? :constants and node.constants.include? c_name
             node = node.const_get(c_name)
           elsif node.respond_to? :instance_methods and node.instance_methods(false).include? m_name
-            params = node.instance_method(:initialize).parameters
-
-            opts = {}
-            params.each do |req, name|
-              if req.to_s.start_with? 'key'
-                if name == :name
-                  opt = get_subcontroller_option
-                elsif config.key? name
-                  opt = config[name]
-                end
-                opts.merge!(name => opt) unless opt.nil?
-              end
-            end
-
-            CONTROLLER_BASE_OPTIONS.each {|opt| opts.merge!(opt => config[opt]) unless config[opt].nil? }
-            opts.merge!(logger: @logger)
-            return node.new(**opts).method(m_name)
+            return get_method(m_name, node)
           end
         end
-        raise Error::Base.new('Method doesn\'t found')
+        raise NetStatus::Exception, { message: 'Method doesn\'t found' }
       end
 
       class << self
@@ -139,7 +154,7 @@ module Superhosting
             args
           end
 
-          prepend
+          self.prepend
           cmd, node = get_cmd_and_node(args)
           args = clear_args(args, cmd)
           cmd.new(args, node).run
@@ -148,6 +163,7 @@ module Superhosting
         def prepend
           set_commands_hierarchy
           set_banners
+          i18n_initialize
         end
 
         def set_banners(node=@@commands_hierarchy, path=[])
@@ -171,7 +187,7 @@ module Superhosting
             COMMANDS_MODULE.constants.select {|c| Class === COMMANDS_MODULE.const_get(c) }.sort
           end
 
-          @@commands_hierarchy = get_commands.inject({}) do |h,k|
+          @@commands_hierarchy = get_commands.sort_by {|k1, k2| split_toggle_case_name(k1).one? ? 0 : 1 }.inject({}) do |h,k|
             node = h
             parts = split_toggle_case_name(k)
             parts.each do |cmd|
@@ -181,7 +197,7 @@ module Superhosting
           end
         end
 
-        def get_split_class_name
+        def get_splited_class_name
           self.split_toggle_case_name(self.name.split('::').last)
         end
 

data/lib/superhosting/cli/cmd/admin_add.rb

@@ -2,6 +2,11 @@ module Superhosting
   module Cli
     module Cmd
       class AdminAdd < Base
+        option :generate,
+               :short => '-g',
+               :long  => '--generate',
+               :boolean => true
+
         def self.has_required_param?
           true
         end

data/lib/superhosting/cli/cmd/admin_container_list.rb

@@ -6,6 +6,10 @@ module Superhosting
                :short => '-a NAME',
                :long  => '--admin NAME',
                :required => true
+
+        def self.after_action(data, config)
+          self.info(data)
+        end
       end
     end
   end

data/lib/superhosting/cli/cmd/admin_list.rb

@@ -0,0 +1,11 @@
+module Superhosting
+  module Cli
+    module Cmd
+      class AdminList < Base
+        def self.after_action(data, config)
+          self.info(data)
+        end
+      end
+    end
+  end
+end

data/lib/superhosting/cli/cmd/admin_passwd.rb

@@ -10,6 +10,10 @@ module Superhosting
         def self.has_required_param?
           true
         end
+
+        def self.after_action(data, config)
+          self.info(data)
+        end
       end
     end
   end