cavalerie_web 1.1.3 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3230d2cf9a2a56319d1bc32662833f0a11f815e0
-  data.tar.gz: aa09dada506905f3a4d6be6bb3de1e84c7641704
+  metadata.gz: f2a80f6338fc2036caff35880f8b477d3cdb17b0
+  data.tar.gz: 4c52cd45a3a1414cd855312d4c95595f54f0b907
 SHA512:
-  metadata.gz: 941075929046b0325e44e2cc825ba1ca6cbe0b7c721253724b7bd8ea1a0405c68fe3516e80ef5da9922880ce68da781e062f53569c3b9c95f9fb533b101812d6
-  data.tar.gz: c332daafaa5b89a09b7acea3b43ecc7fad67326fc1708b07351270a3e0f92b760d679bfc7152d91bfcc0fb94879198cc8b1ce33e1db9f06854b8081350f7695b
+  metadata.gz: 59cb5cbd10b1613bf80f8adfbded08f8972881e0e884e452e37968f7dbb2bcdcb75d04c0fe860b4df15b17326a7677dce9fdc7cbb4fa3cbe9dc59c794077cedf
+  data.tar.gz: d4eee108be25fc5ecc44fc9b5f2a86bf57f38dead2521276d34dfee3675a481332cdd18a7caba1e282b70477c85cd60965abdced5da8f863a0aa13b0e590a872

data/README.md

