staticz 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80ecb49f81917fbaaf10fabec468748de38f060525fe63826c9b24f6f40fe7e
-  data.tar.gz: d0d42fa919ad0e332a6b310a855ec72af64786401e32825f52ace50303ba08f7
+  metadata.gz: 514a1a85d3b4dfaa09b9f9b193e8e7e8d6ab5932233ddc23e28982c0b9bd33b4
+  data.tar.gz: 6ed2e3c26f0e82a78fa3669aa0ce0d1753875d8e27d71b07ccacd54092b08dfd
 SHA512:
-  metadata.gz: 6b9956372490bdd8bb44ff5533c05e107f9d5997ccf8b42186037dc4dc4e475b55972712c613cc88de3e208999d5ee985f152d215f774d3b43d907c4e43b6738
-  data.tar.gz: 104e0a387444c5e8e962936fce024bf416389bc8b4e1a118473827bc6765f1d164511cd9d5ebe313405ac7150e8c09a8e420776e7f2b47162c7d5647a86c9f25
+  metadata.gz: ded82ed2f8c9af219f81624e7210537d88dd0ee0f0d3188d50a2616f29e4473f2866b10b9b057d41cab6e63e54849365aae1480b86ec5301910dacc6cd340a6b
+  data.tar.gz: 33ee4a79b001ede15aa7fcb05ecbede3e8edd30c099eb82798f0da3ed4070424ea5789136389682e2c92149abe3da713e57e7e6be16aefb732e444579e65d9af

data/lib/builder.rb

@@ -1,19 +1,21 @@
+require "tty-spinner"
 require_relative "modules/lib_loader"
+require_relative "manifest/manifest"
 
 module Staticz
   class Builder
-    def initialize
-      build
+    def initialize(listener_class: nil)
+      @listener_class = listener_class
     end
 
-    private
-
     def build
       Staticz::Modules::LibLoader.load_files
 
       Dir.mkdir('build') unless File.exist?('build')
 
-      Staticz::Manifest.instance.build
+      Staticz::Manifest.instance.build(listener_class: @listener_class)
+
+      Staticz::Manifest.instance.valid?
     end
   end
 end

data/lib/commands/base_command.rb

@@ -0,0 +1,33 @@
+require "tty-option"
+
+module Staticz
+  class BaseCommand
+    include TTY::Option
+
+    usage do
+      program "staticz"
+      no_command
+
+      description "Staticz helps create static websites",
+        "\nCommands:",
+        "  staticz new - Create a new project",
+        "  staticz server - Run the development server",
+        "  staticz manifest - Print out all files and how they will be built",
+        "  staticz build - Compile the project"
+    end
+
+    argument :mode do
+      desc "[new server manifest build]"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print this page"
+    end
+
+    def run
+      print help
+    end
+  end
+end

data/lib/commands/build_command.rb

