runfile 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b399f5dddc730408a835c29507af0b23d80be1ce6452c90d0c26d0d0acc577e7
-  data.tar.gz: 27211f7110e22ca49317d893952d7af82bdd774879782335185f0421e74f864b
+  metadata.gz: 5ae2a7aefd3a25703d232d70e6857aeafe467772582a96202d371bfca748e1f7
+  data.tar.gz: 32f39514ba7ffb8318c305278f55a397d2e686c7179cec0ff5899c5e6fd62871
 SHA512:
-  metadata.gz: eaf0546be8eed23eeb6af18789a83e4b4eaa5514b044b41efb7a7a401da8465986a05bfcc5ec0930b0292edf4ea1830d2c78d0014808b59d5cf2f7c25fd3eb6d
-  data.tar.gz: 7eb9ba751139e0a83106cf7a5c0ff933b51ebba6cdbd63ee32f7ddf34be249b9804f6fb007e303cb3e225cb3cedf04ed9418a7e6856cb94165208ee3e5e672c2
+  metadata.gz: 289c29cf9119ce944bc46c1c6067299454396b143721b5b5b0b6b03553bca3c805743656a13cb8f4757a77022e4294152254124d7f6dfea4803879ac4289690d
+  data.tar.gz: 61afd4733813f4f3082765eae107295af324a446da8ccc5bc70959504c81aba0a161e286fc25ff0095b2fbff0c50b3a9fb76a8a21f992c6f5c620b1abd15b111

data/README.md

@@ -29,7 +29,8 @@ command line "toolbelt" for your projects, you can use it regardless.
 ## Pre-release Notice
 
 Note that this README describes the not yet released 1.0.0 version.  
-See https://bashly.dannyb.co/ for the stable release documentation.
+See [runfile.dannyb.co](https://runfile.dannyb.co/) for the stable release
+documentation.
 
 During the pre-release phase, the `run` executable is called `runn` instead, 
 to allow running both the stable and pre-release version side by side.

data/examples/import/more_tasks/spec.runfile

@@ -3,5 +3,6 @@ option '--continue, -c', 'Continue testing'
 option '--failed, -f', 'Retest failed specs'
 action do |args|
   say 'spec action'
+  p context
   p args
 end

data/examples/import/runfile

@@ -2,7 +2,7 @@ title 'Importing other funfiles'
 summary 'Reference other runfiles to blend them seamlessly as one command line interface'
 
 import 'tasks/*'
-import 'more_tasks/spec'
+import 'more_tasks/spec', anything: 'Context Values'
 
 usage 'say MESSAGE'
 action 'say' do |args|

data/examples/import/tasks/server.runfile

@@ -1,6 +1,7 @@
 summary 'Server management commands'
 
 action 'start' do |_args|
+  say "Context: #{context[:anything]}"
   say 'g`Starting server`'
 end
 

data/lib/runfile/concerns/dsl.rb

@@ -10,12 +10,6 @@ module Runfile
       current_action.shortcut = shortcut if shortcut
       current_action.prefix = action_prefix if action_prefix
 
-      # if default_action && name
-      #   raise SyntaxError, <<~ERROR
-      #     Cannot define action nub`#{name}` since a default action was already defined
-      #   ERROR
-      # end
-
       actions[name || :default] = current_action
       @default_action = current_action unless name
       @current_action = nil
@@ -33,21 +27,15 @@ module Runfile
       current_action.help = message
     end
 
-    def import(pathspec)
-      imports.push pathspec
+    def import(pathspec, context = nil)
+      imports[pathspec] = context
     end
 
-    def import_gem(gem_name, runfile_path, context = nil)
-      if context && !context.is_a?(Hash)
-        raise SyntaxError, <<~ERROR
-          The third argument to nub`import_gem` must be a hash
-          got rb`#{context.inspect}`
-        ERROR
-      end
-
-      path = GemFinder.find gem_name, runfile_path
-      imports.push path
-      contexts[runfile_path] = context if context
+    def import_gem(pathspec, context = nil)
+      gem_name, glob = pathspec.split('/', 2)
+      glob ||= '*'
+      path = GemFinder.find gem_name, glob
+      imports[path] = context
     end
 
     def option(name, help)
@@ -95,10 +83,6 @@ module Runfile
       nil
     end
 
-    def contexts
-      @contexts ||= {}
-    end
-
     def actions
       @actions ||= {}
     end
@@ -120,7 +104,7 @@ module Runfile
     end
 
     def imports
-      @imports ||= []
+      @imports ||= {}
     end
 
   private

data/lib/runfile/meta.rb

@@ -43,23 +43,23 @@ module Runfile
       @masterfile ||= Userfile.load_file masterfile_path
     end
 
-    # def title
-    #   masterfile&.title
-    # end
-
-    # def summary
-    #   masterfile&.summary
-    # end
-
     def globs
-      @globs ||= (masterfile ? ['*'] + masterfile.imports : ['*'])
+      @globs ||= (masterfile ? ['*'] + masterfile.imports.keys : ['*'])
     end
 
     def external_files
-      @external_files ||= globs
-        .map { |glob| Dir["#{glob}.runfile"].sort }
-        .flatten
-        .to_h { |file| [File.basename(file, '.runfile'), Userfile.load_file(file)] }
+      @external_files ||= begin
+        result = []
+        globs.each do |glob|
+          Dir["#{glob}.runfile"].sort.each do |file|
+            userfile = Userfile.load_file(file)
+            userfile.context = masterfile.imports[glob] if masterfile
+            result.push userfile
+          end
+        end
+        
+        result.to_h { |file| [file.name, file] }
+      end
     end
   end
 end

data/lib/runfile/userfile.rb

@@ -44,11 +44,11 @@ module Runfile
     end
 
     def inspectable
-      { name: name, path: path }
+      { name: name, path: path, context: context }
     end
 
     def run(argv = [])
-      found_delegate = delegate argv[0]
+      found_delegate = delegates[argv[0]]
       if found_delegate
         found_delegate.run argv
       else
@@ -92,14 +92,6 @@ module Runfile
       end
     end
 
-    def delegate(name)
-      return nil unless delegates.has_key? name
-
-      result = delegates[name]
-      result.context = contexts[name]
-      result
-    end
-
     def meta
       @meta ||= Meta.new
     end

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole