marv 0.2.5 → 0.3.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+== 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

data/Gemfile

@@ -2,23 +2,22 @@ source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 
 gem 'thor', '>= 0.19.1'
-gem 'guard', '>= 2.2.1'
 gem 'guard-livereload', '>= 2.3.0'
 gem 'sprockets', '>= 2.12.0'
 gem 'rubyzip', '>= 1.1.6'
-gem 'rack', '>= 1.5.2'
+gem 'rack-legacy', '>= 1.0.0'
+gem 'mysql2', '>= 0.3.15'
 gem 'sass', '>= 3.3.0'
 gem 'less', '>= 2.6.0'
 gem 'coffee-script', '>= 2.3.0'
 gem 'therubyracer', '>= 0.12.0'
-gem 'rb-fsevent', '>= 0.9.4'
 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'
   gem 'cucumber'
-  gem 'aruba'
   gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,12 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
-      cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.4)
+    addressable (2.3.6)
+    builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     childprocess (0.3.5)
@@ -17,22 +13,35 @@ GEM
       execjs
     coffee-script-source (1.7.1)
     commonjs (0.2.7)
-    cucumber (1.2.1)
+    cucumber (1.3.16)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.0.3)
     execjs (2.2.1)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     formatador (0.2.5)
-    gherkin (2.11.1)
-      json (>= 1.4.6)
-    git (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    git (1.2.8)
+    github_api (0.12.1)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
     guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -43,13 +52,21 @@ GEM
       em-websocket (~> 0.5)
       guard (~> 2.0)
       multi_json (~> 1.8)
+    hashie (3.3.1)
+    highline (1.6.21)
     hike (1.2.3)
     http_parser.rb (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
+      rdoc
     json (1.8.1)
+    jwt (1.0.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
@@ -59,25 +76,50 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
+    mini_portile (0.6.0)
     multi_json (1.10.1)
+    multi_test (0.1.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    mysql2 (0.3.16)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     pry (0.10.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (0.9.2.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)
       ffi (>= 0.5.0)
+    rdoc (4.1.1)
+      json (~> 1.4)
     ref (1.0.5)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
     rubyzip (1.1.6)
     sass (3.3.14)
     slop (3.6.0)
@@ -90,6 +132,7 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
     uglifier (2.5.3)
@@ -100,15 +143,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
   coffee-script (>= 2.3.0)
   cucumber
-  guard (>= 2.2.1)
   guard-livereload (>= 2.3.0)
   jeweler
   less (>= 2.6.0)
-  rack (>= 1.5.2)
-  rb-fsevent (>= 0.9.4)
+  mysql2 (>= 0.3.15)
+  rack-legacy (>= 1.0.0)
+  rake
   rspec
   rubyzip (>= 1.1.6)
   sass (>= 3.3.0)

data/LICENSE

@@ -1,3 +1,27 @@
+Copyright (c) 2014 Hardpixel
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+LICENSES FOR PARTS OF THIS SOFTWARE
+
 Copyright (c) 2011 Jestro LLC
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,9 +10,10 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "marv"
@@ -25,10 +27,12 @@ Jeweler::Tasks.new do |gem|
   # dependencies defined in Gemfile
   gem.files.include Dir.glob('**/*')
 end
+
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
@@ -39,11 +43,13 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 require 'cucumber/rake/task'
+
 Cucumber::Rake::Task.new(:features)
 
 task :default => :spec
 
 require 'rdoc/task'
+
 RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/layouts/bramble/functions/functions.php.erb

@@ -6,17 +6,17 @@ if( ! defined( 'ABSPATH' ) ) exit;
 /**
  * Init for Bramble Child
  */
-function <%= theme_id %>_init() {
+function <%= project_id %>_init() {
 
 	// Image sizes
 	add_image_size( 'wide', 1600, 1200, true );
 
 	// Default settings
-	<%= theme_id %>_default_settings();
+	<%= project_id %>_default_settings();
 
 }
 
-add_action( 'bramble_child_init', '<%= theme_id %>_init' );
+add_action( 'bramble_child_init', '<%= project_id %>_init' );
 
 
 /**
@@ -25,7 +25,7 @@ add_action( 'bramble_child_init', '<%= theme_id %>_init' );
 *
 **/
 
-function <%= theme_id %>_default_settings()
+function <%= project_id %>_default_settings()
 {
 	$user = get_option( 'theme_options' );
 
@@ -57,7 +57,7 @@ function <%= theme_id %>_default_settings()
 /**
  * Localize scripts
  */
-function <%= theme_id %>_localize_scripts()
+function <%= project_id %>_localize_scripts()
 {
 	$localize = array(
 		'ajax_url'		=> admin_url('admin-ajax.php')
@@ -66,18 +66,18 @@ function <%= theme_id %>_localize_scripts()
 	wp_localize_script( 'theme', 'localize', $localize );
 }
 
-add_action( 'wp_enqueue_scripts', '<%= theme_id %>_localize_scripts', 99 );
+add_action( 'wp_enqueue_scripts', '<%= project_id %>_localize_scripts', 99 );
 
 
 /**
  * Enqueue admin scripts
  */
-function <%= theme_id %>_enqueue_admin_scripts()
+function <%= project_id %>_enqueue_admin_scripts()
 {
-	wp_enqueue_script( '<%= theme_id %>-admin', get_stylesheet_directory_uri() . '/javascripts/admin.js', array( 'jquery' ), '', true  );
+	wp_enqueue_script( '<%= project_id %>-admin', get_stylesheet_directory_uri() . '/javascripts/admin.js', array( 'jquery' ), '', true  );
 }
 
-add_action( 'admin_enqueue_scripts', '<%= theme_id %>_enqueue_admin_scripts', 99 );
+add_action( 'admin_enqueue_scripts', '<%= project_id %>_enqueue_admin_scripts', 99 );
 
 
 /**
@@ -91,7 +91,7 @@ include 'includes/options.php';
  * Theme Settings Page
  */
 
-function <%= theme_id %>_settings_page( $pages )
+function <%= project_id %>_settings_page( $pages )
 {
 	$pages[] = array(
 		'page_title'	=> 'Theme Settings',
@@ -102,11 +102,11 @@ function <%= theme_id %>_settings_page( $pages )
 		'setting'		=> 'theme_settings',
 		'icon'			=> 'options-general',
 		'save'			=> true,
-		'save_text'		=> __( 'Save Theme Settings', '<%= theme_id %>' ),
+		'save_text'		=> __( 'Save Theme Settings', '<%= project_id %>' ),
 		'default_tab'	=> 'Theme Settings'
 	);
 
 	return $pages;
 }
 
-add_filter('piklist_admin_pages', '<%= theme_id %>_settings_page');
+add_filter('piklist_admin_pages', '<%= project_id %>_settings_page');

data/layouts/bramble/includes/options.php.erb

@@ -4,14 +4,14 @@
  * Theme Customizer options
  */
 
-function <%= theme_id %>_customizer_options() {
+function <%= project_id %>_customizer_options() {
 
 	/*
 	 * Using helper function to get default required capability
 	 */
 	$bramble_customizer_capability = bramble_customizer_capability();
 
-	$<%= theme_id %>_options = array(
+	$<%= project_id %>_options = array(
 
 		/*
 		 * Add fields to an existing Customizer section
@@ -1332,8 +1332,8 @@ function <%= theme_id %>_customizer_options() {
 
 	);
 
-	return $<%= theme_id %>_options;
+	return $<%= project_id %>_options;
 
 }
 
-add_filter( 'bramble_customizer_options_array', '<%= theme_id %>_customizer_options' );
+add_filter( 'bramble_customizer_options_array', '<%= project_id %>_customizer_options' );

data/layouts/config/{config.tt → project-config.rb}

@@ -9,6 +9,9 @@ config[:compress_css] = false
 # Enable livereload
 config[:livereload] = false
 
+# Additional assets
+# config[:additional_assets] = [['custom.js'], ['stylesheets', 'custom.css'], ['includes', 'javascripts', 'includes.js']]
+
 # You can also include additional Compass frameworks by requiring them:
-# require 'boubon'
+# require 'bourbon'
 # require 'neat'

data/layouts/config/rack-config.ru

@@ -0,0 +1,38 @@
+# config.ru for Rackup + Wordpress
+
+require 'rack-legacy'
+
+module Rack
+  module Legacy
+    # patch Php from rack-legacy to write pid file and customize server
+    class Php
+      def initialize app, public_dir=Dir.getwd, php_exe='php', quiet=true
+        @app = app; @public_dir = public_dir
+        server = TCPServer.new('127.0.0.1', 0)
+        port = server.addr[1]
+        server.close()
+        @proxy = Rack::ReverseProxy.new do
+        reverse_proxy_options preserve_host: false
+        reverse_proxy /^.*$/, "http://localhost:#{port}"
+        end
+        @php = ChildProcess.build php_exe,
+        '-S', "localhost:#{port}", '-t', public_dir
+        @php.io.inherit! unless quiet
+        @php.start
+        at_exit {@php.stop if @php.alive?}
+
+        # Write PHP proccess id to file
+        ::File.open(::File.join(@public_dir, 'php.pid'), 'w') do |file|
+          file.write(@php.pid)
+        end
+
+        puts "Visit http://localhost:#{port}";
+      end
+    end
+  end
+end
+
+use Rack::Legacy::Index
+use Rack::Legacy::Php
+use Rack::Legacy::Cgi
+run Rack::File.new Dir.getwd