marv 0.2.5 → 0.3.0

data/layouts/default/templates/partials/content-none.php.erb

@@ -1,17 +1,17 @@
 <div class="no-results not-found">
 	<header class="page-header">
-		<h1 class="page-title"><?php _e( 'Nothing Found', '<%= theme_id %>' ); ?></h1>
+		<h1 class="page-title"><?php _e( 'Nothing Found', '<%= project_id %>' ); ?></h1>
 	</header>
 
 	<div class="page-content">
 		<?php if( is_search() ) : ?>
 
-			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', '<%= theme_id %>' ); ?></p>
+			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', '<%= project_id %>' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php else : ?>
 
-			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '<%= theme_id %>' ); ?></p>
+			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '<%= project_id %>' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>

data/layouts/default/templates/partials/content.php.erb

@@ -6,11 +6,11 @@
 	<?php if ( is_search() ) : ?>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
-			<a href="<?php the_permalink(); ?>"><?php _e('Read more', '<%= theme_id %>') ?></a>
+			<a href="<?php the_permalink(); ?>"><?php _e('Read more', '<%= project_id %>') ?></a>
 		</div>
 	<?php else : ?>
 		<div class="entry-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', '<%= theme_id %>' ) ); ?>
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', '<%= project_id %>' ) ); ?>
 		</div>
 	<?php endif; ?>
 </div>

data/layouts/default/templates/partials/searchform.php.erb

@@ -1,5 +1,5 @@
 <form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
-	<label for="s" class="assistive-text"><?php _e( 'Search', '<%= theme_id %>' ); ?></label>
-	<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', '<%= theme_id %>' ); ?>" />
-	<button type="submit" class="submit" name="submit" id="searchsubmit"><?php _e( 'Search', '<%= theme_id %>' ); ?></button>
+	<label for="s" class="assistive-text"><?php _e( 'Search', '<%= project_id %>' ); ?></label>
+	<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', '<%= project_id %>' ); ?>" />
+	<button type="submit" class="submit" name="submit" id="searchsubmit"><?php _e( 'Search', '<%= project_id %>' ); ?></button>
 </form>

data/layouts/default/templates/search.php.erb

@@ -5,7 +5,7 @@
 			<?php if ( have_posts() ) : ?>
 
 				<header class="page-header">
-					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', '<%= theme_id %>' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', '<%= project_id %>' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
 				</header>
 
 				<?php while ( have_posts() ) : the_post(); ?>
@@ -14,7 +14,7 @@
 
 				<?php endwhile; ?>
 
-				<?php <%= theme_id %>_paging_nav(); ?>
+				<?php <%= project_id %>_paging_nav(); ?>
 
 			<?php else : ?>
 

data/lib/guard/marv/assets.rb

@@ -10,22 +10,30 @@ module Guard
 
     def start
       UI.info "Building all assets"
-      ::Marv::Guard.builder.build_assets
+      build_assets
     end
 
     # Called on Ctrl-\ signal
     # This method should be principally used for long action like running all specs/tests/...
     def run_all
       UI.info "Rebuilding all assets"
-      ::Marv::Guard.builder.clean_images
-      ::Marv::Guard.builder.build_assets
+      clean_build_assets
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
       UI.info "Assets have changed, rebuilding..."
+      clean_build_assets
+    end
+
+    def build_assets
+      ::Marv::Guard.builder.build_assets
+    end
+
+    def clean_build_assets
       ::Marv::Guard.builder.clean_images
       ::Marv::Guard.builder.build_assets
     end
+
   end
 end

data/lib/guard/marv/config.rb

@@ -3,6 +3,7 @@ require 'guard/guard'
 
 module Guard
   class MarvConfig < ::Guard::Guard
+
     def initialize(watchers=[], options={})
       super
     end
@@ -30,5 +31,6 @@ module Guard
       # Rebuild everything if the config changes
       ::Marv::Guard.builder.build
     end
