marv 0.6.5 → 0.7.0

data/lib/marv/project/builder/engines.rb

@@ -1,5 +1,3 @@
-gem 'tilt', '!= 1.3', '~> 1.1'
-
 require 'tilt'
 
 module Tilt

data/lib/marv/project/create.rb

@@ -23,20 +23,20 @@ module Marv
       def project_options
         # Check if project exists and abort
         if ::File.directory?(@path)
-          @task.say "Project already exists", :red
+          @task.say_error "Project already exists", nil, false
           abort
         end
 
-        @task.say "This will create a new project.", :cyan
-        @task.say "Please enter project details below."
+        @task.say_info "This will create a new project."
+        @task.say_warning "Please enter project details below."
 
         # Get project options
         options = {}
 
-        options[:name] = @task.ask "Enter project name", :default => @global.config[:name]
-        options[:uri] = @task.ask "Enter project URI", :default => @global.config[:uri]
-        options[:version] = @task.ask "Enter project version", :default => @global.config[:version]
-        options[:description] = @task.ask "Enter project description", :default => @global.config[:description]
+        options[:name] = @task.ask_input "Enter project name:", :default => @global.config.fetch(:name, @dir)
+        options[:uri] = @task.ask_input "Enter project URI:", :default => @global.config[:uri]
+        options[:version] = @task.ask_input "Enter project version:", :default => @global.config.fetch(:version, '0.1.0')
+        options[:description] = @task.ask_input "Enter project description:", :default => @global.config.fetch(:description, 'Created with Marv')
 
         options.merge!(ask_author_details)
         options.merge!(ask_project_layout)
@@ -48,10 +48,10 @@ module Marv
       def ask_author_details
         options = {}
 
-        options[:author] = @task.ask "Enter project author", :default => @global.config[:author]
-        options[:author_uri] = @task.ask "Enter project author URI", :default => @global.config[:author_uri]
-        options[:license_name] = @task.ask "Enter project license name", :default => @global.config[:license_name]
-        options[:license_uri] = @task.ask "Enter project license URI", :default => @global.config[:license_uri]
+        options[:author] = @task.ask_input "Enter project author:", :default => @global.config[:author]
+        options[:author_uri] = @task.ask_input "Enter project author URI:", :default => @global.config[:author_uri]
+        options[:license_name] = @task.ask_input "Enter project license name:", :default => @global.config[:license_name]
+        options[:license_uri] = @task.ask_input "Enter project license URI:", :default => @global.config[:license_uri]
 
         return options
       end
@@ -60,17 +60,30 @@ module Marv
       def ask_project_layout
         options = {}
 
-        if @task.yes?("Do you want to use a local layout?")
-          options[:local_layout] = true
-          options[:layout] = @task.ask "Which layout do you want to use?", :limited_to => @global.layouts
+        if @global.layouts.empty?
+          options.merge!(ask_builtin_project_layout)
         else
-          options[:local_layout] = false
-          options[:layout] = @task.ask "Which layout do you want to use?", :limited_to => ["theme", "plugin"], :default => "theme"
+          if @task.said_yes?("Do you want to use a local layout?")
+            options[:local_layout] = true
+            options[:layout] = @task.ask_input "Which layout do you want to use?", :limited_to => @global.layouts
+          else
+            options.merge!(ask_builtin_project_layout)
+          end
         end
 
         return options
       end
 
+      # Ask builtin project layout
+      def ask_builtin_project_layout
+        options = {}
+
+        options[:local_layout] = false
+        options[:layout] = @task.ask_input "Which layout do you want to use?", :limited_to => ["theme", "plugin"], :default => "theme"
+
+        return options
+      end
+
       # Choosen layout path
       def layout_path
         layout = ::File.expand_path(::File.join(Marv.root, 'layouts', @options[:layout]))
@@ -129,6 +142,8 @@ module Marv
 
       # Create a new project
       def create_project
+        @task.say_empty(2)
+
         create_project_dirs
         create_config_file
         parse_layout_files

data/lib/marv/project/guard.rb

@@ -1,9 +1,9 @@
-gem 'guard', '~> 2.8', '< 2.9'
-
 require 'guard'
 require 'guard/plugin'
 
 # Marv Guard plugins
+require 'marv/project/guard/pry'
+require 'marv/project/guard/commander'
 require 'marv/project/guard/assets'
 require 'marv/project/guard/config'
 require 'marv/project/guard/functions'

data/lib/marv/project/guard/commander.rb

@@ -0,0 +1,14 @@
+module Guard
+  module Commander
+
+    # Stop proccess
+    def stop
+      listener.stop
+      interactor.background
+      ::Guard::UI.debug "Guard stops all plugins"
+      runner.run(:stop)
+      ::Guard::Notifier.turn_off
+    end
+
+  end
+end

