lux_assets 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 881393b401a0889dc9f796b8188981bd46a32fdeecd24331b1968d7b800e73d4
-  data.tar.gz: af21cd349f444ecac98faf88ed2bba53a9a20bd80c3292093ee7828d07dd84b0
+  metadata.gz: 4ba2b3c00e281b88fce7778d3625bfb78039d023ad288945a5835b0878721e40
+  data.tar.gz: ca4bf2c15022da0ed16e3662aeb0a6509ff9d76e6d64941a9788f3c51e9e7297
 SHA512:
-  metadata.gz: c0215e85dc0f841a4598ab95ab76f159a39c2a34a0fdbca5e97891b9bec3c9c245d7dbd40e507f5019ae16d2a6f84e4b38dbec91a3d3bbf3fbc80fee81531e62
-  data.tar.gz: 5895c5a63c3a2b6f9ab556c3d1345983a7bfb05aa4dfbe0b98d67d64d67c3729af3b481a26b5402bd122f93b7c59c8b84c06874f99a12ec55bea394cd94afd1b
+  metadata.gz: 8bddce098f693c140b676bfaf4d276758ee2d1d90819be1f3ef64d61596336b56390ade0def18cd4c68a5ac465fe84516de66e5d5f8738dc8f343f632c04e0ed
+  data.tar.gz: 628c3d656ac78aae471a951d9ea338bedf7c5b48a697280e1a56929375ab44d9c8221f1eb8d2242365f1774deee63bdec9326af8e4e85c2af538d06aae83ee6b

data/README.md

@@ -41,6 +41,7 @@ Commands:
   lux_assets compile         # Compile assets for production
   lux_assets help [COMMAND]  # Describe available commands or one specific command
   lux_assets install         # Install all needed packages via yarn
