fuse 0.1.3 → 0.1.4

data/lib/fuse.rb

@@ -3,12 +3,36 @@ require 'thin'
 
 module Fuse
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
+
+  LOG_COLOURS = {
+      info:     6, # cyan
+      success:  2, # green
+      error:    1, # red
+      notice:   3  # yellow
+  }
 
   def self.root
     @root ||= File.expand_path File.dirname(__FILE__)
   end
 
+  def self.log_file=(file)
+    @log_file = file
+  end
+
+  def self.log_file
+    @log_file ||= $stderr
+  end
+
+  def self.log(message, type = nil)
+    m = "\x1b["
+    m << (30 + (LOG_COLOURS[type] || LOG_COLOURS[:info])).to_s
+    m << 'm'
+    m << message
+    m << "\x1b[0m"
+    log_file.puts m
+  end
+
 end
 
 $:.unshift Fuse.root unless $:.include?(Fuse.root)

data/lib/fuse/document.rb

@@ -37,6 +37,7 @@ class Fuse::Document
       collection = assets.of_type(klass).sort!
       next unless collection.length > 0
       if @options[:embed_assets]
+        #todo recreate stylesheet media attributes
         tag = Nokogiri::XML::Node.new(klass::EMBED_WITH, document)
         raw = collection.map do |asset|
           tag['type'] = asset.type
@@ -125,7 +126,7 @@ class Fuse::Document
         raise Fuse::Exception::SourceUnknown::NotFound.new(option_value) unless File.exists?(option_value)
         return [option_value] unless File.directory? option_value
       end
-      Dir[File.join(option_value || root, "**/*.{#{extensions.join(',')}}")]
+      Dir[File.join(option_value || root, "**/*.{#{extensions.join(',')}}")].select{ |f| File.size? f }
     end
 
     def expect_one(list, option, missing_exception)

data/lib/fuse/document/asset.rb

@@ -30,7 +30,7 @@ class Fuse::Document::Asset
   end
 
   def relative_path
-    @relative_path ||= path.sub(%r`^/`, '')
+    @relative_path ||= path.sub(%r`^[\\/]`, '')
   end
 
   def raw

data/lib/fuse/document/asset_types.rb

@@ -53,10 +53,20 @@ class Fuse::Document::Asset
     def media
       @media ||= (match = MEDIA_PATTERN.match(path)) && match[1].split(/,\s*/).sort.join(', ')
     end
-    def compress; ::Sass.compile raw, style: :compressed end
+    def compress
+      original = raw
+      compressed = ::Sass.compile original, style: :compressed
+      Fuse.log "SASS: Compressed #{path} from #{original.length} bytes to #{compressed.length} bytes", :success
+      compressed
+    end
     def type; 'text/css' end
     class Sass < self
-      def filter; ::Sass.compile raw, style: :expanded end
+      def filter
+        original = raw
+        compiled = ::Sass.compile original, style: :expanded
+        Fuse.log "SASS: Compiled #{path} from #{original.length} bytes to #{compiled.length} bytes", :success
+        compiled
+      end
     end
   end
 
@@ -73,10 +83,20 @@ class Fuse::Document::Asset
           }
       }
     end
-    def compress; Uglifier.compile filtered end
+    def compress
+      original = filtered
+      compressed = Uglifier.compile original
+      Fuse.log "Uglifier: Compressed #{path} from #{original.length} bytes to #{compressed.length} bytes", :success
+      compressed
+    end
     def type; 'text/javascript' end
     class Coffee < self
-      def filter; CoffeeScript.compile raw end
+      def filter
+        original = raw
+        compiled = CoffeeScript.compile original
+        Fuse.log "CoffeeScript: Compiled #{path} from #{original.length} bytes to #{compiled.length} bytes", :success
+        compiled
+      end
     end
   end
 

data/lib/fuse/main.rb

@@ -9,6 +9,7 @@ module Fuse
       encoding: 'UTF-8'
     },
     server: {
+        addr: '127.0.0.1',
         port: 9460,
         embed_assets: false
     },
@@ -18,19 +19,33 @@ module Fuse
     }
   }
 
+  SUMMARY_WIDTH  = 30
+  SUMMARY_INDENT = 4
+
   def self.main
 
     options = {}
 
     options_parser = OptionParser.new do |opts|
 
-      opts.banner = 'Usage: fuse [command] [options]'
-      opts.separator ''
-      opts.separator 'Commands:'
-      opts.separator '    server  : Run a local testing server'
-      opts.separator '    compile : Compile the document and send to STDOUT'
-      opts.separator ''
-      opts.separator 'Options:'
+      "
+
+Usage: #{$0} [command] [options]
+
+Commands:
+    server  : Run a local testing server
+    compile : Compile the document and send to STDOUT
+
+Options:
+
+      ".strip.lines.each { |line| opts.separator line }
+
+      opts.on('-a',
+              '--addr',
+              wrap("Server binding address. Defaults to #{DEFAULTS[:server][:addr]}. Use 0.0.0.0 for access from other computers. Be careful; server will allow access to any locally accessible file of Fuse's supported types.")
+      ) do |addr|
+        options[:addr] = addr
+      end
 
       opts.on('-c',
               '--[no-]compress-assets',
@@ -41,7 +56,7 @@ module Fuse
 
       opts.on('-e',
               '--encoding CHARSET',
-              "Output encoding. Default is #{DEFAULTS[:common][:encoding]}."
+              wrap("Output encoding. Default is #{DEFAULTS[:common][:encoding]}.")
       ) do |e|
         options[:encoding] = e
       end
@@ -56,14 +71,14 @@ module Fuse
       opts.on('-p',
               '--port PORT',
               Integer,
-              "Port on which to listen (only with 'server' command). Default is #{DEFAULTS[:server][:port]}."
+              wrap("Port on which to listen (only with 'server' command). Default is #{DEFAULTS[:server][:port]}.")
       ) do |port|
         options[:port] = port
       end
 
       opts.on('-s',
               '--source [FILE|DIR]',
-              'The source directory, or HTML or XML document. Default is current directory.'
+              wrap('The source directory, or HTML or XML document. Default is current directory.')
       ) do |doc|
         options[:source] = doc
       end
@@ -82,13 +97,13 @@ module Fuse
 
       opts.on('-x',
               '--xsl FILE',
-              'XSL transformation stylesheet. Default is current directory.'
+              wrap('XSL transformation stylesheet. Default is current directory.')
       ) do |xsl|
         abort "#{xsl} isn't a valid XSL stylesheet" unless xsl.match(/\.xsl$/i)
         options[:xsl] = xsl
       end
 
-      opts.on_tail('-h', '--help', 'Show this message.') { puts opts.to_s }
+      opts.on_tail('-h', '--help', 'Show this message.') { summary opts }
 
     end
 
@@ -99,23 +114,26 @@ module Fuse
     case ARGV[0]
 
       when 'server'
-        Thin::Server.start('0.0.0.0', options[:port]) do
+        Thin::Server.start(options[:addr], options[:port]) do
           use Rack::ShowExceptions
           run Server.new(options)
         end
 
       when 'compile'
         begin
-          print Document.new(options).to_s
+          doc = Document.new(options)
+          log "Compiling #{doc.source_path}"
+          print doc.to_s
+          log 'Done.', :success
         rescue Exception::SourceUnknown::TooManySources
-          $stderr.puts "Found more than one potential #{$!.option_name} document. Please specify one with --#{$!.option_name}."
-          $stderr.puts $!.options.join "\n"
+          log "Found more than one potential #{$!.option_name} document. Please specify one with --#{$!.option_name}.", :notice
+          log $!.options.join "\n"
         rescue Exception
-          $!.message ? $stderr.puts($!.message) : raise
+          $!.message ? log($!.message, :error) : raise
         end
 
       else
-        puts options_parser
+        summary options_parser
 
     end
 
@@ -131,4 +149,12 @@ module Fuse
       end
     end
 
+    def self.wrap(text, width = 80 - SUMMARY_WIDTH)
+      text.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n#{' ' * (SUMMARY_WIDTH + SUMMARY_INDENT + 1)}").strip
+    end
+
+    def self.summary(opts)
+      abort opts.summarize([], SUMMARY_WIDTH, SUMMARY_WIDTH - 1, ' ' * SUMMARY_INDENT).join
+    end
+
 end

data/lib/fuse/server.rb

@@ -13,28 +13,39 @@ class Fuse::Server
     call_options = @options.merge Hash[request.GET.map{ |k, v| [k.to_sym, v] }]
 
     if @root && (asset = Fuse::Document::Asset.for(request.path))
+      log env, "Serve asset #{asset.path}"
       return asset.call(env)
     end
 
     begin
       doc = Fuse::Document.new(call_options)
       @root = doc.root
+      result = doc.to_s
+      log env, "Using    #{doc.xsl_path} for transformation" if doc.xsl_path
+      log env, "Rendered #{doc.source_path} (#{result.length} bytes)", :success
     rescue Fuse::Exception::SourceUnknown::TooManySources
-      doc = render_list($!.options, $!.option_name, request)
+      result = render_list($!.options, $!.option_name, request)
+      log env, 'Multiple source document options', :notice
     rescue Fuse::Exception
       if $!.message
-        doc = render_error($!.message)
+        result = render_error($!.message)
+        log env, $!.message, :notice
       else
         raise
       end
     end
 
-    [200, {'Content-Type' => 'text/html'}, [doc.to_s]]
+    [200, {'Content-Type' => 'text/html'}, [result]]
 
   end
 
   private
 
+    def log(env, message, *args)
+      Fuse.log_file.write "#{Time.now.strftime '%Y-%m-%d %H:%M:%S'} [#{env['REMOTE_ADDR']}] GET #{env['REQUEST_PATH']} "
+      Fuse.log message, *args
+    end
+
     def render_error(text)
       render_body do |h|
         h.p { h.text text }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin