Compare commits

...

2 Commits

6 changed files with 72 additions and 25 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
tmp/ tmp/
export/ export/
secrets/ secrets/
.rucksack
.rucksack.toc

View File

@ -40,11 +40,11 @@ shards:
git: https://github.com/kemalcr/kemal.git git: https://github.com/kemalcr/kemal.git
version: 1.5.0 version: 1.5.0
kemal-basic-auth:
git: https://github.com/kemalcr/kemal-basic-auth.git
version: 1.0.0
radix: radix:
git: https://github.com/luislavena/radix.git git: https://github.com/luislavena/radix.git
version: 0.4.1 version: 0.4.1
rucksack:
git: https://github.com/busyloop/rucksack.git
version: 2.0.0

View File

@ -28,3 +28,8 @@ dependencies:
branch: add_exposed_ports branch: add_exposed_ports
kemal: kemal:
github: kemalcr/kemal github: kemalcr/kemal
rucksack:
github: busyloop/rucksack
scripts:
postinstall: cat .rucksack >> bin/faaso

26
src/commands/new.cr Normal file
View File

@ -0,0 +1,26 @@
require "rucksack"
module Faaso
module Commands
# Creates a new empty funko out of a given runtime
struct New
@@known : Array(String) = {{`find ./runtimes -type d -mindepth 1`.split('\n').reject(&.empty?)}}
def run(options, folder)
if options["-r"].as(String) == "list"
Log.info { "Crystal has some included runtimes:\n" }
@@known.each do |runtime|
Log.info { " * #{Path[runtime].basename}" }
end
Log.info { "\nOr if you have your own, use a folder name" }
return 0
end
end
end
end
end
# Embed runtimes in the binary using rucksack
{% for name in `find ./runtimes -type f`.split('\n') %}
rucksack({{name}})
{% end %}

View File

@ -1,5 +1,6 @@
require "./commands/build.cr" require "./commands/build.cr"
require "./commands/export.cr" require "./commands/export.cr"
require "./commands/new.cr"
require "./commands/scale.cr" require "./commands/scale.cr"
require "./commands/secret.cr" require "./commands/secret.cr"
require "./commands/status.cr" require "./commands/status.cr"

View File

@ -18,17 +18,26 @@ struct LogFormat < Log::StaticFormatter
end end
def self.setup(verbosity) def self.setup(verbosity)
_verbosity = [ Colorize.on_tty_only!
Log::Severity::Fatal, if verbosity < 3
Log::Severity::Error, _verbosity = [
Log::Severity::Warn, Log::Severity::Fatal,
Log::Severity::Info, Log::Severity::Error,
Log::Severity::Debug, Log::Severity::Warn,
Log::Severity::Trace, ][[verbosity, 2].min]
][[verbosity, 5].min] Log.setup(
_verbosity,
Log::IOBackend.new(io: STDERR, formatter: LogFormat)
)
end
_verbosity = [Log::Severity::Info,
Log::Severity::Debug,
Log::Severity::Trace,
][[verbosity - 3, 3].min]
Log.setup( Log.setup(
_verbosity, _verbosity,
Log::IOBackend.new(io: STDERR, formatter: LogFormat) Log::IOBackend.new(io: STDOUT, formatter: LogFormat)
) )
end end
end end
@ -37,19 +46,21 @@ doc = <<-DOC
FaaSO CLI tool. FaaSO CLI tool.
Usage: Usage:
faaso build FOLDER ... [-v=<level>] [-l] faaso build FOLDER ... [-v <level>] [-l]
faaso scale FUNKO [SCALE] [-v=<level>] [-l] faaso export SOURCE DESTINATION [-v <level>]
faaso status FUNKO [-v=<level>] [-l] faaso new -r runtime FOLDER [-v <level>]
faaso export SOURCE DESTINATION [-v=<level>] faaso scale FUNKO [SCALE] [-v <level>] [-l]
faaso secret [-d|-a] FUNKO SECRET [-v=<level>] [-l] faaso secret (-d|-a) FUNKO SECRET [-v <level>] [-l]
faaso status FUNKO [-v <level>] [-l]
faaso version
Options: Options:
-l --local Run commands locally instead of against a FaaSO server.
-h --help Show this screen.
-d --delete Delete
-a --add Add -a --add Add
--version Show version. -d --delete Delete
-v=level Control the logging verbosity, 0 to 5 [default: 3] -h --help Show this screen
-l --local Run commands locally instead of against a FaaSO server
-r runtime Runtime for the new funko (use -r list for examples)
-v level Control the logging verbosity, 0 to 5 [default: 3]
DOC DOC
ans = Docopt.docopt(doc, ARGV) ans = Docopt.docopt(doc, ARGV)
@ -61,10 +72,12 @@ when .fetch("build", false)
Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String))) Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String)))
when .fetch("export", false) when .fetch("export", false)
Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String)) Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String))
when .fetch("new", false)
Faaso::Commands::New.new.run(ans, ans["FOLDER"].as(Array(String))[0])
when .fetch("scale", false) when .fetch("scale", false)
Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"]) Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"])
when .fetch("status", false)
Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
when .fetch("secret", false) when .fetch("secret", false)
Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String)) Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String))
when .fetch("status", false)
Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
end end