marv 0.3.2 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -61,13 +61,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: childprocess
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -173,13 +173,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,87 +187,55 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 description: A toolkit for bootstrapping and developing WordPress themes and plugins
   using Sass, LESS, and CoffeeScript.
 email: info@hardpixel.eu
@@ -278,7 +246,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .rspec
+- .document
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -287,63 +255,67 @@ files:
 - Rakefile
 - VERSION
 - bin/marv
-- features/step_definitions/marv_steps.rb
-- features/support/env.rb
-- layouts/config/project-config.rb
-- layouts/config/router.php.erb
-- layouts/config/wp-config.php.erb
-- layouts/plugin/functions/plugin.php.erb
-- layouts/plugin/images/screenshot.png
-- layouts/plugin/javascripts/admin.coffee
-- layouts/plugin/javascripts/admin.js
-- layouts/plugin/javascripts/plugin.coffee
-- layouts/plugin/javascripts/plugin.js
-- layouts/plugin/stylesheets/plugin.scss
-- layouts/theme/functions/functions.php.erb
-- layouts/theme/images/screenshot.png
-- layouts/theme/includes/filters-admin.php.erb
-- layouts/theme/includes/filters.php.erb
-- layouts/theme/includes/helpers.php.erb
-- layouts/theme/javascripts/admin.coffee
-- layouts/theme/javascripts/admin.js
-- layouts/theme/javascripts/theme.coffee
-- layouts/theme/javascripts/theme.js
-- layouts/theme/stylesheets/_header.scss.erb
-- layouts/theme/stylesheets/style.scss.erb
-- layouts/theme/templates/404.php.erb
-- layouts/theme/templates/archive.php.erb
-- layouts/theme/templates/author.php.erb
+- layouts/config/global.rb
+- layouts/config/project.rb
+- layouts/config/router.php
+- layouts/config/server.rb
+- layouts/config/wp-config.php
+- layouts/plugin/assets/images/screenshot.png
+- layouts/plugin/assets/javascripts/admin.coffee
+- layouts/plugin/assets/javascripts/admin.js
+- layouts/plugin/assets/javascripts/plugin.coffee
+- layouts/plugin/assets/javascripts/plugin.js
+- layouts/plugin/assets/stylesheets/plugin.scss
+- layouts/plugin/functions/plugin.php
+- layouts/theme/assets/images/screenshot.png
+- layouts/theme/assets/javascripts/admin.coffee
+- layouts/theme/assets/javascripts/admin.js
+- layouts/theme/assets/javascripts/theme.coffee
+- layouts/theme/assets/javascripts/theme.js
+- layouts/theme/assets/stylesheets/_header.scss
+- layouts/theme/assets/stylesheets/style.scss
+- layouts/theme/functions/functions.php
+- layouts/theme/includes/filters-admin.php
+- layouts/theme/includes/filters.php
+- layouts/theme/includes/helpers.php
 - layouts/theme/templates/footer.php
 - layouts/theme/templates/header.php
 - layouts/theme/templates/index.php
 - layouts/theme/templates/page.php
-- layouts/theme/templates/partials/comments.php.erb
-- layouts/theme/templates/partials/content-none.php.erb
+- layouts/theme/templates/pages/404.php
+- layouts/theme/templates/pages/archive.php
+- layouts/theme/templates/pages/author.php
+- layouts/theme/templates/pages/search.php
+- layouts/theme/templates/partials/comments.php
+- layouts/theme/templates/partials/content-none.php
 - layouts/theme/templates/partials/content-page.php
 - layouts/theme/templates/partials/content-single.php
-- layouts/theme/templates/partials/content.php.erb
-- layouts/theme/templates/partials/searchform.php.erb
+- layouts/theme/templates/partials/content.php
+- layouts/theme/templates/partials/searchform.php
 - layouts/theme/templates/partials/sidebar.php
-- layouts/theme/templates/search.php.erb
 - layouts/theme/templates/single.php
-- lib/guard/marv/assets.rb
-- lib/guard/marv/config.rb
-- lib/guard/marv/folders.rb
-- lib/guard/marv/functions.rb
-- lib/guard/marv/templates.rb
 - lib/marv.rb
-- lib/marv/builder.rb
 - lib/marv/cli.rb
