coyote 1.0.2 → 1.0.3

data/coyote.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coyote"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Imulus"]

data/lib/coyote.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 require 'fileutils'
 require 'coyote/bundle'
 require 'coyote/fs_listener'
@@ -6,39 +7,44 @@ include Coyote::Notifications
 
 module Coyote
   
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   
   def self.run(input_path, output_path, options = {})
     @@input_path  = input_path
     @@output_path = output_path
     @@options     = options
-    bundle = Coyote::Bundle.new(input_path, output_path)
-    build bundle
-    watch bundle if @@options[:watch]
+    @@bundle      = Coyote::Bundle.new(input_path, output_path)
+    build { |bundle| bundle.update! }
+    watch if @@options[:watch]
   end
 
+
   def self.options
     ['compress', 'watch', 'quiet', 'version']
   end
 
-  def self.build(bundle)
-    notify bundle.manifest unless @@options[:quiet]
-    bundle.compress! if @@options[:compress]
-    bundle.save
-    notify "#{Time.new.strftime("%I:%M:%S")}   Saved bundle to #{@@output_path}   [#{bundle.files.length} files]", :success    
+
+  def self.build(&block)
+    time = Benchmark.realtime do
+      yield @@bundle unless block.nil?
+      notify @@bundle.manifest unless @@options[:quiet]
+      @@bundle.compress! if @@options[:compress]
+      @@bundle.save
+    end
+
+    notify "#{Time.new.strftime("%I:%M:%S")}   Saved bundle to #{@@output_path}   [#{@@bundle.files.length} files in #{(time).round(5)}s]", :success    
   end
 
 
-  def self.watch(bundle)
+  def self.watch
     listener = Coyote::FSListener.select_and_init
 
     listener.on_change do |changed_files|
-      changed_files = bundle.files & changed_files
+      changed_files = @@bundle.files & changed_files
 
       if changed_files.length > 0
         notify "#{Time.new.strftime("%I:%M:%S")}   Detected change, recompiling...", :warning
-        bundle.update! changed_files
-        build bundle
+        build { |bundle| bundle.update! changed_files }
       end
     end
 

data/lib/coyote/asset.rb

@@ -31,7 +31,10 @@ module Coyote
       @contents = File.exists?(@absolute_path) ? File.open(@absolute_path, 'r').read : ""
       find_dependencies
     end
-
+    
+    def dependencies_have_changed?
+      @last_dependencies != @dependencies
+    end
 
     protected
 
@@ -42,6 +45,7 @@ module Coyote
     end
 
     def find_dependencies
+      @last_dependencies = @dependencies
       matches = @contents.scan(require_pattern)
       @dependencies = matches.reverse.collect { |match| "#{@relative_directory}/#{match.last.strip}" }
     end

data/lib/coyote/bundle.rb

@@ -8,11 +8,9 @@ module Coyote
     attr_reader :contents
 
     def initialize(entry_point, output_path)
+      @entry_point = entry_point
       @output_path = output_path
-      @assets = {}
-      @contents = ""
-      add entry_point
-      update!
+      build
     end
 
 
@@ -35,15 +33,42 @@ module Coyote
 
 
     def update!(changed_files = [])
-      @contents = ""
+      bundle_should_rebuild = false
 
       unless changed_files.empty?
         changed_files.each do |path|
-          @assets["#{Dir.pwd}/#{path}"].update!
+          asset = @assets["#{Dir.pwd}/#{path}"]
+          asset.update!
+          if asset.dependencies_have_changed?
+            bundle_should_rebuild = true
+          end
         end
       end
 
-      files(true).each { |path| @contents += "#{@assets[path].contents} \n\n" }
+      if bundle_should_rebuild
+        notify "#{Time.new.strftime("%I:%M:%S")}   Dependencies have changed. Refreshing bundle and recompiling...", :failure
+        build
+      else
+        refresh
+      end
+    end
+
+        
+    def refresh
+      @contents = ""
+      files(true).each { |path| @contents += "#{@assets[path].contents} \n\n" }      
+    end
+
+
+    def build
+      empty!
+      add @entry_point      
+    end
+
+
+    def empty!
+      @assets = {}
+      @contents = ""    
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coyote
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2165621740 !ruby/object:Gem::Requirement
+  requirement: &2168553680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165621740
+  version_requirements: *2168553680
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2165621140 !ruby/object:Gem::Requirement
+  requirement: &2168552860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2165621140
+  version_requirements: *2168552860
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2165620600 !ruby/object:Gem::Requirement
+  requirement: &2168552160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2165620600
+  version_requirements: *2168552160
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2165620040 !ruby/object:Gem::Requirement
+  requirement: &2168551280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2165620040
+  version_requirements: *2168551280
 description: An intelligent command-line tool for combining, compressing and compiling
   your JavaScript and CoffeeScript files.
 email: developer@imulus.com