marv 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+== 0.3.1 ==
+- Remove command servers
+- Add option --list to server command
+- Remove option --create from server command
+- Add option --start to server command
+- Remove marv link options except --folder
+- Link projects by default to global folders
+
 == 0.3.0 ==
 - Marv server (Wordpress local install)
 - Global plugins & themes for Marv servers

data/Gemfile

@@ -15,6 +15,7 @@ gem 'uglifier', '>= 2.5.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
+
 group :development do
   gem 'rake'
   gem 'rspec'

data/README.md

@@ -1,18 +1,18 @@
 ## What is Marv?
 
-Marv is a free command-line toolkit for bootstrapping and developing WordPress themes in a tidy environment using front-end languages like Sass, LESS, and CoffeeScript.
+Marv is a free command-line toolkit for bootstrapping and developing WordPress themes and plugins in a tidy environment using front-end languages like Sass, LESS, and CoffeeScript.
 
 [![Gem Version](https://badge.fury.io/rb/marv.png)](http://badge.fury.io/rb/marv)
 
 
 ## How does it work?
 
-Marv creates a neatly organized source folder with clean and simple scaffolding (base template files, SCSS files). The source folder is automatically compiled to your local WordPress install(s) as you save changes and work on your theme. When you are ready to distribute your theme Marv will build it to a folder of your choice or bundle the theme up into an easy to install zip package.
+Marv creates a neatly organized source folder with clean and simple scaffolding (base template files, SCSS files). The source folder is automatically compiled to your Marv development server(s) or local WordPress install(s) as you save changes and work on your project. When you are ready to distribute your project Marv will build it to a folder of your choice or bundle the project up into an easy to install zip package.
 
 
 ## Why use Marv?
 
-Marv accelerates development by giving you access to higher-level languages like Sass, LESS, and CoffeeScript. These languages are much quicker and cleaner to code, but still compile to normal CSS and JavaScript. Marv also makes it easy to quickly bootstrap into and a more modular development environment, while still compiling "by the book" WordPress theme code.
+Marv accelerates development by giving you access to higher-level languages like Sass, LESS, and CoffeeScript. These languages are much quicker and cleaner to code, but still compile to normal CSS and JavaScript. Marv also makes it easy to quickly bootstrap into and a more modular development environment, while still compiling "by the book" WordPress code.
 
 
 ## Basic setup
@@ -21,28 +21,40 @@ Install Marv (requires [Ruby](http://www.ruby-lang.org/) and [RubyGems](http://r
 
     $ gem install marv
 
-Create your new theme project:
+Create your new project:
 
-    $ marv create themename
+    $ marv create project-name
 
-Link to your WordPress theme folder:
+Create a Marv development server:
 
-    $ marv link /wordpress/wp-content/themes/my-theme
+	$ marv server server-name
+
+Link to your Marv server:
+
+	$ cd project-name
+    $ marv link server-name --folder themes
+    $ marv link server-name --folder plugins
+
+Also you can link to a WordPress installation:
+
+	$ cd project-name
+    $ marv link /var/www/wordpress --folder themes
+    $ marv link /var/www/wordpress --folder plugins
 
 Watch for changes and start developing!
 
-    $ cd themename
+    $ cd project-name
     $ marv watch
 
 	Press Ctrl + Z to exit watch mode
 
-Build your theme into the build_here directory:
+Build your project into the build_here directory:
 
     $ marv build build_here
 
-Package your theme as themename.zip:
+Package your project as package-name.zip:
 
-    $ marv package themename
+    $ marv package package-name
 
 
 ## Help
@@ -50,6 +62,7 @@ Package your theme as themename.zip:
 Get a little help with the Marv commands:
 
     $ marv help
+    $ marv help command
 
 
 See the [user's manual](https://github.com/hardpixel/marv/wiki) for more information.

data/Rakefile

@@ -20,8 +20,8 @@ Jeweler::Tasks.new do |gem|
   gem.executables = ["marv"]
   gem.homepage = "http://hardpixel.github.io/marv"
   gem.license = "MIT"
-  gem.summary = %Q{A tool for developing wordpress themes}
-  gem.description = %Q{A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript.}
+  gem.summary = %Q{A command-line tool for developing wordpress themes and plugins}
+  gem.description = %Q{A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript.}
   gem.email = "info@hardpixel.eu"
   gem.authors = ["Jonian Guveli", "Olibia Tsati"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/guard/marv/assets.rb

@@ -8,31 +8,25 @@ module Guard
       super
     end
 
+    # Runs on marv watch
     def start
-      UI.info "Building all assets"
-      build_assets
+      build_assets("Building all assets", true)
     end
 
-    # Called on Ctrl-\ signal
-    # This method should be principally used for long action like running all specs/tests/...
+    # Runs on all command in guard console
     def run_all
-      UI.info "Rebuilding all assets"
-      clean_build_assets
+      build_assets("Rebuilding all assets", true)
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
-      UI.info "Assets have changed, rebuilding..."
-      clean_build_assets
+      build_assets("Assets have changed, rebuilding...", nil)
     end
 
-    def build_assets
-      ::Marv::Guard.builder.build_assets
-    end
-
-    def clean_build_assets
-      ::Marv::Guard.builder.clean_images
-      ::Marv::Guard.builder.build_assets
+    # Build assets
+    def build_assets(message, clean)
+      UI.info message
+      ::Marv::Guard.builder.build_assets(clean)
     end
 
   end

data/lib/guard/marv/config.rb

@@ -8,15 +8,13 @@ module Guard
       super
     end
 
-    # Called on Ctrl-Z signal
-    # This method should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
+    # This method should be mainly used for "reload"
     def reload
       UI.info "Reloading project config"
       ::Marv::Guard.project.load_config
     end
 
-    # Called on Ctrl-\ signal
-    # This method should be principally used for long action like running all specs/tests/...
+    # Runs on all command in guard console
     def run_all
       UI.info "Reloading project config"
       ::Marv::Guard.project.load_config
@@ -28,6 +26,7 @@ module Guard
       UI.info "Project config changed, reloading"
       ::Marv::Guard.project.load_config
       ::Marv::Guard.builder = ::Marv::Builder.new(::Marv::Guard.project)
+
       # Rebuild everything if the config changes
       ::Marv::Guard.builder.build
     end

data/lib/guard/marv/folders.rb

@@ -8,29 +8,25 @@ module Guard
       super
     end
 
+    # Runs on marv watch
     def start
-      UI.info "Copying folders over"
-      copy_folders
+      copy_folders("Copying folders over", true)
     end
 
+    # Runs on all command in guard console
     def run_all
-      UI.info "Rebuilding all folders"
-      clean_copy_folders
+      copy_folders("Rebuilding all folders", true)
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
-      UI.info "Folders have changed, copying over"
-      clean_copy_folders
+      copy_folders("Folders have changed, copying over", nil)
     end
 
-    def copy_folders
-      ::Marv::Guard.builder.copy_folders
-    end
-
-    def clean_copy_folders
-      ::Marv::Guard.builder.clean_folders
-      ::Marv::Guard.builder.copy_folders
+    # Copy folders
+    def copy_folders(message, clean)
+      UI.info message
+      ::Marv::Guard.builder.copy_folders(clean)
     end
 
   end

data/lib/guard/marv/functions.rb

@@ -8,32 +8,26 @@ module Guard
       super
     end
 
+    # Runs on marv watch
     def start
-      UI.info "Copying functions over"
-      copy_functions
+      copy_functions("Copying functions over", true)
     end
 
+    # Runs on all command in guard console
     def run_all
-      UI.info "Rebuilding all functions"
-      clean_copy_functions
+      copy_functions("Rebuilding all functions", true)
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
-      UI.info "Functions have changed, copying over"
-      clean_copy_functions
+      copy_functions("Functions have changed, copying over", nil)
     end
 
-    def copy_functions
-      ::Marv::Guard.builder.copy_functions
-      ::Marv::Guard.builder.copy_includes
-    end
-
-    def clean_copy_functions
-      ::Marv::Guard.builder.clean_functions
-      ::Marv::Guard.builder.copy_functions
-      ::Marv::Guard.builder.clean_includes
-      ::Marv::Guard.builder.copy_includes
+    # Copy and clean functions and includes folder
+    def copy_functions(message, clean)
+      UI.info message
+      ::Marv::Guard.builder.copy_functions(clean)
+      ::Marv::Guard.builder.copy_includes(clean)
     end
 
   end

data/lib/guard/marv/templates.rb

@@ -8,29 +8,25 @@ module Guard
       super
     end
 
+    # Runs on marv watch
     def start
-      UI.info "Copying templates over"
-      copy_templates
+      copy_templates("Copying templates over", true)
     end
 
+    # Runs on all command in guard console
     def run_all
-      UI.info "Rebuilding all templates"
-      clean_copy_templates
+      copy_templates("Rebuilding all templates", true)
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
-      UI.info "Templates have changed, copying over"
-      clean_copy_templates
+      copy_templates("Templates have changed, copying over", nil)
     end
 
-    def copy_templates
-      ::Marv::Guard.builder.copy_templates
-    end
-
-    def clean_copy_templates
-      ::Marv::Guard.builder.clean_templates
-      ::Marv::Guard.builder.copy_templates
+    # Copy templates
+    def copy_templates(message, clean)
+      UI.info message
+      ::Marv::Guard.builder.copy_templates(clean)
     end
 
   end

data/lib/marv/builder.rb

@@ -67,7 +67,9 @@ module Marv
     # Empty out the build directory
     def clean_build_directory
       # create build path if it does not exist
-      FileUtils.mkdir_p(@project.build_path) unless File.exists?(@project.build_path)
+      unless File.exists?(@project.build_path)
+        FileUtils.mkdir_p(@project.build_path)
+      end
       # Empty the build path
       FileUtils.rm_rf Dir.glob(File.join(@project.build_path, '*'))
     end
@@ -79,7 +81,11 @@ module Marv
       end
     end
 
-    def copy_templates
+    def copy_templates(clean=nil)
+      unless clean.nil?
+        clean_templates
+      end
+
       template_paths.each do |template_path|
         # Skip directories
         next if File.directory?(template_path)
@@ -98,14 +104,26 @@ module Marv
 
     def clean_functions
       #remove functions php
-      FileUtils.rm File.join(@project.build_path, 'functions.php') if File.exists?(File.join(@project.build_path, 'functions.php'))
+      if File.exists?(File.join(@project.build_path, 'functions.php'))
+        FileUtils.rm File.join(@project.build_path, 'functions.php')
+      end
       # Remove plugin file
-      FileUtils.rm File.join(@project.build_path, @project.project_php_file) if File.exists?(@project.project_php_file)
+      if File.exists?(@project.project_php_file)
+        FileUtils.rm File.join(@project.build_path, @project.project_php_file)
+      end
       # Remove functions folder
-      FileUtils.rm_rf File.join(@project.build_path, 'functions') if File.directory?(File.join(@project.build_path, 'functions'))
+      if File.directory?(File.join(@project.build_path, 'functions'))
+        FileUtils.rm_rf File.join(@project.build_path, 'functions')
+      end
     end
 
-    def copy_functions
+    def copy_functions(clean=nil)
+      # Clean functions
+      unless clean.nil?
+        clean_functions
+      end
+
+      # Copy functions
       functions_erb_path = File.join(@functions_path, 'functions.php.erb')
       functions_php_path = File.join(@functions_path, 'functions.php')
       plugin_php_path = File.join(@functions_path, @project.project_php_file)
@@ -127,10 +145,14 @@ module Marv
 
       unless functions_paths.empty?
         # Create the functions folder in the build directory
-        FileUtils.mkdir_p(File.join(@project.build_path, 'functions'))
+        unless File.directory?(File.join(@project.build_path, 'functions'))
+          FileUtils.mkdir_p(File.join(@project.build_path, 'functions'))
+        end
 
         # Iterate over all files in source/functions, skipping the actual functions.php file
-        paths = Dir.glob(File.join(@functions_path, '**', '*')).reject {|filename| [functions_erb_path, functions_php_path, plugin_php_path].include?(filename) }
+        paths = Dir.glob(File.join(@functions_path, '**', '*')).reject do |filename|
+          [functions_erb_path, functions_php_path, plugin_php_path].include?(filename)
+        end
 
         copy_paths_with_erb(paths, @functions_path, File.join(@project.build_path, 'functions'))
       end
@@ -140,10 +162,18 @@ module Marv
       FileUtils.rm_rf File.join(@project.build_path, 'includes')
     end
 
-    def copy_includes
+    def copy_includes(clean=nil)
+      # Clean Includes
+      unless clean.nil?
+        clean_includes
+      end
+
+      # Copy includes
       unless Dir.glob(File.join(@includes_path, '*')).empty?
         # Create the includes folder in the build directory
-        FileUtils.mkdir(File.join(@project.build_path, 'includes'))
+        unless File.directory?(File.join(@project.build_path, 'includes'))
+          FileUtils.mkdir(File.join(@project.build_path, 'includes'))
+        end
 
         # Iterate over all files in source/includes, so we can exclude if necessary
         paths = Dir.glob(File.join(@includes_path, '**', '*'))
@@ -151,23 +181,25 @@ module Marv
       end
     end
 
-    def clean_folders
-      Dir.glob(File.join(@project.source_path, '*')).each do |folder|
-        unless [@assets_path, @templates_path, @functions_path, @includes_path].include?(folder)
-          if File.directory?(folder)
-            relative_path = folder.gsub(@project.source_path, '')
-            destination = File.join(@project.build_path, relative_path)
+    def clean_folders(folder)
+      # Clean folder
+      relative_path = folder.gsub(@project.source_path, '')
+      destination = File.join(@project.build_path, relative_path)
 
-            FileUtils.rm_rf destination
-          end
-        end
-      end
+      FileUtils.rm_rf destination
     end
 
-    def copy_folders
-      Dir.glob(File.join(@project.source_path, '*')).each do |folder|
-        unless [@assets_path, @templates_path, @functions_path, @includes_path].include?(folder)
-          if File.directory?(folder)
+    def copy_folders(clean=nil)
+      folders = Dir.glob(File.join(@project.source_path, '*'))
+
+      folders.each do |folder|
+        if File.directory?(folder)
+          unless [@assets_path, @templates_path, @functions_path, @includes_path].include?(folder)
+            # Clean folders
+            unless clean.nil?
+              clean_folders(folder)
+            end
+            # Copy folders
             paths = Dir.glob(File.join(folder, '**', '*'))
             copy_paths_with_erb(paths, @project.source_path, @project.build_path)
           end
@@ -179,7 +211,13 @@ module Marv
       FileUtils.rm_rf File.join(@project.build_path, 'images')
     end
 
-    def build_assets
+    def build_assets(clean=nil)
+      # Clean images
+      unless clean.nil?
+        clean_images
+      end
+
+      # Build assets
       default_assets = [['style.css'], ['admin.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']]
       additional_assets = @project.config[:additional_assets]
 
@@ -215,7 +253,9 @@ module Marv
       end
 
       # Copy the images directory over
-      FileUtils.cp_r(File.join(@assets_path, 'images'), @project.build_path) if File.exists?(File.join(@assets_path, 'images'))
+      if File.directory?(File.join(@assets_path, 'images'))
+        FileUtils.cp_r(File.join(@assets_path, 'images'), @project.build_path)
+      end
 
       # Check for screenshot and move it into main build directory
       Dir.glob(File.join(@project.build_path, 'images', '*')).each do |filename|

data/lib/marv/cli.rb

@@ -25,41 +25,23 @@ module Marv
       project = Marv::Project.create(dir, theme, self, options[:layout], options[:local])
     end
 
-    desc "link SERVER", "Create a symbolic link to the compilation directory"
-    long_desc "This command will symlink the compiled version of the project to the specified server or WordPress install path"
-    method_option :folder, :type => :string, :aliases => "-f" , :enum => %w{themes plugins}, :required => true, :desc => "Link Marv project in themes or plugins folfer"
-    method_option :global, :type => :boolean, :aliases => "-g" , :force => false, :desc => "Link Marv project in global folder"
-    method_option :path, :type => :string, :aliases => "-p" , :desc => "Create a symbolic link to a WordPress folder"
-    def link(server=nil)
+    desc "link SERVER or DIRECTORY", "Create a symbolic link to the compilation directory"
+    long_desc "This command will symlink the compiled version of the project to the specified server or WordPress install path."+
+    "If you don't provide a directory or a server name, the symlink will be created in Marv global themes or plugins folder."
+    method_option :folder, :type => :string, :enum => %w{themes plugins}, :required => true, :desc => "Link Marv project in themes or plugins folfer"
+    def link(dir='global')
       project = Marv::Project.new('.', self)
-      project_folder = project.project_id.gsub('_', '-')
-
-      FileUtils.mkdir_p project.build_path unless File.directory?(project.build_path)
-
-      unless server.nil?
-        server_path = File.join(ENV['HOME'], '.marv', 'servers', server, 'wp-content', options[:folder])
-
-        unless options[:global]
-          do_link(project, File.join(server_path, project_folder))
-        end
-      end
-
-      if options[:global]
-        global_folder = File.join(ENV['HOME'], '.marv', options[:folder])
-        FileUtils.mkdir_p global_folder unless File.directory?(global_folder)
-
-        do_link(project, File.join(global_folder, project_folder))
 
-        servers = Dir.glob(File.join(ENV['HOME'], '.marv', 'servers' , '*'))
-
-        servers.each do |server|
-          shell.mute { do_link(project, File.join(server, 'wp-content', options[:folder], project_folder)) }
-        end
+      unless File.directory?(project.build_path)
+        FileUtils.mkdir_p project.build_path
       end
 
-      if options[:path]
-        wp_path = File.join(options[:path], 'wp-content', options[:folder])
-        do_link(project, File.join(wp_path, project_folder))
+      if dir == 'global'
+        link_project_globaly(options, project)
+      else
+        wp_path = File.join(dir, 'wp-content', options[:folder])
+        server_path = File.join(ENV['HOME'], '.marv', 'servers', dir, 'wp-content', options[:folder])
+        link_project(wp_path, server_path, project)
       end
     end
 
@@ -102,98 +84,105 @@ module Marv
     end
 
     desc "server SERVER", "Start a Marv server by name"
-    method_option :create, :type => :boolean, :aliases => "-c" , :force => false, :desc => "Create a new Marv server"
-    method_option :stop, :type => :boolean, :aliases => "-s" , :force => false, :desc => "Stop a running Marv server"
-    method_option :restart, :type => :boolean, :aliases => "-r" , :force => false, :desc => "Restart a Marv server"
+    method_option :list, :type => :boolean, :force => false, :desc => "List all available Marv servers"
+    method_option :start, :type => :boolean, :force => false, :desc => "Create a new Marv server"
+    method_option :stop, :type => :boolean, :force => false, :desc => "Stop a running Marv server"
+    method_option :restart, :type => :boolean, :force => false, :desc => "Restart a Marv server"
     # method_option :backup, :type => :boolean, :force => false, :desc => "Backup a Marv server"
     # method_option :restore, :type => :boolean, :force => false, :desc => "Restore a Marv server"
     method_option :remove, :type => :boolean, :force => false, :desc => "Remove a Marv server"
-    def server(name)
-      config = {}
+    def server(name=nil)
+      if options.empty?
+        server = Marv::Server.new(name, self, server_config)
+        server.create_server
+      end
 
-      if options[:create]
-        say "This will create a new Marv server with WordPress installed:", :green
-        config[:user] = ask("Mysql username:", nil, {:default => "root"})
-        config[:password] = ask("Mysql user password:", nil, {:default => "required"})
-        config[:host] = ask("Mysql host:", nil, {:default => "localhost"})
-        config[:port] = ask("Mysql port:", nil, {:default => "3306"})
-        config[:version] = ask("WordPress version:", nil, {:default => "latest"})
+      if options[:remove]
+        server = Marv::Server.new(name, self, server_config(true, name))
+        server.remove_server
+      end
 
-        server = Marv::Server.new(name, self, config)
-        server.create_server
-      else
+      if options[:start] or options[:stop] or options[:restart]
         server = Marv::Server.new(name, self, nil)
+        control_server(options, name, server)
+      end
 
-        if options.empty?
-          server.start_server
-        end
+      if options[:list]
+        list_servers
+      end
+    end
 
-        if options[:stop]
-          server.stop_server
-        end
+    protected
 
-        if options[:restart]
-          server.restart_server
-        end
+    def link_project_globaly(options, project)
+      project_folder = project.project_id.gsub('_', '-')
+      global_folder = File.join(ENV['HOME'], '.marv', options[:folder])
 
-        if options[:remove]
-          say "This will remove the specified Marv server:", :green
-          config[:user] = ask("Mysql username:", nil, {:default => "root"})
-          config[:password] = ask("Mysql user password:", nil, {:default => "required"})
-          config[:host] = ask("Mysql host:", nil, {:default => "localhost"})
-          config[:port] = ask("Mysql port:", nil, {:default => "3306"})
-          config[:version] = "latest"
+      unless File.directory?(global_folder)
+        FileUtils.mkdir_p global_folder
+      end
 
-          server = Marv::Server.new(name, self, config)
-          server.remove_server
-        end
+      do_link(project, File.join(global_folder, project_folder))
+
+      servers = Dir.glob(File.join(ENV['HOME'], '.marv', 'servers' , '*'))
+
+      servers.each do |server|
+        shell.mute { do_link(project, File.join(server, 'wp-content', options[:folder], project_folder)) }
       end
-      exit
     end
 
-    desc "servers OPTION", "List all available Marv servers"
-    method_option :remove, :type => :boolean, :force => false, :desc => "Remove all Marv servers"
-    # method_option :backup, :type => :boolean, :force => false, :desc => "Backup existing Marv servers"
-    # method_option :restore, :type => :boolean, :force => false, :desc => "Restore Marv servers from backup file"
-    def servers
-      if options.empty?
-        list_all_servers
-      end
+    def server_config(remove=nil, name=nil)
+      config = {}
 
-      if options[:remove]
-        config = {}
+      if remove.nil?
+        say "This will create a new Marv server with WordPress installed:", :green
+      else
+        say "This will remove #{name} server:", :yellow
+      end
 
-        say "This will remove all available Marv servers:", :green
-        config[:user] = ask("Mysql username:", nil, {:default => "root"})
-        config[:password] = ask("Mysql user password:", nil, {:default => "required"})
-        config[:host] = ask("Mysql host:", nil, {:default => "localhost"})
-        config[:port] = ask("Mysql port:", nil, {:default => "3306"})
-        config[:version] = "latest"
+      config[:user] = ask("Mysql username:", nil, {:default => "root"})
+      config[:password] = ask("Mysql user password:", nil, {:default => "required"})
+      config[:host] = ask("Mysql host:", nil, {:default => "localhost"})
+      config[:port] = ask("Mysql port:", nil, {:default => "3306"})
 
-        remove_all_servers(config)
+      if remove.nil?
+        config[:version] = ask("WordPress version:", nil, {:default => "latest"})
       end
-      exit
+
+      config
     end
 
-    protected
+    def control_server(options, name, server)
+      if options[:start]
+        server.start_server
+      end
 
-    def list_all_servers
-      servers_root = File.join(ENV['HOME'], '.marv', 'servers')
-      servers = Dir.glob(File.join(servers_root, '*'))
+      if options[:stop]
+        server.stop_server
+      end
 
-      servers.each do |server|
-        say "Available marv servers:", :yellow
-        say '- ' + File.basename(server), :green
+      if options[:restart]
+        server.restart_server
       end
     end
 
-    def remove_all_servers(config)
+    def list_servers
       servers_root = File.join(ENV['HOME'], '.marv', 'servers')
       servers = Dir.glob(File.join(servers_root, '*'))
 
+      say "Available marv servers:"
       servers.each do |server|
-        server = Marv::Server.new(File.basename(server), self, config)
-        server.remove_server
+        say '- ' + File.basename(server), :cyan
+      end
+    end
+
+    def link_project( wp_path, server_path, project)
+      project_folder = project.project_id.gsub('_', '-')
+
+      if File.directory?(wp_path)
+        do_link(project, File.join(wp_path, project_folder))
+      else
+        do_link(project, File.join(server_path, project_folder))
       end
     end
 

data/lib/marv/generator.rb

@@ -39,56 +39,36 @@ module Marv
       self
     end
 
-    def copy_stylesheets
-      source = File.expand_path(File.join(self.layout_path, 'stylesheets'))
-      target = File.expand_path(File.join(@project.assets_path, 'stylesheets'))
+    def copy_assets
+      ['stylesheets', 'javascripts', 'images'].each do |folder|
+        source = File.expand_path(File.join(self.layout_path, folder))
+        target = File.expand_path(File.join(@project.assets_path, folder))
 
-      render_directory(source, target)
-
-      self
-    end
-
-    def copy_javascript
-      source = File.expand_path(File.join(self.layout_path, 'javascripts'))
-      target = File.expand_path(File.join(@project.assets_path, 'javascripts'))
-
-      render_directory(source, target)
-
-      self
-    end
-
-    def copy_images
-      source = File.expand_path(File.join(self.layout_path, 'images'))
-      target = File.expand_path(File.join(@project.assets_path, 'images'))
-
-      render_directory(source, target)
+        render_directory(source, target)
+      end
 
       self
     end
 
-    def copy_templates
-      source = File.expand_path(File.join(self.layout_path, 'templates'))
-      target = File.expand_path(File.join(@project.source_path, 'templates'))
+    def copy_folders
+      ['templates', 'includes'].each do |folder|
+        source = File.expand_path(File.join(self.layout_path, folder))
+        target = File.expand_path(File.join(@project.source_path, folder))
 
-      render_directory(source, target)
+        render_directory(source, target)
+      end
 
       self
     end
 
     def copy_functions
-      source = File.expand_path(File.join(self.layout_path, 'functions', 'functions.php.erb'))
-      target = File.expand_path(File.join(@project.source_path, 'functions', 'functions.php'))
-
-      write_template(source, target)
-    end
-
-    def copy_includes
-      source = File.expand_path(File.join(self.layout_path, 'includes'))
-      target = File.expand_path(File.join(@project.source_path, 'includes'))
-
-      render_directory(source, target)
-
-      self
+      ['functions.php', @project.project_php_file].each do |file|
+        source = File.expand_path(File.join(self.layout_path, 'functions', "#{file}.erb"))
+        if File.exist?(source)
+          target = File.expand_path(File.join(@project.source_path, 'functions', file))
+          write_template(source, target)
+        end
+      end
     end
 
     def layout_path
@@ -102,12 +82,9 @@ module Marv
     def run
       write_config
       create_structure
-      copy_stylesheets
-      copy_javascript
-      copy_images
-      copy_templates
+      copy_assets
+      copy_folders
       copy_functions
-      copy_includes
 
       return self
     end

data/lib/marv/server.rb

@@ -71,12 +71,13 @@ module Marv
 
       add_global_content
 
-      @task.say "Server #{@server_name} created", :green
+      @task.say "Server #{@server_name} created successfuly!", :green
+      @task.say "Start server using marv server #{@server_name} --start"
       exit
     end
 
     def start_server
-      update_global_content
+      update_global_projects
 
       begin
         @task.shell.mute do
@@ -85,7 +86,6 @@ module Marv
       rescue Exception => e
         @task.say "Error while starting server:"
         @task.say e.message + "\n", :red
-        exit
       end
       @task.say "Server #{@server_name} running", :green
     end
@@ -101,15 +101,14 @@ module Marv
             php_pid = File.read(php_pid_file).to_i
 
             Process.kill(9, ruby_pid, php_pid)
-            @task.say "Server #{@server_name} stopped", :green
+            @task.say "Server #{@server_name} stopped", :yellow
           else
-            @task.say "Server #{@server_name} is not running", :yellow
+            @task.say "Server #{@server_name} is not running", :red
           end
         end
       rescue Exception => e
         @task.say "Error while stoping server:"
         @task.say e.message + "\n", :red
-        exit
       end
     end
 
@@ -119,16 +118,17 @@ module Marv
     end
 
     def remove_server
-      @task.say "Removing server...", :green
+      @task.say "Removing server..."
       @task.shell.mute do
         stop_server
       end
-      @task.say "Removing server files...", :green
+      @task.say "Removing server files..."
 
       begin
         @task.shell.mute do
           FileUtils.rm_r(@server_path)
         end
+        @task.say "Server files removed", :green
       rescue Exception => e
         @task.say "Error while removing server files:"
         @task.say e.message + "\n", :red
@@ -136,7 +136,7 @@ module Marv
 
       remove_server_database
 
-      @task.say "Server successfuly removed", :yellow
+      @task.say "Server successfuly removed!", :green
       exit
     end
 
@@ -154,7 +154,7 @@ module Marv
     end
 
     def download_wordpress
-      @task.say "Starting server installation:", :green
+      @task.say "Starting server installation:"
 
       begin
         @task.shell.mute do
@@ -174,7 +174,6 @@ module Marv
         @task.say e.message + "\n", :red
         exit
       end
-      @task.say "wordpress-#{@wp_version}.tar.gz downloaded"
     end
 
     def extract_wordpress
@@ -195,6 +194,7 @@ module Marv
         @task.say e.message + "\n", :red
         exit
       end
+      @task.say "WordPress files created", :green
     end
 
     def add_wordpress_config
@@ -238,6 +238,7 @@ module Marv
 
     def remove_server_database
       begin
+        @task.say "Removing Mysql database..."
         @task.shell.mute do
           client = Mysql2::Client.new(:host => @db_host, :port => @db_port, :username => @db_user, :password => @db_password)
           client.query("DROP DATABASE IF EXISTS #{@db_name}")
@@ -248,9 +249,8 @@ module Marv
       rescue Exception => e
         @task.say "Error while removing Mysql database:"
         @task.say e.message + "\n", :red
-        exit
       end
-      @task.say "Mysql database removed", :yellow
+      @task.say "Mysql database removed", :green
     end
 
     def add_global_content
@@ -270,31 +270,28 @@ module Marv
       end
     end
 
-    def update_global_content
-      @task.shell.mute do
-        themes = Dir.glob(File.join(@server_path, 'wp-content', 'themes', '*'))
-
-        themes.each do |theme|
-          if File.symlink?(theme)
-            unless File.exists?(theme)
-              File.delete(theme)
-              File.delete(File.join(ENV['HOME'], '.marv', 'themes', File.basename(theme)))
+    def update_global_folders(dir, folders)
+      begin
+        folders.each do |folder|
+          if File.symlink?(folder)
+            unless File.exists?(folder)
+              File.delete(folder)
+              File.delete(File.join(ENV['HOME'], '.marv', dir, File.basename(folder)))
             end
           end
         end
+      rescue Exception => e
+        @task.say "Error while updating global projects:"
+        @task.say e.message + "\n", :red
+      end
+    end
 
-        plugins = Dir.glob(File.join(@server_path, 'wp-content', 'plugins', '*'))
-
-        plugins.each do |plugin|
-          if File.symlink?(plugin)
-            unless File.exists?(plugin)
-              File.delete(plugin)
-              File.delete(File.join(ENV['HOME'], '.marv', 'themes', File.basename(plugin)))
-            end
-          end
-        end
+    def update_global_projects
+      themes = Dir.glob(File.join(@server_path, 'wp-content', 'themes', '*'))
+      update_global_folders('themes', themes)
 
-      end
+      plugins = Dir.glob(File.join(@server_path, 'wp-content', 'plugins', '*'))
+      update_global_folders('plugins', plugins)
     end
 
   end

data/lib/marv/version.rb

@@ -1,3 +1,3 @@
 module Marv
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/marv.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2014-09-08"
-  s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
+  s.date = "2014-09-10"
+  s.description = "A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
   s.extra_rdoc_files = [
@@ -84,7 +84,7 @@ Gem::Specification.new do |s|
     "lib/marv/project.rb",
     "lib/marv/server.rb",
     "lib/marv/version.rb",
-    "marv-0.3.0.gem",
+    "marv-0.3.1.gem",
     "marv.gemspec",
     "spec/lib/marv/project_spec.rb",
     "spec/spec_helper.rb"
@@ -93,7 +93,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
-  s.summary = "A tool for developing wordpress themes"
+  s.summary = "A command-line tool for developing wordpress themes and plugins"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/lib/marv/project_spec.rb

@@ -1,6 +1,7 @@
 require 'marv/project'
 
 describe Marv::Project do
+
   before(:each) do
     @project = Marv::Project.new('/tmp/', nil, {:name => 'Hello'})
   end

data/spec/spec_helper.rb

@@ -9,5 +9,4 @@ p "HEY"
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -252,8 +252,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A toolkit for bootstrapping and developing WordPress themes using Sass,
-  LESS, and CoffeeScript.
+description: A toolkit for bootstrapping and developing WordPress themes and plugins
+  using Sass, LESS, and CoffeeScript.
 email: info@hardpixel.eu
 executables:
 - marv
@@ -328,7 +328,7 @@ files:
 - lib/marv/project.rb
 - lib/marv/server.rb
 - lib/marv/version.rb
-- marv-0.3.0.gem
+- marv-0.3.1.gem
 - marv.gemspec
 - spec/lib/marv/project_spec.rb
 - spec/spec_helper.rb
@@ -356,5 +356,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A tool for developing wordpress themes
+summary: A command-line tool for developing wordpress themes and plugins
 test_files: []