staticz 1.0.14 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9db54242f9202f764923c912127bdf779cd837f56df127d86ffacbd10626d6
-  data.tar.gz: c50be0c1e7c2767bb0b3b016bc8e858ae88e60b8c37288cf583b25fef159d6e5
+  metadata.gz: 9e7fe52aef9da5192c9275f8d0818854a9c73b42276befcfba73e039c7e14e1f
+  data.tar.gz: 3d28541b4452fcd45a88308c4b34651efe44352f856b78c264f16420e75ca66d
 SHA512:
-  metadata.gz: 5e630aa981189afd35fd326b87b121aa6821b9e3996d6b1e51308c9bb525078d72c9e9f507016bf3ae8653a24916c37ee2543e9df7fc4cf9edd2d8c28b73b879
-  data.tar.gz: cf6d1277ce0f4be1c537caa69576b45593ff1f650f5aca5ae9a1c101bf23b8e23d5aaa3826246074c5e60737cac6e39879992a06567036beacf771407efc2aad
+  metadata.gz: d91007bf1075a01a630ec06c231b8f881f1f9081b550a2edd8ae20868f654d5697e1407027e64852c251270c9802cb8df53c9e9d7bf8f2a1b6776d562c5bc820
+  data.tar.gz: faf552e8eb42b8bf5dd593656a0f3aec0682480fee9c4152f2f5d7d8b5639a42edb56a0ea60d39dab93185187f7b1f5c2dc42cb54e26da072ad3fafdf20a6dae

data/lib/commands/base_command.rb

@@ -26,8 +26,18 @@ module Staticz
       desc "Print this page"
     end
 
+    flag :version do
+      short "-v"
+      long "--version"
+      desc "Print the version"
+    end
+
     def run
-      print help
+      if params[:version]
+        puts Staticz::VERSION
+      else
+        puts help
+      end
     end
   end
 end

data/lib/commands/new_command.rb

@@ -1,5 +1,6 @@
 require "tty-option"
-require_relative "../template"
+require_relative "../templates/default"
+require_relative "../templates/layout"
 
 module Staticz
   class NewCommand
@@ -14,7 +15,7 @@ module Staticz
 
     argument :name do
       required
-      desc "testies"
+      desc "The name to give the app. Decides how the folder is named"
     end
 
     flag :help do
@@ -23,19 +24,29 @@ module Staticz
       desc "Print this page"
     end
 
+    option :template do
+      short "-t"
+      long "--template name"
+      desc "The template to use"
+
+      default "default"
+      permit %w[default layout]
+    end
+
     def run
       if params[:help]
         print help
         exit 1
       end
 
-      if !params[:name]
-        puts "Name missing"
-        print help
+      if params.errors.any?
+        puts params.errors.summary
         exit 1
       end
 
-      Staticz::Template.new(params[:name])
+      Object
+        .const_get("Staticz::Templates::#{params[:template].capitalize}")
+        .build(params[:name])
     end
   end
 end

data/lib/manifest/compilable/sassc.rb

@@ -0,0 +1,83 @@
+require "sass-embedded"
+require "pastel"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class SassC
+      include Compilable
+
+      attr_reader :name
+
+      compile "sass", "css", "Sass"
+
+      def initialize(name)
+        @name = name
+        @warnings = []
+      end
+
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
+        if valid?
+          File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
+        end
+      end
+
+      def render
+        Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
+      end
+
+      def errors
+        @_errors_cache ||= begin
+          errors = super
+
+          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
+
+        @warnings
+      end
+    end
+  end
+end

data/lib/manifest/compilable/scssc.rb

@@ -0,0 +1,83 @@
+require "sass-embedded"
+require "pastel"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class ScssC
+      include Compilable
+
+      attr_reader :name
+
+      compile "scss", "css", "Scss"
+
+      def initialize(name)
+        @name = name
+        @warnings = []
+      end
+
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
+        if valid?
+          File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
+        end
+      end
+
+      def render
+        Sass.compile(source_path, style: :compressed, logger: Sass::Logger.silent).css
+      end
+
+      def errors
+        @_errors_cache ||= begin
+          errors = super
+
+          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
+
+        @warnings
+      end
+    end
+  end
+end

data/lib/manifest/compilable/simple_file.rb