+
   end
 end

data/lib/guard/marv/folders.rb

@@ -0,0 +1,37 @@
+require 'guard'
+require 'guard/guard'
+
+module Guard
+  class MarvFolders < ::Guard::Guard
+
+    def initialize(watchers=[], options={})
+      super
+    end
+
+    def start
+      UI.info "Copying folders over"
+      copy_folders
+    end
+
+    def run_all
+      UI.info "Rebuilding all folders"
+      clean_copy_folders
+    end
+
+    # Called on file(s) modifications
+    def run_on_change(paths)
+      UI.info "Folders have changed, copying over"
+      clean_copy_folders
+    end
+
+    def copy_folders
+      ::Marv::Guard.builder.copy_folders
+    end
+
+    def clean_copy_folders
+      ::Marv::Guard.builder.clean_folders
+      ::Marv::Guard.builder.copy_folders
+    end
+
+  end
+end

data/lib/guard/marv/functions.rb

@@ -3,34 +3,38 @@ require 'guard/guard'
 
 module Guard
   class MarvFunctions < ::Guard::Guard
+
     def initialize(watchers=[], options={})
       super
     end
 
     def start
       UI.info "Copying functions over"
-      ::Marv::Guard.builder.copy_functions
-      ::Marv::Guard.builder.copy_includes
-      ::Marv::Guard.builder.copy_extras
+      copy_functions
     end
 
     def run_all
       UI.info "Rebuilding all functions"
-      ::Marv::Guard.builder.clean_functions
-      ::Marv::Guard.builder.copy_functions
-      ::Marv::Guard.builder.clean_includes
-      ::Marv::Guard.builder.copy_includes
-      ::Marv::Guard.builder.copy_extras
+      clean_copy_functions
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
       UI.info "Functions have changed, copying over"
+      clean_copy_functions
+    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
-      ::Marv::Guard.builder.copy_extras
     end
+
   end
 end

data/lib/guard/marv/templates.rb

@@ -3,26 +3,35 @@ require 'guard/guard'
 
 module Guard
   class MarvTemplates < ::Guard::Guard
+
     def initialize(watchers=[], options={})
       super
     end
 
     def start
       UI.info "Copying templates over"
-      ::Marv::Guard.builder.copy_templates
+      copy_templates
     end
 
     def run_all
       UI.info "Rebuilding all templates"
-      ::Marv::Guard.builder.clean_templates
-      ::Marv::Guard.builder.copy_templates
+      clean_copy_templates
     end
 
     # Called on file(s) modifications
     def run_on_change(paths)
       UI.info "Templates have changed, copying over"
+      clean_copy_templates
+    end
+
+    def copy_templates
+      ::Marv::Guard.builder.copy_templates
+    end
+
+    def clean_copy_templates
       ::Marv::Guard.builder.clean_templates
       ::Marv::Guard.builder.copy_templates
     end
+
   end
 end

data/lib/marv.rb

@@ -7,4 +7,5 @@ module Marv
   autoload :Project, 'marv/project'
   autoload :Builder, 'marv/builder'
   autoload :Generator, 'marv/generator'
+  autoload :Server, 'marv/server'
 end

data/lib/marv/builder.rb

@@ -6,6 +6,7 @@ require 'marv/engines'
 
 module Marv
   class Builder
+
     def initialize(project)
       @project = project
       @task = project.task
@@ -13,7 +14,6 @@ module Marv
       @assets_path = @project.assets_path
       @functions_path = @project.functions_path
       @includes_path = @project.includes_path
-      @extras_path = @project.extras_path
       @package_path = @project.package_path
 
       init_sprockets
@@ -25,7 +25,7 @@ module Marv
       copy_templates
       copy_functions
       copy_includes
-      copy_extras
+      copy_folders
       build_assets
     end
 
@@ -97,13 +97,18 @@ module Marv
     end
 
     def clean_functions
