yap-shell 0.4.0 → 0.4.1

data/lib/yap/world/addons.rb

@@ -16,7 +16,12 @@ module Yap
           @addon_name ||= self.name.split(/::/).last.scan(/[A-Z][^A-Z]+/).map(&:downcase).reject{ |f| f == "addon" }.join("_").to_sym
         end
 
+        def debug_log(msg)
+          Treefell['addons'].puts "addon=#{addon_name} #{msg}"
+        end
+
         def require(name)
+          Treefell['shell'].puts "addon is requiring: #{name}"
           directory = File.dirname caller[0].split(':').first
           lib_path = File.join directory, "lib"
           support_file = File.join lib_path, "#{name}.rb"
@@ -26,8 +31,10 @@ module Yap
             o
           end
           if File.exists?(support_file) && namespace
+            Treefell['shell'].puts "#{name} is found in addon, loading #{support_file} in context of #{namespace}"
             namespace.module_eval IO.read(support_file), support_file, lineno=1
           else
+            Treefell['shell'].puts "#{name} not found in addon, falling back to super"
             super(name)
           end
         end
@@ -37,6 +44,10 @@ module Yap
         def addon_name
           @addon_name ||= self.class.addon_name
         end
+
+        def debug_log(msg)
+          self.class.debug_log(msg)
+        end
       end
     end
 
@@ -51,33 +62,51 @@ module Yap
     module Addons
       def self.syntax_ok?(file)
         `ruby -c #{file}`
-        $?.exitstatus == 0
+        ($?.exitstatus == 0).tap do |result|
+          Treefell['shell'].puts "is syntax ok?(#{file.inspect}) #{result}"
+        end
       end
 
       def self.load_rcfiles(files)
+        Treefell['shell'].puts "loading rcfiles #{files.inspect}"
         files.map do |file|
-          RcFile.new IO.read(file)
-        end
+          if File.exists?(file)
+            RcFile.new file
+          else
+            Treefell['shell'].puts "skipping non-existent rcfile #{file.inspect} "
+          end
+        end.flatten.compact
       end
 
       def self.load_directories(directories)
+        Treefell['shell'].puts "loading addon directories: #{directories.inspect}"
         directories.map do |d|
-          next unless File.directory?(d)
-          load_directory(d).map(&:new)
-        end.flatten
+          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"
+          end
+        end.flatten.compact.tap do |results|
+          Treefell['shell'].puts "loaded addons: #{results.inspect}"
+        end
       end
 
       class RcFile < Addon
-        def initialize(contents)
-          @contents = contents
+        attr_reader :file
+
+        def initialize(file)
+          @file = file
         end
 
         def initialize_world(world)
-          world.instance_eval @contents
+          Treefell['shell'].puts "initializing rcfile: #{file}"
+          world.instance_eval File.read(@file)
         end
       end
 
       def self.load_directory(directory)
+        directory = File.expand_path(directory)
+        Treefell['shell'].puts "loading addon from directory: #{directory}"
         namespace = File.basename(directory).
           split(/[_-]/).
           map(&:capitalize).join
@@ -96,23 +125,35 @@ module Yap
         end
 
         Yap::World::UserAddons.const_set namespace, addon_module
+        Treefell['shell'].puts "creating addon namespace: Yap::World::UserAddons::#{namespace}"
 
         lib_path = File.join directory, "lib"
+        Treefell['shell'].puts "prepending addon path to $LOAD_PATH: #{lib_path}"
         $LOAD_PATH.unshift lib_path
 
-        gemfiles =   Dir["#{directory}/Gemfile"]
-        gemfiles.each do |gemfile|
-          eval File.read(gemfile)
+        gemfiles = Dir["#{directory}/Gemfile"]
+        Treefell['shell'].puts "looking for Gemfile in #{namespace} addon directory: #{directory}"
+        if gemfiles.any?
+          gemfiles.each do |gemfile|
+            Treefell['shell'].puts "loading #{gemfile} for addon"
+            eval File.read(gemfile)
+          end
+        else
+          Treefell['shell'].puts "No Gemfile found for #{namespace} addon"
         end
 
         Dir["#{directory}/*.rb"].map do |addon_file|
           load_file(addon_file, namespace:namespace, dir:directory, addon_module:addon_module)
         end
       ensure
-        $LOAD_PATH.delete(lib_path) if lib_path
+        if lib_path
+          Treefell['shell'].puts "Removing addon #{lib_path} path from $LOAD_PATH"
+          $LOAD_PATH.delete(lib_path)
+        end
       end
 
       def self.load_file(file, dir:, namespace:, addon_module:)
+        Treefell['shell'].puts "loading #{namespace} addon file: #{file}"
         klass_name = file.sub(dir, "").
           sub(/^#{Regexp.escape(File::Separator)}/, "").
           sub(File.extname(file.to_s), "").
@@ -128,6 +169,8 @@ module Yap
           else
             raise("Did not find #{klass_name} in #{file}")
           end
+        end.tap do |loaded_addon|
+          Treefell['shell'].puts "loaded #{File.dirname(file)} as #{loaded_addon.inspect}"
         end
       end
     end

data/rcfiles/.yaprc

@@ -259,7 +259,13 @@ end
 
 func :'run-modified-specs' do |stdin:, stdout:|
   str = `git status`
-  specs = str.scan(/\S+_spec.rb/)
+  files = str.scan(/\S+.rb/)
+  specs, non_specs = files.partition { |file| file.match(/\S+_spec.rb/) }
+  non_specs.each do |non_spec|
+    filename_without_extension = non_spec.gsub(/^[^\/]+\//, '').gsub(/\.rb$/, '')
+    specs.concat Dir["spec/**/*#{filename_without_extension}_spec.rb"]
+  end
+
   cmd = "bundle exec rspec #{specs.join(' ')}"
   stdout.puts cmd
   shell cmd

data/yap-shell.gemspec

@@ -60,11 +60,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yap-shell-parser", "~> 0.5.0"
+  spec.add_dependency "yap-shell-parser", "~> 0.6.1"
   spec.add_dependency "term-ansicolor", "~> 1.3"
   spec.add_dependency "ruby-termios", "~> 0.9.6"
   spec.add_dependency "ruby-terminfo", "~> 0.1.1"
   spec.add_dependency "yap-rawline", "~> 0.3.1"
+  spec.add_dependency "treefell", "~> 0.2.3"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yap-shell-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: treefell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement