runfile 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e111538a4979749e713b04fb8923319832a1476
-  data.tar.gz: babe075877cfb3303216c5fa0b28a57610a421b4
+  metadata.gz: 0980ca227f78853f3dcf034253d57a0ac61f5cc0
+  data.tar.gz: c5548ead96c34f0dbcfa59a48d64153463b5b75e
 SHA512:
-  metadata.gz: 61066ce548063ca59745775f689da55dc4e621e0966eb137981d0296e49e47e59625b24cfc84b2d4972303f2e69d8669979836178730544b06a1304cc0b15431
-  data.tar.gz: 5b833eb34b1bbe3efd9c49c15ff83ef854f70fad6ed315a104d4e810f092bcffc362706b190dc14c898c46993482fdba566cf829dbe676e977d0a161d1a7b558
+  metadata.gz: 1a960d00b7663752bb7e6f7264323c2d5e654fac533f391dc54c1dcced5e1aa9e171e7cd55f199855fe908e64660b2680d5aa63c646aeffd2c252ae2c119d223
+  data.tar.gz: 367511ebf703bb821a5acec2742e8371d0459e0f7adbb4998871cf40044792aa5646be49b06993ab82588aa060c3d42c7ebcde59e97d57a4bec56198a09ca5fe

data/lib/runfile/docopt_helper.rb

@@ -29,7 +29,8 @@ module Runfile
     # and options we have collected from the Runfile DSL.
     def docopt
       width, height = detect_terminal_size
-      doc = ["#{@name} #{@version}"]
+      doc = []
+      doc << (@version ? "#{@name} #{@version}" : "#{@name}")
       doc << "#{@summary}" if @summary
       doc += docopt_usage
       doc += docopt_commands width
@@ -43,10 +44,11 @@ module Runfile
       @actions.each do |name, action|
         doc << "  run #{action.usage}" unless action.usage == false
       end
+      basic_flags = @version ? "(-h|--help|--version)" : "(-h|--help)"
       if @superspace
-        doc << "  run #{@superspace} (-h|--help|--version)\n"
+        doc << "  run #{@superspace} #{basic_flags}\n"
       else
-        doc << "  run (-h|--help|--version)\n"
+        doc << "  run #{basic_flags}\n"
       end
       doc
     end
@@ -70,7 +72,7 @@ module Runfile
     def docopt_options(width)
       @options['Options'] = {} unless @options['Options']
       @options['Options']['-h --help'] = 'Show this screen'
-      @options['Options']['--version'] = 'Show version number'
+      @options['Options']['--version'] = 'Show version number' if @version
 
       doc = []
       @options.each do |scope, values|

data/lib/runfile/runfile_helper.rb

@@ -58,7 +58,7 @@ module Runfile
       result = []
       dirs = runfile_folders
       dirs.each do |d|
-        found = Dir[File.join(d, '**/*.runfile')]
+        found = Dir[File.join(d, '*.runfile')]
         result << found unless found.empty?
       end
       return result.empty? ? false : result.flatten.uniq
@@ -76,9 +76,12 @@ module Runfile
       end
     end
 
-    # Return array of folders we should search for runfiles
+    # Return array of folders we should search in for runfiles.
     def runfile_folders
-      [Dir.pwd, "#{Dir.home}/runfile", "/etc/runfile"]
+      # This trick allows searching in subfolders recursively, including
+      # one level of symlinked folder
+      subdirs = '**{,/*/**}'
+      [Dir.pwd, "#{Dir.home}/runfile/#{subdirs}", "/etc/runfile/#{subdirs}"]
     end
     
     # [UNUSED] Same as runfile_folders, but including PATH

data/lib/runfile/runner.rb

@@ -23,7 +23,7 @@ module Runfile
       @actions = {}        # dsl: action
       @options = {}        # dsl: option
       @name    = "Runfile" # dsl: name
-      @version = "0.0.0"   # dsl: version
+      @version = false     # dsl: version
       @summary = false     # dsl: summary
     end
 

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole