marv 0.2.2 → 0.2.3

data/CHANGELOG.md

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

data/Gemfile

@@ -1,29 +1,29 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
+#   gem 'activesupport', '>= 2.3.5'
 
-gem "thor", ">= 0.18.1"
-gem "guard", ">= 2.2.1"
-gem "guard-livereload", ">= 2.0.0"
-gem "sprockets", ">= 2.12.0"
-gem "rubyzip", ">= 1.0.0"
-gem "json", ">= 1.8.0"
-gem "sass", ">= 3.3.0"
-gem "sprockets-sass", ">= 1.2.0"
-gem "compass", ">= 1.0.0.alpha.21"
+gem 'thor', '>= 0.18.1'
+gem 'guard', '>= 2.2.1'
+gem 'guard-livereload', '>= 2.0.0'
+gem 'sprockets', '>= 2.12.0'
+gem 'rubyzip', '>= 1.0.0'
+gem 'json', '>= 1.8.0'
+gem 'sass', '>= 3.3.0'
+gem 'sprockets-sass', '>= 1.2.0'
+gem 'compass', '>= 0.12.5'
 gem 'rack', '>= 1.5.2'
-gem "therubyracer", ">= 0.12.0"
-gem "less", ">= 2.6.0"
-gem "coffee-script", ">= 2.3.0"
-gem "rb-fsevent", ">= 0.9.3"
-gem "yui-compressor", ">= 0.12.0"
+gem 'therubyracer', '>= 0.12.0'
+gem 'less', '>= 2.6.0'
+gem 'coffee-script', '>= 2.3.0'
+gem 'rb-fsevent', '>= 0.9.3'
+gem 'yui-compressor', '>= 0.12.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
-  gem "cucumber", ">= 0"
-  gem "aruba"
-  gem "jeweler", "~> 1.6.4"
+  gem 'rspec'
+  gem 'cucumber'
+  gem 'aruba'
+  gem 'jeweler'
 end

data/Gemfile.lock

@@ -121,11 +121,11 @@ PLATFORMS
 DEPENDENCIES
   aruba
   coffee-script (>= 2.3.0)
-  compass (>= 1.0.0.alpha.21)
+  compass (>= 0.12.5)
   cucumber
   guard (>= 2.2.1)
   guard-livereload (>= 2.0.0)
-  jeweler (~> 1.6.4)
+  jeweler
   json (>= 1.8.0)
   less (>= 2.6.0)
   rack (>= 1.5.2)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Hardpixel
+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

data/Rakefile

@@ -16,12 +16,12 @@ Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "marv"
   gem.executables = ["marv"]
-  gem.homepage = "https://github.com/hardpixel/marv"
+  gem.homepage = "http://hardpixel.github.io/marv"
   gem.license = "MIT"
   gem.summary = %Q{A tool for developing wordpress themes}
   gem.description = %Q{A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript.}
   gem.email = "info@hardpixel.eu"
-  gem.authors = ["Hardpixel"]
+  gem.authors = ["Jonian Guveli", "Olibia Tsati"]
   # dependencies defined in Gemfile
   gem.files.include Dir.glob('**/*')
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/marv/builder.rb

@@ -67,6 +67,9 @@ module Marv
 
     # Empty out the build directory
     def clean_build_directory
+      # create build path if it does not exist
+      FileUtils.mkdir_p(@project.build_path) unless File.exists?(@project.build_path)
+      # Empty the build path
       FileUtils.rm_rf Dir.glob(File.join(@project.build_path, '*'))
     end
 
@@ -115,7 +118,7 @@ module Marv
       end
 
       unless functions_paths.empty?
-        # Create the includes folder in the build directory
+        # Create the functions folder in the build directory
         FileUtils.mkdir_p(File.join(@project.build_path, 'functions'))
 
         # Iterate over all files in source/functions, skipping the actual functions.php file
@@ -154,7 +157,7 @@ module Marv
     end
 
     def build_assets
