marv 0.2.4 → 0.2.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+== 0.2.5 ==
+- Remove compass, sprockets-sass and yui-compressor
+- Better error reporting in pry
+- Add uglifier
+- Remove unused functions
+
 == 0.2.4 ==
 - Update compass version
 

data/Gemfile

@@ -1,23 +1,18 @@
 source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
-# Example:
-#   gem 'activesupport', '>= 2.3.5'
 
-gem 'thor', '>= 0.18.1'
+gem 'thor', '>= 0.19.1'
 gem 'guard', '>= 2.2.1'
-gem 'guard-livereload', '>= 2.0.0'
+gem 'guard-livereload', '>= 2.3.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.20'
+gem 'rubyzip', '>= 1.1.6'
 gem 'rack', '>= 1.5.2'
-gem 'therubyracer', '>= 0.12.0'
+gem 'sass', '>= 3.3.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 'rb-fsevent', '>= 0.9.4'
+gem 'uglifier', '>= 2.5.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -6,33 +6,17 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.0.0)
+    builder (3.0.4)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
-    chunky_png (1.3.1)
     coderay (1.1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.7.1)
     commonjs (0.2.7)
-    compass (1.0.0.alpha.21)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.0.alpha.21)
-      compass-import-once (~> 1.0.4)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.0, < 3.5)
-    compass-core (1.0.0.alpha.21)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.4)
-      sass (>= 3.2, < 3.5)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -44,12 +28,12 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.0.3)
     execjs (2.2.1)
-    ffi (1.1.5)
-    formatador (0.2.4)
+    ffi (1.9.3)
+    formatador (0.2.5)
     gherkin (2.11.1)
       json (>= 1.4.6)
     git (1.2.5)
-    guard (2.6.0)
+    guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -69,23 +53,21 @@ GEM
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
-    listen (2.7.1)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
+    lumberjack (1.0.9)
     method_source (0.8.2)
