cyborg 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d1dc919350c58e8dba2e60bef24090a5bfb07e
-  data.tar.gz: 4b1c0545b4ab96eedf7b55806f947111352a701f
+  metadata.gz: deaac461b4f0974e0ad9a1f51439096dd087329c
+  data.tar.gz: dd7093d99a3c253c06f24d0939c5dac99e584a60
 SHA512:
-  metadata.gz: b2fcb930d1a8b88ea653523519a3eea3e4fc09b0e95845699207688772b8ff47f41f7211f1598d9c4e3d7bdb172473b55463df7559aa6848a5c104454ff50ee6
-  data.tar.gz: 09e5f45fb099313c0f5bd48d1acfccc2fbfd1ff613b0e27d73d63cc2deb6593e7f851b2f6b261bb1dd8051e88c2869499b5c18a31616818ce745d7ef7b50ff6b
+  metadata.gz: 7471921a487d3b2bef35e63d157f5c9d8fc82558a0e660beffdb45eefb68beef9547da36725b64b7fd34f169cde54a7911d0f422a58923fcdf29feaf8aad3879
+  data.tar.gz: c657b4e2d50285d5cff98bdef05841b43a44db12ab36b4d059c9237dd05331cc540e00b64cc18cbcb38c418bfdd322dc5b7cab90548d751c6dffe69147cb4dd3

data/lib/cyborg/plugin/assets/asset.rb

@@ -40,22 +40,26 @@ module Cyborg
         File.basename(path).sub(/(\.\w+)$/, '-'+plugin.version+'\1')
       end
 
+      def local_path(file)
+        destination(file).sub(plugin.root+'/','')
+      end
+
       def build_success(file)
-        log_success "Built: #{destination(file).sub(plugin.root+'/','')}"
+        log_success "Built: #{local_path(file)}"
       end
 
       def build_failure(file)
-        msg = "FAILED TO BUILD"
-        msg += ": #{destination(file).sub(plugin.root+'/','')}" if file
+        msg = "\nFAILED TO BUILD"
+        msg += ": #{local_path(file)}" if file
         log_error msg
       end
 
       def log_success( msg )
-        STDOUT.print msg.to_s.strip.colorize(:green)
+        STDOUT.puts msg.to_s.colorize(:green)
       end
 
       def log_error( msg )
-        STDERR.puts msg.to_s.strip.colorize(:red)
+        STDERR.puts msg.to_s.colorize(:red)
       end
 
       # Determine if an NPM module is installed by checking paths with `npm ls`
@@ -95,7 +99,7 @@ module Cyborg
       end
 
       def watch
-        puts "Watching for changes to #{base.sub(plugin.root+'/', '')}..."
+        puts "Watching for changes to #{base.sub(plugin.root+'/', '')}...".colorize(:light_yellow)
 
         Thread.new {
           listener = Listen.to(base) do |modified, added, removed|
@@ -108,9 +112,9 @@ module Cyborg
       end
 
       def change(modified, added, removed)
-        puts "Added: #{file_event(added)}"       unless added.empty?
-        puts "Removed: #{file_event(removed)}"   unless removed.empty?
-        puts "Modified: #{file_event(modified)}" unless modified.empty?
+        puts "Added: #{file_event(added)}".colorize(:light_green)       unless added.empty?
+        puts "Removed: #{file_event(removed)}".colorize(:light_red)   unless removed.empty?
+        puts "Modified: #{file_event(modified)}".colorize(:light_yellow) unless modified.empty?
 
         build
       end

data/lib/cyborg/plugin/assets/javascripts.rb

@@ -19,15 +19,31 @@ module Cyborg
 
         if Open3.capture3("npm ls browserify-incremental")[1].empty?
           files.each do |file|
-            begin
-              system build_command(file)
-              compress(destination(file)) if Cyborg.production?
 
-              puts build_success(file)
+            dest = destination(file)
 
-            rescue => bang
+            FileUtils.rm dest
+
+            response = Open3.capture3(build_command(file))
+
+            if File.exist?(dest) && !File.read(dest).strip.empty?
+              compress(dest) if Cyborg.production?
+              build_success file
+            else
               build_failure file
-              log_error bang
+
+              response = response.map { |l| l.to_s.split("\n") }.flatten
+
+              response.each do |line|
+                if !line.empty? &&
+                   !line.match(/node_modules/i) &&
+                   !line.match(/pid (\d+?) exit/i) &&
+                   !line.match(/\[BABEL\] Note:/i)
+                  log_error line.gsub(plugin.root+'/','')
+                end
+              end
+
+              puts ""
             end
           end
         else

data/lib/cyborg/plugin/assets/stylesheets.rb

@@ -27,9 +27,15 @@ module Cyborg
             end
 
             puts build_success(file)
-          rescue => bang
+
+          rescue Exception => e
             build_failure file
-            log_error bang
+
+            if e.backtrace.is_a? Array
+              log_error "Error in file: #{local_path(e.backtrace[0])}"
+            end
+
+          log_error "  #{e.message}\n" if e.message
           end
         end
       end

data/lib/cyborg/plugin/assets/svgs.rb

@@ -37,9 +37,19 @@ module Cyborg
           else
             log_error "FAILED TO BUILD SVGs"
           end
-        rescue => bang
-          log_error "FAILED TO BUILD SVGs"
-          log_error bang
+        rescue Exception => e
+          log_error "\nFAILED TO BUILD SVGs"
+
+          if e.backtrace && e.backtrace.is_a?(Array)
+            log_error "Error in file: #{local_path(e.backtrace.shift)}"
+
+            e.backtrace.each do |line|
+              log_error local_path(line)
+            end
+          end
+
+          log_error("  #{e.message}\n") if e.message
+
         end
       end
     end

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.5.14"
+  VERSION = "0.5.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Brandon Mathis