-      [['style.css'], ['ie.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']].each do |asset|
+      [['style.css'], ['admin.css'], ['javascripts', 'theme.js'], ['javascripts', 'admin.js']].each do |asset|
         destination = File.join(@project.build_path, asset)
 
         sprocket = @sprockets.find_asset(asset.last)
@@ -226,7 +229,7 @@ module Marv
     def init_sprockets
       @sprockets = Sprockets::Environment.new
 
-      ['javascripts', 'stylesheets', 'lib'].each do |dir|
+      ['javascripts', 'stylesheets'].each do |dir|
         @sprockets.append_path File.join(@assets_path, dir)
       end
 

data/lib/marv/config.rb

@@ -29,7 +29,7 @@ module Marv
 
     # Returns the path to the user's configuration file
     def config_file
-      @config_file ||= File.expand_path(File.join('~', '.watch', 'config.yml'))
+      @config_file ||= File.expand_path(File.join('~', '.marv', 'config.yml'))
     end
 
     # Writes the configuration file

data/lib/marv/generator.rb

@@ -22,7 +22,6 @@ module Marv
         ['assets', 'images'],
         ['assets', 'javascripts'],
         ['assets', 'stylesheets'],
-        ['assets', 'lib'],
 
         ['functions'],
 

data/lib/marv/project.rb

@@ -62,7 +62,7 @@ module Marv
     end
 
     def global_config_file
-      @global_config_file ||= File.join(ENV['HOME'], '.watch', 'config.rb')
+      @global_config_file ||= File.join(ENV['HOME'], '.marv', 'config.rb')
     end
 
     # Create a symlink from source to the project build dir

data/lib/marv/version.rb

@@ -1,3 +1,3 @@
 module Marv
-  VERSION = "0.1"
+  VERSION = "0.2.3"
 end

data/marv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Hardpixel"]
-  s.date = "2014-07-29"
+  s.authors = ["Jonian Guveli", "Olibia Tsati"]
+  s.date = "2014-07-30"
   s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".document",
-    ".gitmodules",
     ".rspec",
     "CHANGELOG.md",
     "Gemfile",
@@ -39,7 +37,7 @@ Gem::Specification.new do |s|
     "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/stylesheets/style.scss.erb",
     "layouts/bramble/templates/sample-template.php",
     "layouts/config/config.tt",
     "layouts/default/functions/functions.php.erb",
@@ -52,7 +50,7 @@ Gem::Specification.new do |s|
     "layouts/default/javascripts/theme.coffee",
     "layouts/default/javascripts/theme.js",
     "layouts/default/stylesheets/_header.scss.erb",
-    "layouts/default/stylesheets/style.css.scss.erb",
+    "layouts/default/stylesheets/style.scss.erb",
     "layouts/default/templates/404.php.erb",
     "layouts/default/templates/archive.php.erb",
     "layouts/default/templates/author.php.erb",
@@ -83,13 +81,13 @@ Gem::Specification.new do |s|
     "lib/marv/guard.rb",
     "lib/marv/project.rb",
     "lib/marv/version.rb",
-    "marv-0.2.2.gem",
+    "marv-0.2.3.gem",
     "marv.gemspec",
     "spec/lib/marv/config_spec.rb",
     "spec/lib/marv/project_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "https://github.com/hardpixel/marv"
+  s.homepage = "http://hardpixel.github.io/marv"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
@@ -107,7 +105,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.8.0"])
       s.add_runtime_dependency(%q<sass>, [">= 3.3.0"])
       s.add_runtime_dependency(%q<sprockets-sass>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<compass>, [">= 1.0.0.alpha.21"])
+      s.add_runtime_dependency(%q<compass>, [">= 0.12.5"])
       s.add_runtime_dependency(%q<rack>, [">= 1.5.2"])
       s.add_runtime_dependency(%q<therubyracer>, [">= 0.12.0"])
       s.add_runtime_dependency(%q<less>, [">= 2.6.0"])
@@ -117,7 +115,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0.18.1"])
       s.add_dependency(%q<guard>, [">= 2.2.1"])
@@ -127,7 +125,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 1.8.0"])
       s.add_dependency(%q<sass>, [">= 3.3.0"])
       s.add_dependency(%q<sprockets-sass>, [">= 1.2.0"])
