dry-stack 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d5a06106fbacfedcb2f6fab9517028453f90f6fbf0f0b8c3eda23c1092d0d3
-  data.tar.gz: 3508abce4e446048dd3bba5d85ad46c76fba5a2daafb4e1ff32f1986317b57c1
+  metadata.gz: 4b5476c2fbc526efb9f2626a6324ef08de62db257f415dad79117cd6ba9e2112
+  data.tar.gz: cbcd327643b6447815f1ca6c0119b0b4bedc2c07f382d7541be5f40372fed291
 SHA512:
-  metadata.gz: 1c10e24510f36e8fa58b11fc1e738e503583ca186501aa0233902d3a4e448e6a1df662f88e4e61a6c1808a4391f4500634e6d06fd77b67df15bff881039a6f6c
-  data.tar.gz: 992a925a38a5a256497999e6d01d99883efaa011d321fcd8ca7429367932221cfcca071eea749ac48c1c496fa078d8360024e01ab26f669b510ed7e42b6b0230
+  metadata.gz: 8b0cb4055dfc95cbd774ddacf53a4d7d3a3d8225e92c1aa97d7b317279db51f085ce700872c6bc34ab4b857c1102b4f3090460213ccbeb6fe85768d27b687fa0
+  data.tar.gz: cb635df42bf89ad2e08b33d2704348ac0091c087b36ec458d3f5aa0ceb5eda462339ee8b68fc7a17fde4464b1360b5f7ef94f1076d0531d041ff27e8557fd1e0

data/bin/stack.drs

@@ -1,19 +1,16 @@
-Stack :simple_stack do
+HttpFront services: {admin: 'admin.*', operator: 'operator.*', reports: 'reports.*',
+                     navigator: 'navigator.*', backend: 'admin.*, operator.*, navigator.*'}
 
-  HttpFront services: {admin: 'admin.*', operator: 'operator.*', reports: 'reports.*',
-                       navigator: 'navigator.*', backend: 'admin.*, operator.*, navigator.*'}
+PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
 
-  PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
+Service :admin,     image: 'frontend', env: {APP: 'admin'},     ports: 5000
+Service :operator,  image: 'frontend', env: {APP: 'operator'},  ports: 5000
+Service :navigator, image: 'frontend', env: {APP: 'navigator'}, ports: 5000
 
-  Service :admin,     image: 'frontend', env: {APP: 'admin'},     ports: 5000
-  Service :operator,  image: 'frontend', env: {APP: 'operator'},  ports: 5000
-  Service :navigator, image: 'frontend', env: {APP: 'navigator'}, ports: 5000
-
-  Service :backend,   image: 'backend', ports: 3000 do
-    env APP_PORT: 3000, NODE_ENV: 'development', SKIP_GZ: true, DB_URL: '$DB_URL'
-  end
+Service :backend,   image: 'backend', ports: 3000 do
+  env APP_PORT: 3000, NODE_ENV: 'development', SKIP_GZ: true, DB_URL: '$DB_URL'
+end
 
-  Service :reports, image: 'reports:0.1', env: {DB_URL: '$DB_URL'}, ports: 7000
+Service :reports, image: 'reports:0.1', env: {DB_URL: '$DB_URL'}, ports: 7000
 
-  Network :default, attachable: true
-end
+Network :default, attachable: true

data/bin/stack1.drs

@@ -0,0 +1 @@
+Service :reports, image: 'reports', ports: 7000, env: {DB_URL: '$DB_URL'}

data/lib/dry-stack/command_compose.rb

@@ -1,8 +1,11 @@
 require_relative 'command_line'
 
-Dry::CommandLine::COMMANDS[:compose] = Class.new do
-  def run(stack, args)
-    $stdout.puts stack.to_compose
+Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
+  def run(stack, params, args)
+    yaml = stack.to_compose.lines[1..].join
+
+    # substitute ENV variables
+    params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml}\"")
   end
 
   def help = 'Print stack in docker compose format'

data/lib/dry-stack/command_line.rb

@@ -1,15 +1,27 @@
+require_relative '../version'
 
 module Dry
   module CommandLine
     COMMANDS = {}
 
     class << self
+      def load_env
+        File.read('.env').lines.map(&:strip).grep_v(/^\s*#/).reject(&:empty?)
+          .map {_1.split('=').map(&:strip).tap { |k,v|
+            ENV[k] = v
+          }}.to_h
+       rescue =>e
+         puts "Load env error: #{e.message}"
+         raise 'Invalid .env file'
+      end
+
       def run(args)
-        stack_file = false
-        stack_file = STDIN.read unless $stdin.tty?
+        params = {}
 
         ARGV << '-h' if ARGV.empty?
         OptionParser.new do |o|
+          o.version = "v#{Dry::Stack::VERSION}"
+
           usage = [
             'dry-stack -s stackfile [options] COMMAND',
             'cat stackfile | dry-stack COMMAND',
@@ -24,17 +36,20 @@ module Dry
           o.separator 'Options:'
 
           #  in all caps are required
-          o.on('-s', '--stack STACK_NAME', 'Stack file') { |v| stack_file = v }
+          o.on('-s', '--stack STACK_NAME', 'Stack file')
+          o.on('-e', '--env', 'Load .env file') { load_env }
+          o.on('-n', '--no-env', 'Do not process env variables') { true }
           o.on('-h', '--help') { puts o; exit }
-          o.parse! args
+          o.parse! args, into: params
 
-          raise 'Stack file not defined' unless stack_file
+          raise 'Stack file not defined' if $stdin.tty? && !params[:stack]
 
-          command = args.shift
+          command = args.shift || ''
           raise "Unknown command: #{command}" unless COMMANDS.key?(command.to_sym)
 
-          eval $stdin.tty? ? File.read(stack_file) : stack_file
-          COMMANDS[command.to_sym].run Stack.last_stack, args
+          stack_text = $stdin.tty? ? File.read(params[:stack]) : STDIN.read
+          Dry::Stack() { eval stack_text }
+          COMMANDS[command.to_sym].run Stack.last_stack, params, args
         rescue => e
           puts e.message
           exit 1

data/lib/dry-stack/stack.rb

@@ -4,7 +4,7 @@ require 'optparse'
 
 module Dry
 
-  def Stack(name, &)
+  def Stack(name = nil, &)
     Stack.last_stack = Stack.new name
     Stack.last_stack.instance_exec(&) if block_given?
   end
@@ -12,6 +12,8 @@ module Dry
   class ServiceFunction
     def initialize(service, &); @service = service; instance_exec(&) end
     def env(variables)= @service[:environment].merge! variables
+    def image(name)= @service[:image] = name
+    def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
   end
 
   class Stack
@@ -19,6 +21,11 @@ module Dry
       attr_accessor :last_stack
     end
 
+    def Stack(name = nil, &)
+      Stack.last_stack = Stack.new name
+      Stack.last_stack.instance_exec(&) if block_given?
+    end
+
     def initialize(name)
       @name = name
       @services = {}

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
-  module Stack
-    VERSION = '0.0.2'
+  class Stack
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - bin/dry-stack
 - bin/stack.drs
+- bin/stack1.drs
 - lib/dry-stack.rb
 - lib/dry-stack/command_compose.rb
 - lib/dry-stack/command_line.rb