yap-shell 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e98defe8356bb996354db08976f8e762a1b483
-  data.tar.gz: da5bca87b69f4ba413825a9e3acbc028c92f96a6
+  metadata.gz: d9694f89f2c9e5c706fd5366e9d9cd3d3030137f
+  data.tar.gz: 45d092310b1f1a1aba4f0c50a356393c123798b5
 SHA512:
-  metadata.gz: e5478a09a56148a96a97cf821bc1781982c45ba39e631a9b36e3d99f51389bbbf95b66f4c3ad999b9b98aa66a9d0898b5b65ff305948f68dc326a91590b58fe5
-  data.tar.gz: 8a0c2e941931074975163d0292620e25fd1d432afcf66c8cedb9bc4cde1f56780f6a2a3176709e7f8f18af2a8c15639b4cf932bdbc313834e7ed0d0b84c2b333
+  metadata.gz: d6cacce91721d91e0aab0a805f22d1b01e006c7de639f4f779f0ae8e2b7c00e48144ab608f43aa8fe686d1720d768f2d1ee47217a659d010c668459d42f7bbb9
+  data.tar.gz: ef3856b79228091b42dbbbe1b8ea1ef5618c63031433ce40a34549125283f0faaab5ba8e180b67676578e4c0e6a49b88112dd69ee00203bfff7236c2ee30d6be

data/lib/yap/configuration.rb

@@ -13,13 +13,13 @@ module Yap
 
     def initialize
       @addon_paths = [
-        Dir["#{File.dirname(__FILE__)}/../../addons/*"],
-        Dir["#{ENV['HOME']}/.yap/addons/*"]
-      ].flatten
+        "#{File.dirname(__FILE__)}/../../addons",
+        "#{ENV['HOME']}/.yap/addons"
+      ]
 
       @rcfiles = [
-        Dir["#{ENV['HOME']}/.yaprc"]
-      ].flatten
+        "#{ENV['HOME']}/.yaprc"
+      ]
     end
 
     def path_for(part)

data/lib/yap/shell/version.rb

@@ -1,5 +1,5 @@
 module Yap
   module Shell
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

data/lib/yap/world/addons.rb

@@ -68,27 +68,30 @@ module Yap
       end
 
       def self.load_rcfiles(files)
-        Treefell['shell'].puts "loading rcfiles #{files.inspect}"
+        Treefell['shell'].puts %|searching for rcfiles:\n  * #{files.join("\n  * ")}|
         files.map do |file|
           if File.exists?(file)
+            Treefell['shell'].puts "rcfile #{file} found, loading."
             RcFile.new file
           else
-            Treefell['shell'].puts "skipping non-existent rcfile #{file.inspect} "
+            Treefell['shell'].puts "rcfile #{file} not found, skipping."
           end
         end.flatten.compact
       end
 
-      def self.load_directories(directories)
-        Treefell['shell'].puts "loading addon directories: #{directories.inspect}"
-        directories.map do |d|
-          if File.directory?(d)
-            load_directory(d).map(&:new)
-          else
-            Treefell['shell'].puts "skipping addon directory #{d.inspect}, does not exist or is not a directory"
+      def self.load_directories(search_paths)
+        Treefell['shell'].puts %|searching for addons in:\n  * #{search_paths.join("\n  * ")}|
+        search_paths.map do |directory|
+          Dir["#{directory}/*"].map do |d|
+            if File.directory?(d)
+              Treefell['shell'].puts %|addon found: #{d}|
+              load_directory(d).map(&:new)
+            else
+              Treefell['shell'].puts %|file found in add-on search path, skipping.|
+              nil
+            end
           end
-        end.flatten.compact.tap do |results|
-          Treefell['shell'].puts "loaded addons: #{results.inspect}"
-        end
+        end.flatten.compact
       end
 
       class RcFile < Addon

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Zach Dennis