@@ -76,6 +76,14 @@ $ sudo yum install mysql-devel
 $ brew install mysql
 ```
 
+#### Vagrant
+
+Visit [this page to install Vagrant](http://www.vagrantup.com/downloads) on your system.
+
+#### VirtualBox
+
+Visit [this page to install VirtualBox](https://www.virtualbox.org/wiki/Downloads) on your system.
+
 ### 2. Gem installation
 
 In your Terminal, run the following commands:

data/cavalerie_web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cavalerie_web"
-  spec.version       = "1.1.3"
+  spec.version       = "1.1.6"
   spec.authors       = ["Arnaud Lenglet"]
   spec.email         = ["arlenglet@gmail.com"]
 
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", '~> 3.2'
   spec.add_development_dependency "guard", '~> 2.12'
   spec.add_development_dependency "guard-rspec", '~> 4.5'
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "codeclimate-test-reporter", '~> 0.4'
 end

data/lib/cavalerie_web.rb

@@ -25,17 +25,6 @@ module CavalerieWeb
     Dir.chdir $gem_path
   end
 
-  # Initialization
-  def self.initialize_system
-    $sites_folder_path = ENV[Config.get_environment_variables[:sites][:name]]
-    $shared_folder_path = ENV[Config.get_environment_variables[:shared][:name]]
-    $mysql_folder_path = ENV[Config.get_environment_variables[:mysql][:name]]
-    $export_folder_path = ENV[Config.get_environment_variables[:export][:name]]
-    $credentials_folder_path = $shared_folder_path + "/_credentials"
-    $samples_folder_path = $shared_folder_path + "/_samples"
-    $db_dumps_folder_path = $shared_folder_path + "/_db_dumps"
-  end
-
   run_on_startup
 
 end

data/lib/cavalerie_web/configs/config.rb

@@ -30,26 +30,11 @@ Use of NFS mount is discouraged since it could lead to stability issue
       ["sites", "shared", "mysql", "credentials", "samples", "db_dumps", "export"]
     end
 
-    def self.get_containers_names
-      get_docker_configs["containers_names"]
-    end
-
     def self.get_docker_configs
       docker_configs_file = File.read "#{$configs_path}/docker_configs.json"
       parsed = JSON.parse docker_configs_file
     end
 
-    def self.get_setup_status
-      setup_status_file = File.read "#{$configs_path}/setup_status.json"
-      parsed = JSON.parse setup_status_file
-    end
-
-    def self.reset_setup_status
-      setup_status_file_default = "#{$configs_path}/setup_status.default.json"
-      setup_status_file = "#{$configs_path}/setup_status.json"
-      FileUtils.cp setup_status_file_default, setup_status_file
-    end
-
   end
 
 end

data/lib/cavalerie_web/configs/docker_configs.json

@@ -11,12 +11,12 @@
   "mysql-server_root_password": "cavalerie",
   "mysql-server_os": "Ubuntu 4.8.2-19",
   "mysql-server_version": "MySQL Community Server 5.6.24",
-  "mysql-server_post_start_script": false,
 
   "apache-server_container_ip": "",
-  "apache-server_os": "Debian",
+  "apache-server_os": "Debian (Wheezy)",
   "apache-server_version": "Apache/2.2.22",
-  "apache-server_post_start_script": false,
 
-  "phpmyadmin_post_start_script": false
+  "phpmyadmin_container_ip": "",
+  "phpmyadmin_os": "Ubuntu",
+  "phpmyadmin_version": "4.0.10deb1"
 }

data/lib/cavalerie_web/configs/setup_status.default.json

@@ -9,5 +9,6 @@
 
 {
   "is_vagrant_installed?": false,
+  "is_virtualbox_installed?": false,
   "are_required_plugins_installed?": false
 }

data/lib/cavalerie_web/configs/setup_status.json

@@ -9,5 +9,6 @@
 
 {
   "is_vagrant_installed?": false,
+  "is_virtualbox_installed?": false,
   "are_required_plugins_installed?": false
 }

data/lib/cavalerie_web/errors/virtual_box_not_installed_error.rb

@@ -0,0 +1,2 @@
+class VirtualBoxNotInstalledError < StandardError
+end

data/lib/cavalerie_web/helpers/vagrant_helper.rb

@@ -5,6 +5,7 @@ module CavalerieWeb
   class VagrantHelper
 
     def self.start_container container_name
+      puts "\n"
       puts Message.notice "Starting container \"#{container_name}\""
       long_vagrant_command "vagrant up #{container_name}"
     end
@@ -36,9 +37,7 @@ module CavalerieWeb
 
       def self.move_to_vagrant_folder
         vagrant_directory_path = "#{$gem_path}/lib/vagrant"
-        if Dir.pwd != vagrant_directory_path
-          Dir.chdir vagrant_directory_path
-        end
+        Dir.chdir vagrant_directory_path
       end
 
       def self.vagrant_command command

data/lib/cavalerie_web/managers/file_folder_manager.rb

@@ -20,11 +20,32 @@ module CavalerieWeb
         file_content = File.read virtualhost_file
         file_content.gsub! "_site_name_here_", site[:name]
 
-        puts Message.notice "New #{site[:name]}'s VirtualHost file created."
+        File.open(virtualhost_file, 'w') { |file| file << file_content }
+
+        puts Message.notice "#{site[:name]}: VirtualHost file created."
+      end
+    end
+
+    def self.delete_virtualhost_file_if_invalid site
+      virtualhost_file = "#{site[:path]}/VirtualHost"
+      virtualhost_file_content = File.read virtualhost_file
+
+      unless virtualhost_file_content.include? site[:name]
+        File.delete virtualhost_file
+        puts Message.warning "#{site[:name]}: VirtualHost file was invalid and has been deleted."
+      end
+    end
+
+    def self.get_global_virtualhosts_file
+      virtualhost_file = "#{$configs_path}/sites_virtualhosts"
+      if File.exist? virtualhost_file
+        "\n#{File.read(virtualhost_file)}"
+      else
+        Message.warning "Apache virtualhosts file doesn't exist yet.\nDon't worry too much: it will be automatically\ncreated when you'll run 'cavalerie up'"
       end
     end
 
-    def self.update_sites_virtualhosts_file
+    def self.update_global_virtualhosts_file
       virtualhost_file = "#{$configs_path}/sites_virtualhosts"
       File.open(virtualhost_file, 'w') do |file|
         SiteManager.get_all_sites.each do |site|
@@ -53,25 +74,27 @@ module CavalerieWeb
       local_config_file = "#{site[:path]}/local-config.php"
 
       unless File.exist? local_config_file
+        docker_configs = Config.get_docker_configs
         FileUtils.cp local_config_file_sample, local_config_file
-        file_content = File.read local_config_file
-        file_content.gsub! "_db_name_here_", site[:name]
-        file_content.gsub! "_db_host_here_", ENV["DB_PORT_3306_TCP_ADDR"].to_s
+        local_config_file_content = File.read local_config_file
+
+        local_config_file_content.gsub! "_db_name_here_", "#{site[:name]}-dev"
+        local_config_file_content.gsub! "_db_host_here_", docker_configs["mysql-server_container_ip"]
+
+        File.open(local_config_file, 'w') { |file| file << local_config_file_content }
 
         puts Message.notice "New #{site[:name]}'s local-config.php file created."
       end
     end
 
-    def self.update_local_config_files
-      SiteManager.get_all_sites.each do |site|
-        local_config_file = "#{site[:path]}/local-config.php"
-
-        if File.exist? local_config_file
-          File.delete local_config_file
-          puts Message.notice "Previous #{site[:name]}'s local-config.php file deleted."
-        end
+    def self.delete_local_config_file_if_invalid site
+      local_config_file = "#{site[:path]}/local-config.php"
+      local_config_file_content = File.read local_config_file
+      docker_configs = Config.get_docker_configs
 
-        create_local_config_file_if_not_exist site
+      unless local_config_file_content.include?(site[:name]) && local_config_file_content.include?(docker_configs["mysql-server_container_ip"])
+        File.delete local_config_file
+        puts Message.warning "#{site[:name]}: local-config.php file was invalid and has been deleted."
       end
     end
 

data/lib/cavalerie_web/managers/sequence_manager.rb

@@ -24,23 +24,23 @@ module CavalerieWeb
 
           sequence_ended = true
 
-        rescue StandardError => error
+        rescue StandardError => initial_error
           begin
 
-            puts Message.warning "Error #{error.class}: #{error.message}\n\nCurrent path: #{Dir.pwd}\n\nBacktrace:\n\n" + error.backtrace.join("\n") + "\n\n"
+            puts Message.warning "Warning: #{initial_error.class}: #{initial_error.message}\n\nCurrent path: #{Dir.pwd}\n\nBacktrace:\n\n" + initial_error.backtrace.join("\n") + "\n\n"
 
             retry_counter += 1
-            raise MaxRetriesReachError, "Sequence \"#{human_sequence_name}\" restarted #{max_retries} time(s) but never completed successfully" unless retry_counter < max_retries
+            raise MaxRetriesReachError, "Sequence \"#{human_sequence_name}\" restarted #{max_retries} time(s) but never completed successfully. Initial error was:\n\n\t#{initial_error.class}: #{initial_error.message}" unless retry_counter < max_retries
 
-            puts Message.notice "Rescuing #{error.class} from sequence #{klass.to_s}"
+            puts Message.notice "Rescuing #{initial_error.class} from sequence #{klass.to_s}"
 
-            klass.rescue error
+            klass.rescue initial_error
             next
 
           rescue StandardError => error
-            Config.reset_setup_status
+            SetupManager.reset_setup_status
             sequence_ended = true
-            abort Message.error "Failed to rescue: #{error.message}\n\nBacktrace:\n\n" + error.backtrace.join("\n")
+            abort Message.error "Failed to rescue error. #{error.message}\n\nBacktrace:\n\n" + error.backtrace.join("\n")
           end
 
         end

data/lib/cavalerie_web/managers/setup_manager.rb

@@ -0,0 +1,123 @@
+module CavalerieWeb
+
+  class SetupManager
+
+    # Initialization
+    def self.initialize_system
+      $sites_folder_path = ENV[Config.get_environment_variables[:sites][:name]]
+      $shared_folder_path = ENV[Config.get_environment_variables[:shared][:name]]
+      $mysql_folder_path = ENV[Config.get_environment_variables[:mysql][:name]]
+      $export_folder_path = ENV[Config.get_environment_variables[:export][:name]]
+      $credentials_folder_path = $shared_folder_path + "/_credentials"
+      $samples_folder_path = $shared_folder_path + "/_samples"
+      $db_dumps_folder_path = $shared_folder_path + "/_db_dumps"
+    end
+
+    def self.ask_for_root_privileges
+      run_sudo_command "echo 'Root access granted'"
+    end
+
+    def self.ensure_vagrant_is_installed
+      begin
+        raise VagrantNotInstalledError unless is_vagrant_installed?
+        update_setup_status "is_vagrant_installed?", true
+      rescue VagrantNotInstalledError
+        abort Message.error "Vagrant isn't installed. Please visit https://www.vagrantup.com for installation details."
+      end
+    end
+
+    def self.ensure_virtualbox_is_installed
+      begin
+        raise VirtualBoxNotInstalledError unless is_virtualbox_installed?
+        update_setup_status "is_virtualbox_installed?", true
+      rescue VirtualBoxNotInstalledError
+        abort Message.error "VirtualBox isn't installed. Please visit https://www.virtualbox.org/wiki/Downloads for installation details."
+      end
+    end
+
+    def self.ensure_required_plugins_are_installed
+      if missing_plugins = is_a_required_plugin_missing?
+        raise RequiredPluginMissingError, missing_plugins
+      else
+        update_setup_status "are_required_plugins_installed?", true
+      end
+    end
+
+    def self.ensure_environment_variables_are_set
+      unset_environment_variables = []
+      Config.get_environment_variables.each do |environment_variable|
+        unset_environment_variables << environment_variable[1][:name] unless ENV[environment_variable[1][:name]]
+      end
+
+      if unset_environment_variables.count > 0
+        abort Message.error "#{unset_environment_variables.count} environment variable(s) are unset. Please run \"cavalerie init\" to resolve this problem."
+      end
+    end
+
+    def self.ensure_required_folders_are_available
+      if missing_folders_paths = is_a_required_folder_unavailable?
+        raise RequiredFolderUnavailableError, missing_folders_paths
+      end
+    end
+
+    def self.get_setup_status
+      setup_status_file = File.read "#{$configs_path}/setup_status.json"
+      parsed = JSON.parse setup_status_file
+    end
+
+    def self.update_setup_status setup_status, value
+      setup_status_file = File.read "#{$configs_path}/setup_status.json"
+      parsed = JSON.parse setup_status_file
+      parsed[setup_status.to_s] = value
+      File.open("#{$configs_path}/setup_status.json", 'w') { |file| file << parsed.to_json }
+    end
+
+    def self.reset_setup_status
+      setup_status_file_default = "#{$configs_path}/setup_status.default.json"
+      setup_status_file = "#{$configs_path}/setup_status.json"
+      FileUtils.cp setup_status_file_default, setup_status_file
+    end
+
+    private
+
+      def self.is_vagrant_installed?
+        !File.which("vagrant").nil?
+      end
+
+      def self.is_virtualbox_installed?
+        !File.which("virtualbox").nil?
+      end
+
+      def self.is_a_required_plugin_missing?
+        missing_plugins = []
+
+        installed_plugins = VagrantHelper.plugin_list
+        Config.get_required_plugins_list.each do |plugin|
+          missing_plugins << plugin unless installed_plugins.include? plugin
+        end
+
+        missing_plugins unless missing_plugins.empty?
+      end
+
+      def self.is_a_required_folder_unavailable?
+        unavailable_folders = []
+
+        Config.get_required_folders_list.each do |folder_name|
+          folder_path = get_folder_path folder_name
+          unavailable_folders << folder_path unless File.directory? folder_path
+        end
+
+        unavailable_folders unless unavailable_folders.empty?
+      end
+
+      def self.get_folder_path folder_name
+        eval("$#{folder_name}_folder_path")
+      end
+
+      def self.run_sudo_command command
+        `sudo #{command}`
+      end
+
+  end
+
+end

