flow-lite 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bec58eb7b17f61cd186fa21cf7b57bf3b93a8ee0
-  data.tar.gz: b2c6da0f1440e70133c79b4ab2bdac478c08e8a0
+  metadata.gz: 48d2755dfa5c6d365387d7a788804dd458d0fedf
+  data.tar.gz: '04586b4969ec5b3aa278ba933904c62ea753f765'
 SHA512:
-  metadata.gz: 6eb5a662ed0393f8a77df8077a7df4c9da69038529fa53ef235d299298e33724aaf764cb4fd3fcbcf9cf53606f5bd22143a1f98d89758ff7905a22b9dd9559ea
-  data.tar.gz: d68c1d0439b921ca86a36e850ecb6837b1e3e5dfbfb1cd411c30466d69d30de6909d8315895b69f8d0db9a4fc1d34578bce789d8d1f36a00137384f697116a2b
+  metadata.gz: 10c26e5b61781002e063f4695d676d8847e666950b25c6fe451a1d4e396b14c5b85f5892ecd2cbcc1ac35840f3823462edcb95e0ff221acf06021e30a0503db1
+  data.tar.gz: b7fdb1a505e1b9eb92dd219e8e86af7813b17874562f1f45ab0b9f18be8f4f3cf1c44a8d2571c56cb8b17912960ff58b82de1f1af379b92c3cb62a1452c456ce

data/Manifest.txt

@@ -4,4 +4,6 @@ README.md
 Rakefile
 bin/flow
 lib/flow-lite.rb
+lib/flow-lite/base.rb
+lib/flow-lite/tool.rb
 lib/flow-lite/version.rb

data/lib/flow-lite.rb

@@ -20,6 +20,9 @@ require 'optparse'
 #####################
 # our own code
 require 'flow-lite/version'   # note: let version always go first
+require 'flow-lite/base'
+require 'flow-lite/tool'
+
 
 
 
@@ -42,72 +45,6 @@ class Step
 end # class Step
 
 
-
-class Base    ## base class for flow class (auto)-constructed/build from flowfile
-  def self.define_step( name_or_names, &block )
-    names =  if name_or_names.is_a?( Array )
-               name_or_names
-             else
-               [name_or_names]   ## assume single symbol (name); wrap in array
-             end
-    names = names.map {|name| name.to_sym }   ## make sure we always use symbols
-
-
-    name = names[0]
-    puts "[flow]    adding step  >#{name}<..."
-    define_method( :"step_#{name}", &block )
-
-    alt_names = names[1..-1]
-    alt_names.each do |alt_name|
-      puts "[flow]      adding alias >#{alt_name}< for >#{name}<..."
-      alias_method( :"step_#{alt_name}", :"step_#{name}" )
-    end
-  end  # method self.define_step
-
-
-
-  ## run step by symbol/name (e.g. step :hello - etc.)
-  def step( name )
-    step_name = :"step_#{name}"  ## note: make sure we always use symbols
-    if respond_to?( step_name )
-      #######
-      ## check: track (and report) call stack - why? why not?
-      ## e.g.
-      ##   [flow >(1) first_step)] step >first_step< - starting...
-      ##   [flow >(2) ..first_step > second_step)] step >second_step< - starting...
-      ##   [flow >(3) ....first_step > second_step > third_step)] step >third_step< - starting...
-      @stack ||= []   ## use a call stack of step names
-      @stack.push( name )
-
-      puts "[flow >(#{@stack.size}) #{'..'*(@stack.size-1)}#{@stack.join(' > ')})] step >#{name}< - starting..."
-      start_time = Time.now   ## todo: use Timer? t = Timer.start / stop / diff etc. - why? why not?
-
-      __send__( step_name )
-
-      end_time = Time.now
-      diff_time = end_time - start_time
-      puts "[flow <(#{@stack.size}) #{'..'*(@stack.size-1)}#{@stack.join(' < ')})] step >#{name}< - done in #{diff_time} sec(s)"
-      @stack.pop
-    else
-      puts "!! ERROR: step definition >#{name}< not found; cannot run/execute - known (defined) steps include:"
-      pp self.class.step_methods  #=> e.g. [:hello, ...]
-      exit 1
-    end
-  end  # method step
-
-
-  def self.step_methods
-    names = instance_methods.reduce([]) do |names, name|
-                                          names << $1.to_sym  if name =~ /^step_(.+)/
-                                          names
-                                        end
-    names
-  end
-end  # class Base
-
-
-
-
 class Flowfile
 
   ## find flowfile path by convention
@@ -176,69 +113,6 @@ class Flowfile
     flow_class.new.step( name )
   end
 end # class Flowfile
-
-
-
-
-class Tool
-  def self.main( args=ARGV )
-    options = {}
-    OptionParser.new do |parser|
-      parser.on( '-f FILENAME', '--flowfile FILENAME' ) do |filename|
-        options[:flowfile] = filename
-      end
-
-      ## note:
-      ##  you can add many/multiple modules
-      ##  e.g. -r gitti -r mono etc.
-      parser.on( '-r NAME', '--require NAME') do |name|
-        options[:requires] ||= []
-        options[:requires] << name
-      end
-    end.parse!( args )
-
-
-    ## check for any (dynamic/auto) requires
-    if options[:requires]
-      names = options[:requires]
-      names.each do |name|
-        ## todo/check: add some error/exception handling here - why? why not?
-        puts "[flow] auto-require >#{name}<..."
-        require( name )
-      end
-    else  ## use/try defaults
-      config_path = "./config.rb"
-      if File.exist?( config_path )
-        puts "[flow] auto-require (default) >#{config_path}<..."
-        require( config_path )
-      end
-    end
-
-
-    path = nil
-    if options[:flowfile]
-      path = options[:flowfile]
-    else
-      path = Flowfile.find_file
-
-      if path.nil?
-        STDERR.puts "!! ERROR - no flowfile found, sorry - looking for: #{Flowfile::NAMES.join(', ')} in (#{Dir.pwd})"
-        exit 1
-      end
-    end
-
-    puts "[flow] loading >#{path}<..."
-    flowfile = Flowfile.load_file( path )
-
-
-    ## allow multipe steps getting called - why? why not?
-    ##   flow setup clone update   etc??
-    args.each do |arg|
-      flowfile.run( arg )
-    end
-  end # method self.main
-end # class Tool
-
 end # module Flow
 
 

data/lib/flow-lite/base.rb

@@ -0,0 +1,89 @@
+
+module Flow
+
+class Base    ## base class for flow class (auto)-constructed/build from flowfile
+  def self.define_step( name_or_names, &block )
+    names =  if name_or_names.is_a?( Array )
+               name_or_names
+             else
+               [name_or_names]   ## assume single symbol (name); wrap in array
+             end
+    names = names.map {|name| name.to_sym }   ## make sure we always use symbols
+
+
+    name = names[0]
+    puts "[flow]    adding step  >#{name}<..."
+    define_method( :"step_#{name}", &block )
+
+    alt_names = names[1..-1]
+    alt_names.each do |alt_name|
+      puts "[flow]      adding alias >#{alt_name}< for >#{name}<..."
+      alias_method( :"step_#{alt_name}", :"step_#{name}" )
+    end
+  end  # method self.define_step
+
+
+
+
+  TRUE_VALUES = [
+    'true', 't',
+    'yes', 'y',
+    'on',
+    '1',
+  ]
+
+  ### include / check for ruby debug flag too - why? why not?
+  def debug?
+    value = ENV['DEBUG']
+    if value && TRUE_VALUES.include?( value.downcase )
+      true
+    else
+      false
+    end
+  end
+
+
+
+  ## run step by symbol/name (e.g. step :hello - etc.)
+  ##
+  ##  todo/check:  allow (re)entrant calls to step (step calling step etc.) - why? why not?
+  def step( name )
+    step_name = :"step_#{name}"  ## note: make sure we always use symbols
+    if respond_to?( step_name )
+      #######
+      ## check: track (and report) call stack - why? why not?
+      ## e.g.
+      ##   [flow >(1) first_step)] step >first_step< - starting...
+      ##   [flow >(2) ..first_step > second_step)] step >second_step< - starting...
+      ##   [flow >(3) ....first_step > second_step > third_step)] step >third_step< - starting...
+      @stack ||= []   ## use a call stack of step names
+      @stack.push( name )
+
+      puts "[flow >(#{@stack.size}) #{'..'*(@stack.size-1)}#{@stack.join(' > ')})] step >#{name}< - starting..."
+      start_time = Time.now   ## todo: use Timer? t = Timer.start / stop / diff etc. - why? why not?
+
+      __send__( step_name )
+
+      end_time = Time.now
+      diff_time = end_time - start_time
+      puts "[flow <(#{@stack.size}) #{'..'*(@stack.size-1)}#{@stack.join(' < ')})] step >#{name}< - done in #{diff_time} sec(s)"
+      @stack.pop
+    else
+      puts "!! ERROR: step definition >#{name}< not found; cannot run/execute - known (defined) steps include:"
+      pp self.class.step_methods  #=> e.g. [:hello, ...]
+      exit 1
+    end
+  end  # method step
+
+
+  def self.step_methods
+    names = instance_methods.reduce([]) do |names, name|
+                                          names << $1.to_sym  if name =~ /^step_(.+)/
+                                          names
+                                        end
+    names
+  end
+end  # class Base
+
+
+end # module Flow

data/lib/flow-lite/tool.rb

@@ -0,0 +1,130 @@
+module Flow
+
+class Tool
+  def self.main( args=ARGV )
+    options = {}
+    OptionParser.new do |parser|
+      parser.on( '-f FILE', '--file FILE', '--flowfile FILE',
+                    'Read FILE as a flowfile.'
+               ) do |file|
+        options[:flowfile] = file
+      end
+
+      ## note:
+      ##  you can add many/multiple modules
+      ##  e.g. -r gitti -r mono etc.
+      parser.on( '-r NAME', '--require NAME') do |name|
+        options[:requires] ||= []
+        options[:requires] << name
+      end
+
+      parser.on( '-d', '--debug') do |debug|
+        options[:debug] = debug
+        ## note: for no auto-set env here - why? why not
+        ENV['DEBUG']='1'   ## use t or true or such - why? why not?
+        puts "[flow] setting >DEBUG< env variable to >#{1}<"
+      end
+
+      ## todo/check/reserve:  add  -e/--env(iornmanet)  e.g.  dev/test/prod(uction) etc.
+      ##             plus (convenience) shortcuts  e.g.  --dev, --prod(uction), --test
+    end.parse!( args )
+
+
+    ## check for any (dynamic/auto) requires
+    if options[:requires]
+      names = options[:requires]
+      names.each do |name|
+        ## todo/check: add some error/exception handling here - why? why not?
+        puts "[flow] auto-require >#{name}<..."
+        require( name )
+      end
+    else  ## use/try defaults
+      config_path = "./config.rb"
+      if File.exist?( config_path )
+        puts "[flow] auto-require (default) >#{config_path}<..."
+        require( config_path )
+      end
+    end
+
+
+    path = nil
+    if options[:flowfile]
+      path = options[:flowfile]
+    else
+      path = Flowfile.find_file
+
+      if path.nil?
+        STDERR.puts "!! ERROR - no flowfile found, sorry - looking for: #{Flowfile::NAMES.join(', ')} in (#{Dir.pwd})"
+        exit 1
+      end
+    end
+
+
+    ### split args into vars and steps
+    vars = []
+    args = args.select do |arg|
+      ## note: mark freestanding = as fatal error (empty var)
+      if arg == '='
+        STDERR.puts "!! ERROR - empty var (=) in args; sorry - make sure there are NO spaces before ="
+        exit 1
+      elsif arg =~ /^[A-Za-z][A-Za-z0-9_]*=/
+        vars << arg
+        false    ## filter -- do NOT include
+      else
+        true
+      end
+    end
+
+    if args.size > 0
+      puts "[flow] #{args.size} arg(s):"
+      pp args
+    end
+
+    if vars.size > 0
+      puts "[flow] #{vars.size} var(s):"
+      pp vars
+
+      ## auto-add vars to ENV
+      ##   note: if the value is empty e.g. DEBUG= or such
+      ##         the variable gets deleted / undefined / unset!!
+      vars.each do |var|
+        pos = var.index('=')   ## split on first =
+        name  = var[0..(pos-1)]
+        value = var[(pos+1)..-1]
+        # print "[flow] splitting "
+        # print "%-24s  "  % ">#{var}<"
+        # print "=>  name: "
+        # print "%-18s " % ">#{name}<,"
+        # print "value: >#{value}< (#{value.class.name})"
+        # print "\n"
+
+        if value.empty?  ## note: variable gets deleted / undefined / unset
+           puts "[flow]   UNSET >#{name}< env variable"
+           ENV[ name ] = nil
+        else
+           puts "[flow]   set >#{name}< env variable to >#{value}<"
+           ENV[ name ] = value
+        end
+      end
+    end
+
+
+
+    puts "[flow] loading >#{path}<..."
+    flowfile = Flowfile.load_file( path )
+
+
+
+    ## allow multipe steps getting called - why? why not?
+    ##   flow setup clone update   etc.  - yes, yes
+    ##    follow make model and allow variables with FOO= or bar= too
+    ##    note:  mark freestanding = as fatal error (empty var)
+
+    args.each do |arg|
+      flowfile.run( arg )
+    end
+  end # method self.main
+end # class Tool
+
+
+end # module Flow

data/lib/flow-lite/version.rb

@@ -1,8 +1,8 @@
 module FlowLite
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 3
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flow-lite
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -61,6 +61,8 @@ files:
 - Rakefile
 - bin/flow
 - lib/flow-lite.rb
+- lib/flow-lite/base.rb
+- lib/flow-lite/tool.rb
 - lib/flow-lite/version.rb
 homepage: https://github.com/rubycoco/flow
 licenses: