gli 2.3.0 → 2.4.0

data/features/todo.feature

@@ -41,6 +41,7 @@ Feature: The todo app has a nice user interface
         list          - List things, such as tasks or contexts
         ls            - LS things, such as tasks or contexts
         second        - 
+        third         - 
     """
     Examples:
       | help      |
@@ -118,6 +119,7 @@ Feature: The todo app has a nice user interface
         create, new   - Create a new task or context
         list          - List things, such as tasks or contexts
         ls            - LS things, such as tasks or contexts
+        third         - 
         first         - 
         second        - 
         chained       - 

data/lib/gli/app.rb

@@ -12,23 +12,31 @@ module GLI
     include DSL
     include AppSupport
 
-    # Loads ruby files in the load path that start with 
+    # Loads ruby files in the load path that start with
     # +path+, which are presumed to be commands for your executable.
-    # This is a glorified +require+, but could also be used as a plugin mechanism.
-    # You could manipualte the load path at runtime and this call
-    # would find those files
+    # This is useful for decomposing your bin file into different classes, but
+    # can also be used as a plugin mechanism, allowing users to provide additional
+    # commands for your app at runtime.  All that being said, it's basically
+    # a glorified +require+.
     #
-    # path:: a path relative to somewhere in the <code>LOAD_PATH</code>, from which all <code>.rb</code> files will be required.
+    # path:: a path from which to load <code>.rb</code> files that, presumably, contain commands.  If this is an absolute path,
+    #        any files in that path are loaded.  If not, it is interpretted as relative to somewhere
+    #        in the <code>LOAD_PATH</code>.
+    #
+    # == Example:
+    #
+    #     # loads *.rb from your app's install - great for decomposing your bin file
+    #     commands_from "my_app/commands"
+    #
+    #     # loads *.rb files from the user's home dir - great and an extension/plugin mechanism
+    #     commands_from File.join(ENV["HOME"],".my_app","plugins")
     def commands_from(path)
-      $LOAD_PATH.each do |load_path|
-        commands_path = File.join(load_path,path)
-        if File.exists? commands_path
-          Dir.entries(commands_path).sort.each do |entry|
-            file = File.join(commands_path,entry)
-            if file =~ /\.rb$/
-              require file
-            end
-          end
+      if Pathname.new(path).absolute? and File.exists?(path)
+        load_commands(path)
+      else
+        $LOAD_PATH.each do |load_path|
+          commands_path = File.join(load_path,path)
+          load_commands(commands_path)
         end
       end
     end
@@ -37,7 +45,7 @@ module GLI
     # of what your program does that will appear in the help output.
     #
     # +description+:: A String of the short description of your program's purpose
-    def program_desc(description=nil) 
+    def program_desc(description=nil)
       if description
         @program_desc = description
       end
@@ -251,5 +259,18 @@ module GLI
     def default_command(command)
       @default_command = command.to_sym
     end
+
+    private
+
+    def load_commands(path)
+      if File.exists? path
+        Dir.entries(path).sort.each do |entry|
+          file = File.join(path,entry)
+          if file =~ /\.rb$/
+            require file
+          end
+        end
+      end
+    end
   end
 end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.3.0' #:nodoc:
+    VERSION = '2.4.0' #:nodoc:
   end
 end

data/test/apps/todo/bin/todo

@@ -29,6 +29,7 @@ switch :otherswitch, :negatable => true
 version Todo::VERSION
 
 commands_from 'todo/commands'
+commands_from File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'todo_plugins', 'commands'))
 
 command :first  do |c| c.action { |g,o,a| puts "first: #{a.join(',')}" } end
 command :second do |c| c.action { |g,o,a| puts "second: #{a.join(',')}" } end

data/test/apps/todo_plugins/commands/third.rb

@@ -0,0 +1 @@
+command :third do |c| c.action { |g,o,a| puts "third: #{a.join(',')}" } end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -311,6 +311,8 @@ files:
   dGVzdC9hcHBzL3RvZG8vdG9kby5nZW1zcGVj
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vdG9kby5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fcGx1Z2lucy9jb21tYW5kcy90aGlyZC5yYg==
 - !binary |-
   dGVzdC9jb25maWcueWFtbA==
 - !binary |-
@@ -365,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3822562624553397534
+      hash: -3686138508377363663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -374,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3822562624553397534
+      hash: -3686138508377363663
 requirements: []
 rubyforge_project: gli
 rubygems_version: 1.8.24
@@ -421,6 +423,8 @@ test_files:
   dGVzdC9hcHBzL3RvZG8vdG9kby5nZW1zcGVj
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vdG9kby5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fcGx1Z2lucy9jb21tYW5kcy90aGlyZC5yYg==
 - !binary |-
   dGVzdC9jb25maWcueWFtbA==
 - !binary |-