data/lib/cavalerie_web/managers/site_manager.rb

@@ -7,7 +7,14 @@ module CavalerieWeb
 
       site_paths = Dir.glob("#{get_sites_folder_path}/*").select { |f| File.directory? f }
       site_paths.each do |path|
-        sites << { name: path.split("/").last, path: path }
+        site_name = path.split("/").last.downcase
+
+        sites << {
+          name: site_name,
+          path: path,
+          is_in_hosts_list: is_site_in_hosts_list?(site_name),
+          is_in_global_virtualhosts_file: is_site_in_global_virtualhosts_file?(site_name)
+        }
       end
 
       sites
@@ -20,13 +27,25 @@ module CavalerieWeb
       sites.each do |site|
         FileFolderManager.create_folder_if_not_exist "#{site[:path]}/logs"
         FileFolderManager.create_folder_if_not_exist "#{$shared_folder_path}/#{site[:name]}"
+        FileFolderManager.delete_virtualhost_file_if_invalid site
         FileFolderManager.create_virtualhost_file_if_not_exist site
+        FileFolderManager.delete_local_config_file_if_invalid site
         FileFolderManager.create_local_config_file_if_not_exist site
 
         puts Message.success "Site \"#{site[:name]}\" is valid"
       end
     end
 
+    def self.is_site_in_hosts_list? site_name
+      hosts_list = FileFolderManager.get_hosts_list
+      true if hosts_list.include? site_name
+    end
+
+    def self.is_site_in_global_virtualhosts_file? site_name
+      global_virtualhosts_file = FileFolderManager.get_global_virtualhosts_file
+      true if global_virtualhosts_file.include? site_name
+    end
+
     private
       def self.get_sites_folder_path
         $sites_folder_path

data/lib/cavalerie_web/managers/vagrant_manager.rb

@@ -1,3 +1,5 @@
+require 'ptools'
+
 module CavalerieWeb
 
   class VagrantManager
@@ -32,11 +34,23 @@ module CavalerieWeb
 
     def self.ensure_containers_are_running
       begin
-        Config.get_containers_names.each do |container_name|
-          raise ContainerNotRunningError, container_name unless get_container_status(container_name) == "running"
+        VagrantManager.get_containers_names.each do |container_name|
+          container_status = get_container_status container_name
+
+          timer = 0
+          max_timer = 30
+          while container_status == "preparing" && timer < max_timer
+            puts Message.notice "\"#{container_name}\" container is preparing. Waiting 2 seconds. (Current time: #{timer}s)"
+            sleep 2
+            timer += 2
+            container_status = get_container_status container_name
+          end
+
+          raise ContainerNotRunningError, { container_name: container_name, container_status: container_status } unless container_status == "running"
         end
       rescue ContainerNotRunningError => error
-        abort Message.error "Container \"#{error.message}\" isn't running. Are you sure you have already run the command \"cavalerie up\"?\n\nIf the problem persists, this often means there is already another Vagrant virtual machine running in VirtualBox.\nPlease find and delete any virtual machine named \"Vagrant-Dockerhost\" in VirtualBox, and run \"cavalerie up\" again."
+        error_params = eval error.message
+        abort Message.error "Container \"#{error_params[:container_name]}\" isn't running.\n\n\t\"#{error_params[:container_name]}\" container status: #{error_params[:container_status]}\n\nAre you sure you have already run the command \"cavalerie up\"?\nIf the problem persists, this often means there is already another Vagrant virtual machine running in VirtualBox.\nPlease find and delete any virtual machine named \"Vagrant-Dockerhost\" in VirtualBox, and run \"cavalerie up\" again."
       end
     end
 
@@ -46,21 +60,61 @@ module CavalerieWeb
     end
 
     def self.start_containers
-      Config.get_containers_names.each do |container_name|
+      VagrantManager.get_containers_names.each do |container_name|
         VagrantHelper.start_container container_name
-
-        if Config.get_docker_configs["#{container_name}_post_start_script"]
-          VagrantHelper.run_script container_name, "/scripts/post_start.rb"
-        end
       end
     end
 
     def self.destroy_containers
-      Config.get_containers_names.each do |container_name|
+      VagrantManager.get_containers_names.each do |container_name|
         VagrantHelper.destroy_container container_name unless get_container_status(container_name) == "not created"
       end
     end
 
