yap-shell 0.6.0 → 0.7.0

data/spec/features/aliases_spec.rb

@@ -16,7 +16,7 @@ describe 'Aliases', type: :feature do
   it 'executes them' do
     type 'foo'
     enter
-    expect { output }.to have_printed(/bar\n/)
+    expect { output }.to have_printed(/^bar$/m)
   end
 
   it 'unsets them' do
@@ -41,14 +41,14 @@ describe 'Aliases', type: :feature do
     it 'supports logical AND: &&' do
       type "pass && pass"
       enter
-      expect { output }.to have_printed(/pass.*\n.*pass/m)
+      expect { output }.to have_printed(/^pass$.*^pass$/m)
     end
 
     it 'supports logical OR: &&' do
       type "fail || pass"
       enter
       expect { error_output }.to have_printed(/yap: command not found: non-existent-command/m)
-      expect { output }.to have_printed(/pass/m)
+      expect { output }.to have_printed(/^pass$/m)
       clear_all_output
 
       type "echo $?"
@@ -60,19 +60,19 @@ describe 'Aliases', type: :feature do
       type "(pass && fail) || pass"
       enter
       expect { error_output }.to have_printed(/yap: command not found: non-existent-command/m)
-      expect { output }.to have_printed(/pass.*\n.*pass/m)
+      expect { output }.to have_printed(/^pass$.*^pass$/m)
       clear_all_output
 
       type "(pass || fail) && pass"
       enter
       expect { error_output }.to have_not_printed(/yap: command not found: non-existent-command/m)
-      expect { output }.to have_printed(/pass.*\n.*pass/m)
+      expect { output }.to have_printed(/^pass$.*^pass$/m)
       clear_all_output
 
       type "(fail && pass) && pass"
       enter
       expect { error_output }.to have_printed(/yap: command not found: non-existent-command/m)
-      expect { output }.to have_not_printed(/pass.*\n.*pass/m)
+      expect { output }.to have_not_printed(/^pass$.*^pass$/m)
     end
   end
 end

data/spec/features/grouping_spec.rb

@@ -19,62 +19,62 @@ describe 'Grouping commands', type: :feature do
     it 'works with: (command1 && command2) || command3' do
       type '(./pass 1 && ./fail 2) || ./pass 3'
       enter
-      expect { output }.to have_printed(/pass 1.*fail 2.*pass 3/m)
+      expect { output }.to have_printed(/^pass 1$.*^fail 2$.*^pass 3$/m)
       clear_all_output
 
       type '(./fail 1 && ./pass 2) || ./pass 3'
       enter
-      expect { output }.to have_printed(/fail 1.*pass 3/m)
-      expect { output }.to have_not_printed(/pass 2/m)
+      expect { output }.to have_printed(/^fail 1$.*^pass 3$/m)
+      expect { output }.to have_not_printed(/^pass 2$/m)
     end
 
     it 'works with: (command1 && command2 && command3) || command4' do
       type '(./pass 1 && ./fail 2 && ./pass 3) || ./pass 4'
       enter
-      expect { output }.to have_printed(/pass 1.*fail 2.*pass 4/m)
-      expect { output }.to have_not_printed(/pass 1.*fail 2.*pass 3.*pass 4/m)
+      expect { output }.to have_printed(/^pass 1$.*^fail 2$.*^pass 4$/m)
+      expect { output }.to have_not_printed(/^pass 1$.*^fail 2$.*^pass 3$.*^pass 4$/m)
       clear_all_output
 
       type '(./fail 1 && ./pass 2 && ./pass 3) || ./pass 4'
       enter
-      expect { output }.to have_printed(/fail 1.*pass 4/m)
-      expect { output }.to have_not_printed(/pass 2.*pass 3/m)
+      expect { output }.to have_printed(/^fail 1$.*^pass 4$/m)
+      expect { output }.to have_not_printed(/^pass 2$.*^pass 3$/m)
     end
 
     it 'works with: (command1 || command2) && command4' do
       type '(./fail 1 || ./pass 2) && ./pass 3'
       enter
-      expect { output }.to have_printed(/fail 1.*pass 2.*pass 3/m)
+      expect { output }.to have_printed(/^fail 1$.*^pass 2$.*^pass 3$/m)
 
       type '(./pass 1 || ./fail 2) && ./pass 3'
       enter
-      expect { output }.to have_printed(/pass 1.*pass 3/m)
-      expect { output }.to have_not_printed(/fail 2/m)
+      expect { output }.to have_printed(/^pass 1$.*^pass 3$/m)
+      expect { output }.to have_not_printed(/^fail 2$/m)
     end
 
     it 'works with: (command1 && command2) && command4' do
       type '(./fail 1 && ./pass 2) && ./pass 3'
       enter
-      expect { output }.to have_printed(/fail 1/m)
-      expect { output }.to have_not_printed(/.*pass 2.*pass 3/m)
+      expect { output }.to have_printed(/^fail 1$/m)
+      expect { output }.to have_not_printed(/^pass 2$.*^pass 3$/m)
       clear_all_output
 
       type '(./pass 1 && ./fail 2) && ./pass 3'
       enter
-      expect { output }.to have_printed(/pass 1.*fail 2/m)
-      expect { output }.to have_not_printed(/pass 3/m)
+      expect { output }.to have_printed(/^pass 1$.*^fail 2$/m)
+      expect { output }.to have_not_printed(/^pass 3$/m)
     end
 
     it 'works with: (command1 || command2) || command4' do
       type '(./fail 1 || ./pass 2) || ./pass 3'
       enter
-      expect { output }.to have_printed(/fail 1.*pass 2/m)
-      expect { output }.to have_not_printed(/pass 3/m)
+      expect { output }.to have_printed(/^fail 1$.*^pass 2$/m)
+      expect { output }.to have_not_printed(/^pass 3$/m)
 
       type '(./pass 1 || ./fail 2) || ./pass 3'
       enter
-      expect { output }.to have_printed(/pass 1/m)
-      expect { output }.to have_not_printed(/fail 2.*pass 3/m)
+      expect { output }.to have_printed(/^pass 1$/m)
+      expect { output }.to have_not_printed(/^fail 2$.*^pass 3$/m)
     end
   end
 

data/spec/features/line_editing_spec.rb

@@ -35,8 +35,12 @@ describe 'Line editing', type: :feature do
     type 'echo hello world'
     6.times { type left_arrow }
     6.times { type delete }
+
+    expect { output }.to have_printed_lines('yap> echo hello')
+    clear_all_output(console: false)
+
     enter
-    expect { output }.to have_printed('hello')
+    expect { output }.to have_printed_lines('hello')
     expect { output }.to have_not_printed('world')
   end
 
@@ -141,6 +145,10 @@ describe 'Line editing', type: :feature do
       type ?\C-w
       type ?\C-w
       type 'nope'
+
+      expect { output }.to have_printed_line('yap> echo nope')
+      clear_all_output(console: false)
+
       enter
       expect { output }.to have_printed('nope')
       expect { output }.to have_not_printed('hello world')

data/spec/features/redirection_spec.rb

@@ -47,15 +47,19 @@ describe 'I/O Redirection', type: :feature do
       before do
         type 'echo foo > output.txt'
         enter
+        clear_all_output
+
         type 'cat output.txt'
         enter
-        expect { output }.to have_printed(/foo/)
+        expect { output }.to have_printed_line('foo')
         clear_all_output
       end
 
       it 'appends with: >>' do
         type 'echo bar >> output.txt'
         enter
+        clear_all_output
+
         type 'cat output.txt'
         enter
         expect { output }.to have_printed(/foo.*\n.*bar/)
@@ -64,6 +68,8 @@ describe 'I/O Redirection', type: :feature do
       it 'appends with: 1>>' do
         type 'echo bar 1>> output.txt'
         enter
+        clear_all_output
+
         type 'cat output.txt'
         enter
         expect { output }.to have_printed(/foo.*\n.*bar/)
@@ -100,15 +106,18 @@ describe 'I/O Redirection', type: :feature do
       before do
         type './fail caz 2> error.txt'
         enter
+        clear_all_output
+
         type 'cat error.txt'
         enter
-        expect { output }.to have_printed(/fail caz/)
-        clear_all_output
+        expect { output }.to have_printed_line('fail caz')
       end
 
       it 'appends with: 2>>' do
         type './fail box 2>> error.txt'
         enter
+        clear_all_output
+
         type 'cat error.txt'
         enter
         expect { output }.to have_printed(/fail caz.*\n.*fail box/)

data/spec/spec_helper.rb

@@ -36,22 +36,27 @@ RSpec.configure do |config|
   config.before(:all, type: :feature) do
     ENV['HOME'] = tmp_dir.to_s
 
+    mkdir tmp_dir
+    Dir.chdir tmp_dir
+
     set_yap_command_line_arguments \
       '--no-history', '--no-addons', '--no-rcfiles', '--skip-first-time'
 
     turn_on_debug_log(debug: 'editor')
-
     initialize_shell
 
-    mkdir tmp_dir
-    Dir.chdir tmp_dir
-
-    type "cd #{tmp_dir}"
-    enter
-
-    type "pwd"
-    enter
-    expect { output }.to have_printed(File.expand_path(tmp_dir))
+    if self.class.metadata[:repl] == false
+      # no-op if the test specificaly says it doesn't use a repl
+      # This is likely when we're expecting yap to print information
+      # and exit immediately
+    else
+      type "cd #{tmp_dir}"
+      enter
+
+      type "pwd"
+      enter
+      expect { output }.to have_printed(File.expand_path(tmp_dir))
+    end
     clear_all_output
   end
 