-- lib/marv/engines.rb
-- lib/marv/error.rb
-- lib/marv/generator.rb
-- lib/marv/guard.rb
-- lib/marv/project.rb
-- lib/marv/server.rb
-- marv-0.3.2.gem
+- lib/marv/cli/project.rb
+- lib/marv/cli/server.rb
+- lib/marv/global.rb
+- lib/marv/project/actions.rb
+- lib/marv/project/builder.rb
+- lib/marv/project/builder/assets.rb
+- lib/marv/project/builder/engines.rb
+- lib/marv/project/builder/functions.rb
+- lib/marv/project/builder/templates.rb
+- lib/marv/project/create.rb
+- lib/marv/project/guard.rb
+- lib/marv/project/guard/assets.rb
+- lib/marv/project/guard/config.rb
+- lib/marv/project/guard/functions.rb
+- lib/marv/project/guard/templates.rb
+- lib/marv/project/project.rb
+- lib/marv/server/actions.rb
+- lib/marv/server/create.rb
+- lib/marv/server/server.rb
 - marv.gemspec
-- spec/lib/marv/project_spec.rb
-- spec/spec_helper.rb
 homepage: http://hardpixel.github.io/marv
 licenses:
 - MIT
@@ -357,6 +329,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1860274097938123520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rspec

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

data/features/step_definitions/marv_steps.rb

@@ -1,38 +0,0 @@
-Given /^I am in a marv project named "([^"]*)"$/ do |name|
-  cli = Marv::CLI.new
-
-  cli.shell.mute do
-    Marv::Project.create(File.join(current_dir, name), {:name => name}, cli)
-  end
-
-  cd name
-end
-
-Given /^a WordPress installation exists at "([^"]*)"$/ do |directory|
-  create_dir directory
-end
-
-Then /^the file "([^"]*)" should contain:$/ do |filename, content_partials|
-  content_partials.raw.each do |content|
-    check_file_content(filename, content[0], true)
-  end
-end
-
-Then /^the marv skeleton should be created in directory "([^"]*)"$/ do |base_dir|
-  skeleton_dirs = [
-    ['assets', 'images'],
-    ['assets', 'javascripts'],
-    ['assets', 'stylesheets'],
-
-    ['functions'],
-
-    ['templates', 'core'],
-    ['templates', 'custom', 'pages'],
-    ['templates', 'custom', 'partials']
-  ]
-
-  skeleton_dirs.each do |skeleton_dir|
-    full_path = File.join(base_dir, skeleton_dir)
-    check_directory_presence([full_path], true)
-  end
-end

data/features/support/env.rb

@@ -1,17 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-file_path = Pathname.new(__FILE__).realpath
-libdir = File.join(File.dirname(File.dirname(File.dirname(file_path))), "lib")
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require 'marv'
-
-require 'rspec/expectations'
-require 'aruba/cucumber'

data/layouts/config/project-config.rb

@@ -1,17 +0,0 @@
-# WordPress theme information is stored in source/assets/stylesheets/_header.scss
-
-# JavaScript compression
-config[:compress_js] = false
-
-# Stylesheets compression
-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 'bourbon'
-# require 'neat'

data/layouts/plugin/javascripts/plugin.js

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

data/layouts/theme/stylesheets/_header.scss.erb

@@ -1,18 +0,0 @@
-/*!
- * Theme Name: <%= config[:name].capitalize %>
- * Theme URI: <%= config[:uri] %>
- * Author: <%= config[:author] %>
- * Author URI: <%= config[:author_uri] %>
- * Description: <%= if config[:description] then config[:description] else 'Wordpress theme made with Marv.' end %>
- * Version: <%= if config[:version_number] then config[:version_number] else '0.1' end %>
-<% if config[:template] -%>
- * Template: <%= config[:template] %>
-<% end -%>
- * License: <%= if config[:license_name] then config[:license_name] else 'GPLv3' end %>
- * License URI: <%= if config[:license_uri] then config[:license_uri] else 'http://www.gnu.org/copyleft/gpl.html' end %>
- * Tags: <%= config[:tags].join(", ") if config[:tags] %>
-<%- unless config[:comments].nil? || config[:comments].empty? -%>
- *
- * <%= config[:comments] %>
-<%- end -%>
- */

data/lib/guard/marv/assets.rb

@@ -1,33 +0,0 @@
-require 'guard'
-require 'guard/guard'
-
-module Guard
-  class MarvAssets < ::Guard::Guard
-
-    def initialize(watchers=[], options={})
-      super
-    end
-
-    # Runs on marv watch
-    def start
-      build_assets("Building all assets", true)
-    end
-
-    # Runs on all command in guard console
-    def run_all
-      build_assets("Rebuilding all assets", true)
-    end
-
-    # Called on file(s) modifications
-    def run_on_change(paths)
-      build_assets("Assets have changed, rebuilding...", nil)
-    end
-
-    # Build assets
-    def build_assets(message, clean)
-      UI.info message
-      ::Marv::Guard.builder.build_assets(clean)
-    end
-
-  end
-end