+  lux_assets monitor         # Montitor and compile changed files
   lux_assets show            # Show all files/data in manifest
 ```
 

data/bin/lux_assets

@@ -88,6 +88,11 @@ class AssetsCli < Thor
     Cli.run 'rm ./public/manifest.json'
   end
 
+  desc :monitor, 'Montitor and compile changed files'
+  def monitor
+    LuxAssets::Cli.monitor
+  end
+
 end
 
 AssetsCli.start ARGV

data/lib/lux_assets/asset.rb

@@ -20,7 +20,7 @@ class LuxAssets::Asset
   def compile
     @data = []
 
-    die "No files found for [#{@ext}/#{@name}]" unless @files[0]
+    LuxAssets::Cli.die "No files found for [#{@ext}/#{@name}]" unless @files[0]
 
     for file in @files
       if file.is_a?(Proc)
@@ -47,15 +47,18 @@ class LuxAssets::Asset
   def tag_public_assets
     data = @asset_path.read
     data = data.gsub(/url\(([^\)]+)\)/) do
-      if $1.include?('data:') || $1.include?('#') || $1.include?('?')
+      if $1.include?('data:') || $1.include?('#') || $1.include?('?') || $1.include?('::')
         'url(%s)' % $1
       else
         path = $1.gsub(/^['"]|['"]$/, '')
         path = path[0,1] == '/' ? Pathname.new('./public%s' % path) : Pathname.new('./public/assets').join(path)
 
-        LuxAssets.die 'Resource "%s" referenced in "%s/%s" but not found' % [path, @ext, @name] unless path.exist?
-
-        'url("%s?%s")' % [path.to_s.sub('./public', ''), Digest::SHA1.hexdigest(path.read)[0, 6]]
+        if path.exist?
+          'url("%s?%s")' % [path.to_s.sub('./public', ''), Digest::SHA1.hexdigest(path.read)[0, 6]]
+        else
+          LuxAssets::Cli.warn 'Resource "%s" referenced in "%s/%s" but not found' % [path, @ext, @name]
+          'url("%s")' % path
+        end
       end
     end
 
@@ -75,7 +78,7 @@ class LuxAssets::Asset
   def compile_js
     save_data @data.join(";\n") do
       # babel fix and minify
-      LuxAssets.run 'node_modules/babel-cli/.bin/babel --minified --no-comments --compact true -o "%{file}" "%{file}"' % { file: @asset_path }
+      LuxAssets::Cli.run 'node_modules/babel-cli/.bin/babel --minified --no-comments --compact true -o "%{file}" "%{file}"' % { file: @asset_path }
     end
   end
 
@@ -84,7 +87,7 @@ class LuxAssets::Asset
       tag_public_assets
 
       #autoprefixer
-      LuxAssets.run './node_modules/.bin/autoprefixer-cli %s' % @asset_path
+      LuxAssets::Cli.run './node_modules/.bin/autoprefixer-cli %s' % @asset_path
     end
   end
 end

data/lib/lux_assets/base.rb

@@ -18,11 +18,6 @@ module LuxAssets
     @relative_root
   end
 
-  def die text
-    puts text.try(:red)
-    exit
-  end
-
   def asset name
     @name = name.to_s
     yield
@@ -73,7 +68,7 @@ module LuxAssets
       if files[0]
         add_local_files files
       else
-        die 'No files found in "%s -> :%s" (%s)'.red % [@ext, @name, added]
+        LuxAssets::Cli.die 'No files found in "%s -> :%s" (%s)'.red % [@ext, @name, added]
       end
     end
   end
@@ -106,7 +101,7 @@ module LuxAssets
     # gzip if needed
     files = Dir['./public/assets/*.css'] + Dir['./public/assets/*.js']
     files.each do |file|
-      LuxAssets.run 'gzip -k %s' % file unless File.exist?('%s.gz' % file)
+      LuxAssets::Cli.run 'gzip -k %s' % file unless File.exist?('%s.gz' % file)
     end
 
     # touch all files and reset the timestamp
@@ -117,7 +112,7 @@ module LuxAssets
   # get all files as a hash
   def to_h
     unless @assets_loaded
-      die 'Assets file not found in %s' % CONFIG_PATH unless CONFIG_PATH.exist?
+      LuxAssets::Cli.die 'Assets rb config file not found in %s' % CONFIG_PATH unless CONFIG_PATH.exist?
       @assets_loaded = true
       eval CONFIG_PATH.read
     end
@@ -151,26 +146,6 @@ module LuxAssets
     end
   end
 
-  def run what, cache_file=nil
-    puts what.yellow
-
-    stdin, stdout, stderr, wait_thread = Open3.popen3(what)
-
-    error = stderr.gets
-    while line = stderr.gets do
-      error += line
-    end
-
-    # node-sass prints to stderror on complete
-    error = nil if error && error.index('Rendering Complete, saving .css file...')
-
-    if error
-      cache_file.unlink if cache_file && cache_file.exist?
-
-      puts error.red
-    end
-  end
-
   private
 
   def add_local_files files

data/lib/lux_assets/cli.rb

@@ -0,0 +1,55 @@
+# command line helpers
+
+module LuxAssets::Cli
+  extend self
+
+  def die text
+    text = text.red if text.respond_to?(:red)
+    puts text
+    puts caller.slice(0, 10)
+    exit
+  end
+
+  def warn text
+    text = text.magenta if text.respond_to?(:magenta)
+    puts text
+  end
+
+  def run what, cache_file=nil
+    puts what.yellow
+
+    stdin, stdout, stderr, wait_thread = Open3.popen3(what)
+
+    error = stderr.gets
+    while line = stderr.gets do
+      error += line
+    end
+
+    # node-sass prints to stderror on complete
+    error = nil if error && error.include?('Rendering Complete, saving .css file...')
+
+    if error
+      cache_file.unlink if cache_file && cache_file.exist?
+      warn error
+    end
+  end
+
+  # monitor for file changes
+  def monitor
+    puts 'Lux assets - looking for file changes'
+
+    files       = LuxAssets.to_h.values.map(&:values).flatten.map { |it| Pathname.new it }
+    last_change = Time.now
+
+    while true
+      for file in files
+        if file.mtime > last_change
+          last_change = Time.now
+          LuxAssets.compile file.to_s
+        end
+      end
+
+      sleep 2
+    end
+  end
+end

data/lib/lux_assets/element.rb

@@ -1,4 +1,5 @@
 # One file that can be scss, js, coffee, ts, etc...
+
 class LuxAssets::Element
   def initialize source
     @source = Pathname.new source
@@ -38,7 +39,7 @@ class LuxAssets::Element
     coffee_path = './node_modules/coffee-script/bin/coffee'
     coffee_opts = production? ? '-cp' : '-Mcp --no-header'
 
-    LuxAssets.run "#{coffee_path} #{coffee_opts} '#{@source}' > '#{@cache}'", @cache
+    LuxAssets::Cli.run "#{coffee_path} #{coffee_opts} '#{@source}' > '#{@cache}'", @cache
 
     data = @cache.read
     data = data.gsub(%r{//#\ssourceURL=[\w\-\.\/]+/app/assets/}, '//# sourceURL=/raw_asset/')
@@ -51,7 +52,7 @@ class LuxAssets::Element
   def compile_scss
     node_sass = './node_modules/node-sass/bin/node-sass'
     node_opts = production? ? '--output-style compressed' : '--source-comments'
-    LuxAssets.run "#{node_sass} #{node_opts} '#{@source}' '#{@cache}'", @cache
+    LuxAssets::Cli.run "#{node_sass} #{node_opts} '#{@source}' '#{@cache}'", @cache
     @cache.read
   end
   alias :compile_sass :compile_scss
@@ -62,7 +63,7 @@ class LuxAssets::Element
   end
 
   def compile_ts
-    LuxAssets.run "node_modules/typescript/.bin/tsc --outFile '#{@cache}' '#{@source}'"
+    LuxAssets::Cli.run "node_modules/typescript/.bin/tsc --outFile '#{@cache}' '#{@source}'"
   end
 
 end

data/lib/lux_assets/manifest.rb

@@ -2,6 +2,7 @@
 
 module LuxAssets::Manifest
   MANIFEST = Pathname.new(ENV.fetch('ASSETS_MANIFEST') { './public/manifest.json' })
+  MANIFEST.write '{"files":{}}' unless MANIFEST.exist?
 
   extend self
 
@@ -20,10 +21,6 @@ module LuxAssets::Manifest
     json = JSON.load MANIFEST.read
     json['files'][name]
   end
-
-  ###
-
-  MANIFEST.write '{"files":{}}' unless MANIFEST.exist?
 end
 
 

data/lib/lux_assets.rb

@@ -7,6 +7,7 @@ require 'open3'
 # gem files
 require_relative './lux_assets/base'
 require_relative './lux_assets/asset'
+require_relative './lux_assets/cli'
 require_relative './lux_assets/element'
 require_relative './lux_assets/manifest'
 

data/lib/vendor/lux/assets_routes.rb

@@ -1,7 +1,6 @@
 # /compiled_asset/www/js/pjax.coffee
 # /raw_asset/www/js/pjax.coffee
 Lux.app.before do
-  # skip /favicon.ico that forces refresh
   next unless nav.path[1]
   next unless Lux.config(:compile_assets)
 

data/lib/vendor/tasks.rb

@@ -28,6 +28,11 @@ namespace :assets do
     LuxAssets.examine
   end
 
+  desc 'Monitor for file changes'
+  task monitor: :env do
+    LuxAssets::Cli.monitor
+  end
+
   desc 'Upload assets to S3'
   task :s3_upload do
     puts 'aws s3 sync ./public s3://bucket.location --cache-control "max-age=31536000, public"'

data/public/manifest.json

@@ -0,0 +1 @@
+{"files":{}}

data/spec/assets/js/test.coffee

@@ -1 +1,2 @@
-alert 123
+alert 123
+

data/spec/tests/common_spec.rb

@@ -32,8 +32,15 @@ describe LuxAssets do
     expect(css).to include('-webkit')
 
     expect(Dir.entries('./public/assets').length > 8).to be true
+  end
+
+  it 'deletes folders and files' do
     `rm -rf ./public/assets`
     Dir.rmdir('./public') if Dir.entries('./public').length == 2
+
+    if LuxAssets::Manifest::MANIFEST.exist?
+      LuxAssets::Manifest::MANIFEST.delete
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lux_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Dino Reic
@@ -66,6 +66,7 @@ files:
 - "./lib/lux_assets.rb"
 - "./lib/lux_assets/asset.rb"
 - "./lib/lux_assets/base.rb"
+- "./lib/lux_assets/cli.rb"
 - "./lib/lux_assets/element.rb"
 - "./lib/lux_assets/manifest.rb"
 - "./lib/vendor/lux/assets_helper.rb"
@@ -7355,6 +7356,7 @@ files:
 - "./node_modules/yargs/package.json"
 - "./node_modules/yargs/yargs.js"
 - "./package.json"
+- "./public/manifest.json"
 - "./spec/assets/assets.rb"
 - "./spec/assets/css/test.css"
 - "./spec/assets/css/test.scss"