marv 0.6.5 → 0.7.0

data/lib/marv/cli/project.rb

@@ -1,14 +1,9 @@
+require 'marv/cli/base'
 require 'marv/project/project'
 
 module Marv
   module CLI
-    class Project < Thor
-
-      def self.source_root
-        ::File.expand_path(::File.join(Marv.root, 'layouts'))
-      end
-
-      include Thor::Actions
+    class Project < Base
 
       # Create a new Marv project
       desc "create DIRECTORY", "Creates a Marv project into specified directory"
@@ -38,7 +33,7 @@ module Marv
       end
 
       # Build a Marv project to a directory
-      desc "build DIRECTORY", "Build your theme into specified directory"
+      desc "build DIRECTORY", "Build your project into specified directory"
       method_option :config, :type => :string, :desc => "Name of alternate config file"
       def build(dir='build')
         project = Marv::Project::Project.new(self, '.', options[:config])
@@ -58,4 +53,4 @@ module Marv
 
     end
   end
-end
+end

data/lib/marv/cli/server.rb

@@ -1,14 +1,9 @@
+require 'marv/cli/base'
 require 'marv/server/server'
 
 module Marv
   module CLI
-    class Server < Thor
-
-      def self.source_root
-        ::File.expand_path(::File.join(Marv.root, 'layouts'))
-      end
-
-      include Thor::Actions
+    class Server < Base
 
       # List all Marv servers
       desc "list", "List all Marv servers"
@@ -16,31 +11,32 @@ module Marv
         servers = Marv::Global.new(self).servers
 
         if dir == 'all'
-          say "Available marv servers:"
-          servers.each_with_index do |server, index|
-            say "#{index + 1}. #{server}", :cyan
+          say_info "Available marv servers:", true
+          servers.each_with_index do |server_dir, index|
+            server = Marv::Server::Server.new(self, server_dir)
+            say_message "#{index + 1}. #{server.name} [http://#{server.host}:#{server.port}]", false
           end
 
           if servers.empty?
-            say "No servers found", :yellow
+            say_warning "No servers found", false
           end
         end
 
         if dir == 'running'
           index = 0
-          say "Running marv servers:"
-          servers.each do |dir|
-            server = Marv::Server::Server.new(self, dir)
+          say_success "Running marv servers:", true
+          servers.each do |server_dir|
+            server = Marv::Server::Server.new(self, server_dir)
             action = Marv::Server::Actions.new(server)
 
             if action.is_server_running?
-              say "#{index + 1}. #{server.name} [http://#{server.host}:#{server.port}]", :green
+              say_message "#{index + 1}. #{server.name} [http://#{server.host}:#{server.port}]", false
               index += 1
             end
           end
 
           if index == 0
-            say "No running servers found", :yellow
+            say_warning "No running servers found", false
           end
         end
       end
@@ -66,8 +62,9 @@ module Marv
 
         # Create server if it does not exist
         unless ::File.directory?(::File.join(servers_path, dir))
-          say "Server #{dir} does not exist.", :yellow
-          if yes?("Would you like to create the server?")
+          say_warning "Server #{dir} does not exist."
+          if said_yes?("Would you like to create the server?")
+            say_empty
             create(dir)
           end
         end
@@ -85,8 +82,8 @@ module Marv
         if dir == 'all'
           servers = Marv::Global.new(self).servers
 
-          servers.each do |dir|
-            server = Marv::Server::Server.new(self, dir)
+          servers.each do |server_dir|
+            server = Marv::Server::Server.new(self, server_dir)
             action = Marv::Server::Actions.new(server)
 
             if action.is_server_running?
@@ -114,4 +111,4 @@ module Marv
 
     end
   end
-end
+end

data/lib/marv/global.rb

@@ -3,11 +3,15 @@ module Marv
 
     attr_accessor :config, :path, :servers, :plugins, :themes, :layouts
 
-    def initialize(task)
+    def initialize(task, from_command=false)
       @task = task
 
       create_global_folders
-      create_global_config
+
+      @current = current_options
+      @default = default_options
+
+      generate_config(from_command)
 
       @path = global_path
       @config = global_config
@@ -22,6 +26,49 @@ module Marv
       end
     end
 
+    # Generate configuration
+    def generate_config(from_command=false)
+      if from_command
+        ::File.exists?(config_file) ? reconfigure : configure(from_command)
+      else
+        configure unless ::File.exists?(config_file)
+      end
+    end
+
+    # Default config options
+    def default_options
+      defaults = {
+        :server_host  => "localhost",
+        :server_port  => "3000",
+        :db_user      => "root",
+        :db_password  => "root",
+        :db_host      => "localhost",
+        :db_port      => "3306",
+        :wp_version   => "latest",
+        :uri          => "https://wordpress.org",
+        :author       => username,
+        :author_uri   => "https://wordpress.org",
+        :license_name => "GPLv3",
+        :license_uri  => "http://www.gnu.org/licenses/gpl.html"
+      }
+
+      defaults.merge(@current)
+    end
+
+    # Get current options
+    def current_options
+      if ::File.exists?(config_file)
+        global_config.reject { |opt| opt.nil? || opt == '' }
+      else
+        {}
+      end
+    end
+
+    # Get user name
+    def username
+      ENV['USERNAME'] || 'marv'
+    end
+
     # Global Marv folder path
     def global_path
       ::File.join(ENV['HOME'], '.marv')
@@ -34,7 +81,11 @@ module Marv
 
     # Load global config file
     def global_config
-      load_ruby_config(config_file)
+      if ::File.exists?(config_file)
+        load_ruby_config(config_file)
+      else
+        {}
+      end
     end
 
     # Servers folder path
@@ -123,13 +174,28 @@ module Marv
       end
     end
 
+    # Project details
+    def ask_project_details
+      options = {}
+
+      if @task.said_change?("Do you want to set default project details?")
+        options[:uri] = @task.ask_option "Default project URI:", :default => @default[:uri]
+        options[:author] = @task.ask_option "Default project author:", :default => @default[:author]
+        options[:author_uri] = @task.ask_option "Default project author URI:", :default => @default[:author_uri]
+        options[:license_name] = @task.ask_option "Default project license name:", :default => @default[:license_name]
+        options[:license_uri] = @task.ask_option "Default project license URI:", :default => @default[:license_uri]
+      end
+
+      return options
+    end
+
     # Server details
     def ask_server_details
       options = {}
 
-      if @task.yes?("Do you want to set default server settings?")
-        options[:server_host] = @task.ask "Default host for servers?", :default => "localhost"
-        options[:server_port] = @task.ask "Default port for servers?", :default => "3000"
+      if @task.said_change?("Do you want to set default server settings?")
+        options[:server_host] = @task.ask_option "Default host for servers:", :default => @default[:server_host]
+        options[:server_port] = @task.ask_option "Default port for servers:", :default => @default[:server_port]
       end
 
       return options
@@ -139,11 +205,11 @@ module Marv
     def ask_database_details
       options = {}
 
-      if @task.yes?("Do you want to set default database settings?")
-        options[:db_user] = @task.ask "Default database username?", :default => "root"
-        options[:db_password] = @task.ask "Default database password?", :default => "root"
-        options[:db_host] = @task.ask "Default database host?", :default => "localhost"
-        options[:db_port] = @task.ask "Default database port?", :default => "3306"
+      if @task.said_change?("Do you want to set default database settings?")
+        options[:db_user] = @task.ask_option "Default database username:", :default => @default[:db_user]
+        options[:db_password] = @task.ask_option "Default database password:", :default => @default[:db_password]
+        options[:db_host] = @task.ask_option "Default database host:", :default => @default[:db_host]
+        options[:db_port] = @task.ask_option "Default database port:", :default => @default[:db_port]
       end
 
       return options
@@ -153,8 +219,8 @@ module Marv
     def ask_wordpress_details
       options = {}
 
-      if @task.yes?("Do you want to set default WordPress version?")
-        options[:wp_version] = @task.ask "Default WordPress version?", :default => "latest"
+      if @task.said_change?("Do you want to set default WordPress version?")
+        options[:wp_version] = @task.ask_option "Default WordPress version?", :default => @default[:wp_version]
       end
 
       return options
@@ -167,18 +233,9 @@ module Marv
 
     # Ask global options
     def ask_global_options
-      options = {}
-
-      @task.say "This will create a new global configuration file.", :cyan
-
-      if @task.yes?("Do you want to set default project details?")
-        options[:uri] = @task.ask "Default project URI"
-        options[:author] = @task.ask "Default project author"
-        options[:author_uri] = @task.ask "Default project author URI"
-        options[:license_name] = @task.ask "Default project license name"
-        options[:license_uri] = @task.ask "Default project license URI"
-      end
+      options = @default
 
+      options.merge!(ask_project_details)
       options.merge!(ask_server_details)
       options.merge!(ask_database_details)
       options.merge!(ask_wordpress_details)
@@ -189,22 +246,43 @@ module Marv
     # Create global config
     def create_global_config
       unless ::File.exists?(config_file)
+        @task.shell.mute do
+          layout = ::File.join(Marv.root, 'layouts', 'config', 'global.rb')
+          filepath = ::File.join(global_path, 'config.rb')
+
+          template layout, filepath, instance_eval('binding')
+        end
+      end
+    end
+
+    # Configure Marv global options
+    def configure(from_command=false)
+      @task.say_warning "You do not have a global configuration file.", false
+      @task.say_info "This will create a new global configuration file.", true
+
+      if @task.said_change?("Do you want to change the default options?")
         ask_global_options