@@ -64,17 +69,22 @@ RSpec.configure do |config|
       if self.class.metadata[:forks]
         # no-op because the example will cause yap to fork inside the child
         # childprocess and will break the IO pipes we know about in the test
+      elsif self.class.metadata[:repl] == false
+        # no-op if the test specificaly says it doesn't use a repl
+        # This is likely when we're expecting yap to print information
+        # and exit immediately
       else
         enter if typed_content_awaiting_enter?
 
         # Use yap to tell us when it's done doing whatever is was doing.
         # This ensures we don'try to clean up before yap is done!
+        clear_all_output(console: true)
         type 'echo done with this test'
         enter
         expect { output }.to have_printed('done with this test')
       end
-      clear_all_output
     ensure
+      clear_all_output(console: false)
       Dir.chdir(tmp_dir) do
         # remove all files including hidden but not current directory and
         # parent directory

data/spec/support/matchers/have_printed.rb

@@ -28,3 +28,41 @@ RSpec::Matchers.define :have_printed do |expected|
     true
   end
 end
+
+
+RSpec::Matchers.define :have_printed_lines do |expected|
+  output_seen_so_far = ""
+  current_line = nil
+
+  match do |block|
+    begin
+      expected.lines.each do |line|
+        current_line = line
+        regex = /#{Regexp.escape(line)}/m
+        very_soon do
+          current_output = block.call
+          output_seen_so_far = current_output
+          regex.match(current_output)
+        end
+      end
+      true
+    rescue Timeout::Error
+      false
+    end
+  end
+
+  failure_message do |actual|
+    if expected.is_a?(Regexp)
+      "expected that #{current_line.inspect} would match #{output_seen_so_far.inspect}"
+    else
+      "expected that #{current_line.inspect} would appear in #{output_seen_so_far.inspect}"
+    end
+  end
+
+  def supports_block_expectations?
+    true
+  end
+end
+
+RSpec::Matchers.alias_matcher :have_printed_line, :have_printed_lines
+RSpec::Matchers.alias_matcher :have_line, :have_printed_lines

data/spec/support/yap_spec_dsl.rb

@@ -69,8 +69,7 @@ module Yap
           # make stdin available, writable
           process.duplex = true
 
-          # tmpdir = File.dirname(__FILE__) + '/../tmp'
-          process.cwd = File.dirname(__FILE__)
+          process.cwd = Dir.pwd
           process.start
 
           # make sure clean-up child processes, hang if any fail
@@ -110,7 +109,13 @@ module Yap
       end
 
       def mkdir(path)
-        path = tmp_dir.join(path) unless path == tmp_dir
+        mkdir_p path
+      end
+
+      def mkdir_p(path)
+        unless File.expand_path(path.to_s).include?(tmp_dir.to_s)
+          path = tmp_dir.join(path)
+        end
         FileUtils.mkdir_p Pathname.new(path).expand_path
       end
 
@@ -123,7 +128,15 @@ module Yap
         FileUtils.rm_rf Pathname.new(path).expand_path
       end
 
+      def write_file(filename, contents)
+        filename = tmp_dir.join(filename) unless filename.to_s.include?(tmp_dir.to_s)
+        file = File.new(filename, 'w+')
+        file.write contents
+        file.close
+      end
+
       def write_executable_script(filename, contents)
+        filename = tmp_dir.join(filename) unless filename.to_s.include?(tmp_dir.to_s)
         file = File.new(filename, 'w+')
         file.write contents
         file.chmod 0755
@@ -141,11 +154,10 @@ module Yap
       def turn_on_debug_log(file: '/tmp/yap-debug.log', debug: '*')
         ENV['TREEFELL_OUT'] = file
         ENV['DEBUG'] = debug
-        reinitialize_shell
       end
 
       def set_yap_command_line_arguments(*args)
-        @yap_command_line_arguments = args
+        @yap_command_line_arguments = args.flatten
       end
 
       def yap_command_line_arguments
@@ -163,6 +175,7 @@ module Yap
 
       def reinitialize_shell
         initialize_shell
+        clear_all_output(console: false)        
       end
 
       def shell
@@ -188,7 +201,12 @@ module Yap
         shell.io.stdin.print "\r"
       end
 
-      def clear_all_output
+      def clear_all_output(console: true)
+        if console
+          type 'echo done'
+          enter
+          expect { output }.to have_printed_line('done')
+        end
         output_file.clear
         error_output_file.clear
       end

data/yap-shell.gemspec

