marv 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,52 +1,58 @@
-== 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
-- Config.rb option for additional assets
-- Use local layouts on project on create
-- Copy user folders in project root
-- Copy file with project name from functions folder
-- Informative error messages
-- Remove extras folder
-- Update dependencies
-- Update config templates
-- Many new functions & function updates
-
-== 0.2.5 ==
-- Remove compass, sprockets-sass and yui-compressor
-- Better error reporting in pry
-- Add uglifier
-- Remove unused functions
-
-== 0.2.4 ==
-- Update compass version
-
-== 0.2.3 ==
-- Fix marv global settings folder name
-- Remove ie.css
-- Add admin.css
-- Fix errors on build
-
-== 0.2.2 ==
-- Add support for layouts on marv create
-- Bramble Framework child theme project layout
-- Optimize images
-
-== 0.2.1 ==
-- New default project layout
-
-== 0.2.0 ==
-- Fix errors
-
-== 0.1.0 ==
-- Fork from Forge (https://github.com/thethemefoundry/forge)
-- Update dependencies
-- Fix errors from old dependencies
-- Add extras folder
+## v0.3.2
+* Fix bug when creating server
+* Use Thor to download wordpress
+* Fix marv watch not compiling assets
+* Fix error when compression enabled
+
+## v0.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
+
+## v0.3.0
+* Marv server (Wordpress local install)
+* Global plugins & themes for Marv servers
+* Config.rb option for additional assets
+* Use local layouts on project on create
+* Copy user folders in project root
+* Copy file with project name from functions folder
+* Informative error messages
+* Remove extras folder
+* Update dependencies
+* Update config templates
+* Many new functions & function updates
+
+## v0.2.5
+* Remove compass, sprockets-sass and yui-compressor
+* Better error reporting in pry
+* Add uglifier
+* Remove unused functions
+
+## v0.2.4
+* Update compass version
+
+## v0.2.3
+* Fix marv global settings folder name
+* Remove ie.css
+* Add admin.css
+* Fix errors on build
+
+## v0.2.2
+* Add support for layouts on marv create
+* Bramble Framework child theme project layout
+* Optimize images
+
+## v0.2.1
+* New default project layout
+
+## v0.2.0
+* Fix errors
+
+## v0.1.0
+* Fork from Forge (https://github.com/thethemefoundry/forge)
+* Update dependencies
+* Fix errors from old dependencies
+* Add extras folder

data/Gemfile

@@ -5,7 +5,7 @@ gem 'thor', '>= 0.19.1'
 gem 'guard-livereload', '>= 2.3.0'
 gem 'sprockets', '>= 2.12.0'
 gem 'rubyzip', '>= 1.1.6'
-gem 'rack-legacy', '>= 1.0.0'
+gem 'childprocess', '>= 0.3.5'
 gem 'mysql2', '>= 0.3.15'
 gem 'sass', '>= 3.3.0'
 gem 'less', '>= 2.6.0'
@@ -19,6 +19,7 @@ gem 'uglifier', '>= 2.5.0'
 group :development do
   gem 'rake'
   gem 'rspec'
+  gem 'aruba'
   gem 'cucumber'
   gem 'jeweler'
 end

data/Gemfile.lock

@@ -2,6 +2,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
@@ -95,12 +100,6 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-legacy (1.0.0)
-      childprocess
-      rack
-      rack-reverse-proxy
-    rack-reverse-proxy (0.4.4)
-      rack (>= 1.0.0)
     rake (10.3.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
@@ -143,13 +142,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba
+  childprocess (>= 0.3.5)
   coffee-script (>= 2.3.0)
   cucumber
   guard-livereload (>= 2.3.0)
   jeweler
   less (>= 2.6.0)
   mysql2 (>= 0.3.15)
-  rack-legacy (>= 1.0.0)
   rake
   rspec
   rubyzip (>= 1.1.6)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/layouts/config/router.php.erb

@@ -0,0 +1,25 @@
+<?php
+
+$root = $_SERVER['DOCUMENT_ROOT'];
+chdir( $root );
+
+$path = '/'. ltrim( parse_url( $_SERVER['REQUEST_URI'] )['path'], '/' );
+set_include_path( get_include_path() .':'. __DIR__ );
+
+if( file_exists( $root.$path ) ) {
+
+	if( is_dir( $root.$path ) && substr( $path, strlen( $path ) - 1, 1 ) !== '/' ) {
+		$path = rtrim( $path, '/' ) .'/index.php';
+	}
+
+	if( strpos( $path, '.php' ) === false ) {
+		return false;
+	}
+	else {
+		chdir( dirname( $root.$path ) );
+		require_once $root.$path;
+	}
+}
+else {
+	include_once 'index.php';
+}

data/layouts/plugin/functions/plugin.php.erb

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Plugin Name: <%= config[:name].capitalize %>
+ * Plugin URI: <%= config[:uri] %>
+ * Description: <%= config[:name].capitalize %> plugin created with Marv.
+ * Version: 0.1
+ * Author: <%= config[:author] %>
+ * Author URI: <%= config[:author_uri] %>
+ * License: GPL2
+ */
+
+// Block direct access
+if( ! defined( 'ABSPATH' ) ) exit;
+
+
+/**
+ * Enqueue scripts and styles.
+ */
+function <%= project_id %>_styles_scripts()
+{
+	// Styles
+	add_action( 'wp_enqueue_scripts', 	'<%= project_id %>_register_styles' );
+	add_action( 'wp_enqueue_scripts', 	'<%= project_id %>_enqueue_styles' );
+
+	// Scripts
+	add_action( 'wp_enqueue_scripts', 	'<%= project_id %>_register_scripts' );
+	add_action( 'wp_enqueue_scripts', 	'<%= project_id %>_enqueue_scripts' );
+
+	// Admin scripts
+	add_action( 'admin_enqueue_scripts', 	'<%= project_id %>_register_admin_scripts' );
+	add_action( 'admin_enqueue_scripts', 	'<%= project_id %>_enqueue_admin_scripts' );
+}
+
+add_action( 'init', '<%= project_id %>_styles_scripts' );
+
+/**
+ * Register styles.
+ */
+function <%= project_id %>_register_styles()
+{
+	// Theme
+	wp_register_style( 'plugin', get_stylesheet_directory_uri() . '/plugin.css', '', '', 'screen' );
+}
+
+/**
+ * Enqueue styles.
+ */
+function <%= project_id %>_enqueue_styles()
+{
+	wp_enqueue_style( 'plugin' );
+}
+
+/**
+ * Register scripts
+ */
+function <%= project_id %>_register_scripts()
+{
+	// Theme
+	wp_register_script( 'plugin', get_stylesheet_directory_uri() . '/javascripts/plugin.js', array( 'jquery' ), '', true );
+}
+
+/**
+ * Enqueue scripts
+ */
+function <%= project_id %>_enqueue_scripts()
+{
+	wp_enqueue_script( 'plugin' );
+
+	if ( is_singular() && get_option( 'thread_comments' ) ) {
+		wp_enqueue_script( 'comment-reply' );
+	}
+}
+
+/**
+ * Register admin scripts
+ */
+function <%= project_id %>_register_admin_scripts()
+{
+	// Admin
+	wp_register_script( 'admin', get_stylesheet_directory_uri() . '/javascripts/admin.js', array( 'jquery' ), '', true );
+}
+
+/**
+ * Enqueue admin scripts
+ */
+function <%= project_id %>_enqueue_admin_scripts()
+{
+	wp_enqueue_script( 'admin' );
+}
+
+/**
+ * Allow automatic updates
+ */
+add_filter( 'automatic_updates_is_vcs_checkout', '__return_false' );

data/layouts/plugin/stylesheets/plugin.scss

@@ -0,0 +1 @@
+// This is your master stylesheet

data/lib/marv/builder.rb

@@ -22,10 +22,10 @@ module Marv
     # Runs all the methods necessary to build a completed project
     def build
       clean_build_directory
+      copy_folders
       copy_templates
       copy_functions
       copy_includes
-      copy_folders
       build_assets
     end
 

data/lib/marv/cli.rb

@@ -16,8 +16,8 @@ module Marv
 
     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"
+    method_option :layout, :type => :string, :default => 'theme', :enum => %w{theme plugin}, :desc => "Scaffold layout for theme or plugin"
+    method_option :local, :type => :boolean, :force => false, :desc => "Use custom layout from ~/.marv/layouts folder"
     def create(dir)
       theme = {}
       theme[:name] = dir
@@ -29,14 +29,14 @@ module Marv
     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')
+    def link(dir=nil)
       project = Marv::Project.new('.', self)
 
       unless File.directory?(project.build_path)
         FileUtils.mkdir_p project.build_path
       end
 
-      if dir == 'global'
+      if dir.nil?
         link_project_globaly(options, project)
       else
         wp_path = File.join(dir, 'wp-content', options[:folder])
@@ -83,7 +83,7 @@ module Marv
       builder.zip(filename)
     end
 
-    desc "server SERVER", "Start a Marv server by name"
+    desc "server SERVER", "Create a Marv server with the specified name"
     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"

data/lib/marv/server.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'mysql2'
+require 'childprocess'
 
 module Marv
   class Server
@@ -10,10 +11,6 @@ module Marv
       # Deploy variables
       @server_name = name
       @server_path = server_path
-
-      @rack_config = rack_config
-      @wp_config = wp_config
-
       @db_name = 'marv_'+name.gsub(/\W/, '_').downcase
 
       # CLI Options
@@ -39,14 +36,6 @@ module Marv
       File.join(ENV['HOME'], '.marv', 'servers', @server_name)
     end
 
-    def rack_config
-      File.join(ENV['HOME'], '.marv', @server_path, 'config.ru')
-    end
-
-    def wp_config
-      File.join(ENV['HOME'], '.marv', @server_path, 'wp-config.php')
-    end
-
     def db_name
       @db_name
     end
@@ -59,15 +48,33 @@ module Marv
       @db_host
     end
 
+    def run_php_server
+      # Setup server
+      server = TCPServer.new('127.0.0.1', 0)
+      port = server.addr[1]
+      server.close()
+
+      # Run PHP server
+      ::Dir.chdir @server_path
+      @php = ChildProcess.build 'php', '-S', "localhost:#{port}", 'router.php'
+      @php.start
+
+      # Write PHP proccess id to file
+      File.open(File.join(@server_path, 'php.pid'), 'w') do |file|
+        file.write(@php.pid)
+      end
+
+      @task.say "Visit http://localhost:#{port}"
+    end
+
     def create_server
       create_server_directory
 
-      download_wordpress
-      extract_wordpress
-      add_rack_config
+      copy_wordpress_files
+      add_config_file('router.php.erb', 'router.php')
 
       create_server_database
-      add_wordpress_config
+      add_config_file('wp-config.php.erb', 'wp-config.php')
 
       add_global_content
 
@@ -77,12 +84,9 @@ module Marv
     end
 
     def start_server
-      update_global_projects
-
       begin
-        @task.shell.mute do
-          system("cd #{server_path}; rackup --daemonize --pid=ruby.pid")
-        end
+        update_global_projects
+        run_php_server
       rescue Exception => e
         @task.say "Error while starting server:"
         @task.say e.message + "\n", :red
@@ -93,14 +97,12 @@ module Marv
     def stop_server
       begin
         @task.shell.mute do
-          ruby_pid_file = File.join(@server_path, 'ruby.pid')
           php_pid_file = File.join(@server_path, 'php.pid')
 
-          if File.exist?(ruby_pid_file) && File.exist?(php_pid_file) then
-            ruby_pid = File.read(ruby_pid_file).to_i
+          if File.exists?(php_pid_file)
             php_pid = File.read(php_pid_file).to_i
 
-            Process.kill(9, ruby_pid, php_pid)
+            Process.kill('KILL', php_pid)
             @task.say "Server #{@server_name} stopped", :yellow
           else
             @task.say "Server #{@server_name} is not running", :red
@@ -142,79 +144,66 @@ module Marv
 
     private
 
+    # Creates a directory for a new server
     def create_server_directory
-      unless File.exist?(self.servers_root)
-        Dir.mkdir(servers_root)
+      # Create dir
+      unless ::File.exist?(self.servers_root)
+        ::Dir.mkdir(servers_root)
       end
-
-      if File.exist?(@server_path)
+      # Exit if dir exists
+      if ::File.exist?(@server_path)
         @task.say "A server with name #{@server_name} already exists", :red
         exit
       end
     end
 
+    # Downloads WordPress from wordpress.org
     def download_wordpress
-      @task.say "Starting server installation:"
+      package = "/tmp/wordpress-#{@wp_version}.tar.gz"
 
-      begin
-        @task.shell.mute do
-          if !File.exists?("/tmp/wordpress-#{@wp_version}.tar.gz")
-            @task.say "Downloading wordpress-#{@wp_version}.tar.gz..."
-
-            Net::HTTP.start('wordpress.org') do |http|
-              resp = http.get("/wordpress-#{@wp_version}.tar.gz")
-              open("/tmp/wordpress-#{@wp_version}.tar.gz", 'w') do |file|
-                file.write(resp.body)
-              end
-            end
+      # Download package file
+      @task.shell.mute do
+        unless ::File.exists?(package)
+          @task.get "https://wordpress.org/wordpress-#{@wp_version}.tar.gz" do |content|
+            @task.create_file package, content
           end
         end
-      rescue Exception => e
-        @task.say "Error while downloading wordpress-#{@wp_version}.tar.gz:"
-        @task.say e.message + "\n", :red
-        exit
       end
-    end
 
-    def extract_wordpress
-      begin
-        @task.shell.mute do
-          filestamp = Time.now.to_i
-          download_location = File.join('/tmp', "wordpress-#{@wp_version}.tar.gz")
-          tmp_dir = "/tmp/wordpress-latest-#{filestamp}"
+      # Return package file
+      package
+    end
 
-          Dir.mkdir(tmp_dir)
-          `cd #{tmp_dir}; tar -xzf #{download_location}`
+    # Copy WordPress files
+    def copy_wordpress_files
+      package = download_wordpress
 
-          FileUtils.mv("#{tmp_dir}/wordpress", @server_path)
-          FileUtils.rm_r(tmp_dir)
-        end
-      rescue Exception => e
-        @task.say "Error while extracting wordpress-#{@wp_version}.tar.gz:"
-        @task.say e.message + "\n", :red
-        exit
+      # Get package content and extract to dir
+      tmp_dir = "/tmp/wordpress-latest-#{Time.now.to_i}"
+      # Create temporary dir
+      unless ::File.exists?(tmp_dir)
+        Dir.mkdir(tmp_dir)
       end
-      @task.say "WordPress files created", :green
-    end
 
-    def add_wordpress_config
-      unless File.exists?(@wp_config)
-        wp_config = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'layouts', 'config', 'wp-config.php.erb'))
-        wp_config_template = ERB.new(::File.binread(wp_config), nil, '-', '@output_buffer')
+      # Extract package to temporary dir
+      @task.shell.mute do
+        @task.run "cd #{tmp_dir};tar -xzf #{package}"
+        @task.directory "#{tmp_dir}/wordpress", @server_path
+      end
 
-        File.open(File.join(@server_path, 'wp-config.php'), 'w') do |file|
-          file.write(wp_config_template.result(binding))
-        end
+      # Remove temporary dir
+      if ::File.exists?(tmp_dir)
+        FileUtils.rm_r(tmp_dir)
       end
     end
 
-    def add_rack_config
-      unless File.exists?(@rack_config)
-        config_wp = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'layouts', 'config', 'rack-config.ru'))
-        config_ru_template = ERB.new(::File.binread(config_wp), nil, '-', '@output_buffer')
+    def add_config_file(source, target)
+      unless File.exists?(target)
+        config = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'layouts', 'config', source))
+        config_template = ERB.new(::File.binread(config), nil, '-', '@output_buffer')
 
-        File.open(File.join(@server_path, 'config.ru'), 'w') do |file|
-          file.write(config_ru_template.result(binding))
+        File.open(File.join(@server_path, target), 'w') do |file|
+          file.write(config_template.result(binding))
         end
       end
     end
@@ -233,12 +222,10 @@ module Marv
         @task.say e.message + "\n", :red
         exit
       end
-      @task.say "Mysql database created", :green
     end
 
     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}")
@@ -250,7 +237,6 @@ module Marv
         @task.say "Error while removing Mysql database:"
         @task.say e.message + "\n", :red
       end
-      @task.say "Mysql database removed", :green
     end
 
     def add_global_content