aggkit 0.2.9.8725 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0aca73460b75c612192138b7fc158d09f100285
-  data.tar.gz: 71d6c9237c9b0a37f34475c14bcfa3668df72be9
+SHA256:
+  metadata.gz: 1cb8844a3333ce60ca5918aaf4d13ac75dcbf22dc82387de89417435632f7f76
+  data.tar.gz: d7f1f771d64acd6d1bf34dd28374d023a2430c6769d92f84c74d1b0163458b62
 SHA512:
-  metadata.gz: 29fb6e8d0aa9a82707150ace023c69d915b9b1e6d7f23b5b7ee72fdd1bd086b8817bd5de13ce94f48d9f0e243437bdc5347149c72acd2c22ff289ee72747fc37
-  data.tar.gz: 524cf71c2d723310082bc9792d4a1f5d9a01fc3e0f7fd9b26cb56daa7abe14237d3299872c8cf91861002041c61967986966840cae4675851967ae3de3b5e73e
+  metadata.gz: b7115a18b786af71eac551e93ebeae47fa474c3e7650979cb3d6cbf377c310bfd7101354f7f2fed1088372cf13eeba23a716df4b9fb2750173e6fe9424e68c0a
+  data.tar.gz: f281d3f5ec9594197680290536b2aec4cc149b0d3b02cba3dcb2a550749655922c08935a643ca79f07f4bf0cf6c2ca647af352816df4986d0027e59af68b5aa2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.2.9.8725)
+    aggkit (0.3.0)
       diplomat
       dotenv
       json

data/bin/aggstart

@@ -1,42 +1,40 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
 require 'aggkit'
 
 UTIL = File.basename(__FILE__)
 
 @opts = {
   service: ENV['AGGREDATOR_SERVICE'],
-  consul: ENV['CONSUL_HOST'],
+  consul: ENV['CONSUL_HOST'] || 'localhost',
+  consulconf: [],
   depends: [],
-  consulconf: []
 }
 
-
-parser = OptionParser.new do |o|
+parser = Aggkit::OptionParser.new do |o|
   o.banner = "Usage: #{UTIL} [options]"
 
-  o.on("--service=#{@opts[:service]}", 'set service name') do |service|
+  o.on("--service <NAME>", 'Set service NAME. AGGREDATOR_SERVICE env can be used instead') do |service|
     @opts[:service] = service.to_s
   end
 
-  o.on("--consul=#{@opts[:consul]}", 'set consul host') do |consul|
-    if consul.to_s == 'none'
-      @opts[:consul] = nil
-    else
-      @opts[:consul] = consul.to_s
-    end
+  o.on("--consul=#{@opts[:consul]}", 'Set consul host. CONSUL_HOST env can be used instead') do |consul|
+    @opts[:consul] = consul.to_s
   end
 
-  o.on("--consulconf=list", 'set list of folders with consul configs') do |list|
-    @opts[:consulconf] = list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
+  o.on("--consulconf=consul,consul/smev3...", 'Set list of folders with consul configs. Special: none - disable local consul') do |list|
+    @opts[:consulconf] = if list.to_s == 'none'
+      nil
+    else
+      list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
+    end
   end
 
-  o.on("--depends=list", 'set list of services to wait for ready') do |list|
+  o.on("--depends=mq,db,router...", 'Set list of services to wait for ready before start') do |list|
     @opts[:depends] = list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
   end
 
-  o.on("--exec=file", 'set file to execute') do |file|
+  o.on("--exec <FILE>", 'Set FILE to execute.') do |file|
     @opts[:exec] = file.to_s
   end
 
@@ -44,41 +42,47 @@ parser = OptionParser.new do |o|
 end
 parser.parse!
 
+
 include Aggkit::Runner
 
-init_service @opts[:service]
+if @opts[:service].to_s.empty?
+  die "service name must be provided"
+end
+
+if @opts[:exec].to_s.empty?
+  die "exec script must be provided"
+end
+
+@opts[:node_name] = "#{@opts[:service]}_#{`hostname`.strip}".strip
+
+ENV['AGGREDATOR_SERVICE'] = @opts[:service]
+ENV['CONSUL_HOST'] = @opts[:consul]
+ENV['NODE_NAME'] = @opts[:node_name]
 
-$AGGREDATOR_SERVICE = ensure_env_defined!('AGGREDATOR_SERVICE')
-$CONSUL_HOST = @opts[:consul]
-$NODE_NAME = ENV['NODE_NAME'] ||= "#{$AGGREDATOR_SERVICE}_#{`hostname`.strip}".strip
+init_service @opts[:service], @opts
 
 envsubst '/home/app/consul'
 
 Aggkit::Watcher.new.exec do |watcher|
 
-  if @opts[:consul]
-    #watcher.add %W{consul agent -config-dir consul -config-dir consul/smev3 -node #{$NODE_NAME}}
+  if @opts[:consulconf]
     configs = @opts[:consulconf].map do |folder|
       "-config-dir #{folder}"
     end.join(' ').strip
 
-    watcher.add "consul agent #{configs} -node #{$NODE_NAME}".split
+    watcher.add "consul agent #{configs} -node #{@opts[:node_name]}".split
   end
 
-  execute!("aggwait -t 20 --consul-addr=http://#{$CONSUL_HOST}:8500 --consul", "Timeout for consul service")  
+  execute!("aggwait -t 20 --consul-addr=http://#{@opts[:consul]}:8500 --consul", "Timeout for consul service")  
 
-  load_envs_from_consul($CONSUL_HOST, $AGGREDATOR_SERVICE)
+  load_envs_from_consul(@opts[:consul], @opts[:service])
 
   @opts[:depends].each do |service|
-    execute!("aggwait -t 60 --consul-addr=http://$CONSUL_HOST:8500 --consul-service #{service}", "Timeout for #{service} service")
+    execute!("aggwait -t 60 --consul-addr=http://#{@opts[:consul]}:8500 --consul-service #{service}", "Timeout for #{service} service")
   end
 
   sleep 2
 
- 
-  # execute("rake db:create")
-  # execute!("rake db:migrate", "migrate failed")
-  # execute!("rake db:seed", "seed failed")
   watcher.add %W{#{@opts[:exec]}}
 end
 

data/lib/aggkit/option_parser.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'English'
+
+# Add the ability to specify switches as required to OptionParser
+class OptionParser
+
+  # An array of messages describing any missing required switches
+  attr_reader :missing_switches
+
+  # Convenience method to test if we're missing any required switches
+  def missing_switches?
+    !@missing_switches.nil?
+  end
+
+  # Alias the OptionParser::make_switch function
+  # (instead of directly modifying it like I did in 0.1.0)
+  alias :pickled_make_switch :make_switch
+
+  # Wrapper for OptionParser::make_switch to allow for required switches
+  def make_switch(opts, block = nil)
+
+    # Test if a switch is required
+    required = opts.delete(:required)
+
+    return_values = pickled_make_switch(opts, block)
+
+    # Make sure required switches are given
+    if required
+      short = return_values[1][0].nil? ? nil : "-#{return_values[1][0]}"
+      long = return_values[2][0].nil? ? nil : "--#{return_values[2][0]}"
+
+      if !(default_argv.include?(short) || default_argv.include?(long))
+        @missing_switches ||= [] # Should be placed in initialize if incorporated into Ruby proper
+
+        # Not much prettier, but a bit more readable than the previous iteration
+        message = "Missing switch: "
+        message << short unless short.nil?
+        message << " or " unless (short.nil? || long.nil?)
+        message << long unless long.nil?
+        @missing_switches << message
+      end
+    end
+
+    return return_values
+  end
+end
+
+module Aggkit
+  OptionParser = ::OptionParser
+end

data/lib/aggkit/runner.rb

@@ -6,11 +6,14 @@ module Aggkit
 
   module Runner
 
-    def init_service(service)
+    def init_service(service, options = nil)
       STDOUT.sync = true
       STDERR.sync = true
 
       puts "Starting #{service}..."
+      if options
+        puts "Options: #{options.inspect}"
+      end
 
       trap('EXIT') do
         puts "Stopping #{service}..."

data/lib/aggkit/version.rb

@@ -1,5 +1,5 @@
 module Aggkit
 
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.3.0'.freeze
 
 end

data/lib/aggkit.rb

@@ -3,8 +3,8 @@ require 'English'
 require 'optparse'
 require 'dotenv'
 
-
 require 'aggkit/version'
+require 'aggkit/option_parser'
 require 'aggkit/watcher'
 require 'aggkit/runner'
 require 'aggkit/env'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.2.9.8725
+  version: 0.3.0
 platform: ruby
 authors:
 - Godko Ivan
@@ -165,6 +165,7 @@ files:
 - lib/aggkit/childprocess/windows/structs.rb
 - lib/aggkit/ci.rb
 - lib/aggkit/env.rb
+- lib/aggkit/option_parser.rb
 - lib/aggkit/runner.rb
 - lib/aggkit/version.rb
 - lib/aggkit/watcher.rb
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul in Aggredator