@@ -64,21 +64,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pry-byebug", "~> 3.3.0"
-  spec.add_dependency "yap-shell-parser", "~> 0.7.0"
+  spec.add_dependency "pry-byebug", "~> 3.3"
+  spec.add_dependency "yap-shell-parser", "~> 0.7.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.5.0"
-  spec.add_dependency "treefell", "~> 0.2.3"
+  spec.add_dependency "yap-rawline", "~> 0.6.2"
+  spec.add_dependency "chronic", "~> 0.10.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10"
-  spec.add_development_dependency "rspec", "~> 3.4.0"
+  spec.add_development_dependency "rake", "~> 11"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "childprocess", "~> 0.5.9"
-
-  #--BEGIN_ADDON_GEM_DEPENDENCIES--#
-  spec.add_dependency "chronic", "~> 0.10.2"
-  # spec.add_dependency "term-ansicolor", "~> 1.3.2"
-  #--END_ADDON_GEM_DEPENDENCIES--#
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yap-shell-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: treefell
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.9
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.2
 description: The Lagniappe "Yap" shell description.
 email:
 - zach.dennis@gmail.com
@@ -194,30 +180,47 @@ files:
 - DESIGN.md
 - Gemfile
 - Gemfile.travis
+- Gemfile.travis.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - WISHLIST.md
-- addons/history/README.md
-- addons/history/history.rb
-- addons/history_search/history_search.rb
-- addons/keyboard_macros/keyboard_macros.rb
-- addons/keyboard_macros/lib/keyboard_macros/cycle.rb
-- addons/prompt/Gemfile
-- addons/prompt/right_prompt.rb
-- addons/prompt_updates/prompt_updates.rb
-- addons/tab_completion/Gemfile
-- addons/tab_completion/lib/tab_completion/basic_completion.rb
-- addons/tab_completion/lib/tab_completion/completer.rb
-- addons/tab_completion/lib/tab_completion/custom_completion.rb
-- addons/tab_completion/lib/tab_completion/dsl_methods.rb
-- addons/tab_completion/tab_completion.rb
 - bin/yap
 - bin/yap-dev
-- lib/tasks/addons.rake
 - lib/tasks/gem.rake
 - lib/yap.rb
+- lib/yap/addon.rb
+- lib/yap/addon/base.rb
+- lib/yap/addon/export_as.rb
+- lib/yap/addon/loader.rb
+- lib/yap/addon/path.rb
+- lib/yap/addon/rc_file.rb
+- lib/yap/addon/reference.rb
+- lib/yap/cli.rb
+- lib/yap/cli/commands.rb
+- lib/yap/cli/commands/addon.rb
+- lib/yap/cli/commands/addon/disable.rb
+- lib/yap/cli/commands/addon/enable.rb
+- lib/yap/cli/commands/addon/list.rb
+- lib/yap/cli/commands/addon/search.rb
+- lib/yap/cli/commands/generate.rb
+- lib/yap/cli/commands/generate/addon.rb
+- lib/yap/cli/commands/generate/addonrb.template
+- lib/yap/cli/commands/generate/gemspec.template
+- lib/yap/cli/commands/generate/license.template
+- lib/yap/cli/commands/generate/rakefile.template
+- lib/yap/cli/commands/generate/readme.template
+- lib/yap/cli/options.rb
+- lib/yap/cli/options/addon.rb
+- lib/yap/cli/options/addon/disable.rb
+- lib/yap/cli/options/addon/enable.rb
+- lib/yap/cli/options/addon/list.rb
+- lib/yap/cli/options/addon/search.rb
+- lib/yap/cli/options/generate.rb
+- lib/yap/cli/options/generate/addon.rb
 - lib/yap/configuration.rb
+- lib/yap/gem_helper.rb
+- lib/yap/gem_tasks.rb
 - lib/yap/shell.rb
 - lib/yap/shell/aliases.rb
 - lib/yap/shell/builtins.rb
@@ -240,7 +243,6 @@ files:
 - lib/yap/shell/repl.rb
 - lib/yap/shell/version.rb
 - lib/yap/world.rb
-- lib/yap/world/addons.rb
 - rcfiles/yaprc
 - scripts/4
 - scripts/bg-vim
@@ -251,6 +253,8 @@ files:
 - scripts/simulate-long-running
 - scripts/write-to-stderr.rb
 - scripts/write-to-stdout.rb
+- spec/features/addons/generating_an_addon_spec.rb
+- spec/features/addons/using_an_addon_spec.rb
 - spec/features/aliases_spec.rb
 - spec/features/environment_variables_spec.rb
 - spec/features/filesystem_commands_spec.rb
@@ -310,6 +314,8 @@ signing_key:
 specification_version: 4
 summary: The Lagniappe "Yap" shell.
 test_files:
+- spec/features/addons/generating_an_addon_spec.rb
+- spec/features/addons/using_an_addon_spec.rb
 - spec/features/aliases_spec.rb
 - spec/features/environment_variables_spec.rb
 - spec/features/filesystem_commands_spec.rb