Merge branch 'master' into fix-postgres-naming

README.md

@@ -5,6 +5,7 @@
 [![license](https://img.shields.io/github/license/amberframework/amber.svg)](https://github.com/amberframework/amber/blob/master/LICENSE)
 [![GitHub tag](https://img.shields.io/github/tag/amberframework/amber.svg)](https://github.com/amberframework/amber/releases/latest)
 [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/veelenga/awesome-crystal/#web-frameworks)
+[![Dependency Status](https://shards.rocks/badge/github/amberframework/amber/status.svg)](https://shards.rocks/github/amberframework/amber)
 
 # Welcome to Amber
 

shard.yml

@@ -19,52 +19,56 @@ targets:
 dependencies:
   radix:
     github: luislavena/radix
-    branch: master
+    version: ~> 0.3.8
 
   kilt:
     github: jeromegn/kilt
     version: ~> 0.3.3
 
   slang:
     github: jeromegn/slang
-    branch: master
+    version: ~> 1.6.1
 
   redis:
     github: stefanwille/crystal-redis
-    version: ~> 1.8.0
+    version: ~> 1.9.0
 
   cli:
     github: mosop/cli
     version: ~> 0.5.1
 
   teeplate:
     github: mosop/teeplate
-    version: ~> 0.4.4
+    version: ~> 0.4.5
 
-  icr:
-    github: TechMagister/crystal-icr
+  sentry:
+    github: samueleaton/sentry
     branch: master
 
-  sentry:
-    github: TechMagister/sentry
-    branch: change_cli
+  icr:
+    github: crystal-community/icr
+    version: ~> 0.3.0
 
   micrate:
     github: juanedi/micrate
+    version: ~> 0.3.0
 
   shell-table:
     github: jwaldrip/shell-table.cr
     version: ~> 0.9.1
 
   spinner:
     github: askn/spinner
+    version: ~> 0.1.1
 
   pg:
     github: will/crystal-pg
+    version: ~> 0.13.4
 
   mysql:
     github: crystal-lang/crystal-mysql
+    branch: master
 
   sqlite3:
     github: crystal-lang/crystal-sqlite3
-
+    branch: master

src/amber/cli/commands.cr

@@ -18,7 +18,7 @@ end
 module Amber::CLI
   class MainCommand < ::Cli::Supercommand
     command_name "amber"
-    version "Amber CMD (amberframework.org) - v#{VERSION}"
+    version "Amber CLI (amberframework.org) - v#{VERSION}"
 
     class Help
       title "\nAmber - Command Line Interface"

src/amber/cli/commands/routes.cr

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

src/amber/cli/commands/watch.cr

@@ -1,5 +1,5 @@
 require "cli"
-require "sentry/sentry_command"
+require "../sentry_command_helper"
 
 module Amber::CLI
   class MainCommand < ::Cli::Supercommand

src/amber/cli/sentry_command_helper.cr

@@ -0,0 +1,103 @@
+require "yaml"
+require "cli"
+
+require "sentry"
+
+module Sentry
+
+  class SentryCommand < Cli::Command
+
+    command_name "sentry"
+
+    SHARD_YML = "shard.yml"
+    DEFAULT_NAME = "[process_name]"
+
+    class Options
+
+      def self.defaults
+        name = Options.get_name
+        {
+          name: name,
+          process_name: "./#{name}",
+          build: "crystal build ./src/#{name}.cr",
+          watch: ["./src/**/*.cr", "./src/**/*.ecr"]
+        }
+      end
+
+      def self.get_name
+        if File.exists?(SHARD_YML) &&
+           (yaml = YAML.parse(File.read SHARD_YML)) &&
+           (name = yaml["name"]?)
+          name.as_s
+        else
+          DEFAULT_NAME
+        end
+      end
+
+      string %w(-n --name), desc: "Sets the name of the app process",
+      default: Options.defaults[:name]
+
+      string %w(-b --build), desc: "Overrides the default build command",
+      default: Options.defaults[:build]
+
+      string "--build-args", desc: "Specifies arguments for the build command"
+
+      bool "--no-build", desc: "Skips the build step", default: false
+
+      string %w(-r --run), desc: "Overrides the default run command",
+      default: Options.defaults[:process_name]
+
+      string "--run-args", desc: "Specifies arguments for the run command"
+
+      array %w(-w --watch),
+      desc: "Overrides default files and appends to list of watched files",
+      default: Options.defaults[:watch]
+
+      bool %w(-i --info),
+      desc: "Shows the values for build/run commands, build/run args, and watched files",
+      default: false
+
+      help
+
+    end
+
+    def run
+
+      if options.info?
+        puts "
+      name:       #{options.name?}
+      build:      #{options.build?}
+      build args: #{options.build_args?}
+      run:        #{options.run?}
+      run args:   #{options.run_args?}
+      files:      #{options.watch}
+    "
+        exit! code: 0
+      end
+
+      build_args = if ba = options.build_args?
+                     ba.split " "
+                   else
+                     [] of String
+                   end
+      run_args = if ra = options.run_args?
+                   ra.split " "
+                 else
+                   [] of String
+                 end
+
+      process_runner = Sentry::ProcessRunner.new(
+        process_name: options.name,
+        build_command: options.build,
+        run_command: options.run,
+        build_args: build_args,
+        run_args: run_args,
+        should_build: !options.no_build?,
+        files: options.watch
+      )
+
+      process_runner.run
+
+    end
+  end
+end