guard-entangle 0.0.4.4 → 0.0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb3cf5fc653251a0f86ef0ba45cde239dbd7d48
-  data.tar.gz: 1a3ee58e2f67a89cb2536bf15efcbefdd533c381
+  metadata.gz: 4bd715421e7ff970ad10a17252452ab066f39516
+  data.tar.gz: 8418706babf13d2fdd2a3be47b5d17f450ecbce2
 SHA512:
-  metadata.gz: 894317b5e0e8e2cc9268324aefdc30657c07ea49206362451623ab9949068cff76ed638decb4361dcdd6b8b46a8e4f6d4c8403e2656f64534de457c7ebc7ee24
-  data.tar.gz: aa95642ca8b241a62debad635a5b4ca5d571d58f17e249dd6c990c73e61f90c4071f00af40504e581c7b82bf8ec2230a4d11511141176eae252a2c9db83113f4
+  metadata.gz: 0dc56b08fc7803137b446463201992df0a27f50fe9ae954ee829f2770573006a6c5ec49495c4d30192d5130027912899942fd1a80b1319d5dc4d1c817d4e5bfa
+  data.tar.gz: b2179c62004954e691049058363898d4d128dd9103d03379d85f662f1c4690e78e5b6a139c5430fbe1f50d23653d3fc4a04aa8426aad0c9ed1dba77938779973

data/lib/guard/entangle/entangler.rb

@@ -66,6 +66,7 @@ module Guard
         name = file.sub '//=', ''
         stripped = name.strip
         file = "#{path}/#{stripped}"
+
         if File.exists?(file) && File.readable?(file)
           insert = File.open(file, 'rb')
           insert_content = insert.read

data/lib/guard/entangle/formatter.rb

@@ -57,6 +57,15 @@ module Guard
           ::Guard::Notifier.notify(message, options)
         end
 
+        # Output raw string, as Guard UI adds [#XXXXXXX] memory address to string
+        #
+        # @param [String] text the text to colorize
+        # @param [String] color_code the color code
+        #
+        def colorize(text, color_code)
+            return "\e[#{color_code}m#{text}\e[0m"
+        end
+
         private
 
         # Print a info message to the console.

data/lib/guard/entangle/runner.rb

@@ -83,7 +83,7 @@ module Guard
         elsif paths.kind_of?(String)
           process_dir(paths)
         else
-          ::Guard::UI.info "Paths in configuration are incorrect"
+          ::Guard::UI.error "Paths in configuration are incorrect"
         end
       end
 

data/lib/guard/entangle/version.rb

@@ -2,6 +2,6 @@
 
 module Guard
   class EntangleVersion
-    VERSION = "0.0.4.4"
+    VERSION = "0.0.5.0"
   end
 end

data/lib/guard/entangle/writer.rb

@@ -43,6 +43,7 @@ module Guard
           else
             path.gsub! "#{cwd}/", ''
             message = "The path #{ rel } is not writable."
+            puts "here"
             @formatter.error(message)
             return
           end
@@ -62,7 +63,7 @@ module Guard
         if File.extname(path) == '.js'
           min = path.gsub(/\.[^.]+$/, '.min.js')
           begin
-            if (options[:force_utf8])
+            if options[:force_utf8]
               content.encoding
               content.force_encoding 'utf-8'
             end
@@ -71,7 +72,12 @@ module Guard
           rescue Exception => e
             # Get a readable message
             message = e.message.split(/[\n\r]/).first
+            lines = error_lines(content, message)
             @formatter.error("Uglifier - #{message}")
+            if lines
+              @formatter.error("Surrounding lines:")
+              puts lines
+            end
             return nil
           end
 
@@ -84,6 +90,54 @@ module Guard
         end
       end
 
+      # Get the error lines for an uglifier error
+      #
+      # @param [String] content The content that is being parsed
+      # @param [String] message The error message from uglifier
+      #
+      # @return [mixed] error lines or false
+      #
+      def error_lines(content, message)
+        line = error_line_number(message)
+
+        # The line number is set, we can now get the lines from the file
+        if line
+          counter = 2
+          first = line - options[:error_lines]
+          last = line + options[:error_lines]
+          file_lines = []
+
+          content.each_line do |item|
+            if counter >= first && counter <= last
+              item.sub! "\n", ''
+              if counter == line
+                file_lines << @formatter.colorize("line #{counter}: #{item}", 31)
+              else
+                file_lines << @formatter.colorize("line #{counter}: #{item}", 33)
+              end
+            end
+            counter += 1
+          end
+
+          if not file_lines.empty?
+            return file_lines.join("\n")
+          end
+        end
+      end
+
+      # Get the line number for an error message
+      #
+      # @param [String] message The error message generated by Uglifier
+      #
+      # @return [String] The error line number
+      #
+      def error_line_number(message)
+        lines = message.match(/line:\s?(\d+),/)
+
+        if lines.kind_of?(MatchData) && lines[1]
+          return lines[1].to_i
+        end
+      end
 
       # Save the file
       #

data/lib/guard/entangle.rb

@@ -17,6 +17,7 @@ module Guard
       :hide_success     => false,
       :uglifier_options => {},
       :force_utf8       => false,
+      :error_lines      => 6,
       :copy             => true #save a copy of the original file
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-entangle
 version: !ruby/object:Gem::Version
-  version: 0.0.4.4
+  version: 0.0.5.0
 platform: ruby
 authors:
 - Deshi Rahim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard