runfile 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b62f3eec29bfcf7295e6d6da2f08b8461e9957f1d85296ab1831666d841f9e
-  data.tar.gz: 5f2b029e59be9181f05abf5b45448bd1bf57527df33e8a5431c445b106c633e1
+  metadata.gz: b5a340ad5324cc9b24104fc460c171300cc2ab9690bb8bdfa2b38442b3ddf81a
+  data.tar.gz: e3f0fe2e7c4ba4fca9058d10f5caffc2daa76d5f0810aa5a63d646d2a23347d4
 SHA512:
-  metadata.gz: 7ea4e40d8cca826236c906dd6d8430f6a5ba1d2f317babce072f6034cefa7e9bb439f6582dc4e4fffec017cbaf78e93ef5785c5578a6d13743d9910a8f62bc3f
-  data.tar.gz: 42f2904c17a98672d2291808b7adde081207f083ab200a8a6ff01990a87aaf9b62554a4b914807363481d9ba59faadfdc57d0cdcf00820df8a3f9eff457be61b
+  metadata.gz: 0f94f10d4feda0300878584b68c1af769bc1a81392ee52f7716d89d0d7fe376cf9d20cc2cbb8bc0ef35d5574b469de038df67e99dbaa0a077ca4fed7a7cb548c
+  data.tar.gz: 5983f010e720484acdb6b013248c32f4ed104180e7fc05218c93abfaf1a3eea7775b95e7e6e7cbe2c0871316056fe4d99c27b7e1b93b13524782015199a66a8a

data/README.md

@@ -125,8 +125,8 @@ Note that the current user guide is for the stable version 0.12.0.
 ## Breaking Changes in 1.0.0
 
 If you are using a version earlier than 1.0, note that version 1.0.0 includes
-some breaking changes. You can read more about them in [this Pull Request]
-(https://github.com/DannyBen/runfile/pull/50).
+some breaking changes. You can read more about them in
+[this Pull Request](https://github.com/DannyBen/runfile/pull/50).
 
 ### Upgrading to 1.0.0
 

data/lib/runfile/runner.rb

@@ -11,10 +11,10 @@ module Runfile
     private
 
       def call_docopt(docopt, version: nil, argv: nil)
-        Docopt.docopt docopt, argv: argv, version: version
-      rescue Docopt::Exit => e
+        DocoptNG.docopt docopt, argv: argv, version: version
+      rescue DocoptNG::Exit => e
         raise ExitWithUsage, e.message
-      rescue Docopt::DocoptLanguageError => e
+      rescue DocoptNG::DocoptLanguageError => e
         raise DocoptError, "There is an error in your runfile:\nnb`#{e.message}`"
       end
     end

data/lib/runfile/userfile.rb

@@ -77,9 +77,11 @@ module Runfile
 
     def run(argv = [])
       eval_code
-      argv = transform_argv argv if argv.any?
 
-      found_guest = find_guest argv
+      if argv.any?
+        argv = expand_shortcuts argv
+        found_guest = find_guest argv
+      end
 
       if found_guest
         found_guest.run argv
@@ -128,9 +130,19 @@ module Runfile
       exit_code if exit_code.is_a? Integer
     end
 
-    def transform_argv(argv)
+    # Shortcuts will always appear after the name, so we split argv to
+    # name (array), shortcut wannabe (string), rest of the args (array).
+    # Then, if the shortcut wannabe is a match, we stitch the new argv back
+    # together, with its expansion.
+    def expand_shortcuts(argv)
+      size = id.size
+
+      p1 = argv[0...size]
+      p2 = argv[size]
+      p3 = argv[(size + 1)..]
+
       shortcuts.each do |from, to|
-        return Shellwords.split(to) + argv[1..] if from == argv[0]
+        return p1 + Shellwords.split(to) + p3 if from == p2
       end
 
       argv

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/runfile.rb

@@ -1,13 +1,8 @@
 require 'gtx'
-require 'docopt'
+require 'docopt_ng'
 require 'colsole'
 require 'requires'
 
 requires 'runfile/exceptions'
 requires 'runfile/concerns'
 requires 'runfile'
-
-if ENV['BYEBUG']
-  require 'byebug'
-  require 'lp'
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: docopt_ng
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: gtx
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Local command line for your projects