marv 0.2.1 → 0.2.2

data/layouts/bramble/javascripts/admin.js

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

data/layouts/bramble/javascripts/theme.js

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

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

@@ -0,0 +1,16 @@
+/*!
+ * 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 'Bramble Framework child theme for Wordpress, made with Marv.' end %>
+ * Version: <%= if config[:version_number] then config[:version_number] else '0.1' end %>
+ * Template: bramble-framework
+ * 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/layouts/bramble/stylesheets/style.css.scss.erb

@@ -0,0 +1,4 @@
+// WordPress theme header
+@import "header";
+
+// This is your master stylesheet

data/layouts/bramble/templates/sample-template.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+*
+* Template Name: Sample Template
+*
+**/
+
+get_header(); ?>
+
+	<div id="content">
+
+		<?php bramble_content_before(); ?>
+
+		<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
+
+			<?php get_template_part( 'content', get_post_format() ); ?>
+
+		<?php endwhile; endif; ?>
+
+		<?php bramble_content_after(); ?>
+
+	</div>
+
+<?php get_footer(); ?>

data/lib/marv/cli.rb

@@ -14,11 +14,13 @@ module Marv
     end
 
     desc "create DIRECTORY", "Creates a Marv project"
+    long_desc "Creates a new project. Use the layout option to choose a scaffold"
+    option :layout, :type => :string, :default => 'default', :desc => "Name of alternate layout"
     def create(dir)
       theme = {}
       theme[:name] = dir
 
-      project = Marv::Project.create(dir, theme, self)
+      project = Marv::Project.create(dir, theme, self, options[:layout])
     end
 
     desc "link PATH", "Create a symbolic link to the compilation directory"

data/lib/marv/generator.rb

@@ -2,13 +2,13 @@
 module Marv
   class Generator
     class << self
-      def run(project, layout='default')
+      def run(project, layout)
         generator = self.new(project, layout)
         generator.run
       end
     end
 
-    def initialize(project, layout='default')
+    def initialize(project, layout)
       @project = project
       @task    = project.task
       @layout  = layout

data/lib/marv/project.rb

@@ -4,11 +4,11 @@ require 'compass'
 module Marv
   class Project
     class << self
-      def create(root, config, task)
+      def create(root, config, task, layout)
         root = File.expand_path(root)
 
         project = self.new(root, task, config)
-        Generator.run(project)
+        Generator.run(project, layout)
 
         project
       end

data/marv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hardpixel"]
-  s.date = "2014-07-28"
+  s.date = "2014-07-29"
   s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
@@ -31,6 +31,16 @@ Gem::Specification.new do |s|
     "bin/marv",
     "features/step_definitions/marv_steps.rb",
     "features/support/env.rb",
+    "layouts/bramble/functions/functions.php.erb",
+    "layouts/bramble/images/screenshot.png",
+    "layouts/bramble/includes/options.php.erb",
+    "layouts/bramble/javascripts/admin.coffee",
+    "layouts/bramble/javascripts/admin.js",
+    "layouts/bramble/javascripts/theme.coffee",
+    "layouts/bramble/javascripts/theme.js",
+    "layouts/bramble/stylesheets/_header.scss.erb",
+    "layouts/bramble/stylesheets/style.css.scss.erb",
+    "layouts/bramble/templates/sample-template.php",
     "layouts/config/config.tt",
     "layouts/default/functions/functions.php.erb",
     "layouts/default/images/screenshot.png",
@@ -73,7 +83,7 @@ Gem::Specification.new do |s|
     "lib/marv/guard.rb",
     "lib/marv/project.rb",
     "lib/marv/version.rb",
-    "marv-0.2.1.gem",
+    "marv-0.2.2.gem",
     "marv.gemspec",
     "spec/lib/marv/config_spec.rb",
     "spec/lib/marv/project_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -338,6 +338,16 @@ files:
 - bin/marv
 - features/step_definitions/marv_steps.rb
 - features/support/env.rb
+- layouts/bramble/functions/functions.php.erb
+- layouts/bramble/images/screenshot.png
+- layouts/bramble/includes/options.php.erb
+- layouts/bramble/javascripts/admin.coffee
+- layouts/bramble/javascripts/admin.js
+- layouts/bramble/javascripts/theme.coffee
+- layouts/bramble/javascripts/theme.js
+- layouts/bramble/stylesheets/_header.scss.erb
+- layouts/bramble/stylesheets/style.css.scss.erb
+- layouts/bramble/templates/sample-template.php
 - layouts/config/config.tt
 - layouts/default/functions/functions.php.erb
 - layouts/default/images/screenshot.png
@@ -380,7 +390,7 @@ files:
 - lib/marv/guard.rb
 - lib/marv/project.rb
 - lib/marv/version.rb
-- marv-0.2.1.gem
+- marv-0.2.2.gem
 - marv.gemspec
 - spec/lib/marv/config_spec.rb
 - spec/lib/marv/project_spec.rb