-    multi_json (1.9.2)
-    nio4r (1.0.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    multi_json (1.10.1)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rake (0.9.2.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     ref (1.0.5)
     rspec (2.11.0)
@@ -97,23 +79,22 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
     rubyzip (1.1.6)
-    sass (3.3.11)
-    slop (3.5.0)
-    sprockets (2.12.0)
+    sass (3.3.14)
+    slop (3.6.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (1.2.0)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     tilt (1.4.1)
     timers (1.1.0)
-    yui-compressor (0.12.0)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
@@ -121,20 +102,17 @@ PLATFORMS
 DEPENDENCIES
   aruba
   coffee-script (>= 2.3.0)
-  compass (>= 1.0.0.alpha.20)
   cucumber
   guard (>= 2.2.1)
-  guard-livereload (>= 2.0.0)
+  guard-livereload (>= 2.3.0)
   jeweler
-  json (>= 1.8.0)
   less (>= 2.6.0)
   rack (>= 1.5.2)
-  rb-fsevent (>= 0.9.3)
+  rb-fsevent (>= 0.9.4)
   rspec
-  rubyzip (>= 1.0.0)
+  rubyzip (>= 1.1.6)
   sass (>= 3.3.0)
   sprockets (>= 2.12.0)
-  sprockets-sass (>= 1.2.0)
   therubyracer (>= 0.12.0)
-  thor (>= 0.18.1)
-  yui-compressor (>= 0.12.0)
+  thor (>= 0.19.1)
+  uglifier (>= 2.5.0)

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/layouts/config/config.tt

@@ -1,19 +1,13 @@
 # WordPress theme information is stored in source/assets/stylesheets/_header.scss
 
 # JavaScript compression
-# config[:compress_js] = false
+config[:compress_js] = false
 
-# Enable livereload
-# config[:livereload] = false
-
-# Compass configuration can also go here.
-# See http://compass-style.org/help/tutorials/configuration-reference/ for some of the options
-# Note: Most options (especially path-related options) will have no effect on Marv
+# Stylesheets compression
+config[:compress_css] = false
 
-# Compass.configuration do |compass|
-#   compass.line_comments = true
-#   compass.output_style = :expanded # use :compressed for minified version
-# end
+# Enable livereload
+config[:livereload] = false
 
 # You can also include additional Compass frameworks by requiring them:
 # require 'boubon'

data/lib/marv.rb

@@ -7,5 +7,4 @@ module Marv
   autoload :Project, 'marv/project'
   autoload :Builder, 'marv/builder'
   autoload :Generator, 'marv/generator'
-  autoload :Config, 'marv/config'
 end

data/lib/marv/builder.rb

@@ -1,5 +1,4 @@
 require 'sprockets'
-require 'sprockets-sass'
 require 'sass'
 require 'less'
 require 'zip'
@@ -9,7 +8,7 @@ module Marv
   class Builder
     def initialize(project)
       @project = project
-      @task    = project.task
+      @task = project.task
       @templates_path = @project.templates_path
       @assets_path = @project.assets_path
       @functions_path = @project.functions_path
@@ -160,29 +159,18 @@ module Marv
       [['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)
-
         # Catch any sprockets errors and continue the process
         begin
           @task.shell.mute do
+            sprocket = @sprockets.find_asset(asset.last)
+
             FileUtils.mkdir_p(File.dirname(destination)) unless File.directory?(File.dirname(destination))
             sprocket.write_to(destination) unless sprocket.nil?
-
-            if @project.config[:compress_js] && destination.end_with?('.js')
-              require "yui/compressor"
-
-              # Grab the initial sprockets output
-              sprockets_output = File.open(destination, 'r').read
-
-              # Re-write the file, minified
-              File.open(destination, 'w') do |file|
-                file.write(YUI::JavaScriptCompressor.new.compress(sprockets_output))
-              end
-            end
           end
         rescue Exception => e
           @task.say "Error while building #{asset.last}:"
           @task.say e.message, Thor::Shell::Color::RED
+
           File.open(destination, 'w') do |file|
             file.puts(e.message)
           end
@@ -233,6 +221,14 @@ module Marv
         @sprockets.append_path File.join(@assets_path, dir)
       end
 
+      if @project.config[:compress_js]
+        @sprockets.js_compressor = :uglify
+      end
+
+      if @project.config[:compress_css]
+        @sprockets.css_compressor = :scss
+      end
+
       # Add assets/styleshets to load path for Less Engine
       Tilt::LessTemplateWithPaths.load_path = File.join(@assets_path, 'stylesheets')
 

data/lib/marv/cli.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'yaml'
 require 'guard/marv/assets'
 require 'guard/marv/config'
 require 'guard/marv/templates'
@@ -15,7 +14,7 @@ module Marv
 
     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"
+    method_option :layout, :type => :string, :default => 'default', :desc => "Name of alternate layout"
     def create(dir)
       theme = {}
       theme[:name] = dir
@@ -73,6 +72,7 @@ module Marv
     end
 
     protected
+
     def do_link(project, path)
       begin
         project.link(path)

data/lib/marv/generator.rb

@@ -105,6 +105,7 @@ module Marv
       copy_templates
       copy_functions
       copy_includes
+
       return self
     end
 

data/lib/marv/project.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'compass'
 
 module Marv
   class Project
@@ -92,13 +91,8 @@ module Marv
       if File.exists?(self.config_file)
         config.merge!(load_ruby_config(self.config_file))
       else
-        # Old format of config file
-        if File.exists?(File.join(self.root, 'config.json'))
-          config.merge!(convert_old_config)
-        else
-          raise Error, "Could not find the config file, are you sure you're in a
-          marv project directory?"
-        end
+        raise Error, "Could not find the config file, are you sure you're in a
+        marv project directory?"
       end
 
       @config = config
@@ -114,36 +108,6 @@ module Marv
 
     private
 
-    def convert_old_config
-      require 'json'
-
-      # Let the user know what is going to happen
-      @task.say("It looks like you are using the old JSON-format config. Marv will now try converting your config to the new Ruby format.")
-      @task.ask(" Press any key to continue...")
-
-      begin
-        old_file_name = File.join(self.root, 'config.json')
-        # Parse the old config format, convert keys to symbols
-        @config = JSON.parse(File.open(old_file_name).read).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
-        @task.create_file(@config_file) do
-          # Find the config.tt template, and parse it using ERB
-          config_template_path = @task.find_in_source_paths(File.join(['config', 'config.tt']))
-          parse_erb(File.expand_path(config_template_path))
-        end
-      rescue Exception => e
-        @task.say "Error while building new config file:", Thor::Shell::Color::RED
-        @task.say e.message, Thor::Shell::Color::RED
-        @task.say "You'll need to either fix the error and try again, or manually convert your config.json file to Ruby format (config.rb)"
-        exit
-      end
-
-      @task.say "Success! Double-check that all your config values were moved over, and you can now delete config.json.", Thor::Shell::Color::GREEN
-
-      # We now have a Ruby config file, so we can continue loading as normal
-      return load_ruby_config(self.config_file)
-    end
-
     def load_ruby_config(file)
       config = {}
 

data/lib/marv/version.rb

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

data/marv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2014-07-31"
+  s.date = "2014-08-05"
   s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
@@ -73,15 +73,14 @@ Gem::Specification.new do |s|
     "lib/marv.rb",
     "lib/marv/builder.rb",
     "lib/marv/cli.rb",
-    "lib/marv/config.rb",
     "lib/marv/engines.rb",
     "lib/marv/error.rb",
     "lib/marv/generator.rb",
     "lib/marv/guard.rb",
     "lib/marv/project.rb",
     "lib/marv/version.rb",
+    "marv-0.2.5.gem",
     "marv.gemspec",
-    "spec/lib/marv/config_spec.rb",
     "spec/lib/marv/project_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -95,62 +94,53 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0.18.1"])
+      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.0.0"])
+      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.0.0"])
-      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.20"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_runtime_dependency(%q<rack>, [">= 1.5.2"])
-      s.add_runtime_dependency(%q<therubyracer>, [">= 0.12.0"])
+      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<rb-fsevent>, [">= 0.9.3"])
-      s.add_runtime_dependency(%q<yui-compressor>, [">= 0.12.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<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.18.1"])
+      s.add_dependency(%q<thor>, [">= 0.19.1"])
       s.add_dependency(%q<guard>, [">= 2.2.1"])
-      s.add_dependency(%q<guard-livereload>, [">= 2.0.0"])
+      s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
       s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-      s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
-      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.20"])
+      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_dependency(%q<rack>, [">= 1.5.2"])
-      s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
+      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<rb-fsevent>, [">= 0.9.3"])
-      s.add_dependency(%q<yui-compressor>, [">= 0.12.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<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.18.1"])
+    s.add_dependency(%q<thor>, [">= 0.19.1"])
     s.add_dependency(%q<guard>, [">= 2.2.1"])
-    s.add_dependency(%q<guard-livereload>, [">= 2.0.0"])
+    s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
     s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-    s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
-    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.20"])
+    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
     s.add_dependency(%q<rack>, [">= 1.5.2"])
-    s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
+    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<rb-fsevent>, [">= 0.9.3"])
-    s.add_dependency(%q<yui-compressor>, [">= 0.12.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<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -125,29 +125,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: compass
+  name: less
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.20
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,15 +139,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.20
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -188,38 +172,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: less
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +179,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,15 +187,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
-  name: yui-compressor
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -251,7 +203,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -381,15 +333,14 @@ files:
 - lib/marv.rb
 - lib/marv/builder.rb
 - lib/marv/cli.rb
-- lib/marv/config.rb
 - lib/marv/engines.rb
 - lib/marv/error.rb
 - lib/marv/generator.rb
 - lib/marv/guard.rb
 - lib/marv/project.rb
 - lib/marv/version.rb
+- marv-0.2.5.gem
 - marv.gemspec
-- spec/lib/marv/config_spec.rb
 - spec/lib/marv/project_spec.rb
 - spec/spec_helper.rb
 homepage: http://hardpixel.github.io/marv

data/lib/marv/config.rb

@@ -1,61 +0,0 @@
-module Marv
-  # Reads/Writes a configuration file in the user's home directory
-  #
-  class Config
-
-    @config
-
-    attr_accessor :config
-
-    def initialize()
-      @config = {
-        :theme => {
-          :author     => nil,
-          :author_url => nil,
-        },
-        :links => []
-      }
-    end
-
-    # Provides access to the config using the Hash square brackets
-    def [](var)
-      @config[var]
-    end
-
-    # Allows modifying variables through hash square brackets
-    def []=(var, value)
-      @config[var] = value
-    end
-
-    # Returns the path to the user's configuration file
-    def config_file
-      @config_file ||= File.expand_path(File.join('~', '.marv', 'config.yml'))
-    end
-
-    # Writes the configuration file
-    def write(options={})
-      # If we're unit testing then it helps to use a
-      # StringIO object instead of a file buffer
-      io = options[:io] || File.open(self.config_file, 'w')
-
-      io.write JSON.generate(@config)
-
-      io.close
-
-      self
-    end
-
-    # Loads config declarations in user's home dir
-    #
-    # If file does not exist then it will be created
-    def read
-      return write unless File.exists?(self.config_file)
-
-      data = File.open(self.config_file).read
-
-      @config = data.empty? ? {} : JSON.parse(data)
-
-      self
-    end
-  end
-end

data/spec/lib/marv/config_spec.rb

@@ -1,79 +0,0 @@
-
-require 'marv/config'
-
-describe Marv::Config do
-
-  def config_file
-    File.expand_path(File.join('~', '.marv', 'config.yml'))
-  end
-
-  before(:each) do
-    @buffer = StringIO.new
-    @config = Marv::Config.new
-  end
-
-  it "should provide empty config object by default" do
-    @config.config.should == {
-      :theme => {
-        :author    => nil,
-        :author_url => nil
-      },
-      :links => []
-    }
-  end
-
-  it "should allow access to config variables through []" do
-    @config[:links].should == []
-  end
-
-  it "should allow config options to be changed through []" do
-    @config[:links] = ['/var/www/wordpress']
-    @config[:links].should == ['/var/www/wordpress']
-  end
-
-  it "should store config in ~/.marv/config.yml" do
-    @config.config_file.should == config_file
-  end
-
-  it "should write default configuration to yaml" do
-    @config.write(:io => @buffer)
-    @buffer.string.should == "---\n:theme:\n  :author: !!null \n  :author_url: !!null \n:links: []\n"
-  end
-
-  describe :write do
-    it "should dump any changes made to the config" do
-      @config[:theme][:author] = "John Doe"
-      @config[:theme][:author_url] = "http://john-doe.com"
-
-      @config.write(:io => @buffer)
-      @buffer.string.should == "---\n:theme:\n  :author: John Doe\n  :author_url: http://john-doe.com\n:links: []\n"
-    end
-  end
-
-  describe :read do
-    it "should call #write if the file does not exist" do
-      File.should_receive(:exists?).with(config_file).and_return(false)
-      Psych.should_not_receive(:load_file)
-
-      @config.should_receive(:write)
-      @config.read
-    end
-
-    it "should not call #write if the config file exists" do
-      File.should_receive(:exists?).with(config_file).and_return(true)
-      Psych.should_receive(:load_file).with(config_file)
-
-      @config.should_not_receive(:write)
-      @config.read
-    end
-
-    it "should load config from yaml file" do
-      File.stub!(:exists?).and_return(true)
-      Psych.stub!(:load_file).and_return({:theme => {:author => 'Drew'}, :links => []})
-
-      @config.read
-      @config[:links].should == []
-      @config[:theme].should == {:author => 'Drew'}
-    end
-  end
-end