-      FileUtils.rm File.join(@project.build_path, 'functions.php')
-      FileUtils.rm_rf File.join(@project.build_path, 'functions')
+      #remove functions php
+      FileUtils.rm File.join(@project.build_path, 'functions.php') if File.exists?(File.join(@project.build_path, 'functions.php'))
+      # Remove plugin file
+      FileUtils.rm File.join(@project.build_path, @project.project_php_file) if File.exists?(@project.project_php_file)
+      # Remove functions folder
+      FileUtils.rm_rf File.join(@project.build_path, 'functions') if File.directory?(File.join(@project.build_path, 'functions'))
     end
 
     def 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)
 
       if File.exists?(functions_erb_path)
         destination = File.join(@project.build_path, 'functions.php')
@@ -112,8 +117,12 @@ module Marv
         FileUtils.cp functions_php_path, @project.build_path
       end
 
+      if File.exists?(plugin_php_path)
+        FileUtils.cp plugin_php_path, @project.build_path
+      end
+
       functions_paths = Dir.glob(File.join(@functions_path, '*')).reject do |filename|
-        [functions_erb_path, functions_php_path].include?(filename)
+        [functions_erb_path, functions_php_path, plugin_php_path].include?(filename)
       end
 
       unless functions_paths.empty?
@@ -121,7 +130,7 @@ module Marv
         FileUtils.mkdir_p(File.join(@project.build_path, 'functions'))
 
         # 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].include?(filename) }
+        paths = Dir.glob(File.join(@functions_path, '**', '*')).reject {|filename| [functions_erb_path, functions_php_path, plugin_php_path].include?(filename) }
 
         copy_paths_with_erb(paths, @functions_path, File.join(@project.build_path, 'functions'))
       end
@@ -142,12 +151,27 @@ module Marv
       end
     end
 
-    def copy_extras
-      unless Dir.glob(File.join(@extras_path, '*')).empty?
+    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)
 
-        # Iterate over all files in source/extras, so we can exclude if necessary
-        paths = Dir.glob(File.join(@extras_path, '**', '*'))
-        copy_paths_with_erb(paths, @extras_path, File.join(@project.build_path, ''))
+            FileUtils.rm_rf destination
+          end
+        end
+      end
+    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)
+            paths = Dir.glob(File.join(folder, '**', '*'))
+            copy_paths_with_erb(paths, @project.source_path, @project.build_path)
+          end
+        end
       end
     end
 
@@ -156,7 +180,16 @@ module Marv
     end
 
     def build_assets
-      [['style.css'], ['admin.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']].each do |asset|
+      default_assets = [['style.css'], ['admin.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']]
+      additional_assets = @project.config[:additional_assets]
+
+      if additional_assets
+        assets = default_assets + additional_assets
+      else
+        assets = default_assets
+      end
+
+      assets.each do |asset|
         destination = File.join(@project.build_path, asset)
 
         # Catch any sprockets errors and continue the process
@@ -169,7 +202,7 @@ module Marv
           end
         rescue Exception => e
           @task.say "Error while building #{asset.last}:"
-          @task.say e.message, Thor::Shell::Color::RED
+          @task.say e.message, :red
 
           File.open(destination, 'w') do |file|
             file.puts(e.message)
@@ -273,9 +306,10 @@ module Marv
         end
       rescue Exception => e
         @task.say "Error while building #{File.basename(source)}:"
-        @task.say e.message + "\n", Thor::Shell::Color::RED
+        @task.say e.message + "\n", :red
         exit
-     end
+      end
     end
+
   end
 end

data/lib/marv/cli.rb

@@ -3,38 +3,68 @@ require 'guard/marv/assets'
 require 'guard/marv/config'
 require 'guard/marv/templates'
 require 'guard/marv/functions'
+require 'guard/marv/folders'
 
 module Marv
   class CLI < Thor
+
     include Thor::Actions
 
     def self.source_root
       File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'layouts'))
     end
 
