Wrap const_defined? in begin/rescue

YellowApple · Sep 5, 2015 · 5c76fdb · 5c76fdb
1 parent 204d94d
commit 5c76fdb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lib/bales/application.rb b/lib/bales/application.rb
@@ -174,10 +174,14 @@ def self.parse_command_name(argv)
                  .map { |p| p.capitalize }
                  .join
           name = "#{const}::#{part}"
-          if const.const_defined? name
-            const = eval(name)
-            depth += 1
-          else
+          begin
+            if const.const_defined? name
+              const = eval(name)
+              depth += 1
+            else
+              break
+            end
+          rescue NameError
             break
           end
         end

diff --git a/lib/bales/command/help.rb b/lib/bales/command/help.rb
@@ -41,8 +41,13 @@ def self.commands(ns)
     end
 
     ns.constants
-      .select { |c| ns.const_defined? "#{ns}::#{c}" }
-      .select { |c| eval("#{ns}::#{c}").class == Class }
+      .select { |c|
+      begin
+        ns.const_defined? "#{ns}::#{c}"
+      rescue NameError
+        false
+      end
+    }.select { |c| eval("#{ns}::#{c}").class == Class }
       .select { |c| eval("#{ns}::#{c}") <= Bales::Command }
       .map { |c| eval "#{ns}::#{c}" }
   end

diff --git a/lib/bales/version.rb b/lib/bales/version.rb
@@ -1,3 +1,3 @@
 module Bales
-  VERSION="0.1.1"
+  VERSION="0.1.2"
 end