@@ -20,6 +20,8 @@ module Staticz
       def create_link_function
         link_path = "/#{name}"
         Object.send(:define_method, path_method_name) { link_path }
+
+        Manifest.instance.functions << path_method_name
       end
 
       def initialize(name)

data/lib/manifest/compilable.rb

@@ -39,13 +39,17 @@ module Staticz
     end
 
     def path_method_name
-      "#{path.gsub(/[.\/-]/, "_")}_path"
+      "#{path.gsub(/[^A-Za-z0-9]+/, "_").downcase}_path"
     end
 
     def valid?
       errors.empty?
     end
 
+    def warnings
+      []
+    end
+
     def errors
       errors = []
 
@@ -57,6 +61,7 @@ module Staticz
     def create_link_function
       link_path = "/#{name}.#{build_file_ending}"
       shortened_link_path = "/#{name}"
+
       Object.send(:define_method, path_method_name) do |shorten: false|
         if shorten
           shortened_link_path
@@ -64,11 +69,16 @@ module Staticz
           link_path
         end
       end
+      Manifest.instance.functions << path_method_name
     end
 
     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
@@ -87,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/manifest/css_bundle.rb

@@ -17,11 +17,11 @@ module Staticz
     end
 
     def sass(name, &block)
-      elements.push(Staticz::Compilable::Sass.new(generate_location_path(name)))
+      elements.push(Staticz::Compilable::SassC.new(generate_location_path(name)))
     end
 
     def scss(name, &block)
-      elements.push(Staticz::Compilable::Scss.new(generate_location_path(name)))
+      elements.push(Staticz::Compilable::ScssC.new(generate_location_path(name)))
     end
 
     def generate_location_path(name)
@@ -69,6 +69,8 @@ module Staticz
       Object.send(:define_method, path_method_name) do
         link_path
       end
+
+      Manifest.instance.functions << path_method_name
     end
 
     def valid?

data/lib/manifest/js_bundle.rb

@@ -73,6 +73,8 @@ module Staticz
       Object.send(:define_method, path_method_name) do
         link_path
       end
+
+      Manifest.instance.functions << path_method_name
     end
 
     def valid?

data/lib/manifest/manifest.rb

@@ -4,8 +4,8 @@ require_relative "compilable/haml"
 require_relative "compilable/cs"
 require_relative "compilable/js"
 require_relative "compilable/react"
-require_relative "compilable/sass"
-require_relative "compilable/scss"
+require_relative "compilable/sassc"
+require_relative "compilable/scssc"
 require_relative "compilable/simple_file"
 require_relative "js_bundle"
 require_relative "css_bundle"
@@ -14,10 +14,11 @@ module Staticz
   class Manifest
     include Singleton
 
-    attr_reader :elements
+    attr_reader :elements, :functions
 
     def initialize
       @elements = []
+      @functions = []
     end
 
     def sub(name, &block)
@@ -32,11 +33,11 @@ module Staticz
     end
 
     def sass(name)
-      elements.push(Staticz::Compilable::Sass.new(name))
+      elements.push(Staticz::Compilable::SassC.new(name))
     end
 
     def scss(name)
-      elements.push(Staticz::Compilable::Scss.new(name))
+      elements.push(Staticz::Compilable::ScssC.new(name))
     end
 
     def js(name)
@@ -97,6 +98,12 @@ module Staticz
 
     def define(block)
       elements.clear
+
+      functions.each do |function|
+        Object.send(:undef_method, function)
+      end
+      functions.clear
+
       instance_eval(&block)
     end
 

data/lib/manifest/sub.rb

@@ -10,7 +10,7 @@ module Staticz
     def sub(name, &block)
       s = Staticz::Sub.new("#{@name}/#{name}")
       elements.push(s)
-      s.instance_eval(&block)
+      s.instance_eval(&block) if block_given?
     end
 
     def haml(name, &block)
@@ -18,11 +18,11 @@ module Staticz
     end
 
     def sass(name, &block)
-      elements.push(Staticz::Compilable::Sass.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::SassC.new("#{@name}/#{name}"))
     end
 
     def scss(name, &block)
-      elements.push(Staticz::Compilable::Scss.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::ScssC.new("#{@name}/#{name}"))
     end
 
     def js(name, &block)

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,6 +6,8 @@ require_relative "commands/manifest_command"
 require_relative "commands/build_command"
 
 module Staticz
