phlexite-cli 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef2e0e8f9b0a78d5084843ae4880dfbdca540848baa74c1db688d5e42249c71
-  data.tar.gz: 0fabe535b18e62a44d296c3daf86538eacd08027d05817ed6cda426747e9a453
+  metadata.gz: 5b99dc0fc598467cf53962828a0109b18accd8a1fabc7e273691a1a67fe439e9
+  data.tar.gz: 8d380f4330ee4374fe9313ef4596f75332eaf1cc2c33f97a2be7374af293242d
 SHA512:
-  metadata.gz: cf7447df9adf8193d97d5bb80bd1bdd4d0847b7e9e9061d3dbf94a3a72d128a518b823a9750b08b12b297319b31b349562ae0a3c45168fd6dfa49f12dadcbebf
-  data.tar.gz: 4901c6588c9d1b4e7dabe81bdcdafd3cc09a8f30f51387b88adc9c3bd0f174c7bc7b8addfc548667dbfe223ad50ec4734f93423ce746c08c90f1a4368780cf72
+  metadata.gz: e0d1a158a0d33ce9d31383474968ddac640971059a57a3ddd0eebf396636314dc9d290866f876860440ed5a29d31c485a47d1c77ff1ea3a6b7e6e00e53d72be8
+  data.tar.gz: f4d1f3848a0177b50c0d3b1bc7bb37779158a2382347d4cffa58ed69719c8ac19b754553b860fef8b016d00fe1272e9edbdf0ba478148777683568f920f39d74

data/.build.yml

@@ -3,6 +3,7 @@ image: alpine/edge
 packages:
   - ruby
   - ruby-dev
+  - musl-dev
   - yaml-dev
   - ruby-bundler
 

data/lib/phlexite/cli/cli.rb

@@ -1,26 +1,36 @@
 # frozen_string_literal: true
 
 require "thor"
-require "filewatcher"
+require "listen"
+require "whirly"
+require "paint"
 require_relative "version"
 require_relative "server"
+require_relative "glob"
+
+Whirly.configure spinner: "dots"
 
 module Phlexite
   module Cli
     class Cli < Thor
       class Error < StandardError; end
 
+      def spin
+        Whirly.start status: "Building", stop: Paint["✓", :green] do
+          yield
+        end
+      end
+
       desc "build", "Build your site"
       option :script
       def build
-        puts "\e[1m==> starting build\e[0m"
-        file = options[:script] || "./build.rb"
-        cmd = "#{RbConfig.ruby} #{file}"
-        cmd = "bundle exec #{cmd}" if File.file? "Gemfile"
-
-        system(cmd)
+        spin do
+          file = options[:script] || "./build.rb"
+          cmd = "#{RbConfig.ruby} #{file}"
+          cmd = "bundle exec #{cmd}" if File.file? "Gemfile"
 
-        puts "\e[1m==> build finished\e[0m"
+          system(cmd)
+        end
       end
 
       desc "dev", "Run a development server to watch your files"
@@ -33,17 +43,19 @@ module Phlexite
         build
 
         port = options[:port] || 3000
-        puts "\e[1m=> Starting server on port #{port}\e[0m"
-        Server.start port, build_dir
-
-        puts "\e[1m=> Starting watcher (excluding #{build_dir} and gitignored files)\e[0m"
-        Filewatcher
-          .new("**/*.*", exclude:
-            [File.join(build_dir, "**", "*.*")] +
-            (File.read(".gitignore") || "").split("\n"))
-          .watch do
-            build
-          end
+        puts "\e[1m>  Starting server on port #{port}\e[0m"
+        server = Server.start port, build_dir
+
+        puts "\e[1m>  Starting watcher (excluding #{build_dir} and gitignored files)\e[0m"
+
+        excluded_paths = ([File.join(build_dir, "**", "*.*")] +
+                         (File.read(".gitignore") || "").split("\n"))
+          .map { |p| Glob.new(p).to_regexp }
+        listener = Listen.to(".", ignore: excluded_paths) do |modified, added, removed|
+          build
+        end
+        listener.start
+        server.join
       end
     end
   end

data/lib/phlexite/cli/glob.rb

@@ -0,0 +1,85 @@
+# https://github.com/alexch/rerun/blob/master/lib/rerun/glob.rb
+
+module Phlexite
+  module Cli
+    class Glob
+      NO_LEADING_DOT = '(?=[^\.])'   # todo
+      START_OF_FILENAME = '(\A|\/)'  # beginning of string or a slash
+      END_OF_STRING = '\z'
+
+      def initialize glob_string
+        @glob_string = glob_string
+      end
+
+      def to_regexp_string
+        chars = @glob_string.chars
+
+        chars = smoosh(chars)
+
+        curlies = 0
+        escaping = false
+        string = chars.map do |char|
+          if escaping
+            escaping = false
+            char
+          else
+            case char
+            when "**"
+              "([^/]+/)*"
+            when "*"
+              ".*"
+            when "?"
+              "."
+            when "."
+              "\\."
+
+            when "{"
+              curlies += 1
+              "("
+            when "}"
+              if curlies > 0
+                curlies -= 1
+                ")"
+              else
+                char
+              end
+            when ","
+              if curlies > 0
+                "|"
+              else
+                char
+              end
+            when "\\"
+              escaping = true
+              "\\"
+
+            else
+              char
+
+            end
+          end
+        end.join
+        START_OF_FILENAME + string + END_OF_STRING
+      end
+
+      def to_regexp
+        Regexp.new(to_regexp_string)
+      end
+
+      def smoosh chars
+        out = []
+        until chars.empty?
+          char = chars.shift
+          if char == "*" && chars.first == "*"
+            chars.shift
+            chars.shift if chars.first == "/"
+            out.push("**")
+          else
+            out.push(char)
+          end
+        end
+        out
+      end
+    end
+  end
+end

data/lib/phlexite/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexite
   module Cli
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexite-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Aleks Rutins
@@ -24,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: filewatcher
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: whirly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - keeper@farthergate.com
 executables:
@@ -66,6 +94,7 @@ files:
 - exe/phlexite
 - lib/phlexite/cli.rb
 - lib/phlexite/cli/cli.rb
+- lib/phlexite/cli/glob.rb
 - lib/phlexite/cli/server.rb
 - lib/phlexite/cli/version.rb
 - sig/phlexite/cli.rbs
@@ -91,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A CLI for Phlexite
 test_files: []