-    desc "create DIRECTORY", "Creates a Marv project"
+    desc "create DIRECTORY", "Creates a Marv project into specified directory"
     long_desc "Creates a new project. Use the layout option to choose a scaffold"
     method_option :layout, :type => :string, :default => 'default', :desc => "Name of alternate layout"
+    method_option :local, :type => :boolean, :force => false, :desc => "Use local layout from .marv folder"
     def create(dir)
       theme = {}
       theme[:name] = dir
 
-      project = Marv::Project.create(dir, theme, self, options[:layout])
+      project = Marv::Project.create(dir, theme, self, options[:layout], options[:local])
     end
 
-    desc "link PATH", "Create a symbolic link to the compilation directory"
-    long_desc "This command will symlink the compiled version of the theme to the specified path.\n\n"+
-      "To compile the theme use the `marv watch` command"
-    def link(path)
+    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)
       project = Marv::Project.new('.', self)
+      project_folder = project.project_id.gsub('_', '-')
 
       FileUtils.mkdir_p project.build_path unless File.directory?(project.build_path)
 
-      do_link(project, 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
+      end
+
+      if options[:path]
+        wp_path = File.join(options[:path], 'wp-content', options[:folder])
+        do_link(project, File.join(wp_path, project_folder))
+      end
     end
 
     desc "watch", "Start watch process"
-    long_desc "Watches the source directory in your project for changes, and reflects those changes in a compile folder"
+    long_desc "Watches the source directory in your Marv project for changes, and reflects those changes in a compile folder"
     method_option :config, :type => :string, :desc => "Name of alternate config file"
     def watch
       project = Marv::Project.new('.', self, nil, options[:config])
@@ -61,7 +91,7 @@ module Marv
       directory(project.build_path, dir)
     end
 
-    desc "package FILENAME", "Compile and zip your project to FILENAME.zip"
+    desc "package FILENAME", "Compile and zip your Marv project to FILENAME.zip"
     method_option :config, :type => :string, :desc => "Name of alternate config file"
     def package(filename=nil)
       project = Marv::Project.new('.', self, nil, options[:config])
@@ -71,8 +101,102 @@ module Marv
       builder.zip(filename)
     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 :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 = {}
+
+      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"})
+
+        server = Marv::Server.new(name, self, config)
+        server.create_server
+      else
+        server = Marv::Server.new(name, self, nil)
+
+        if options.empty?
+          server.start_server
+        end
+
+        if options[:stop]
+          server.stop_server
+        end
+
+        if options[:restart]
+          server.restart_server
+        end
+
+        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"
+
+          server = Marv::Server.new(name, self, config)
+          server.remove_server
+        end
+      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
+
+      if options[:remove]
+        config = {}
+
+        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"
+
+        remove_all_servers(config)
+      end
+      exit
+    end
+
     protected
 
+    def list_all_servers
+      servers_root = File.join(ENV['HOME'], '.marv', 'servers')
+      servers = Dir.glob(File.join(servers_root, '*'))
+
+      servers.each do |server|
+        say "Available marv servers:", :yellow
+        say '- ' + File.basename(server), :green
+      end
+    end
+
+    def remove_all_servers(config)
+      servers_root = File.join(ENV['HOME'], '.marv', 'servers')
+      servers = Dir.glob(File.join(servers_root, '*'))
+
+      servers.each do |server|
+        server = Marv::Server.new(File.basename(server), self, config)
+        server.remove_server
+      end
+    end
+
     def do_link(project, path)
       begin
         project.link(path)
@@ -80,9 +204,10 @@ module Marv
         say_status :error, "The path #{File.dirname(path)} does not exist", :red
         exit 2
       rescue Errno::EEXIST
-        say_status :error, "The path #{path} already exsts", :red
+        say_status :error, "The path #{path} already exists", :red
         exit 2
       end
     end
+
   end
 end