evax 0.0.13 → 0.0.15

data/bin/evax

@@ -11,8 +11,19 @@ rescue LoadError
 end
 
 if ( ARGV.size < 2 )
-  Evax::Logger.log "use: $ evax <config_file_path> <relative_path>"
+  usage = "Usage:\n"\
+    "$ evax <config_file_path> <relative_path> [<options>]\n"\
+    "options:\n"\
+    "\t-w\t- watch assets for changes and rebuild when necessary"
+  Evax::Logger.log usage
   exit 1
 end
 
-Evax.new( ARGV[0], ARGV[1] ).build
+evax = Evax.new( ARGV[0], ARGV[1] )
+options = ARGV[2..-1]
+
+if options.include?("-w")
+  evax.run_as_daemon
+else
+  evax.run_once
+end

data/evax.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "evax"
 
-  s.add_development_dependency "bundler",   "1.0.21"
+  s.add_development_dependency "bundler",   "1.1.0"
   s.add_development_dependency "rake",      "0.9.2.2"
   s.add_development_dependency "mocha",     "0.10.0"
   s.add_development_dependency "delorean",  "1.1.1"
 
   s.add_dependency "uglifier",  "1.2.3"
+  s.add_dependency "watchr",    "0.7"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/evax.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "uglifier"
+require "watchr"
 
 require_relative "evax/version"
 require_relative "evax/css_minifier"
@@ -16,6 +17,14 @@ class Evax
     Evax::Logger.log "Relative Path: #{self.relative_path}"
   end
 
+  def run_once
+    build
+  end
+
+  def run_as_daemon
+    watch
+  end
+
   def config
     default_opts = { "compress" => true }
     default_opts.merge(YAML::load_file( @config_file ))
@@ -32,8 +41,18 @@ class Evax
     build_css if css_configured?
   end
 
-  def build_js
-    config["javascripts"].each_key do |group_name|
+  def watch
+    script = Watchr::Script.new
+    script.watch( asset_files_regex(:javascripts) ) {|asset| build_js( js_groups_for( asset[0] ) ) } if js_configured?
+    script.watch( asset_files_regex(:stylesheets) ) {|asset| build_css( css_groups_for( asset[0] ) ) } if css_configured?
+    Watchr::Controller.new( script, Watchr.handler.new ).run
+  end
+
+  def build_js( group_names=[] )
+    groups = config["javascripts"]
+    groups.select!{|k, v| group_names.include? k } if group_names.any?
+
+    groups.each_key do |group_name|
       result_string = join( :javascripts, group_name )
       result_string = Evax.compress_js( result_string ) if config["compress"]
 
@@ -41,8 +60,11 @@ class Evax
     end
   end
 
-  def build_css
-    config["stylesheets"].each_key do |group_name|
+  def build_css( group_names=[] )
+    groups = config["stylesheets"]
+    groups.select!{|k, v| group_names.include? k } if group_names.any?
+
+    groups.each_key do |group_name|
       result_string = join( :stylesheets, group_name )
       result_string = Evax.compress_css( result_string ) if config["compress"]
 
@@ -79,4 +101,20 @@ class Evax
     !config["stylesheets"].nil?
   end
 
+  def asset_files_regex(type)
+    config[type.to_s].values.flatten.uniq.map {|path| Regexp.quote( path ) }.join( "|" )
+  end
+
+  def js_groups_for( file )
+    filter_groups_by_file( :javascripts, file )
+  end
+
+  def css_groups_for( file )
+    filter_groups_by_file( :stylesheets, file )
+  end
+
+  def filter_groups_by_file(type, file)
+    config[type.to_s].select {|k, v| v.include? file }.keys
+  end
+
 end

data/lib/evax/version.rb

@@ -1,3 +1,3 @@
 class Evax
-  VERSION = "0.0.13"
+  VERSION = "0.0.15"
 end

data/test/evax_test.rb

@@ -74,7 +74,7 @@ class EvaxTest < Test::Unit::TestCase
     end
   end
 