+    def self.restart_container container_name
+      VagrantHelper.destroy_container container_name
+      VagrantHelper.start_container container_name
+    end
+
+    def self.get_containers_names
+      Config.get_docker_configs["containers_names"]
+    end
+
+    def self.get_container_info container_name
+      docker_configs = Config.get_docker_configs
+
+      container_info = {
+        ip: docker_configs["#{container_name}_container_ip"],
+        os: docker_configs["#{container_name}_os"],
+        version: docker_configs["#{container_name}_version"],
+        status: get_container_status(container_name),
+        others: get_container_other_info(container_name)
+      }
+    end
+
+    def self.get_all_containers_info
+      all_containers_info = {}
+      Config.get_docker_configs["containers_names"].each do |container_name|
+        all_containers_info[container_name] = VagrantManager.get_container_info container_name
+      end
+      all_containers_info
+    end
+
+    def self.get_container_other_info container_name
+      docker_configs = Config.get_docker_configs
+      others = {}
+
+      docker_configs.each do |docker_config_key, docker_config_value|
+        if docker_config_key.to_s.include? container_name
+          already_registered_config = ["#{container_name}_container_ip", "#{container_name}_os", "#{container_name}_version"]
+          is_an_other_key = already_registered_config.none? { |config| docker_config_key == config }
+          others[docker_config_key] = docker_config_value if is_an_other_key
+        end
+      end
+
+      others
+    end
+
   end
 
 end

data/lib/cavalerie_web/sequences/cavalerie_destroy_sequence.rb

@@ -4,7 +4,6 @@ module CavalerieWeb
 
     def self.start
       SequenceManager.start_sequence :ensure_setup_is_correct, 2
-      CavalerieWeb.initialize_system
 
       VagrantManager.destroy_containers
     end

data/lib/cavalerie_web/sequences/cavalerie_init_sequence.rb

@@ -58,12 +58,15 @@ Let's begin:
       end
 
       def self.add_environment_variables_instructions variables_to_export_array
-        puts "ONE MORE STEP!".colorize(:green)
-        puts "\nTo complete the setup, please add the following variables to your shell profile\n(for example: ~/.bashrc for bash, ~/.zshrc for ZSH)\n\n"
+        puts "--------------------------------\nONE MORE STEP!".colorize(:green)
+        puts "\nTo complete the setup, please #{'add the following variables'.colorize(:green)} to your shell config\n(for example: ~/.bashrc for bash, ~/.zshrc for ZSH)\n\n"
 
         variables_to_export_array.each do |variables_to_export|
           puts "\t#{variables_to_export}".colorize(:yellow)
         end
+
+        puts "\nWhen it's done, #{'reload'.colorize(:green)} your shell (open another one or source your shell config file)."
+        puts "\n#{'/!\ CAUTION /!\\'.colorize(:red)}\nThe \"cavalerie up\" command #{'won\'t work'.colorize(:red)} until you add the variables to your shell config file."
       end
 
   end

data/lib/cavalerie_web/sequences/cavalerie_refresh_sequence.rb

@@ -3,18 +3,21 @@ module CavalerieWeb
   class CavalerieRefreshSequence < BaseSequence
 
     def self.start
+      SetupManager.ask_for_root_privileges
       SequenceManager.start_sequence :ensure_setup_is_correct, 2
-      CavalerieWeb.initialize_system
       VagrantManager.ensure_containers_are_running
 
       # ------ Shared part with Cavalerie up sequence ------- #
       # TODO: factorize that
       SiteManager.ensure_sites_are_valid
-      FileFolderManager.update_sites_virtualhosts_file
+      FileFolderManager.update_global_virtualhosts_file
       FileFolderManager.update_hosts_file
-      FileFolderManager.update_local_config_files
-      DatabaseManager.create_sites_database_if_not_exist
       # ------ Shared part with Cavalerie up sequence ------- #
+
+      DatabaseManager.create_sites_database_if_not_exist
+
+      VagrantManager.restart_container "apache-server"
+      VagrantManager.ensure_containers_are_running
     end
 
   end

data/lib/cavalerie_web/sequences/cavalerie_status_sequence.rb

@@ -3,70 +3,41 @@ module CavalerieWeb
   class CavalerieStatusSequence < BaseSequence
 
     def self.start
-
+      SetupManager.ask_for_root_privileges
       SequenceManager.start_sequence :ensure_setup_is_correct, 2
-      CavalerieWeb.initialize_system
-
-      docker_configs = Config.get_docker_configs
-
-      apache_status = colorize_status VagrantManager.get_container_status docker_configs["apache-server_container_name"]
-      mysql_status = colorize_status VagrantManager.get_container_status docker_configs["mysql-server_container_name"]
 
-      virtualhosts_content = get_virtualhosts_content
+      puts Message.notice "Gathering informations: please wait..."
 
