New amber watch config

src/amber/cli/commands/database.cr

@@ -55,7 +55,7 @@ module Amber::CLI
           when "create"
             Micrate.logger.info create_database
           when "seed"
-            Helpers.run("crystal db/seeds.cr", wait: true, shell: true)
+            Helpers.run("crystal db/seeds.cr", shell: true).wait
             Micrate.logger.info "Seeded database"
           when "migrate"
             begin

src/amber/cli/commands/pipelines.cr

@@ -1,6 +1,5 @@
 require "cli"
 require "shell-table"
-require "../helpers/sentry"
 
 module Amber::CLI
   class MainCommand < ::Cli::Supercommand

src/amber/cli/commands/routes.cr

@@ -1,6 +1,5 @@
 require "cli"
 require "shell-table"
-require "../helpers/sentry"
 
 module Amber::CLI
   class MainCommand < ::Cli::Supercommand

src/amber/cli/commands/watch.cr

@@ -1,28 +1,27 @@
 require "cli"
-require "../helpers/sentry"
+require "../helpers/process_runner"
 
 module Amber::CLI
   class MainCommand < ::Cli::Supercommand
     command "w", aliased: "watch"
 
-    class Watch < Sentry::SentryCommand
-      command_name "watch"
-
+    class Watch < ::Cli::Command
       class Options
         bool "--no-color", desc: "# Disable colored output", default: false
         help
       end
 
       class Help
-        header "Starts amber development server and rebuilds on file changes"
-        caption "# Starts amber development server and rebuilds on file changes"
+        header <<-HEADER
+        Starts amber development server and rebuilds on file changes.
+        See `.amber.yml` for more settings.
+        HEADER
       end
 
       def run
         CLI.toggle_colors(options.no_color?)
-        options.watch << "./config/**/*.cr"
-        options.watch << "./src/views/**/*.slang"
-        super
+        process_runner = Helpers::ProcessRunner.new
+        process_runner.run
       end
     end
   end

src/amber/cli/config.cr

@@ -1,18 +1,26 @@
+require "yaml"
+
 module Amber::CLI
   def self.config
     if File.exists? AMBER_YML
       Config.from_yaml File.read(AMBER_YML)
     else
       Config.new
     end
+  rescue ex : YAML::ParseException
+    logger.error "Couldn't parse #{AMBER_YML} file", "Watcher", :red
+    exit 1
   end
 
   class Config
-    property database : String = "pg"
-    property language : String = "slang"
-    property model : String = "granite"
-    property recipe : (String | Nil) = nil
-    property recipe_source : (String | Nil) = nil
+    alias Watch = Hash(String, Hash(String, Array(String)))
+
+    getter database : String = "pg"
+    getter language : String = "slang"
+    getter model : String = "granite"
+    getter recipe : String?
+    getter recipe_source : String?
+    getter watch : Watch?
 
     def initialize
     end
@@ -21,8 +29,9 @@ module Amber::CLI
       database: {type: String, default: "pg"},
       language: {type: String, default: "slang"},
       model: {type: String, default: "granite"},
-      recipe: String | Nil,
-      recipe_source: String | Nil
+      recipe: String?,
+      recipe_source: String?,
+      watch: Watch?
     )
   end
 end

src/amber/cli/helpers/file_watcher.cr

@@ -0,0 +1,19 @@
+module Amber
+    class FileWatcher
+      @file_timestamps = {} of String => String
+
+      private def get_timestamp(file : String)
+        File.info(file).modification_time.to_s("%Y%m%d%H%M%S")
+      end
+
+      def scan_files(files)
+        Dir.glob(files) do |file|
+          timestamp = get_timestamp(file)
+          if @file_timestamps[file]? != timestamp
+            @file_timestamps[file] = timestamp
+            yield file
+          end
+        end
+      end
+    end
+  end

src/amber/cli/helpers/helpers.cr

@@ -33,11 +33,7 @@ module Amber::CLI::Helpers
     File.write("./config/application.cr", application.gsub("require \"amber\"", replacement))
   end
 
-  def self.run(command, wait = true, shell = true)
-    if wait
-      Process.run(command, shell: shell, output: Process::Redirect::Inherit, error: Process::Redirect::Inherit)
-    else
-      Process.new(command, shell: shell, output: Process::Redirect::Inherit, error: Process::Redirect::Inherit)
-    end
+  def self.run(command, shell = true, input = Process::Redirect::Inherit, output = Process::Redirect::Inherit, error = Process::Redirect::Inherit)
+    Process.new(command, shell: shell, input: input, output: output, error: error)
   end
 end