marv 0.2.5 → 0.3.0

data/lib/marv/version.rb

@@ -1,3 +1,3 @@
 module Marv
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/marv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.2.5"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2014-08-05"
+  s.date = "2014-09-08"
   s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rspec",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -38,7 +39,9 @@ Gem::Specification.new do |s|
     "layouts/bramble/stylesheets/_header.scss.erb",
     "layouts/bramble/stylesheets/style.scss.erb",
     "layouts/bramble/templates/sample-template.php",
-    "layouts/config/config.tt",
+    "layouts/config/project-config.rb",
+    "layouts/config/rack-config.ru",
+    "layouts/config/wp-config.php.erb",
     "layouts/default/functions/functions.php.erb",
     "layouts/default/images/screenshot.png",
     "layouts/default/includes/filters-admin.php.erb",
@@ -68,6 +71,7 @@ Gem::Specification.new do |s|
     "layouts/default/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",
@@ -78,8 +82,9 @@ Gem::Specification.new do |s|
     "lib/marv/generator.rb",
     "lib/marv/guard.rb",
     "lib/marv/project.rb",
+    "lib/marv/server.rb",
     "lib/marv/version.rb",
-    "marv-0.2.5.gem",
+    "marv-0.3.0.gem",
     "marv.gemspec",
     "spec/lib/marv/project_spec.rb",
     "spec/spec_helper.rb"
@@ -95,55 +100,52 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0.19.1"])
-      s.add_runtime_dependency(%q<guard>, [">= 2.2.1"])
       s.add_runtime_dependency(%q<guard-livereload>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<sprockets>, [">= 2.12.0"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
-      s.add_runtime_dependency(%q<rack>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<rack-legacy>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<mysql2>, [">= 0.3.15"])
       s.add_runtime_dependency(%q<sass>, [">= 3.3.0"])
       s.add_runtime_dependency(%q<less>, [">= 2.6.0"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<therubyracer>, [">= 0.12.0"])
-      s.add_runtime_dependency(%q<rb-fsevent>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<uglifier>, [">= 2.5.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       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>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0.19.1"])
-      s.add_dependency(%q<guard>, [">= 2.2.1"])
       s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
       s.add_dependency(%q<sprockets>, [">= 2.12.0"])
       s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
-      s.add_dependency(%q<rack>, [">= 1.5.2"])
+      s.add_dependency(%q<rack-legacy>, [">= 1.0.0"])
+      s.add_dependency(%q<mysql2>, [">= 0.3.15"])
       s.add_dependency(%q<sass>, [">= 3.3.0"])
       s.add_dependency(%q<less>, [">= 2.6.0"])
       s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
       s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
-      s.add_dependency(%q<rb-fsevent>, [">= 0.9.4"])
       s.add_dependency(%q<uglifier>, [">= 2.5.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.19.1"])
-    s.add_dependency(%q<guard>, [">= 2.2.1"])
     s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
     s.add_dependency(%q<sprockets>, [">= 2.12.0"])
     s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
-    s.add_dependency(%q<rack>, [">= 1.5.2"])
+    s.add_dependency(%q<rack-legacy>, [">= 1.0.0"])
+    s.add_dependency(%q<mysql2>, [">= 0.3.15"])
     s.add_dependency(%q<sass>, [">= 3.3.0"])
     s.add_dependency(%q<less>, [">= 2.6.0"])
     s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
     s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
-    s.add_dependency(%q<rb-fsevent>, [">= 0.9.4"])
     s.add_dependency(%q<uglifier>, [">= 2.5.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/spec/lib/marv/project_spec.rb

@@ -1,4 +1,3 @@
-
 require 'marv/project'
 
 describe Marv::Project do
@@ -8,7 +7,7 @@ describe Marv::Project do
 
   describe :config_file do
     it "should create an expanded path to the config file" do
-      @project.config_file.should == '/tmp/config.json'
+      @project.config_file.should == '/tmp/config.rb'
     end
   end
 
@@ -25,9 +24,9 @@ describe Marv::Project do
     end
   end
 
-  describe :theme_id do
+  describe :project_id do
     it "should be the same as the project folder" do
-      @project.theme_id.should == 'tmp'
+      @project.project_id.should == 'tmp'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -29,13 +29,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,15 +43,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: guard-livereload
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: rack-legacy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -172,22 +172,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +189,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -221,7 +205,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -237,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -278,6 +262,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- .rspec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -298,7 +283,9 @@ files:
 - layouts/bramble/stylesheets/_header.scss.erb
 - layouts/bramble/stylesheets/style.scss.erb
 - layouts/bramble/templates/sample-template.php
-- layouts/config/config.tt
+- layouts/config/project-config.rb
+- layouts/config/rack-config.ru
+- layouts/config/wp-config.php.erb
 - layouts/default/functions/functions.php.erb
 - layouts/default/images/screenshot.png
 - layouts/default/includes/filters-admin.php.erb
@@ -328,6 +315,7 @@ files:
 - layouts/default/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
@@ -338,8 +326,9 @@ files:
 - lib/marv/generator.rb
 - lib/marv/guard.rb
 - lib/marv/project.rb
+- lib/marv/server.rb
 - lib/marv/version.rb
-- marv-0.2.5.gem
+- marv-0.3.0.gem
 - marv.gemspec
 - spec/lib/marv/project_spec.rb
 - spec/spec_helper.rb