-      hosts_file_content = FileFolderManager.get_hosts_list
-
-      site_list_array = get_site_list hosts_file_content, virtualhosts_content
-      site_list = ""
-
-      site_list_array.each_with_index do |site, index|
-        site_list += "\t#{index + 1}. #{site[:name].colorize(:light_blue)}\n"
-        site_list += "\t\t\t- URL: #{site[:url]}\n"
-        site_list += "\t\t\t- Is in virtualhost? #{site[:virtualhost]}\n\n"
-      end
-
-      print <<-EOF
-
- ------------------------------------------------------------------------------------------------------------------
-| \t#{"SYSTEM STATUS SUMMARY".colorize(:yellow)}                                                                                      |
-------------------------------------------------------------------------------------------------------------------
+      docker_configs = Config.get_docker_configs
+      containers_names = docker_configs["containers_names"]
+      global_virtualhosts_file = FileFolderManager.get_global_virtualhosts_file
+      sites = SiteManager.get_all_sites
 
- \tApache server
- \t\t\t - Container status    #{apache_status}
- \t\t\t - Container name      #{docker_configs["containers_names"][1]}
- \t\t\t - Container IP        #{docker_configs["apache-server_container_ip"]}
- \t\t\t - Machine OS          #{docker_configs["apache-server_os"]}
- \t\t\t - Apache version      #{docker_configs["apache-server_version"]}
+      puts "\n -----------------------------------------------------------------------------------------------"
+      printf "|\t %-100s %s\n", "DOCKER CONTAINERS STATUS".colorize(:yellow), "|"
+      puts " -----------------------------------------------------------------------------------------------"
 
- \tMySQL server
- \t\t\t - Container status    #{mysql_status}
- \t\t\t - Container name      #{docker_configs["containers_names"][0]}
- \t\t\t - Container IP        #{docker_configs["mysql-server_container_ip"]}
- \t\t\t - Machine OS          #{docker_configs["mysql-server_os"]}
- \t\t\t - MySQL version       #{docker_configs["mysql-server_version"]}
- \t\t\t - MySQL user / pass   #{docker_configs["mysql-server_user"]} / #{docker_configs["mysql-server_user_password"]}
- \t\t\t - MySQL root pass     #{docker_configs["mysql-server_root_password"]}
+      display_containers_section containers_names
 
- \tFolders paths
- \t\t\t - Sites               #{$sites_folder_path}
- \t\t\t - Shared              #{$shared_folder_path}
- \t\t\t - MySQL               #{$mysql_folder_path}
- \t\t\t - Export              #{$export_folder_path}
+      puts "\n -----------------------------------------------------------------------------------------------"
+      printf "|\t %-100s %s\n", "SITES AVAILABLE".colorize(:light_blue), "|"
+      puts " -----------------------------------------------------------------------------------------------"
 
- \tSites in sites folder
+      display_sites_section sites
 
-#{site_list}
- ------------------------------------------------------------------------------------------------------------------
-| \t#{"MORE DETAILS".colorize(:yellow)}                                                                                               |
- ------------------------------------------------------------------------------------------------------------------
+      puts "\n -----------------------------------------------------------------------------------------------"
+      printf "|\t %-100s %s\n", "FOLDERS REGISTERED".colorize(:light_blue), "|"
+      puts " -----------------------------------------------------------------------------------------------"
 
-  Apache virtualhosts file content
+      display_folders_section
 
-#{virtualhosts_content}
+      puts "\n -----------------------------------------------------------------------------------------------"
+      printf "|\t %-100s %s\n", "APACHE VIRTUALHOSTS".colorize(:light_blue), "|"
+      puts " -----------------------------------------------------------------------------------------------"
 
- ------------------------------------------------------------------------------------------------------------------
+      global_virtualhosts_file
 
-      EOF
+      puts "\n------------------------------------------------------------------------------------------------------------------\n\n"
     end
 
     private
@@ -82,25 +53,45 @@ module CavalerieWeb
         end
       end
 
-      def self.get_virtualhosts_content
-        virtualhost_file = "#{$configs_path}/sites_virtualhosts"
-        if File.exist? virtualhost_file
-          "\n#{File.read(virtualhost_file)}"
-        else
-          Message.warning "Apache virtualhosts file doesn't exist yet.\nDon't worry too much: it will be automatically\ncreated when you'll run 'cavalerie up'"
+      def self.display_containers_section containers_names
+        all_containers_info = VagrantManager.get_all_containers_info
+
+        containers_names.each do |container_name|
+
+          puts "\n"
+          puts "\t#{container_name.colorize(:yellow)}"
+
+          all_containers_info[container_name].each do |info_key, info_value|
+            # TODO: find a way to test the following "if" section
+            if info_key === :status
+              printf "\t\t - %-30s %s\n", info_key, colorize_status(info_value)
+            elsif info_key != :others
+              printf "\t\t - %-30s %s\n", info_key, info_value
+            else
+              info_value.each do |other_key, other_value|
+                printf "\t\t - %-30s %s\n", other_key, other_value
+              end
+            end
+          end
         end
       end
 