+  VERSION = "1.1.1"
+
   def self.init
     cmd, args = case ARGV[0]
     when "new"

data/lib/templates/default.rb

@@ -0,0 +1,56 @@
+require_relative "template"
+
+module Staticz::Templates
+  class Default
+    extend Staticz::Template
+
+    folders "src", "src/css"
+
+    file "manifest.rb", <<~RUBY
+      Staticz::Manifest.define do
+        haml :index
+
+        sub :css do
+          sass :main
+        end
+      end
+    RUBY
+
+    file "src/index.haml", <<~HAML
+      <!DOCTYPE html>
+      %html(lang="en")
+        %head
+          %meta(charset="UTF-8")
+          %meta(name="viewport" content="width=device-width, initial-scale=1")
+
+          %meta(name="description" content="Site description")
+          %meta(name="keywords" content="website, staticz")
+
+          %meta(property="og:site_name" content="example.com")
+          %meta(property="og:title" content="Site created with staticz")
+          %meta(property="og:description" content="Site description")
+          %meta(property="og:type" content="website")
+          %meta(property="og:url" content="https://example.com/")
+          %meta(property="og:title" content="App created with staticz")
+
+          %title App created with staticz
+
+          = stylesheet css_main_path
+
+          = reload_js
+
+        %body
+          Hello World!
+    HAML
+
+    file "src/css/main.sass", <<~SASS
+      html,body
+        padding: 0
+        margin: 0
+    SASS
+
+    file ".gitignore", <<~GITIGNORE
+      build/
+    GITIGNORE
+  end
+end

data/lib/templates/layout.rb

@@ -0,0 +1,72 @@
+require_relative "template"
+
+module Staticz::Templates
+  class Layout
+    extend Staticz::Template
+
+    folders "src", "src/css"
+
+    file "manifest.rb", <<~RUBY
+      Staticz::Manifest.define do
+        haml :index
+
+        sub :css do
+          sass :main
+        end
+      end
+    RUBY
+
+    file "src/index.haml", <<~HAML
+      = render :template do
+        %main
+          Hello World!
+     HAML
+
+    file "src/template.haml", <<~HAML
+      <!DOCTYPE html>
+      %html(lang="en")
+        %head
+          %meta(charset="UTF-8")
+          %meta(name="viewport" content="width=device-width, initial-scale=1")
+
+          %meta(name="description" content="Site description")
+          %meta(name="keywords" content="website, staticz")
+
+          %meta(property="og:site_name" content="example.com")
+          %meta(property="og:title" content="Site created with staticz")
+          %meta(property="og:description" content="Site description")
+          %meta(property="og:type" content="website")
+          %meta(property="og:url" content="https://example.com/")
+          %meta(property="og:title" content="App created with staticz")
+
+          %title App created with staticz
+
+          = stylesheet css_main_path
+
+          = reload_js
+
+        %body
+          = render :nav
+          = capture_haml(&block)
+          = render :footer
+    HAML
+
+    file "src/nav.haml", <<~HAML
+      %nav navigation
+    HAML
+
+    file "src/footer.haml", <<~HAML
+      %footer footer
+    HAML
+
+    file "src/css/main.sass", <<~SASS
+      html,body
+        padding: 0
+        margin: 0
+    SASS
+
+    file ".gitignore", <<~GITIGNORE
+      build/
+    GITIGNORE
+  end
+end

data/lib/templates/template.rb

@@ -0,0 +1,25 @@
+require_relative "template"
+
+module Staticz::Template
+  def folders(*folders)
+    @folders = folders
+  end
+
+  def file(path, content)
+    @files = @files || []
+    @files << [path, content]
+  end
+
+  def build(destination)
+    root_path = File.join(Dir.pwd, destination)
+
+    Dir.mkdir(root_path) if !Dir.exist?(root_path)
+    @folders.each do |folder|
+      Dir.mkdir(File.join(root_path, folder)) if !Dir.exist?(File.join(root_path, folder))
+    end
+
+    @files.each do |path, content|
+      File.write(File.join(root_path, path), content)
+    end
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.1
 platform: ruby
 authors:
 - Philipp Schlesinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.83'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.83'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -171,8 +185,8 @@ files:
 - lib/manifest/compilable/haml.rb
 - lib/manifest/compilable/js.rb
 - lib/manifest/compilable/react.rb
