staticz 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a14e547d746831e18d759c913c5d269066ffd391c3d36e1ba9a8c7eda6ac5a0
-  data.tar.gz: cacec045c2bfec1e65c4317e81c969b43906893f10268c16aa600365def64373
+  metadata.gz: 9e7fe52aef9da5192c9275f8d0818854a9c73b42276befcfba73e039c7e14e1f
+  data.tar.gz: 3d28541b4452fcd45a88308c4b34651efe44352f856b78c264f16420e75ca66d
 SHA512:
-  metadata.gz: b1d64e26c428f5ab6c3caa3f941e49f97d30e607dcc72d74ca32101aa8b940a14a8199b0267d7a148aae15af5d9369aabfe03d28734fe5a9e402c1bb52ef17cd
-  data.tar.gz: 6d1431ec6816c6ba1b1af7bb9577a75471b8d4f4a7133fa88f19abfb259917936a23d8421b6421324aef6b741adbc07ffc72ce3ac0ea915e8f22fd2e89d97772
+  metadata.gz: d91007bf1075a01a630ec06c231b8f881f1f9081b550a2edd8ae20868f654d5697e1407027e64852c251270c9802cb8df53c9e9d7bf8f2a1b6776d562c5bc820
+  data.tar.gz: faf552e8eb42b8bf5dd593656a0f3aec0682480fee9c4152f2f5d7d8b5639a42edb56a0ea60d39dab93185187f7b1f5c2dc42cb54e26da072ad3fafdf20a6dae

data/lib/manifest/compilable/sassc.rb

@@ -1,4 +1,5 @@
 require "sass-embedded"
+require "pastel"
 require_relative "../compilable"
 
 module Staticz
@@ -12,6 +13,7 @@ module Staticz
 
       def initialize(name)
         @name = name
+        @warnings = []
       end
 
       def build(listener_class: nil)
@@ -27,21 +29,54 @@ module Staticz
       end
 
       def render
-        Sass.compile(source_path, style: :compressed).css
+        Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
       end
 
       def errors
-        errors = super
+        @_errors_cache ||= begin
+          errors = super
 
-        if exists?
-          begin
-            Sass.compile(source_path, style: :compressed).css
-          rescue => e
-            errors << e.message
+          if exists?
+            begin
+              Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
+            rescue => e
+              errors << e.message
+            end
           end
+
+          errors
+        end
+      end
+
+      def debug(message, options)
+        warn(message, debug)
+      end
+
+      def warn(message, options)
+        pastel = Pastel.new
+
+        line = options.span.start.line + 1
+        start_index = options.span.start.column
+        end_index = options.span.end.column
+
+        @warnings << <<~WARNING
+          #{pastel.yellow.bold("Warning")}: #{message}
+
+          #{" " * line.to_s.size} #{pastel.blue("╷")}
+          #{pastel.blue(line)} #{pastel.blue("│")} #{pastel.red(options.span.context.strip)}
+          #{" " * line.to_s.size} #{pastel.blue("│")} #{" " * start_index}#{pastel.red("^" * (end_index - start_index))}
+          #{" " * line.to_s.size} #{pastel.blue("╵")}
+
+          #{options.stack}
+        WARNING
+      end
+
+      def warnings
+        if valid?
+          Sass.compile(source_path, style: :compressed, logger: self)
         end
 
-        errors
+        @warnings
       end
     end
   end

data/lib/manifest/compilable/scssc.rb

@@ -1,4 +1,5 @@
 require "sass-embedded"
+require "pastel"
 require_relative "../compilable"
 
 module Staticz
@@ -12,6 +13,7 @@ module Staticz
 
       def initialize(name)
         @name = name
+        @warnings = []
       end
 
       def build(listener_class: nil)
@@ -27,21 +29,54 @@ module Staticz
       end
 
       def render
-        Sass.compile(source_path, style: :compressed).css
+        Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
       end
 
       def errors
-        errors = super
+        @_errors_cache ||= begin
+          errors = super
 
-        if exists?
-          begin
-            Sass.compile(source_path, style: :compressed).css
-          rescue => e
-            errors << e.message
+          if exists?
+            begin
+              Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
+            rescue => e
+              errors << e.message
+            end
           end
+
+          errors
+        end
+      end
+
+      def debug(message, options)
+        warn(message, debug)
+      end
+
+      def warn(message, options)
+        pastel = Pastel.new
+
+        line = options.span.start.line + 1
+        start_index = options.span.start.column
+        end_index = options.span.end.column
+
+        @warnings << <<~WARNING
+          #{pastel.yellow.bold("Warning")}: #{message}
+
+          #{" " * line.to_s.size} #{pastel.blue("╷")}
+          #{pastel.blue(line)} #{pastel.blue("│")} #{pastel.red(options.span.context.strip)}
+          #{" " * line.to_s.size} #{pastel.blue("│")} #{" " * start_index}#{pastel.red("^" * (end_index - start_index))}
+          #{" " * line.to_s.size} #{pastel.blue("╵")}
+
+          #{options.stack}
+        WARNING
+      end
+
+      def warnings
+        if valid?
+          Sass.compile(source_path, style: :compressed, logger: self)
         end
 
-        errors
+        @warnings
       end
     end
   end

data/lib/manifest/compilable.rb

@@ -46,6 +46,10 @@ module Staticz
       errors.empty?
     end
 
+    def warnings
+      []
+    end
+
     def errors
       errors = []
 
@@ -70,7 +74,11 @@ module Staticz
 
     def print(indentation, *args)
       valid_symbol = if valid?
-        Colors.in_green("✔")
+        if warnings.any?
+          Colors.in_yellow("⚠")
+        else
+          Colors.in_green("✔")
+        end
       else
         Colors.in_red("✘")
       end
@@ -89,6 +97,12 @@ module Staticz
           puts "#{" " * (indentation * 3)}   #{Colors.in_red(error)}"
         end
       end
+
+      warnings.each do |warning|
+        warning.lines.each do |line|
+          puts "#{" " * (indentation * 3)}   #{line}"
+        end
+      end
     end
   end
 end

data/lib/server.rb

@@ -91,8 +91,7 @@ module Staticz
         end
         .join(", ")
 
-      $stdout.clear_screen
-      puts "#{file_names} changed, rebuilding..."
+      puts "\n#{file_names} changed, rebuilding...\n\n"
       build_manifest
       puts "Rebuilding successful"
     end

data/lib/staticz.rb

@@ -6,7 +6,7 @@ require_relative "commands/manifest_command"
 require_relative "commands/build_command"
 
 module Staticz
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
   def self.init
     cmd, args = case ARGV[0]

data/lib/templates/default.rb

@@ -48,5 +48,9 @@ module Staticz::Templates
         padding: 0
         margin: 0
     SASS
+
+    file ".gitignore", <<~GITIGNORE
+      build/
+    GITIGNORE
   end
 end

data/lib/templates/layout.rb

@@ -64,5 +64,9 @@ module Staticz::Templates
         padding: 0
         margin: 0
     SASS
+
+    file ".gitignore", <<~GITIGNORE
+      build/
+    GITIGNORE
   end
 end

data/lib/utils/colors.rb

@@ -3,6 +3,10 @@ class Colors
     "\e[31m#{text}\e[0m"
   end
 
+  def self.in_yellow(text)
+    "\e[33m#{text}\e[0m"
+  end
+
   def self.in_green(text)
     "\e[32m#{text}\e[0m"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Philipp Schlesinger
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: Create websites with haml and sass, and compile them into static html
   and css
 email: