mysh 0.3.0 → 0.4.0

data/lib/mysh/user_input.rb

@@ -2,51 +2,35 @@
 
 require 'mini_readline'
 
-require_relative 'user_input/smart_source'
-require_relative 'user_input/parse'
+require_relative 'sources/console'
+require_relative 'sources/string'
+
+require_relative 'sources/smart_auto_complete'
+require_relative 'sources/parse'
 
 #* mysh/user_input.rb -- Get some text from the user.
 module Mysh
 
-  class << self
-    #The input text source.
-    attr_reader :input
-  end
-
   #Get one command from the user.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
-  def self.get_command
-    puts MNV[:pre_prompt] if MNV.key?(:pre_prompt)
-
-    initial_input = @input.readline(prompt: MNV[:prompt] + '>')
-    @input.instance_options[:initial] = ""
-    get_command_extra(initial_input)
-
-  rescue MiniReadlineEOI
-    @mysh_running = false
-    "\n"
+  def self.get_command(source)
+    get_command_extra(source, source.get_command)
   end
 
-  private
-
   #Get any continuations of the inputs
-  def self.get_command_extra(str)
+  def self.get_command_extra(source, str)
     if /\\\s*$/ =~ str
-      parms = {prompt: MNV[:post_prompt] + '\\', prefix: str[0] }
-      get_command_extra($PREMATCH + "\n" + @input.readline(parms))
+      get_command_extra(source, $PREMATCH + "\n" + source.get_command_extra(str))
     else
       str
     end
-
   end
 
   #Get the user input ready.
-  def self.init_input
-    @input = MiniReadline::Readline.new(history:       true,
-                                        eoi_detect:    true,
-                                        auto_complete: true,
-                                        auto_source:   SmartSource)
+  def self.input
+    @input ||= MiniReadline::Readline.new(history:       true,
+                                          eoi_detect:    true,
+                                          auto_complete: true,
+                                          auto_source:   SmartSource)
   end
 
 end

data/lib/mysh/version.rb

@@ -2,7 +2,7 @@
 
 module Mysh
   #The version string of MY SHell.
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
   #A brief summary of this gem.
   SUMMARY = "mysh -- a Ruby inspired command line shell."

data/samples/load.rb

@@ -0,0 +1,6 @@
+#A sample test file to be run.
+
+puts "Accessing mysh from a Ruby script", ""
+
+mysh "@env"
+

data/samples/script.mysh

@@ -0,0 +1,11 @@
+say This is a sample mysh script file.
+say
+
+say Let's try a gls!
+gls
+
+say Let's try a vls!
+vls
+
+say Let's try an @env!
+@env

data/samples/sleep.rb

@@ -0,0 +1,6 @@
+puts "Time for a 10 second nap!"
+
+sleep(10)
+
+puts "Nap time done!"
+

data/samples/sleep.txt

@@ -0,0 +1,2 @@
+Time for a 10 second nap! {{ sleep(10) #}}
+Nap time done!

data/tests/my_shell_tests.rb

@@ -48,8 +48,6 @@ class MyShellTester < Minitest::Test
   end
 
   def test_handlebars
-    Mysh.reset_host
-
     assert_equal("ABC 123 DEF",
                  "ABC {{ (1..3).to_a.join }} DEF".eval_handlebars)
 
@@ -127,8 +125,6 @@ class MyShellTester < Minitest::Test
   end
 
   def test_mysh_variables
-    Mysh.reset_host
-
     assert_equal("", MNV[:test])
     assert_equal("", MNV.get_source(:test))
     refute(MNV.key?(:test), "MNV[:test] should not exist.")
@@ -195,4 +191,10 @@ class MyShellTester < Minitest::Test
     assert_equal("OK", MNV[:bad]) #And this too!
   end
 
+  def test_executing_some_strings
+    Mysh.process_string("$c=43\n$d=99")
+    assert_equal("43", MNV[:c])
+    assert_equal("99", MNV[:d])
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,16 +151,31 @@ files:
 - README.md
 - bin/mysh
 - lib/mysh.rb
+- lib/mysh/binding_wrapper.rb
+- lib/mysh/exceptions.rb
 - lib/mysh/expression.rb
 - lib/mysh/expression/lineage.rb
 - lib/mysh/external_ruby.rb
+- lib/mysh/globalize.rb
 - lib/mysh/handlebars.rb
 - lib/mysh/handlebars/string.rb
+- lib/mysh/init.rb
 - lib/mysh/internal.rb
 - lib/mysh/internal/action.rb
 - lib/mysh/internal/action_pool.rb
 - lib/mysh/internal/actions/actions_path.rb
 - lib/mysh/internal/actions/cd.rb
+- lib/mysh/internal/actions/command_line.rb
+- lib/mysh/internal/actions/command_line/debug.rb
+- lib/mysh/internal/actions/command_line/init.rb
+- lib/mysh/internal/actions/command_line/load.rb
+- lib/mysh/internal/actions/command_line/post_prompt.rb
+- lib/mysh/internal/actions/command_line/pre_prompt.rb
+- lib/mysh/internal/actions/command_line/prompt.rb
+- lib/mysh/internal/actions/command_line/quit.rb
+- lib/mysh/internal/actions/command_line/usage.rb
+- lib/mysh/internal/actions/comment.rb
+- lib/mysh/internal/actions/elapsed.rb
 - lib/mysh/internal/actions/exit.rb
 - lib/mysh/internal/actions/gls.rb
 - lib/mysh/internal/actions/help.rb
@@ -177,9 +192,13 @@ files:
 - lib/mysh/internal/actions/help/ruby.txt
 - lib/mysh/internal/actions/help/show.txt
 - lib/mysh/internal/actions/help/sub_help.rb
+- lib/mysh/internal/actions/help/usage.txt
 - lib/mysh/internal/actions/help/vars.txt
 - lib/mysh/internal/actions/history.rb
+- lib/mysh/internal/actions/load.rb
 - lib/mysh/internal/actions/pwd.rb
+- lib/mysh/internal/actions/quit.rb
+- lib/mysh/internal/actions/say.rb
 - lib/mysh/internal/actions/show.rb
 - lib/mysh/internal/actions/show/env.rb
 - lib/mysh/internal/actions/show/ruby.rb
@@ -196,21 +215,27 @@ files:
 - lib/mysh/internal/format/string.rb
 - lib/mysh/internal/manage.rb
 - lib/mysh/pre_processor.rb
+- lib/mysh/process.rb
 - lib/mysh/quick.rb
 - lib/mysh/shell_variables.rb
 - lib/mysh/shell_variables/evaluate.rb
-- lib/mysh/shell_variables/globalize.rb
 - lib/mysh/shell_variables/shell_variable_keeper.rb
 - lib/mysh/shell_variables/shell_variable_store.rb
+- lib/mysh/sources/console.rb
+- lib/mysh/sources/parse.rb
+- lib/mysh/sources/smart_auto_complete.rb
+- lib/mysh/sources/string.rb
 - lib/mysh/user_input.rb
-- lib/mysh/user_input/parse.rb
-- lib/mysh/user_input/smart_source.rb
 - lib/mysh/version.rb
 - mysh.gemspec
 - mysh.reek
 - rakefile.rb
 - reek.txt
+- samples/load.rb
+- samples/script.mysh
 - samples/show.txt
+- samples/sleep.rb
+- samples/sleep.txt
 - samples/test.rb
 - tests/my_shell_tests.rb
 homepage: https://github.com/PeterCamilleri/mysh

data/lib/mysh/shell_variables/globalize.rb

@@ -1,9 +0,0 @@
-# coding: utf-8
-
-#Monkey patches for Mysh variables
-class Object
-
-  #Make the environment variable store accessible everywhere.
-  MNV = Mysh::MNV
-
-end