-        template ::File.join(Marv.root, 'layouts', 'config', 'global.rb'), ::File.join(global_path, 'config.rb'), instance_eval('binding')
       end
+
+      @options = @default
+      create_global_config
+
+      @task.say_success "Global configuration created successfully.", !from_command, true
     end
 
     # Reconfig Marv global options
     def reconfigure
-      @task.say "This will overwrite your global configuration file.", :cyan
+      @task.say_warning "This will overwrite your global configuration file."
 
-      if @task.yes?("Do you want to continue?")
+      if @task.said_change?("Do you want to continue?")
         @task.shell.mute do
+          ask_global_options
+
           @task.remove_file config_file
+          create_global_config
         end
 
-        create_global_folders
-        create_global_config
+        @task.say_success "Global configuration updated successfully.", false, true
       end
     end
 
@@ -248,8 +326,7 @@ module Marv
         # Config file is just executed as straight ruby
         eval(::File.read(file))
       rescue Exception => e
-        @task.say "Error while evaluating config file:"
-        @task.say e.message, :red
+        @task.say_error "Error while evaluating config file:", e.message
       end
 
       return config
@@ -282,4 +359,4 @@ module Marv
     end
 
   end
-end
+end

data/lib/marv/project/actions.rb

@@ -16,22 +16,28 @@ module Marv
       def link(dir)
         @link_dir = dir
 
+        @task.say_warning "This will link project #{@project.project_id} to server #{dir}."
+
         link_options
         link_target
+
+        @task.say_empty
         create_link
       end
 
       # Packgage project
       def package(filename)
         @package_name = filename
+        pkg_name = filename || get_package_name
 
+        @task.say_warning "This will package project #{@project.project_id} as #{pkg_name}.zip."
         create_package
       end
 
       # Ask for link details
       def link_options
         options = {}
-        options[:folder] = @task.ask "Where do you want to link your project?", :limited_to => ["themes", "plugins"], :default => "themes"
+        options[:folder] = @task.ask_input "Where do you want to link your project?", :limited_to => ["themes", "plugins"], :default => "themes"
 
         @link_options = options
       end
@@ -70,8 +76,8 @@ module Marv
         target = link_global unless link_global.nil?
 
         if target.nil?
-          @task.say "Destination server does not exist!", :red
-          exit
+          @task.say_error "Destination server does not exist!", nil, false, true
+          abort
         end
 
         @link_target = target
@@ -88,8 +94,8 @@ module Marv
         begin
           @task.create_link @link_target, @project.build_path
         rescue Exception => e
-          @task.say "An error occured while creating project link", :red
-          @task.say e.message
+          @task.say_error "An error occured while creating project link", e.message, false. true
+          abort
         end
       end
 
@@ -115,10 +121,15 @@ module Marv
       # Set the package file name
       def set_package_filename
         if @package_name.nil?
-          @package_name = ::File.basename(@project.root)
+          @package_name = get_package_name
         end
       end
 
+      # Get package name
+      def get_package_name
+        ::File.basename(@project.root)
+      end
+
       # Built to a temporary directory
       def build_to_temp_dir
         @builder.build_project

data/lib/marv/project/builder.rb

@@ -35,13 +35,20 @@ module Marv
 
       # Build project to a directory
       def build_to(dir)
-        build_project
-        # Remove build directory
-        @task.shell.mute do
-          @task.remove_dir ::File.expand_path(dir)
+        @task.say_warning "This will build project #{@project.project_id} in directory #{dir}."
+
+        begin
+          build_project
+          # Remove build directory
+          @task.shell.mute do
+            @task.remove_dir ::File.expand_path(dir)
+          end
+          # Copy files from .watch/build directory
+          @task.directory @project.build_path, ::File.expand_path(dir)
+        rescue Exception => e
+          @task.say_error "There was an error while building the project:", e.message, false
+          abort
         end
-        # Copy files from .watch/build directory
-        @task.directory @project.build_path, ::File.expand_path(dir)
       end
 
       # Clean build directory
@@ -53,4 +60,4 @@ module Marv
 
     end
   end
-end
+end

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

@@ -72,8 +72,7 @@ module Marv
       def print_asset_error(asset, message)
         destination = ::File.join(@project.build_path, asset)
 
-        @task.say "Error while building #{asset.last}:"
-        @task.say message, :red
+        @task.say_error "Error while building #{asset.last}:", message
 
         @task.shell.mute do
           @task.create_file destination unless ::File.exists?(destination)