data/lib/marv/project/guard/pry.rb

@@ -0,0 +1,41 @@
+module Guard
+  module Jobs
+    class PryWrapper < Base
+
+      private
+
+      attr_reader :thread
+
+      # Colorizes message using Thor Color Util
+      #
+      def _colorize(text, color)
+        Marv.colorize(text, color)
+      end
+
+      # Configures the pry prompt to see `guard` instead of
+      # `pry`.
+      #
+      def _configure_prompt
+        Pry.config.prompt = [_prompt(_colorize("\u00BB", :green)), _prompt(_colorize("*", :yellow))]
+      end
+
+      # Returns a proc that will return itself a string ending with the given
+      # `ending_char` when called.
+      #
+      def _prompt(ending_char)
+        proc do |target_self, nest_level, pry|
+          history    = pry.input_ring.size
+          process    = ::Guard.listener.paused? ? _colorize("pause", :yellow) : _colorize("marv", :green)
+          level      = ":#{nest_level}" unless nest_level.zero?
+          hist_text  = _colorize("[#{history}]", :yellow)
+          clip_text  = _colorize("(#{_clip_name(target_self)})", :cyan)
+          level_text = _colorize("#{level}", :cyan)
+          path_text  = _colorize(Dir.pwd.sub(Dir.home, '~'), :magenta)
+
+          "#{hist_text} #{_scope_for_prompt}#{process} #{path_text} #{clip_text}#{level_text} #{ending_char} "
+        end
+      end
+
+    end
+  end
+end

data/lib/marv/project/project.rb

@@ -106,8 +106,7 @@ module Marv
         if ::File.exists?(@config_file)
           config_file = @global.load_ruby_config(@config_file)
         else
-          @task.say "Could not find the config file!", :red
-          @task.say "Are you sure you're in a marv project directory?"
+          @task.say_error "Could not find the config file!", "Are you sure you're in a marv project directory?", false
           abort
         end
 
@@ -146,4 +145,4 @@ module Marv
 
     end
   end
-end
+end

data/lib/marv/server/actions.rb

@@ -1,4 +1,4 @@
-require 'socket'
+require 'net/http'
 require 'childprocess'
 
 module Marv
@@ -15,22 +15,23 @@ module Marv
       end
 
       # Initialize server start
-      def start
+      def start(from_command=true)
         if is_server_running?
-          @task.say "Server is already running", :yellow
-          exit
+          @task.say_warning "Server is already running.", false
+          abort
         end
 
-        unless is_port_available?
-          @task.say "Port is not available!", :yellow
+        unless is_port_available?(@server.host, @server.port)
+          @task.say_warning "Port is not available!", false, true
           change_server_port
         end
 
-        run_server
+        run_server(from_command)
       end
 
       # Initialize server stop
-      def stop
+      def stop(message=true)
+        abort_noexist
         pid_file = ::File.join(@path, 'php.pid')
 
         begin
@@ -38,40 +39,47 @@ module Marv
             pid = ::File.read(pid_file).to_i
 
             ::Process.kill('KILL', pid)
-            @task.say "Server #{@name} stopped", :yellow
+            @task.say_warning("Server #{@name} stopped.", false) if message
           end
         rescue
-          @task.say "Server #{@name} is not running", :yellow
+          @task.say_warning("Server #{@name} is not running.", false) if message
         end
       end
 
       # Initialize server restart
       def restart
-        stop
+        stop(false)
+        @task.say_info "Restarting server #{@name}...", true
         sleep 3
         start
       end
 
       # Remove server
       def remove
-        begin
-          @server.remove_database
-
-          @task.shell.mute do
-            stop
-            @task.remove_dir @path
+        abort_noexist
+        @task.say_warning("This will remove server #{@name} and all data will be lost.")
+
+        if @task.said_yes?("Are you sure you want to remove server?")
+          begin
+            @server.remove_database
+
+            @task.shell.mute do
+              stop(false)
+              remove_hotel_server
+              @task.remove_dir @path
+            end
+          rescue Exception => e
+            @task.say_error "Error while removing server:", e.message
+            abort
           end
-        rescue Exception => e
-          @task.say "Error while removing server:"
-          @task.say e.message + "\n", :red
-          exit
-        end
 
-        @task.say "Server successfully removed", :green
+          @task.say_success "Server successfully removed.", false, true
+        end
       end
 
       # Run server
-      def run_server
+      def run_server(from_command=true)
+        abort_noexist_cmd('php')
         ::Dir.chdir @path
 
         unless @debug
@@ -84,19 +92,49 @@ module Marv
           end
         end
 
-        @task.say "Server #{@server.name} is running", :cyan
-        @task.say "Visit http://#{@server.host}:#{@server.port}", :green
+        @task.say_success "Server #{@server.name} is running.", false, !from_command
+        @task.say_message "✔ http://#{@server.host}:#{@server.port}", false, false
 
         # Start server in debug mode
         if @debug