-  def test_build_js
+  def test_build_js_all_groups
     evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :write_output ).with( "js_one.js", File.read( "#{FIXTURES}/js_one.compress.js" ) )
     evax.expects( :write_output ).with( "js_two.js", File.read( "#{FIXTURES}/js_two.compress.js" ) )
@@ -82,6 +82,13 @@ class EvaxTest < Test::Unit::TestCase
     evax.build_js
   end
 
+  def test_build_js_selected_groups
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
+    evax.expects( :write_output ).with( "js_one.js", File.read( "#{FIXTURES}/js_one.compress.js" ) ).once
+
+    evax.build_js(["js_one"])
+  end
+
   def test_build_js_compress_off
     evax = Evax.new( "#{FIXTURES}/assets_compress_off.yml", "#{File.dirname(__FILE__)}/.." )
     Evax.expects( :compress_js ).never
@@ -91,7 +98,7 @@ class EvaxTest < Test::Unit::TestCase
     evax.build_js
   end
 
-  def test_build_css
+  def test_build_css_all_groups
     evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress.css" ) )
     evax.expects( :write_output ).with( "css_two.css", File.read( "#{FIXTURES}/css_two.compress.css" ) )
@@ -99,6 +106,13 @@ class EvaxTest < Test::Unit::TestCase
     evax.build_css
   end
 
+  def test_build_css_selected_groups
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
+    evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress.css" ) ).once
+
+    evax.build_css(["css_one"])
+  end
+
   def test_build_css_off
     evax = Evax.new( "#{FIXTURES}/assets_compress_off.yml", "#{File.dirname(__FILE__)}/.." )
     Evax.expects( :compress_css ).never
@@ -134,4 +148,20 @@ class EvaxTest < Test::Unit::TestCase
     evax.build
   end
 
+  def test_watch
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
+    Watchr::Controller.any_instance.stubs(:run)
+
+    watchr = mock()
+    Watchr::Script.stubs(:new => watchr)
+    watchr.expects(:watch).with do |pattern, block|
+      pattern == "test/fixtures/javascripts/one\\.js|test/fixtures/javascripts/two\\.js|test/fixtures/javascripts/three\\.js|test/fixtures/javascripts/four\\.js"
+    end
+    watchr.expects(:watch).with do |pattern, block|
+      pattern == "test/fixtures/stylesheets/one\\.css|test/fixtures/stylesheets/two\\.css|test/fixtures/stylesheets/three\\.css|test/fixtures/stylesheets/four\\.css"
+    end
+
+    evax.watch
+  end
+
 end

data/test/fixtures/js_one.compress.js

@@ -1 +1 @@
-function js_one(){}function js_two(){}function js_three(){}
+function js_one(){}function js_two(){}function js_three(){};

data/test/fixtures/js_two.compress.js

@@ -1 +1 @@
-function js_four(){}
+function js_four(){};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evax
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70212671242820 !ruby/object:Gem::Requirement
+  requirement: &70165757679220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70212671242820
+  version_requirements: *70165757679220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212671242320 !ruby/object:Gem::Requirement
+  requirement: &70165757678720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70212671242320
+  version_requirements: *70165757678720
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70212671241860 !ruby/object:Gem::Requirement
+  requirement: &70165757678260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70212671241860
+  version_requirements: *70165757678260
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70212671241400 !ruby/object:Gem::Requirement
+  requirement: &70165757677800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *70212671241400
+  version_requirements: *70165757677800
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70212671240940 !ruby/object:Gem::Requirement
+  requirement: &70165757677340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,7 +66,18 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70212671240940
+  version_requirements: *70165757677340
+- !ruby/object:Gem::Dependency
+  name: watchr
+  requirement: &70165757676880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70165757676880
 description: ! "    Evax is a simple asset packaging library for Ruby,\n    providing
   JavaScript/CSS concatenation and compression\n    using UglifyJS and a really simple
   regex based CSS\n    compressor. Just because enough is enough.\n"