-      s.add_dependency(%q<compass>, [">= 1.0.0.alpha.21"])
+      s.add_dependency(%q<compass>, [">= 0.12.5"])
       s.add_dependency(%q<rack>, [">= 1.5.2"])
       s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
       s.add_dependency(%q<less>, [">= 2.6.0"])
@@ -137,7 +135,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.18.1"])
@@ -148,7 +146,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 1.8.0"])
     s.add_dependency(%q<sass>, [">= 3.3.0"])
     s.add_dependency(%q<sprockets-sass>, [">= 1.2.0"])
-    s.add_dependency(%q<compass>, [">= 1.0.0.alpha.21"])
+    s.add_dependency(%q<compass>, [">= 0.12.5"])
     s.add_dependency(%q<rack>, [">= 1.5.2"])
     s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
     s.add_dependency(%q<less>, [">= 2.6.0"])
@@ -158,7 +156,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/spec/lib/marv/config_spec.rb

@@ -4,7 +4,7 @@ require 'marv/config'
 describe Marv::Config do
 
   def config_file
-    File.expand_path(File.join('~', '.watch', 'config.yml'))
+    File.expand_path(File.join('~', '.marv', 'config.yml'))
   end
 
   before(:each) do
@@ -31,7 +31,7 @@ describe Marv::Config do
     @config[:links].should == ['/var/www/wordpress']
   end
 
-  it "should store config in ~/.watch/config.yml" do
+  it "should store config in ~/.marv/config.yml" do
     @config.config_file.should == config_file
   end
 
@@ -42,11 +42,11 @@ describe Marv::Config do
 
   describe :write do
     it "should dump any changes made to the config" do
-      @config[:theme][:author] = "Matt Button"
-      @config[:theme][:author_url] = "http://that-matt.com"
+      @config[:theme][:author] = "John Doe"
+      @config[:theme][:author_url] = "http://john-doe.com"
 
       @config.write(:io => @buffer)
-      @buffer.string.should == "---\n:theme:\n  :author: Matt Button\n  :author_url: http://that-matt.com\n:links: []\n"
+      @buffer.string.should == "---\n:theme:\n  :author: John Doe\n  :author_url: http://john-doe.com\n:links: []\n"
     end
   end
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
-- Hardpixel
+- Jonian Guveli
+- Olibia Tsati
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -146,7 +147,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.21
+        version: 0.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.21
+        version: 0.12.5
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -304,17 +305,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
 description: A toolkit for bootstrapping and developing WordPress themes using Sass,
   LESS, and CoffeeScript.
 email: info@hardpixel.eu
@@ -325,8 +326,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .gitmodules
 - .rspec
 - CHANGELOG.md
 - Gemfile
@@ -346,7 +345,7 @@ files:
 - 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/stylesheets/style.scss.erb
 - layouts/bramble/templates/sample-template.php
 - layouts/config/config.tt
 - layouts/default/functions/functions.php.erb
@@ -359,7 +358,7 @@ files:
 - layouts/default/javascripts/theme.coffee
 - layouts/default/javascripts/theme.js
 - layouts/default/stylesheets/_header.scss.erb
-- layouts/default/stylesheets/style.css.scss.erb
+- layouts/default/stylesheets/style.scss.erb
 - layouts/default/templates/404.php.erb
 - layouts/default/templates/archive.php.erb
 - layouts/default/templates/author.php.erb
@@ -390,12 +389,12 @@ files:
 - lib/marv/guard.rb
 - lib/marv/project.rb
 - lib/marv/version.rb
-- marv-0.2.2.gem
+- marv-0.2.3.gem
 - marv.gemspec
 - spec/lib/marv/config_spec.rb
 - spec/lib/marv/project_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/hardpixel/marv
+homepage: http://hardpixel.github.io/marv
 licenses:
 - MIT
 post_install_message: 

data/.document

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

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "layouts/lib/struts"]
-	path = layouts/lib/struts
-	url = git@github.com:jestro/struts.git