@@ -0,0 +1,108 @@
+require "tty-option"
+require_relative "../settings"
+require_relative "../builder"
+require_relative "../utils/colors"
+
+module Staticz
+  class BuildCommand
+    include TTY::Option
+
+    usage do
+      program "staticz"
+      command "build"
+
+      description "Compile the project"
+    end
+
+    flag :verbose do
+      short "-v"
+      long "--verbose"
+      desc "Use verbose output"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print this page"
+    end
+
+    option :environment do
+      desc "Set the environment"
+      short "-e"
+      long "--environment environment"
+
+      default :production
+      permit [:development, :production]
+      convert :symbol
+    end
+
+    def run
+      if params[:help]
+        print help
+        exit
+      end
+
+      if !params[:environment]
+        puts "Environment must either be development or production"
+        exit 1
+      end
+
+      if params[:verbose]
+        Staticz::Settings.verbose!
+      end
+
+      Staticz::Settings.set_environment(params[:environment])
+
+      result = Staticz::Builder.new(listener_class: BuildListener).build
+
+      if result.flatten.include? false
+        exit 1
+      end
+    end
+  end
+
+  class BuildListener
+    def initialize(compilable)
+      @compilable = compilable
+
+      if Staticz::Settings.verbose?
+        puts "Compiling #{generate_text}"
+      else
+        @spinner = TTY::Spinner.new(
+          "[:spinner] #{generate_text}",
+          format: :classic,
+          success_mark: Colors.in_green("✔"),
+          error_mark: Colors.in_red("✖")
+        )
+
+        @spinner.auto_spin
+      end
+    end
+
+    def finish
+      @spinner.success(Colors.in_green("(successful)")) if !Staticz::Settings.verbose?
+    end
+
+    def error
+      if Staticz::Settings.verbose?
+        puts Colors.in_red("Error:")
+      else
+        @spinner.error(Colors.in_red("(error)"))
+      end
+
+      @compilable.errors.each do |error|
+        puts Colors.in_red(error)
+      end
+    end
+
+    private
+
+    def generate_text
+      if @compilable.is_a? Staticz::JSBundle
+        @compilable.name
+      else
+        "#{@compilable.source_path} -> #{@compilable.build_path}"
+      end
+    end
+  end
+end

data/lib/commands/manifest_command.rb

@@ -0,0 +1,37 @@
+require "tty-option"
+require_relative "../settings"
+require_relative "../modules/lib_loader"
+require_relative "../manifest/manifest"
+
+module Staticz
+  class ManifestCommand
+    include TTY::Option
+
+    usage do
+      program "staticz"
+      command "manifest"
+
+      description "Print out all files and how they will be built"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print this page"
+    end
+
+    def run
+      if params[:help]
+        print help
+      else
+        Staticz::Settings.development!
+
+        load "#{Dir.pwd}/manifest.rb"
+        Staticz::Modules::LibLoader.load_files
+        Staticz::Manifest.instance.create_link_functions
+
+        Staticz::Manifest.instance.print
+      end
+    end
+  end
+end

data/lib/commands/new_command.rb

@@ -0,0 +1,41 @@
+require "tty-option"
+require_relative "../template"
+
+module Staticz
+  class NewCommand
+    include TTY::Option
+
+    usage do
+      program "staticz"
+      command "staticz"
+
+      description "Create a new project"
+    end
+
+    argument :name do
+      required
+      desc "testies"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print this page"
+    end
+
+    def run
+      if params[:help]
+        print help
+        exit 1
+      end
+
+      if !params[:name]
+        puts "Name missing"
+        print help
+        exit 1
+      end
+
+      Staticz::Template.new(params[:name])
+    end
+  end
+end

data/lib/commands/server_command.rb

@@ -0,0 +1,61 @@
+require "tty-option"
+require_relative "../settings"
+require_relative "../server"
+
+module Staticz
+  class ServerCommand
+    include TTY::Option
+
+    usage do
+      program "staticz"
+      command "server"
+
+      description "Run the development server"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print this page"
+    end
+
+    option :port do
+      desc "Define the port used for the webserver"
+      short "-p"
+      long "--port port"
+
+      default 3000
+      convert :integer
+    end
+
+    option :environment do
+      desc "Set the environment"
+      short "-e"
+      long "--environment environment"
+
+      default :development
+      permit [:development, :production]
+      convert :symbol
+    end
+
+    def run
+      if params[:help]
+        print help
+        exit
+      end
+
+      if !params[:port]
+        puts "A given port must be an integer"
+        exit 1
+      end
+
+      if !params[:environment]
+        puts "Environment must either be development or production"
+        exit 1
+      end
+
+      Staticz::Settings.set_environment(params[:environment])
+      Staticz::Server.new(params[:port])
+    end
+  end
+end

data/lib/manifest/compilable/cs.rb

@@ -14,9 +14,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if exists?
           File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
 

data/lib/manifest/compilable/haml.rb

@@ -29,11 +29,16 @@ module Staticz
         errors
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if valid?
           engine = ::Haml::Engine.new(File.read(source_path))
-
           File.write build_path, engine.render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
     end

data/lib/manifest/compilable/js.rb

@@ -13,9 +13,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if exists?
           File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
 

data/lib/manifest/compilable/react.rb

@@ -14,9 +14,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if exists?
           File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
 

data/lib/manifest/compilable/sass.rb

@@ -14,9 +14,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if valid?
           File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
 

data/lib/manifest/compilable/scss.rb

@@ -14,9 +14,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if valid?
           File.write build_path, render
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
 

data/lib/manifest/compilable/simple_file.rb

@@ -26,9 +26,15 @@ module Staticz
         @name = name
       end
 
-      def build
+      def build(listener_class: nil)
+        listener = listener_class&.new(self)
+
         if exists?
           File.write build_path, File.read(source_path)
+
+          listener&.finish
+        else
+          listener&.error
         end
       end
     end

data/lib/manifest/compilable.rb

@@ -1,4 +1,5 @@
 require "io/console"
+require_relative "../utils/colors"
 
 module Staticz
   module Compilable

data/lib/manifest/css_bundle.rb

@@ -32,8 +32,12 @@ module Staticz
       end
     end
 
-    def build
+    def build(listener_class: nil)
+      listener = listener_class&.new(self)
+
       File.write "build/#{name}_bundle.css", render
+
+      listener&.finish
     end
 
     def render
@@ -67,6 +71,12 @@ module Staticz
       end
     end
 
+    def valid?
+      elements.map do |e|
+        e.valid?
+      end
+    end
+
     def print(indentation)
       puts "#{" " * (indentation * 3)}└─ CSSBundle: #{name} -> #{path_method_name}"
       elements.each do |e|
@@ -78,4 +88,4 @@ module Staticz
       "src/#{name}"
     end
   end
-end
+end

data/lib/manifest/js_bundle.rb

@@ -36,8 +36,12 @@ module Staticz
       end
     end
 
-    def build
+    def build(listener_class: nil)
+      listener = listener_class&.new(self)
+
       File.write "build/#{name}_bundle.js", render
+
+      listener&.finish
     end
 
     def render
@@ -71,6 +75,12 @@ module Staticz
       end
     end
 
+    def valid?
+      elements.map do |e|
+        e.valid?
+      end
+    end
+
     def print(indentation)
       puts "#{" " * (indentation * 3)}└─ JSBundle: #{name} -> #{path_method_name}"
       elements.each do |e|
@@ -82,4 +92,4 @@ module Staticz
       "src/#{name}"
     end
   end
-end
+end

data/lib/manifest/manifest.rb

@@ -69,13 +69,13 @@ module Staticz
       s.instance_eval(&block)
     end
 
-    def build
+    def build(listener_class: nil)
       load "#{Dir.pwd}/manifest.rb"
 
       create_link_functions
 
       elements.each do |e|
-        e.build
+        e.build(listener_class: listener_class)
       end
     end
 
@@ -85,6 +85,12 @@ module Staticz
       end
     end
 
+    def valid?
+      elements.map do |e|
+        e.valid?
+      end
+    end
+
     def self.define(&block)
       Staticz::Manifest.instance.define(block)
     end

data/lib/manifest/sub.rb

@@ -55,11 +55,11 @@ module Staticz
       s.instance_eval(&block)
     end
 
-    def build
+    def build(listener_class: nil)
       Dir.mkdir("build/#{name}") if !Dir.exist?("build/#{name}")
 
       elements.each do |e|
-        e.build
+        e.build(listener_class: listener_class)
       end
     end
 
@@ -69,6 +69,12 @@ module Staticz
       end
     end
 
+    def valid?
+      elements.map do |e|
+        e.valid?
+      end
+    end
+
     def print(indentation, *args)
       puts "#{" " * (indentation * 3)}└─ Sub: #{name}"
       elements.each do |e|

data/lib/server.rb

@@ -1,13 +1,16 @@
 require "thin"
 require "listen"
 require "io/console"
-
 require_relative "manifest/manifest"
 require_relative "modules/reload"
+require_relative "builder"
+require_relative "utils/helpers"
 
 module Staticz
   class Server
-    def initialize
+    def initialize(port)
+      @port = port
+
       Thin::Logging.silent = true
 
       app = Rack::Builder.new do
@@ -40,7 +43,7 @@ module Staticz
         end
       end
 
-      thin_server = Thin::Server.new '127.0.0.1', 3000
+      thin_server = Thin::Server.new '127.0.0.1', port
       thin_server.app = app
 
       build_manifest
@@ -95,7 +98,7 @@ module Staticz
     end
 
     def build_manifest
-      Staticz::Builder.new
+      Staticz::Builder.new.build
       Staticz::Manifest.instance.print
 
       Staticz::Modules::Reload.generate_hash

data/lib/settings.rb

@@ -1,5 +1,9 @@
 module Staticz
   class Settings
+    def self.set_environment(environment)
+      @@env = environment
+    end
+
     def self.development!
       @@env = :development
     end
@@ -15,6 +19,18 @@ module Staticz
     def self.production?
       @@env == :production
     end
+
+    def self.verbose!
+      @@verbose = true
+    end
+
+    def self.verbose?
+      if defined? @@verbose
+        @@verbose == true
+      else
+        false
+      end
+    end
   end
 end
 

data/lib/staticz.rb

@@ -1,44 +1,26 @@
-require_relative "template"
-require_relative "server"
-require_relative "builder"
-require_relative "settings"
-require_relative "utils/colors"
-require_relative "utils/helpers"
+require "tty-option"
+require_relative "commands/base_command"
+require_relative "commands/new_command"
+require_relative "commands/server_command"
+require_relative "commands/manifest_command"
+require_relative "commands/build_command"
 
 module Staticz
   def self.init
-    usage = [
-      "Usage: staticz <mode>",
-      "",
-      "  new [name]",
-      "  server",
-      "  manifest",
-      "  build"
-    ].join("\n")
-
-    case ARGV[0]
-    when 'new'
-      if ARGV[1]
-        Staticz::Template.new(ARGV[1])
-      else
-        puts usage
-      end
-    when 'server'
-      Staticz::Settings.development!
-      Staticz::Server.new
-    when 'manifest'
-      Staticz::Settings.development!
-
-      load "#{Dir.pwd}/manifest.rb"
-      Staticz::Modules::LibLoader.load_files
-      Staticz::Manifest.instance.create_link_functions
-
-      Staticz::Manifest.instance.print
-    when 'build'
-      Staticz::Settings.production!
-      Staticz::Builder.new
+    cmd, args = case ARGV[0]
+    when "new"
+      [Staticz::NewCommand.new, ARGV[1..]]
+    when "server"
+      [Staticz::ServerCommand.new, ARGV[1..]]
+    when "manifest"
+      [Staticz::ManifestCommand.new, ARGV[1..]]
+    when "build"
+      [Staticz::BuildCommand.new, ARGV[1..]]
     else
-      puts usage
+      [Staticz::BaseCommand.new, ARGV]
     end
+
+    cmd.parse args
+    cmd.run
   end
 end

data/lib/template.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module Staticz
   class Template
     def initialize(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Philipp Schlesinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Create websites with haml and sass, and compile them into static html
   and css
 email:
@@ -119,6 +147,11 @@ extra_rdoc_files: []
 files:
 - bin/staticz
 - lib/builder.rb
+- lib/commands/base_command.rb
+- lib/commands/build_command.rb
+- lib/commands/manifest_command.rb
+- lib/commands/new_command.rb
+- lib/commands/server_command.rb
 - lib/manifest/compilable.rb
 - lib/manifest/compilable/cs.rb
 - lib/manifest/compilable/haml.rb