marv 0.4.0 → 0.5.0

data/Gemfile

@@ -3,15 +3,15 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'thor', '>= 0.19.1'
-gem 'guard-livereload', '>= 2.3.0'
-gem 'sprockets', '>= 2.12.0'
-gem 'childprocess', '>= 0.3.5'
-gem 'mysql2', '>= 0.3.15'
-gem 'uglifier', '>= 2.5.0'
-gem 'sass', '>= 3.3.0'
+gem 'guard-livereload', '>= 2.3.1'
+gem 'sprockets', '>= 2.12.3'
+gem 'childprocess', '>= 0.5.5'
+gem 'mysql2', '>= 0.3.16'
+gem 'uglifier', '>= 2.5.3'
+gem 'sass', '>= 3.4.7'
 gem 'less', '>= 2.6.0'
 gem 'coffee-script', '>= 2.3.0'
-gem 'therubyracer', '>= 0.12.0'
+gem 'therubyracer', '>= 0.12.1'
 gem 'rubyzip', '>= 1.1.6'
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-script (2.3.0)
@@ -22,7 +22,7 @@ GEM
     execjs (2.2.1)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
+    ffi (1.9.6)
     formatador (0.2.5)
     git (1.2.8)
     github_api (0.12.1)
@@ -33,13 +33,13 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    guard (2.6.1)
+    guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-livereload (2.3.0)
+    guard-livereload (2.3.1)
       em-websocket (~> 0.5)
       guard (~> 2.0)
       multi_json (~> 1.8)
@@ -62,7 +62,7 @@ GEM
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.7)
-    listen (2.7.9)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -94,9 +94,9 @@ GEM
       json (~> 1.4)
     ref (1.0.5)
     rubyzip (1.1.6)
-    sass (3.4.5)
+    sass (3.4.7)
     slop (3.6.0)
