staticz 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317a792669ff58cf54d850e44fc26664a71572c0ceab5c4f6a228fd6bf14fc24
-  data.tar.gz: 45a9e8dccf4db9d09ab6761010ac59c430a5040c4a1d7631c70a9db0e2820a16
+  metadata.gz: 3a14e547d746831e18d759c913c5d269066ffd391c3d36e1ba9a8c7eda6ac5a0
+  data.tar.gz: cacec045c2bfec1e65c4317e81c969b43906893f10268c16aa600365def64373
 SHA512:
-  metadata.gz: d3c45fd41a59f14d5ac7790114bec9853382c2c03f1a7a8a88f2344ca8451676c5109ad0ef2796be57fe917dd9af6478b1326adb349f8084395bff6510723db0
-  data.tar.gz: b73b4f16b7ad1ebb60edaff044326b0bc4e3e5d49b340bab1b3e7bf777c1f5bd5518061b88c1a18e6cddf854fe1dca34b37e029b30219cb9163c9a30318b061b
+  metadata.gz: b1d64e26c428f5ab6c3caa3f941e49f97d30e607dcc72d74ca32101aa8b940a14a8199b0267d7a148aae15af5d9369aabfe03d28734fe5a9e402c1bb52ef17cd
+  data.tar.gz: 6d1431ec6816c6ba1b1af7bb9577a75471b8d4f4a7133fa88f19abfb259917936a23d8421b6421324aef6b741adbc07ffc72ce3ac0ea915e8f22fd2e89d97772

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/{sass.rb → sassc.rb}

@@ -1,9 +1,9 @@
-require "sassc"
+require "sass-embedded"
 require_relative "../compilable"
 
 module Staticz
   module Compilable
-    class Sass
+    class SassC
       include Compilable
 
       attr_reader :name
@@ -27,7 +27,7 @@ module Staticz
       end
 
       def render
-        ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed).render
+        Sass.compile(source_path, style: :compressed).css
       end
 
       def errors
@@ -35,8 +35,7 @@ module Staticz
 
         if exists?
           begin
-            engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass)
-            engine.render
+            Sass.compile(source_path, style: :compressed).css
           rescue => e
             errors << e.message
           end

data/lib/manifest/compilable/{scss.rb → scssc.rb}

@@ -1,9 +1,9 @@
-require "sassc"
+require "sass-embedded"
 require_relative "../compilable"
 
 module Staticz
   module Compilable
-    class Scss
+    class ScssC
       include Compilable
 
       attr_reader :name
@@ -27,7 +27,7 @@ module Staticz
       end
 
       def render
-        ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed).render
+        Sass.compile(source_path, style: :compressed).css
       end
 
       def errors
@@ -35,8 +35,7 @@ module Staticz
 
         if exists?
           begin
-            engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss)
-            engine.render
+            Sass.compile(source_path, style: :compressed).css
           rescue => e
             errors << e.message
           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,7 +39,7 @@ module Staticz
     end
 
     def path_method_name
-      "#{path.gsub(/[.\/-]/, "_")}_path"
+      "#{path.gsub(/[^A-Za-z0-9]+/, "_").downcase}_path"
     end
 
     def valid?
@@ -57,6 +57,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,6 +65,7 @@ module Staticz
           link_path
         end
       end
+      Manifest.instance.functions << path_method_name
     end
 
     def print(indentation, *args)

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/staticz.rb

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

data/lib/templates/default.rb

@@ -0,0 +1,52 @@
+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
+  end
+end

data/lib/templates/layout.rb

@@ -0,0 +1,68 @@
+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
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Philipp Schlesinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -67,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
@@ -157,8 +171,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
@@ -169,13 +183,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
@@ -200,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Static website compiler

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