+          @task.say_empty
           system "php -S #{@server.host}:#{@server.port} router.php"
         end
       end
 
+      # Abort if not exists
+      def abort_noexist
+        unless @server.exists?
+          @task.say_error("Server #{@name} does not exist!")
+          abort
+        end
+      end
+
+      # Abort if command does no exist
+      def abort_noexist_cmd(exec_name, text=nil)
+        unless @task.exec_exixts?(exec_name)
+          text ||= exec_name.upcase
+
+          @task.say_error("#{text} is not installed on your system!")
+          abort
+        end
+      end
+
+      # Remove hotel server if it exists
+      def remove_hotel_server
+        if @task.exec_exixts?('hotel')
+          begin
+            `cd #{@path} && hotel rm`
+          rescue ExceptionName
+            return true
+          end
+        end
+      end
+
       # Change server port
       def change_server_port
-        @task.say "Use another port to run the server", :cyan
-        port = @task.ask "Which port would you like to use?"
+        @task.say_info "Use another port to run the server.", true
+        port = @task.ask_input "Which port would you like to use?"
 
         # Check if port available
         if is_port_available?(@server.host, port)
@@ -118,10 +156,10 @@ module Marv
 
           if ::File.exists?(pid_file)
             pid = ::File.read(pid_file).to_i
-
-            ::Process.kill(0, pid)
-            return true
+            return ::Process.kill(0, pid) == 1
           end
+
+          return false
         rescue
           return false
         end
@@ -130,11 +168,13 @@ module Marv
       # Check if port is available
       def is_port_available?(host=@server.host, port=@server.port)
         begin
-          server = ::TCPServer.new(host, port)
-          server.close()
-          return true
-        rescue
+          url = URI.parse("http://#{host}:#{port}/")
+          req = Net::HTTP.new(url.host, url.port)
+          req.request_head(url)
+
           return false
+        rescue
+          return true
         end
       end
 

data/lib/marv/server/create.rb

@@ -19,6 +19,14 @@ module Marv
 
       # Create server
       def create_server
+        if ::File.exists?(@server.config_file)
+          @task.say_error "A server with the name #{@name} already exists!"
+          abort
+        end
+
+        @server.server_options
+        @config = @server.server_config
+
         begin
           @task.shell.mute do
             create_server_dir
@@ -27,30 +35,29 @@ module Marv
             add_config_files
           end
         rescue Exception => e
-          @task.say "Error while creating server:"
-          @task.say e.message + "\n", :red
+          @task.say_error "Error while creating server:", e.message
           abort
         end
 
-        @task.say "Server #{@name} created successfully!", :green
-        start_server
+        @task.say_success "Server #{@name} created successfully!"
+
+        if @task.exec_exixts?('hotel')
+          create_hotel_server
+        else
+          start_server
+        end
       end
 
       # Starts the new server
       def start_server
-        unless @task.no?("Would you like to start #{@name} server?")
+        if @task.said_yes?("Would you like to start #{@name} server?")
           action = Marv::Server::Actions.new(@server)
-          action.start
+          action.start(false)
         end
       end
 
       # Creates a directory for a new server
       def create_server_dir
-        if ::File.exists?(@server.config_file)
-          @task.say "A server with the name #{@name} already exists", :red
-          abort
-        end
-
         @task.remove_dir @path
         @task.empty_directory @path
       end
@@ -59,8 +66,10 @@ module Marv
       def download_wordpress
         package = "/tmp/wordpress-#{@config[:wp_version]}.zip"
         # Download package file
-        unless ::File.exists?(package)
-          @task.say "Downloading WordPress...", :cyan
+        if ::File.exists?(package)
+          @task.say_warning "WordPress is already downloaded...", false, true
+        else ::File.exists?(package)
+          @task.say_info "Downloading WordPress...", false, true
 
           @task.get "https://wordpress.org/wordpress-#{@config[:wp_version]}.zip" do |content|
             @task.create_file package, content
@@ -97,6 +106,20 @@ module Marv
         @global.template ::File.join(layouts, 'wp-config.php'), ::File.join(@path, 'wp-config.php'), @server.context
       end
 
+      # Create hotel server
+      def create_hotel_server
+        @task.say_warning "Hotel package detected on your system.", false
+
+        if @task.yes?("Would you like to create a hotel server?")
+          begin
+            `hotel add 'php -S 127.0.0.1:$PORT' --port #{@server.port} --dir #{@server.path}`
+            @task.say_success "Hotel server created successfully!", false
+          rescue Exception => e
+            @task.say_error "There was an error while creating hotel server:", e.message, false
+          end
+        end
+      end
+
     end
   end
-end
+end