-- lib/manifest/compilable/sass.rb
-- lib/manifest/compilable/scss.rb
+- lib/manifest/compilable/sassc.rb
+- lib/manifest/compilable/scssc.rb
 - lib/manifest/compilable/simple_file.rb
 - lib/manifest/css_bundle.rb
 - lib/manifest/js_bundle.rb
@@ -183,13 +197,9 @@ files:
 - lib/server.rb
 - lib/settings.rb
 - lib/staticz.rb
-- lib/template.rb
-- lib/template/manifest.rb
-- lib/template/src/css/main.sass
-- lib/template/src/footer.haml
-- lib/template/src/index.haml
-- lib/template/src/nav.haml
-- lib/template/src/template.haml
+- lib/templates/default.rb
+- lib/templates/layout.rb
+- lib/templates/template.rb
 - lib/utils/colors.rb
 - lib/utils/helpers.rb
 homepage: http://rubygems.org/gems/staticz

data/lib/manifest/compilable/sass.rb

@@ -1,49 +0,0 @@
-require "sassc"
-require_relative "../compilable"
-
-module Staticz
-  module Compilable
-    class Sass
-      include Compilable
-
-      attr_reader :name
-
-      compile "sass", "css", "Sass"
-
-      def initialize(name)
-        @name = name
-      end
-
-      def build(listener_class: nil)
-        listener = listener_class&.new(self)
-
-        if valid?
-          File.write build_path, render
-
-          listener&.finish
-        else
-          listener&.error
-        end
-      end
-
-      def render
-        ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed).render
-      end
-
-      def errors
-        errors = super
-
-        if exists?
-          begin
-            engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass)
-            engine.render
-          rescue => e
-            errors << e.message
-          end
-        end
-
-        errors
-      end
-    end
-  end
-end

data/lib/manifest/compilable/scss.rb

@@ -1,49 +0,0 @@
-require "sassc"
-require_relative "../compilable"
-
-module Staticz
-  module Compilable
-    class Scss
-      include Compilable
-
-      attr_reader :name
-
-      compile "scss", "css", "Scss"
-
-      def initialize(name)
-        @name = name
-      end
-
-      def build(listener_class: nil)
-        listener = listener_class&.new(self)
-
-        if valid?
-          File.write build_path, render
-
-          listener&.finish
-        else
-          listener&.error
-        end
-      end
-
-      def render
-        ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed).render
-      end
-
-      def errors
-        errors = super
-
-        if exists?
-          begin
-            engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss)
-            engine.render
-          rescue => e
-            errors << e.message
-          end
-        end
-
-        errors
-      end
-    end
-  end
-end

data/lib/template/manifest.rb

@@ -1,7 +0,0 @@
-Staticz::Manifest.define do
-  haml :index
-
-  sub :css do
-    sass :main
-  end
-end

data/lib/template/src/css/main.sass

@@ -1,3 +0,0 @@
-html,body
-  padding: 0
-  margin: 0

data/lib/template/src/footer.haml

@@ -1 +0,0 @@
-%footer

data/lib/template/src/index.haml

@@ -1,2 +0,0 @@
-= render :template do
-  %main

data/lib/template/src/nav.haml

@@ -1 +0,0 @@
-%nav

data/lib/template/src/template.haml

@@ -1,23 +0,0 @@
-!!! 5
-%html
-  %head
-    %title App created with staticz
-
-    %meta{name: "description", content: "Site description"}
-    %meta{name: "keywords", content: "website, staticz"}
-    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}
-
-    %meta{property: "og:site_name", content: "example.com"}
-    %meta{property: "og:title", content: "Site created with staticz"}
-    %meta{property: "og:description", content: "Site description"}
-    %meta{property: "og:type", content: "website"}
-    %meta{property: "og:url", content: "https://example.com/"}
-    %meta{property: "og:title", content: "App created with staticz"}
-
-    = stylesheet css_main_path
-
-    = reload_js
-  %body
-    = render :nav
-    = capture_haml(&block)
-    = render :footer

data/lib/template.rb

@@ -1,11 +0,0 @@
-require "fileutils"
-
-module Staticz
-  class Template
-    def initialize(name)
-      src = File.join(File.dirname(__FILE__), "template")
-
-      FileUtils.copy_entry src, File.join(Dir.pwd, name)
-    end
-  end
-end