barista 0.4.3 → 0.5.0

data/README.md

@@ -40,19 +40,38 @@ is you can then manage js dependencies using existing tools like bundler.
 In your `Barista.configure` block, you can also configure on a per-application basis the output directory
 for individual frameworks (e.g. put shuriken into vendor/shuriken, bhm-google-maps into vendor/bhm-google-maps):
 
-    Barista.configure do |config|
-      config.change_output_prefix! 'shuriken',        'vendor/shuriken'
-      config.change_output_prefix! 'bhm-google-maps', 'vendor/bhm-google-maps'
+    Barista.configure do |c|
+      c.change_output_prefix! 'shuriken',        'vendor/shuriken'
+      c.change_output_prefix! 'bhm-google-maps', 'vendor/bhm-google-maps'
     end
     
 Alternatively, to prefix all, you can use `Barista.each_framework` (if you pass true, it includes the 'default' framework
 which is your application root).
 
-    Barista.configure do |config|
-      config.each_framework do |framework|
-        config.change_output_prefix! framework.name, "vendor/#{framework.name}"
+    Barista.configure do |c|
+      c.each_framework do |framework|
+        c.change_output_prefix! framework.name, "vendor/#{framework.name}"
       end
     end
+    
+## Hooks ##
+
+Barista lets you hook into the compilation at several stages. Namely:
+
+* before compilation
+* after compilation
+* after compilation fails
+
+To hook into these hooks, you can use like so:
+
+* `Barista.before_compilation { |path| puts "Barista: Compiling #{path}" }`
+* `Barista.on_compilation { |path| puts "Barista: Successfully compiled #{path}" }`
+* `Barista.on_compilation_with_warning { |path, output| puts "Barista: Compilation of #{path} had a warning:\n#{output}" }`
+* `Barista.on_compilation_error { |path, output| puts "Barista: Compilation of #{path} failed with:\n#{output}" }`
+
+
+These allow you to do things such as notify on compilation, automatically
+perform compression post compilation and a variety of other cool things.
 
 ## Configuration ##
 

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.homepage    = "http://github.com/Sutto/barista"
     gem.version     = Barista::Version::STRING
     gem.authors     = ["Darcy Laycock"]
+    gem.add_dependency 'open4'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/barista.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/barista/compiler.rb",
      "lib/barista/filter.rb",
      "lib/barista/framework.rb",
+     "lib/barista/hooks.rb",
      "lib/barista/tasks/barista.rake",
      "lib/barista/version.rb",
      "lib/generators/barista_install/USAGE",
@@ -46,9 +47,12 @@ 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<open4>, [">= 0"])
     else
+      s.add_dependency(%q<open4>, [">= 0"])
     end
   else
+    s.add_dependency(%q<open4>, [">= 0"])
   end
 end
 

data/lib/barista.rb

@@ -10,9 +10,38 @@ module Barista
   autoload :Compiler,  'barista/compiler'
   autoload :Filter,    'barista/filter'
   autoload :Framework, 'barista/framework'
+  autoload :Hooks,     'barista/hooks'
 
   class << self
 
+    def hooks
+      @hooks ||= Hooks.new
+    end
+    
+    def on_hook(name, *args, &blk)
+      hooks.on(name, *args, &blk)
+    end
+    
+    def invoke_hook(name, *args)
+      hooks.invoke(name, *args)
+    end
+    
+    def on_compilation_error(&blk)
+      on_hook :compilation_failed, &blk
+    end
+    
+    def on_compilation(&blk)
+      on_hook :compiled, &blk
+    end
+    
+    def on_compilation_with_warning(&blk)
+      on_hook :compiled_with_warning, &blk 
+    end
+    
+    def before_compilation(&blk)
+      on_hook :before_compilation, &blk
+    end
+
     def configure
       yield self if block_given?
     end

data/lib/barista/compiler.rb

@@ -1,4 +1,5 @@
 require 'digest/sha2'
+require 'open4'
 
 module Barista
   class Compiler
@@ -53,19 +54,27 @@ module Barista
 
     def invoke_coffee(path)
       command = "#{self.class.bin_path} #{coffee_options} '#{path}'".squeeze(' ')
-      result = %x(#{command}).to_s
-      if !$?.success?
+      Barista.invoke_hook :before_compilation, path
+      pid, stdin, stdout, stderr = Open4.popen4(command)
+      stdin.close
+      _, status = Process.waitpid2(pid)
+      out = stdout.read.strip
+      err = stderr.read.strip
+      if status.success?
+        if err.blank?
+          Barista.invoke_hook :compiled, path
+        else
+          Barista.invoke_hook :compiled_with_warning, path, err
+        end
+      else
+        Barista.invoke_hook :compilation_failed, path, err
         if Barista.exception_on_error? && !@options[:silence]
           raise CompilationError, "\"#{command}\" exited with a non-zero status."
         else
-          result = nil
+          out = nil
         end
       end
-      result
-    end
-
-    def content_hash
-      @content_hash ||= Digest::SHA256.hexdigest(@content)
+      out
     end
 
   end

data/lib/barista/hooks.rb

@@ -0,0 +1,20 @@
+module Barista
+  class Hooks
+    
+    def initialize
+      @callbacks = Hash.new { |h,k| h[k] = [] }
+    end
+    
+    def on(name, &blk)
+      @callbacks[name.to_sym] << blk
+    end
+    
+    def invoke(name, *args)
+      @callbacks[name.to_sym].each do |callback|
+        break if callback.call(*args) == false
+      end
+      nil
+    end
+    
+  end
+end

data/lib/barista/version.rb

@@ -1,8 +1,8 @@
 module Barista
   module Version
     MAJOR  = 0
-    MINOR  = 4
-    PATCH  = 3
+    MINOR  = 5
+    PATCH  = 0
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
 end

data/lib/generators/barista_install/templates/initializer.rb

@@ -24,6 +24,13 @@ Barista.configure do |c|
   
   # or, prefix the path for the app files:
   
-  # c.change_output_prefix! :default, 'my-app-name'
+  # c.change_output_prefix! :default, 'my-app-name'  
+  
+  # or, hook into the compilation:
+  
+  # c.before_compilation   { |path|         puts "Barista: Compiling #{path}" }
+  # c.on_compilation       { |path|         puts "Barista: Successfully compiled #{path}" }
+  # c.on_compilation_error { |path, output| puts "Barista: Compilation of #{path} failed with:\n#{output}" }
+  # c.on_compilation_with_warning { |path, output| puts "Barista: Compilation of #{path} had a warning:\n#{output}" }
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -17,8 +17,21 @@ cert_chain: []
 
 date: 2010-07-18 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Automatically compiles app/scripts/*.coffee to javascript for rails awesomesauce.
 email: sutto@sutto.net
 executables: []
@@ -41,6 +54,7 @@ files:
 - lib/barista/compiler.rb
 - lib/barista/filter.rb
 - lib/barista/framework.rb
+- lib/barista/hooks.rb
 - lib/barista/tasks/barista.rake
 - lib/barista/version.rb
 - lib/generators/barista_install/USAGE