-    sprockets (2.12.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -118,16 +118,16 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  childprocess (>= 0.3.5)
+  childprocess (>= 0.5.5)
   coffee-script (>= 2.3.0)
-  guard-livereload (>= 2.3.0)
+  guard-livereload (>= 2.3.1)
   jeweler (~> 2.0.1)
   less (>= 2.6.0)
-  mysql2 (>= 0.3.15)
+  mysql2 (>= 0.3.16)
   rdoc (~> 3.12)
   rubyzip (>= 1.1.6)
-  sass (>= 3.3.0)
-  sprockets (>= 2.12.0)
-  therubyracer (>= 0.12.0)
+  sass (>= 3.4.7)
+  sprockets (>= 2.12.3)
+  therubyracer (>= 0.12.1)
   thor (>= 0.19.1)
-  uglifier (>= 2.5.0)
+  uglifier (>= 2.5.3)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/marv/cli/server.rb

@@ -31,9 +31,21 @@ module Marv
       # Start a Marv server
       desc "start SERVER", "Start the specified Marv server"
       def start(dir)
-        server = Marv::Server::Server.new(self, dir)
-        action = Marv::Server::Actions.new(server)
-        action.start
+        servers_path = Marv::Global.new(self).servers_path
+
+        if ::File.directory?(::File.join(servers_path, dir))
+          server = Marv::Server::Server.new(self, dir)
+          action = Marv::Server::Actions.new(server)
+          action.start
+        end
+
+        # Create server if it does not exist
+        unless ::File.directory?(::File.join(servers_path, dir))
+          say "Server #{dir} does not exist.", :yellow
+          if yes?("Would you like to create the server?")
+            create(dir)
+          end
+        end
       end
 
       # Start a Marv server

data/lib/marv/project/actions.rb

@@ -104,7 +104,7 @@ module Marv
 
         # Copy build files to temporary directory
         @task.shell.mute do
-          @task.directory @project.build_path, ::File.join(@project.package_path, @package_name)
+          @task.directory @project.build_path, ::File.join(@project.package_path, @package_name), :force => true
         end
       end
 

data/lib/marv/project/builder/assets.rb

@@ -36,7 +36,7 @@ module Marv
               @task.copy_file filename, ::File.join(@project.build_path, ::File.basename(filename)), :force => true
             else
               # Copy the other files in images directory
-              @task.copy_file filename, ::File.join(@project.build_path, 'images'), :force => true
+              @task.copy_file filename, ::File.join(@project.build_path, 'images', ::File.basename(filename)), :force => true
             end
           end
         end

data/lib/marv/project/builder/functions.rb

@@ -88,7 +88,7 @@ module Marv
             source = folder.gsub(@project.source_path, '')
             target = ::File.join(@project.build_path, source)
 
-            @task.directory folder, target
+            @task.directory folder, target, :force => true
           end
         end
       end

data/lib/marv/project/builder.rb

@@ -23,19 +23,14 @@ module Marv
       def build_project
         clean_directory
 
-        @assets.build_assets
-        @assets.clean_images
-        @assets.copy_images
-
-        @templates.clean_templates
+        @functions.copy_folders
         @templates.copy_templates
 
-        @functions.clean_functions
         @functions.copy_functions
-        @functions.clean_includes
         @functions.copy_includes
-        @functions.clean_folders
-        @functions.copy_folders
+
+        @assets.copy_images
+        @assets.build_assets
       end
 
       # Build project to a directory

data/lib/marv/project/guard/assets.rb

@@ -1,10 +1,10 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 
 module Guard
-  class Assets < ::Guard::Guard
+  class Assets < ::Guard::Plugin
 
-    def initialize(watchers=[], options={})
+    def initialize(options={})
       super
     end
 

data/lib/marv/project/guard/config.rb

@@ -1,10 +1,10 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 
 module Guard
-  class Config < ::Guard::Guard
+  class Config < ::Guard::Plugin
 
-    def initialize(watchers=[], options={})
+    def initialize(options={})
       @builder = Marv::Project::Guard.builder
       super
     end

data/lib/marv/project/guard/functions.rb

@@ -1,10 +1,10 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 
 module Guard
-  class Functions < ::Guard::Guard
+  class Functions < ::Guard::Plugin
 
-    def initialize(watchers=[], options={})
+    def initialize(options={})
       super
     end
 
@@ -33,6 +33,7 @@ module Guard
         builder.clean_functions
         builder.clean_includes
         builder.clean_folders
+        Marv::Project::Guard.builder.assets.build_assets
       end
 
       builder.copy_functions

data/lib/marv/project/guard/templates.rb

@@ -1,10 +1,10 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 
 module Guard
-  class Templates < ::Guard::Guard
+  class Templates < ::Guard::Plugin
 
-    def initialize(watchers=[], options={})
+    def initialize(options={})
       super
     end
 

data/lib/marv/project/guard.rb

@@ -1,5 +1,5 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 
 # Marv pry console actions
 require 'marv/project/guard/assets'
@@ -51,18 +51,16 @@ module Marv
           guard 'config'#{@options_hash} do
             watch("#{config_file}")
           end
-          guard 'assets' do
-            watch(%r{#{assets_path}/javascripts/*})
-            watch(%r{#{assets_path}/stylesheets/*})
-            watch(%r{#{assets_path}/images/*})
+          guard 'functions' do
+            watch(%r{#{source_path}/*})
           end
           guard 'templates' do
             watch(%r{#{source_path}/templates/*})
-            watch(%r{#{source_path}/partials/*})
           end
-          guard 'functions' do
-            watch(%r{#{source_path}/functions/*})
-            watch(%r{#{source_path}/includes/*})
+          guard 'assets' do
+            watch(%r{#{assets_path}/javascripts/*})
+            watch(%r{#{assets_path}/stylesheets/*})
+            watch(%r{#{assets_path}/images/*})
           end
         }
 

data/lib/marv/server/actions.rb

@@ -1,4 +1,3 @@
-require 'net/http'
 require 'childprocess'
 
 module Marv
@@ -15,12 +14,6 @@ module Marv
 
       # Initialize server start
       def start
-        # Setup server
-        server = TCPServer.new('127.0.0.1', 0)
-        port = server.addr[1]
-        server.close()
-
-        # Run PHP server
         ::Dir.chdir @path
         @php = ChildProcess.build 'php', '-S', "#{@server.host}:#{@server.port}", 'router.php'
         @php.start

data/marv.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.4.0"
+  s.version = "0.5.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-09-30"
+  s.date = "2014-11-10"
   s.description = "A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
   s.extra_rdoc_files = [
-    "LICENSE",
+    "LICENSE.txt",
     "README.md"
   ]
   s.files = [
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
-    "LICENSE",
+    "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -100,30 +100,30 @@ 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-livereload>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 2.12.0"])
-      s.add_runtime_dependency(%q<childprocess>, [">= 0.3.5"])
-      s.add_runtime_dependency(%q<mysql2>, [">= 0.3.15"])
-      s.add_runtime_dependency(%q<uglifier>, [">= 2.5.0"])
-      s.add_runtime_dependency(%q<sass>, [">= 3.3.0"])
+      s.add_runtime_dependency(%q<guard-livereload>, [">= 2.3.1"])
+      s.add_runtime_dependency(%q<sprockets>, [">= 2.12.3"])
+      s.add_runtime_dependency(%q<childprocess>, [">= 0.5.5"])
+      s.add_runtime_dependency(%q<mysql2>, [">= 0.3.16"])
+      s.add_runtime_dependency(%q<uglifier>, [">= 2.5.3"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.4.7"])
       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<therubyracer>, [">= 0.12.1"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
       s.add_dependency(%q<thor>, [">= 0.19.1"])
-      s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
-      s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-      s.add_dependency(%q<childprocess>, [">= 0.3.5"])
-      s.add_dependency(%q<mysql2>, [">= 0.3.15"])
-      s.add_dependency(%q<uglifier>, [">= 2.5.0"])
-      s.add_dependency(%q<sass>, [">= 3.3.0"])
+      s.add_dependency(%q<guard-livereload>, [">= 2.3.1"])
+      s.add_dependency(%q<sprockets>, [">= 2.12.3"])
+      s.add_dependency(%q<childprocess>, [">= 0.5.5"])
+      s.add_dependency(%q<mysql2>, [">= 0.3.16"])
+      s.add_dependency(%q<uglifier>, [">= 2.5.3"])
+      s.add_dependency(%q<sass>, [">= 3.4.7"])
       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<therubyracer>, [">= 0.12.1"])
       s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -131,15 +131,15 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<thor>, [">= 0.19.1"])
-    s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
-    s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-    s.add_dependency(%q<childprocess>, [">= 0.3.5"])
-    s.add_dependency(%q<mysql2>, [">= 0.3.15"])
-    s.add_dependency(%q<uglifier>, [">= 2.5.0"])
-    s.add_dependency(%q<sass>, [">= 3.3.0"])
+    s.add_dependency(%q<guard-livereload>, [">= 2.3.1"])
+    s.add_dependency(%q<sprockets>, [">= 2.12.3"])
+    s.add_dependency(%q<childprocess>, [">= 0.5.5"])
+    s.add_dependency(%q<mysql2>, [">= 0.3.16"])
+    s.add_dependency(%q<uglifier>, [">= 2.5.3"])
+    s.add_dependency(%q<sass>, [">= 3.4.7"])
     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<therubyracer>, [">= 0.12.1"])
     s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.3
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.7
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -243,14 +243,14 @@ executables:
 - marv
 extensions: []
 extra_rdoc_files:
-- LICENSE
+- LICENSE.txt
 - README.md
 files:
 - .document
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
@@ -331,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1860274097938123520
+      hash: -2094091167065699108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: