marv 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 268d564fe9ebeed1c8c5adec5efb6b84307a205a
+  data.tar.gz: 6e67dedb9abceb7d9555b2dec039ecda22854299
+SHA512:
+  metadata.gz: 30ac14ddb72cae4f18504e8248a641c16f951ae042dba69ccb51724f0d1c81298a19ad6d2b147d7157ce75ebdbd366c11b472d5841d10baaa52881131b5f4943
+  data.tar.gz: 86c1c6d25429843a187d4255a54269169226b9b6757596421e17dcc3e7e05074f6ef56b6d139630908ecc8541e25fd807bf51a399b216cde29dad34b30a8726f

data/Gemfile

@@ -1,23 +1,22 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'thor', '>= 0.19.1'
-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.1'
-gem 'rubyzip', '>= 1.1.6'
+gem 'guard', '~> 2.8.0'
+gem 'guard-livereload', '~> 2.4.0'
+gem 'thor', '~> 0.19'
+gem 'sprockets', '~> 2.12'
+gem 'childprocess', '~> 0.5'
+gem 'mysql2', '~> 0.3'
+gem 'uglifier', '~> 2.7'
+gem 'sass', '~> 3.4'
+gem 'less', '~> 2.6'
+gem 'coffee-script', '~> 2.3'
+gem 'therubyracer', '~> 0.12'
+gem 'rubyzip', '~> 1.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem 'rdoc', '~> 3.12'
+  gem 'bundler', '~> 1.0'
+  gem 'jeweler', '~> 2.0'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.7)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -11,25 +11,25 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     commonjs (0.2.7)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.0.3)
-    execjs (2.2.1)
-    faraday (0.9.0)
+    eventmachine (1.0.7)
+    execjs (2.4.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.6)
+    ffi (1.9.8)
     formatador (0.2.5)
-    git (1.2.8)
-    github_api (0.12.1)
+    git (1.2.9.1)
+    github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
@@ -39,12 +39,12 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-livereload (2.3.1)
+    guard-livereload (2.4.0)
       em-websocket (~> 0.5)
-      guard (~> 2.0)
+      guard (~> 2.8)
       multi_json (~> 1.8)
-    hashie (3.3.1)
-    highline (1.6.21)
+    hashie (3.4.0)
+    highline (1.7.1)
     hike (1.2.3)
     hitimes (1.2.2)
     http_parser.rb (0.6.0)