-      def self.get_site_list hosts_file_content, virtualhosts_content
-        site_list = []
-
-        SiteManager.get_all_sites.each_with_index do |site, index|
-          site_url = hosts_file_content.include?(site[:name]) ? "http://#{site[:name]}.dev".colorize(:green) : "Not found in Hosts file".colorize(:red)
-          site_in_virtualhost = virtualhosts_content.include?(site[:name]) ? "Yes".colorize(:green) : "No".colorize(:red)
+      def self.display_folders_section
+        puts "\n"
+        printf "\t%-20s %s\n", "Sites", $sites_folder_path
+        printf "\t%-20s %s\n", "Shared", $shared_folder_path
+        printf "\t%-20s %s\n", "MySQL", $mysql_folder_path
+        printf "\t%-20s %s\n", "Export", $export_folder_path
+      end
 
-          site_list << { name: site[:name], url: site_url, virtualhost: site_in_virtualhost }
+      def self.display_sites_section sites
+        sites.each do |site|
+          puts "\n"
+          printf "\t#{site[:name].colorize(:light_blue)}\n"
+          printf "\t\t- %-20s %s\n", "URL:", "http://#{site[:name]}.dev:8080"
+          printf "\t\t- %-20s %s\n", "In virtualhost?", site[:is_in_global_virtualhosts_file]
+          printf "\t\t- %-20s %s\n", "Is in hosts file?", site[:is_in_hosts_list]
         end
-        site_list
       end
 
   end

data/lib/cavalerie_web/sequences/cavalerie_up_sequence.rb

@@ -3,21 +3,23 @@ module CavalerieWeb
   class CavalerieUpSequence < BaseSequence
 
     def self.start
+      SetupManager.ask_for_root_privileges
       SequenceManager.start_sequence :ensure_setup_is_correct, 2
-      CavalerieWeb.initialize_system
 
       # ------ Shared part with Cavalerie refresh sequence ------- #
       # TODO: factorize that
       SiteManager.ensure_sites_are_valid
-      FileFolderManager.update_sites_virtualhosts_file
+      FileFolderManager.update_global_virtualhosts_file
       FileFolderManager.update_hosts_file
-      FileFolderManager.update_local_config_files
       # ------ Shared part with Cavalerie refresh sequence ------- #
 
       VagrantManager.start_or_restart_containers
       VagrantManager.ensure_containers_are_running
 
       DatabaseManager.create_sites_database_if_not_exist
+
+      puts "\n"
+      puts Message.success "Everything is awesome! (https://youtu.be/cCKONHUigVk)\n      Happy coding! :)\n"
     end
 
   end

data/lib/cavalerie_web/sequences/ensure_setup_is_correct_sequence.rb

@@ -5,22 +5,28 @@ module CavalerieWeb
     def self.start
       threads = []
 
-      CavalerieWeb.initialize_system
+      SetupManager.initialize_system
 
-      setup_status = Config.get_setup_status
+      setup_status = SetupManager.get_setup_status
 
       if setup_status["is_vagrant_installed?"] != true
-        threads << Thread.new { ensure_vagrant_is_installed }
+        threads << Thread.new { SetupManager.ensure_vagrant_is_installed }
+      end
+
+      if setup_status["is_virtualbox_installed?"] != true
+        threads << Thread.new { SetupManager.ensure_virtualbox_is_installed }
       end
 
       if setup_status["are_required_plugins_installed?"] != true
-        threads << Thread.new { ensure_required_plugins_are_installed }
+        threads << Thread.new { SetupManager.ensure_required_plugins_are_installed }
       end
 
-      threads << Thread.new { ensure_environment_variables_are_set }
-      threads << Thread.new { ensure_required_folders_are_available }
+      threads << Thread.new { SetupManager.ensure_environment_variables_are_set }
+      threads << Thread.new { SetupManager.ensure_required_folders_are_available }
 
       SequenceManager.set_threads_timeout threads
+
+      puts Message.success "Setup is correct."
     end
 
     def self.rescue error
@@ -32,6 +38,7 @@ module CavalerieWeb
           puts Message.warning "Plugin \"#{plugin_name.capitalize}\" is not installed. Installing..."
           VagrantHelper.plugin_install plugin_name
         end
+
       when "RequiredFolderUnavailableError"
         missing_folders_paths = eval(error.message)
         puts Message.warning error_message = "#{missing_folders_paths.count} required folder(s) are missing"
@@ -41,39 +48,6 @@ module CavalerieWeb
       end
     end
 
-    private
-
-      def self.ensure_vagrant_is_installed
-        begin
-          raise VagrantNotInstalledError unless VagrantCheck.is_vagrant_installed?
-        rescue VagrantNotInstalledError
-          abort Message.error "Vagrant isn't installed. Please visit https://www.vagrantup.com for installation details."
-        end
-      end
-
-      def self.ensure_required_plugins_are_installed
-        if missing_plugins = VagrantCheck.is_a_required_plugin_missing?
-          raise RequiredPluginMissingError, missing_plugins
-        end
-      end
-
-      def self.ensure_environment_variables_are_set
-        unset_environment_variables = []
-        Config.get_environment_variables.each do |environment_variable|
-          unset_environment_variables << environment_variable[1][:name] unless ENV[environment_variable[1][:name]]
-        end
-
-        if unset_environment_variables.count > 0
-          abort Message.error "#{unset_environment_variables.count} environment variable(s) are unset. Please run \"cavalerie init\" to resolve this problem."
-        end
-      end
-
-      def self.ensure_required_folders_are_available
-        if missing_folders_paths = FileFolderCheck.is_a_required_folder_unavailable?
-          raise RequiredFolderUnavailableError, missing_folders_paths
-        end
-      end
-
   end
 
 end

data/lib/vagrant/Vagrantfile

@@ -53,6 +53,7 @@ Vagrant.configure("2") do |config|
       d.name = "#{apache_container_name}"
       d.link("#{mysql_container_name}:db")
       d.volumes = ["/cavalerie/sites:/cavalerie/sites", "/cavalerie/shared:/cavalerie/shared", "/cavalerie/configs:/cavalerie/configs"]
+      d.cmd = ["/scripts/setup.rb"]
       d.remains_running = true
       d.vagrant_machine = "#{DOCKER_HOST_NAME}"
       d.vagrant_vagrantfile = "#{DOCKER_HOST_VAGRANTFILE}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cavalerie_web
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.6
 platform: ruby
 authors:
 - Arnaud Lenglet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -196,16 +196,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: Contain everything your need to create and manage websites
 email:
 - arlenglet@gmail.com
@@ -227,17 +227,13 @@ files:
 - bin/cavalerie
 - cavalerie_web.gemspec
 - lib/cavalerie_web.rb
-- lib/cavalerie_web/checks/file_folder_check.rb
-- lib/cavalerie_web/checks/vagrant_check.rb
 - lib/cavalerie_web/cli/command.rb
 - lib/cavalerie_web/cli/subcommands/new.rb
 - lib/cavalerie_web/cli/subcommands/server.rb
 - lib/cavalerie_web/configs/VirtualHost.sample
-- lib/cavalerie_web/configs/apache_container_ip
 - lib/cavalerie_web/configs/config.rb
 - lib/cavalerie_web/configs/docker_configs.json
 - lib/cavalerie_web/configs/local-config.sample.php
-- lib/cavalerie_web/configs/mysql_container_ip
 - lib/cavalerie_web/configs/setup_status.default.json
 - lib/cavalerie_web/configs/setup_status.json
 - lib/cavalerie_web/errors/container_not_running_error.rb
@@ -250,12 +246,14 @@ files:
 - lib/cavalerie_web/errors/vagrant_not_installed_error.rb
 - lib/cavalerie_web/errors/vagrant_vm_already_running_error.rb
 - lib/cavalerie_web/errors/vagrant_vm_not_running_error.rb
+- lib/cavalerie_web/errors/virtual_box_not_installed_error.rb
 - lib/cavalerie_web/errors/virtual_host_file_not_found_error.rb
 - lib/cavalerie_web/helpers/os_helper.rb
 - lib/cavalerie_web/helpers/vagrant_helper.rb
 - lib/cavalerie_web/managers/database_manager.rb
 - lib/cavalerie_web/managers/file_folder_manager.rb
 - lib/cavalerie_web/managers/sequence_manager.rb
+- lib/cavalerie_web/managers/setup_manager.rb
 - lib/cavalerie_web/managers/site_manager.rb
 - lib/cavalerie_web/managers/vagrant_manager.rb
 - lib/cavalerie_web/sequences/base_sequence.rb

data/lib/cavalerie_web/checks/file_folder_check.rb

@@ -1,23 +0,0 @@
-module CavalerieWeb
-
-  class FileFolderCheck
-
-    def self.is_a_required_folder_unavailable?
-      unavailable_folders = []
-
-      Config.get_required_folders_list.each do |folder_name|
-        folder_path = get_folder_path folder_name
-        unavailable_folders << folder_path unless File.directory? folder_path
-      end
-
-      unavailable_folders unless unavailable_folders.empty?
-    end
-
-    private
-      def self.get_folder_path folder_name
-        eval("$#{folder_name}_folder_path")
-      end
-
-  end
-
-end

data/lib/cavalerie_web/checks/vagrant_check.rb

@@ -1,24 +0,0 @@
-require 'ptools'
-
-module CavalerieWeb
-
-  class VagrantCheck
-
-    def self.is_vagrant_installed?
-      !File.which("vagrant").nil?
-    end
-
-    def self.is_a_required_plugin_missing?
-      missing_plugins = []
-
-      installed_plugins = VagrantHelper.plugin_list
-      Config.get_required_plugins_list.each do |plugin|
-        missing_plugins << plugin unless installed_plugins.include? plugin
-      end
-
-      missing_plugins unless missing_plugins.empty?
-    end
-
-  end
-
-end

data/lib/cavalerie_web/configs/apache_container_ip

@@ -1 +0,0 @@
-172.17.0.5

data/lib/cavalerie_web/configs/mysql_container_ip

@@ -1 +0,0 @@
-172.17.0.1