dry-stack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d5a06106fbacfedcb2f6fab9517028453f90f6fbf0f0b8c3eda23c1092d0d3
-  data.tar.gz: 3508abce4e446048dd3bba5d85ad46c76fba5a2daafb4e1ff32f1986317b57c1
+  metadata.gz: 25076e926da29d61b22b6be14379e4e9e23af5bf1146c2c5d0ef64f917023a24
+  data.tar.gz: 023ed0ce2c46e14303f1fefdba6811e2401a7c9ac08f4bb44e288cce30943dae
 SHA512:
-  metadata.gz: 1c10e24510f36e8fa58b11fc1e738e503583ca186501aa0233902d3a4e448e6a1df662f88e4e61a6c1808a4391f4500634e6d06fd77b67df15bff881039a6f6c
-  data.tar.gz: 992a925a38a5a256497999e6d01d99883efaa011d321fcd8ca7429367932221cfcca071eea749ac48c1c496fa078d8360024e01ab26f669b510ed7e42b6b0230
+  metadata.gz: 4fc1f361dbde144d87b4a3c0d90b859940f0fca6d3f84c02fd28bf9a4849fb373e1bb8f8a3bc2d0665c22106ba642481e1b8c85adc71199e719c99b95249e8f2
+  data.tar.gz: bc466a6b44eeab9f10a9596316f2b4563c63d42b8632e81f4cc90af87d1ba0117ea4d5079c8554f5c8d8ba3da44013ec1160a0a9560f9cbcf92e53960e06eea9

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,19 @@ 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
+          eval $stdin.tty? ? File.read(params[:stack]) : STDIN.read
+          COMMANDS[command.to_sym].run Stack.last_stack, params, args
         rescue => e
           puts e.message
           exit 1

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Artyom B