@@ -57,24 +57,24 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
+    json (1.8.2)
+    jwt (1.4.1)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.7)
-    listen (2.7.11)
+    listen (2.9.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mysql2 (0.3.18)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -85,16 +85,16 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    rubyzip (1.1.6)
-    sass (3.4.7)
+    rubyzip (1.1.7)
+    sass (3.4.13)
     slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
@@ -105,11 +105,11 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    uglifier (2.5.3)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -118,16 +118,17 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  childprocess (>= 0.5.5)
-  coffee-script (>= 2.3.0)
-  guard-livereload (>= 2.3.1)
-  jeweler (~> 2.0.1)
-  less (>= 2.6.0)
-  mysql2 (>= 0.3.16)
+  childprocess (~> 0.5)
+  coffee-script (~> 2.3)
+  guard (~> 2.8.0)
+  guard-livereload (~> 2.4.0)
+  jeweler (~> 2.0)
+  less (~> 2.6)
+  mysql2 (~> 0.3)
   rdoc (~> 3.12)
-  rubyzip (>= 1.1.6)
-  sass (>= 3.4.7)
-  sprockets (>= 2.12.3)
-  therubyracer (>= 0.12.1)
-  thor (>= 0.19.1)
-  uglifier (>= 2.5.3)
+  rubyzip (~> 1.1)
+  sass (~> 3.4)
+  sprockets (~> 2.12)
+  therubyracer (~> 0.12)
+  thor (~> 0.19)
+  uglifier (~> 2.7)

data/README.md

@@ -45,7 +45,7 @@ Watch for changes and start developing!
     $ cd project-name
     $ marv watch
 
-	Press Ctrl + Z to exit watch mode
+	Press Ctrl + D to exit watch mode
 
 Build your project into the build_here directory:
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/marv.rb

@@ -8,4 +8,11 @@ module Marv
     ::File.expand_path(::File.join(::File.dirname(__FILE__), '..'))
   end
 
-end
+end
+
+trap 'SIGINT' do
+  puts
+  puts
+  puts ::Time.now.strftime('%T') + ' - INFO - Bye bye...'
+  exit 130
+end

data/lib/marv/cli.rb

@@ -5,10 +5,6 @@ module Marv
   module CLI
     class Commands < Project
 
-      def self.source_root
-        ::File.expand_path(::File.join(Marv.root, 'layouts'))
-      end
-
       # Configure marv
       desc "config", "Configure Marv projects and servers"
       long_desc "Creates a global config.rb file that can be used to auto-configure your projects and servers"

data/lib/marv/cli/project.rb

@@ -4,6 +4,10 @@ module Marv
   module CLI
     class Project < Thor
 
+      def self.source_root
+        ::File.expand_path(::File.join(Marv.root, 'layouts'))
+      end
+
       include Thor::Actions
 
       # Create a new Marv project

data/lib/marv/cli/server.rb

@@ -12,12 +12,36 @@ module Marv
 
       # List all Marv servers
       desc "list", "List all Marv servers"
-      def list
+      def list(dir='all')
         servers = Marv::Global.new(self).servers
 
-        say "Available marv servers:"
-        servers.each do |server|
-          say '- ' + server, :cyan
+        if dir == 'all'
+          say "Available marv servers:"
+          servers.each_with_index do |server, index|
+            say "#{index + 1}. #{server}", :cyan
+          end
+
+          if servers.empty?
+            say "No servers found", :yellow
+          end
+        end
+
+        if dir == 'running'
+          index = 0
+          say "Running marv servers:"
+          servers.each do |dir|
+            server = Marv::Server::Server.new(self, dir)
+            action = Marv::Server::Actions.new(server)
+
+            if action.is_server_running?
+              say "#{index + 1}. #{server.name} [http://#{server.host}:#{server.port}]", :green
+              index += 1
+            end
+          end
+
+          if index == 0
+            say "No running servers found", :yellow
+          end
         end
       end
 
@@ -30,12 +54,13 @@ module Marv
 
       # Start a Marv server
       desc "start SERVER", "Start the specified Marv server"
+      method_option :debug, :type => :boolean, :desc => "Start server in debug mode"
       def start(dir)
         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 = Marv::Server::Actions.new(server, options[:debug])
           action.start
         end
 
@@ -51,9 +76,24 @@ module Marv
       # Start a Marv server
       desc "stop SERVER", "Stop the specified Marv server"
       def stop(dir)
-        server = Marv::Server::Server.new(self, dir)
-        action = Marv::Server::Actions.new(server)
-        action.stop
+        unless dir == 'all'
+          server = Marv::Server::Server.new(self, dir)
+          action = Marv::Server::Actions.new(server)
+          action.stop
+        end
+
+        if dir == 'all'
+          servers = Marv::Global.new(self).servers
+
+          servers.each do |dir|
+            server = Marv::Server::Server.new(self, dir)
+            action = Marv::Server::Actions.new(server)
+
+            if action.is_server_running?
+              action.stop
+            end
+          end
+        end
       end
 
       # Start a Marv server

data/lib/marv/project/actions.rb

@@ -39,14 +39,18 @@ module Marv
       # Link to server
       def link_to_server
         unless @link_dir.nil?
-          ::File.join(@global.servers_path, @link_dir, 'wp-content', @link_options[:folder], ::File.basename(@project.root))
+          path = ::File.join(@global.servers_path, @link_dir, 'wp-content', @link_options[:folder])
+
+          if ::File.directory?(path)
+            ::File.join(path, ::File.basename(@project.root))
+          end
         end
       end
 
       # Link to wordpress
       def link_to_folder
         unless @link_dir.nil?
-          unless @global.servers.include?(@link_dir)
+          if ::File.directory?(@link_dir)
             ::File.join(@link_dir, 'wp-content', @link_options[:folder], ::File.basename(@project.root))
           end
         end
@@ -54,10 +58,14 @@ module Marv
 
       # Link target
       def link_target
-        target = ::File.join(@global.global_path, @link_options[:folder], ::File.basename(@project.root))
         target = link_to_server unless link_to_server.nil?
         target = link_to_folder unless link_to_folder.nil?
 
+        if target.nil?
+          @task.say "Destination server does not exist!", :red
+          exit
+        end
+
         @link_target = target
       end
 

data/lib/marv/project/guard.rb

@@ -1,7 +1,10 @@
+gem 'guard', '~> 2.8.0'
+gem 'guard-livereload', '~> 2.4.0'
+
 require 'guard'
 require 'guard/plugin'
 
-# Marv pry console actions
+# Marv Guard plugins
 require 'marv/project/guard/assets'
 require 'marv/project/guard/config'
 require 'marv/project/guard/functions'
@@ -38,7 +41,7 @@ module Marv
           self.project_contents << result unless result.nil?
         end
         # Start guard watching
-        ::Guard.start({ :guardfile_contents => self.project_contents }).join
+        ::Guard.start({ :guardfile_contents => self.project_contents })
       end
 
       # Guard contents

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

@@ -1,6 +1,3 @@
-require 'guard'
-require 'guard/plugin'
-
 module Guard
   class Assets < ::Guard::Plugin
 

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

@@ -1,6 +1,3 @@
-require 'guard'
-require 'guard/plugin'
-
 module Guard
   class Config < ::Guard::Plugin
 

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

@@ -1,6 +1,3 @@
-require 'guard'
-require 'guard/plugin'
-
 module Guard
   class Functions < ::Guard::Plugin
 

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

@@ -1,6 +1,3 @@
-require 'guard'
-require 'guard/plugin'
-
 module Guard
   class Templates < ::Guard::Plugin
 

data/lib/marv/server/actions.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'childprocess'
 
 module Marv
@@ -5,26 +6,27 @@ module Marv
     class Actions
 
       # Initialize actions
-      def initialize(server)
+      def initialize(server, debug=false)
         @server = server
         @task = server.task
         @path = server.path
         @name = server.name
+        @debug = debug
       end
 
       # Initialize server start
       def start
-        ::Dir.chdir @path
-        @php = ChildProcess.build 'php', '-S', "#{@server.host}:#{@server.port}", 'router.php'
-        @php.start
+        if is_server_running?
+          @task.say "Server is already running", :yellow
+          exit
+        end
 
-        # Write PHP proccess id to file
-        @task.shell.mute do
-          @task.create_file ::File.join(@path, 'php.pid'), @php.pid, :force => true
+        unless is_port_available?
+          @task.say "Port is not available!", :yellow
+          change_server_port
         end
 
-        @task.say "Server #{@server.name} is running", :cyan
-        @task.say "Visit http://#{@server.host}:#{@server.port}", :green
+        run_server
       end
 
       # Initialize server stop
@@ -67,6 +69,71 @@ module Marv
         @task.say "Server successfully removed", :green
       end
 
+      # Run server
+      def run_server
+        unless @debug
+          ::Dir.chdir @path
+          @php = ChildProcess.build 'php', '-S', "#{@server.host}:#{@server.port}", 'router.php'
+          @php.start
+
+          # Write PHP proccess id to file
+          @task.shell.mute do
+            @task.create_file ::File.join(@path, 'php.pid'), @php.pid, :force => true
+          end
+        end
+
+        @task.say "Server #{@server.name} is running", :cyan
+        @task.say "Visit http://#{@server.host}:#{@server.port}", :green
+
+        # Start server in debug mode
+        if @debug
+          system "php -S #{@server.host}:#{@server.port} router.php"
+        end
+      end
+
+      # Change server port
+      def change_server_port
+        @task.say "Use another port to run the server", :cyan
+        port = @task.ask "Which port would you like to use?"
+
+        # Check if port available
+        if is_port_available?(@server.host, port)
+          # Write port to server config
+          @task.shell.mute do
+            @task.gsub_file @server.config_file, "#{@server.port}", "#{port}"
+          end
+
+          @server.port = port
+        else
+          change_server_port
+        end
+      end
+
+      # Check if port is available
+      def is_server_running?(server=@server)
+        begin
+          pid_file = ::File.join(server.path, 'php.pid')
+          pid = ::File.read(pid_file).to_i
+
+          ::Process.kill(0, pid)
+        rescue Exception => e
+          return false
+        end
+
+        return true
+      end
+
+      # Check if port is available
+      def is_port_available?(host=@server.host, port=@server.port)
+        begin
+          ::TCPServer.new(host, port)
+        rescue Exception => e
+          return false
+        end
+
+        return true
+      end
+
     end
   end
-end
+end

data/marv.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: marv 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2014-11-10"
+  s.date = "2015-03-25"
   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"]
@@ -91,59 +93,61 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://hardpixel.github.io/marv"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.summary = "A command-line tool for developing wordpress themes and plugins"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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.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.1"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
+      s.add_runtime_dependency(%q<guard>, ["~> 2.8.0"])
+      s.add_runtime_dependency(%q<guard-livereload>, ["~> 2.4.0"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.19"])
+      s.add_runtime_dependency(%q<sprockets>, ["~> 2.12"])
+      s.add_runtime_dependency(%q<childprocess>, ["~> 0.5"])
+      s.add_runtime_dependency(%q<mysql2>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<uglifier>, ["~> 2.7"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.4"])
+      s.add_runtime_dependency(%q<less>, ["~> 2.6"])
+      s.add_runtime_dependency(%q<coffee-script>, ["~> 2.3"])
+      s.add_runtime_dependency(%q<therubyracer>, ["~> 0.12"])
+      s.add_runtime_dependency(%q<rubyzip>, ["~> 1.1"])
       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"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
-      s.add_dependency(%q<thor>, [">= 0.19.1"])
-      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.1"])
-      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
+      s.add_dependency(%q<guard>, ["~> 2.8.0"])
+      s.add_dependency(%q<guard-livereload>, ["~> 2.4.0"])
+      s.add_dependency(%q<thor>, ["~> 0.19"])
+      s.add_dependency(%q<sprockets>, ["~> 2.12"])
+      s.add_dependency(%q<childprocess>, ["~> 0.5"])
+      s.add_dependency(%q<mysql2>, ["~> 0.3"])
+      s.add_dependency(%q<uglifier>, ["~> 2.7"])
+      s.add_dependency(%q<sass>, ["~> 3.4"])
+      s.add_dependency(%q<less>, ["~> 2.6"])
+      s.add_dependency(%q<coffee-script>, ["~> 2.3"])
+      s.add_dependency(%q<therubyracer>, ["~> 0.12"])
+      s.add_dependency(%q<rubyzip>, ["~> 1.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0.19.1"])
-    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.1"])
-    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
+    s.add_dependency(%q<guard>, ["~> 2.8.0"])
+    s.add_dependency(%q<guard-livereload>, ["~> 2.4.0"])
+    s.add_dependency(%q<thor>, ["~> 0.19"])
+    s.add_dependency(%q<sprockets>, ["~> 2.12"])
+    s.add_dependency(%q<childprocess>, ["~> 0.5"])
+    s.add_dependency(%q<mysql2>, ["~> 0.3"])
+    s.add_dependency(%q<uglifier>, ["~> 2.7"])
+    s.add_dependency(%q<sass>, ["~> 3.4"])
+    s.add_dependency(%q<less>, ["~> 2.6"])
+    s.add_dependency(%q<coffee-script>, ["~> 2.3"])
+    s.add_dependency(%q<therubyracer>, ["~> 0.12"])
+    s.add_dependency(%q<rubyzip>, ["~> 1.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonian Guveli
@@ -10,232 +9,218 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 description: A toolkit for bootstrapping and developing WordPress themes and plugins
   using Sass, LESS, and CoffeeScript.
 email: info@hardpixel.eu
@@ -246,7 +231,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -319,29 +304,25 @@ files:
 homepage: http://hardpixel.github.io/marv
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2094091167065699108
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command-line tool for developing wordpress themes and plugins
 test_files: []