marv 0.3.2 → 0.4.0

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/CHANGELOG.md

@@ -1,8 +1,21 @@
+## v0.4.0
+* Complete rewrite
+* Make server subcommand
+* Fix PHP server issues
+* Add marv create wizard
+* Add marv server create wizard
+* Add global config wizard
+* Update project config.rb and layouts
+* Add config.rb for servers
+* Update global config.rb
+* Optimize code (code climate 4.0!)
+
 ## v0.3.2
 * Fix bug when creating server
 * Use Thor to download wordpress
 * Fix marv watch not compiling assets
 * Fix error when compression enabled
+* Update router.php
 
 ## v0.3.1
 * Remove command servers

data/Gemfile

@@ -1,25 +1,23 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 # Add dependencies required to use your gem here.
-
+# Example:
+#   gem "activesupport", ">= 2.3.5"
 gem 'thor', '>= 0.19.1'
 gem 'guard-livereload', '>= 2.3.0'
 gem 'sprockets', '>= 2.12.0'
-gem 'rubyzip', '>= 1.1.6'
 gem 'childprocess', '>= 0.3.5'
 gem 'mysql2', '>= 0.3.15'
+gem 'uglifier', '>= 2.5.0'
 gem 'sass', '>= 3.3.0'
 gem 'less', '>= 2.6.0'
 gem 'coffee-script', '>= 2.3.0'
 gem 'therubyracer', '>= 0.12.0'
-gem 'uglifier', '>= 2.5.0'
+gem 'rubyzip', '>= 1.1.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-
 group :development do
-  gem 'rake'
-  gem 'rspec'
-  gem 'aruba'
-  gem 'cucumber'
-  gem 'jeweler'
+  gem "rdoc", "~> 3.12"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 2.0.1"
 end

data/Gemfile.lock

@@ -2,31 +2,19 @@ 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)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     commonjs (0.2.7)
-    cucumber (1.3.16)
-      builder (>= 2.1.2)
-      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)
@@ -36,8 +24,6 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     formatador (0.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
     git (1.2.8)
     github_api (0.12.1)
       addressable (~> 2.3)
@@ -60,6 +46,7 @@ GEM
     hashie (3.3.1)
     highline (1.6.21)
     hike (1.2.3)
+    hitimes (1.2.2)
     http_parser.rb (0.6.0)
     jeweler (2.0.1)
       builder
@@ -74,7 +61,7 @@ GEM
     jwt (1.0.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.7)
     listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -83,7 +70,6 @@ GEM
     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)
@@ -95,7 +81,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -104,25 +90,13 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.1.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    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)
+    sass (3.4.5)
     slop (3.6.0)
-    sprockets (2.12.1)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -133,7 +107,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -142,16 +117,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  bundler (~> 1.0)
   childprocess (>= 0.3.5)
   coffee-script (>= 2.3.0)
-  cucumber
   guard-livereload (>= 2.3.0)
-  jeweler
+  jeweler (~> 2.0.1)
   less (>= 2.6.0)
   mysql2 (>= 0.3.15)
-  rake
-  rspec
+  rdoc (~> 3.12)
   rubyzip (>= 1.1.6)
   sass (>= 3.3.0)
   sprockets (>= 2.12.0)

data/LICENSE

@@ -18,27 +18,3 @@ 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
-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.

data/README.md

@@ -3,11 +3,12 @@
 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)
+[![Code Climate](https://codeclimate.com/github/hardpixel/marv/badges/gpa.png)](https://codeclimate.com/github/hardpixel/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 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.
+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 development server(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?
@@ -25,21 +26,19 @@ Create your new project:
 
     $ marv create project-name
 
-Create a Marv development server:
+Create your development server:
 
-	$ marv server server-name
+	$ marv server create server-name
 
-Link to your Marv server:
+Link to your development server:
 
 	$ cd project-name
-    $ marv link server-name --folder themes
-    $ marv link server-name --folder plugins
+    $ marv link server-name
 
 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
+    $ marv link /var/www/wordpress
 
 Watch for changes and start developing!
 
@@ -70,6 +69,6 @@ See the [user's manual](https://github.com/hardpixel/marv/wiki) for more informa
 
 ## Credits
 
-Marv is based on [Forge](https://github.com/thethemefoundry/forge) by ThemeFoundry.
+Wordpress theme layout is based on [WP-Scaffold](https://github.com/gizburdt/wp-scaffold) by Gizburdt.
 
-Scaffold Wordpress theme is based on [WP-Scaffold](https://github.com/gizburdt/wp-scaffold) by Gizburdt.
+Marv is inspired from [Forge](https://github.com/thethemefoundry/forge) by ThemeFoundry.

data/Rakefile

@@ -15,7 +15,7 @@ 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 is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "marv"
   gem.executables = ["marv"]
   gem.homepage = "http://hardpixel.github.io/marv"
@@ -30,31 +30,15 @@ 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
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:features)
-
-task :default => :spec
-
 require 'rdoc/task'
 
-RDoc::Task.new do |rdoc|
+Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "marv #{version}"
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('LICENSE*')
+  rdoc.rdoc_files.include('CHANGELOG*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/bin/marv

@@ -9,4 +9,4 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'marv'
 
-Marv::CLI.start
+Marv::CLI::Commands.start

data/layouts/config/global.rb

@@ -0,0 +1,31 @@
+# Marv server configuration
+config[:server_host] = "<%= global_options[:server_host] %>"
+config[:server_port] = "<%= global_options[:server_port] %>"
+
+# Database configuration
+config[:db_user] = "<%= global_options[:db_user] %>"
+config[:db_password] = "<%= global_options[:db_password] %>"
+config[:db_host] = "<%= global_options[:db_host] %>"
+config[:db_port] = "<%= global_options[:db_port] %>"
+config[:wp_version] = "<%= global_options[:wp_version] %>"
+
+# WordPress theme/plugin information
+config[:uri] = "<%= global_options[:uri] %>"
+config[:author] = "<%= global_options[:author] %>"
+config[:author_uri] = "<%= global_options[:author_uri] %>"
+config[:license_name] = "<%= global_options[:license_name] %>"
+config[:license_uri] = "<%= global_options[:license_uri] %>"
+
+# Assets compression
+# config[:compress_js] = true
+# config[:compress_css] = true
+
+# Enable livereload
+# config[:livereload] = true
+
+# Additional assets
+# config[:additional_assets] = [['custom.js'], ['stylesheets', 'custom.css'], ['includes', 'javascripts', 'includes.js']]
+
+# You can also include additional frameworks by requiring them:
+# require 'bourbon'
+# require 'neat'

data/layouts/config/project.rb

@@ -0,0 +1,27 @@
+# WordPress theme/plugin information
+config[:id] = "<%= project_id %>"
+config[:name] = "<%= project_config[:name] %>"
+config[:uri] = "<%= project_config[:uri] %>"
+config[:author] = "<%= project_config[:author] %>"
+config[:author_uri] = "<%= project_config[:author_uri] %>"
+config[:description] = "<%= project_config[:description] %>"
+config[:version] = "<%= project_config[:version] %>"
+config[:license_name] = "<%= project_config[:license_name] %>"
+config[:license_uri] = "<%= project_config[:license_uri] %>"
+# config[:template] = "<%= project_config[:template] %>"
+# config[:tags] = ["<%= project_config[:tags] %>"]
+# config[:comments] = "<%= project_config[:comments] %>"
+
+# Assets compression
+# config[:compress_js] = true
+# config[:compress_css] = true
+
+# Enable livereload
+# config[:livereload] = true
+
+# Additional assets
+# config[:additional_assets] = [['custom.js'], ['stylesheets', 'custom.css'], ['includes', 'javascripts', 'includes.js']]
+
+# You can also include additional frameworks by requiring them:
+# require 'bourbon'
+# require 'neat'

data/layouts/config/{router.php.erb → router.php}

@@ -1,5 +1,9 @@
 <?php
 
+/**
+* WordPress routing for PHP buit in web server
+**/
+
 $root = $_SERVER['DOCUMENT_ROOT'];
 chdir( $root );
 
@@ -22,4 +26,4 @@ if( file_exists( $root.$path ) ) {
 }
 else {
 	include_once 'index.php';
-}
+}

data/layouts/config/server.rb

@@ -0,0 +1,12 @@
+# Server details
+config[:server_host] = "<%= server_host %>"
+config[:server_port] = "<%= server_port %>"
+
+# MySQL database credentials
+config[:db_user] = "<%= db_user %>"
+config[:db_password] = "<%= db_password %>"
+config[:db_host] = "<%= db_host %>"
+config[:db_port] = "<%= db_port %>"
+
+# WordPress version
+config[:wp_version] = "<%= wp_version %>"

data/layouts/plugin/assets/javascripts/plugin.js

@@ -0,0 +1 @@
+//=require 'plugin'

data/layouts/plugin/functions/{plugin.php.erb → plugin.php}

@@ -1,12 +1,13 @@
 <?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
+ * Plugin Name: <%= project_config[:name] %>
+ * Plugin URI: <%= project_config[:uri] %>
+ * Description: <%= project_config[:description] %>
+ * Version: <%= project_config[:version] %>
+ * Author: <%= project_config[:author] %>
+ * Author URI: <%= project_config[:author_uri] %>
+ * License: <%= project_config[:license_name] %>
+ * License URI: <%= project_config[:license_uri] %>
  */
 
 // Block direct access