gloo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0507913bb322d98577252dce4f699185f09d2dc87dc4a8f80ea4fc71859fcc
-  data.tar.gz: 7539b9d58d14baeb60cd98cdea9c92f3330d00da5e1c743fd81aefc7246d03e8
+  metadata.gz: 19496a960895aafa43d063747006006f73974b35932d46e2b6e16348f94ebd12
+  data.tar.gz: ea5df8220074a3d6d9b2e9316696287fe9176f22bcbbd6ca6f0ae3f1108cf983
 SHA512:
-  metadata.gz: c1df92b449aeb3344d47fd8aa3d68b1b7e0ef9001444efbb66897038d8e189d435439c9844afa54948e19c2c161c31213e31ef5ea0573ea31429e30d2f718c51
-  data.tar.gz: '028f3fe632304b2e947f9955e42d1aa0b768384c9649a112dc47e2d4c2d69e034f586c8b10f0c416dd09f506ec814f8a61f0ca6c7bb2e442e8d0e85846a98d94'
+  metadata.gz: 98f6ed2211824bbc5af791b32b1c2a55e5bc70dd91c6fe2440a2820324f2143c39860f89d458787dfba7405eb79f5dcd25f961b2cc9944350347e12d2daa60b6
+  data.tar.gz: ac15204c8c19dc59c87335da8d491436f540976bfba1d2304e38493ec07ba733005333e19f00a26753d4b83c30a86ef5e6764747663562a11787be68cb2c02b0

data/.rubocop.yml

@@ -0,0 +1,73 @@
+AllCops:
+  Exclude:
+    - 'gloo.gemspec'
+
+# -------------- Layout -------------- #
+Layout/SpaceInsideParens:
+  EnforcedStyle: space
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Layout/SpaceInsideArrayLiteralBrackets:
+  EnforcedStyle: space
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: true
+  EnforcedStyle: space
+
+# -------------- Style -------------- #
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+Style/HashSyntax:
+  EnforcedStyle: no_mixed_keys
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantReturn:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/GlobalVars:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/RedundantSelf:
+  Enabled: false
+
+# -------------- Naming -------------- #
+Naming/PredicateName:
+  Enabled: true
+Naming/AccessorMethodName:
+  Enabled: false
+
+# -------------- Metrics -------------- #
+Metrics/MethodLength:
+  Max: 17   # Default is 10
+  Enabled: true
+Metrics/CyclomaticComplexity:
+  Max: 9   # Default is 6
+Naming/MethodParameterName:
+  MinNameLength: 2   # Default value is 3
+Metrics/PerceivedComplexity:
+  Max: 10   # default value is 7
+Metrics/ClassLength:
+  Max: 137   # default is 100
+Metrics/AbcSize:
+  Max: 37   # default is 15
+
+# -------------- Lint -------------- #
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
+
+# -------------- Security -------------- #
+Security/Eval:
+  Enabled: true

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in gloo.gemspec
 gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gloo (0.3.0)
-      activesupport (~> 5.2, >= 5.2.1)
+    gloo (0.4.0)
+      activesupport (~> 5.2, >= 5.2.4.3)
       chronic (~> 0.10, >= 0.10.2)
       colorize (~> 0.8, >= 0.8.1)
       tty (~> 0.8, >= 0.8.1)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)

data/Rakefile

@@ -1,12 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  ENV[ 'GLOO_ENV' ] = "TEST"
+  ENV[ 'GLOO_ENV' ] = 'TEST'
 
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 task :default => :test

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "gloo"
+require 'bundler/setup'
+require 'gloo'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/gloo.gemspec

@@ -4,15 +4,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "gloo/app/info"
 
 Gem::Specification.new do |spec|
-  spec.name          = "gloo"
+  spec.name          = 'gloo'
   spec.version       = Gloo::App::Info::VERSION
-  spec.authors       = ["Eric Crane"]
-  spec.email         = ["eric.crane@mac.com"]
+  spec.authors       = ['Eric Crane']
+  spec.email         = ['eric.crane@mac.com']
 
   spec.summary       = %q{Gloo scripting language.  A scripting language built on ruby.}
   spec.description   = %q{A scripting languge to keep it all together.}
   spec.homepage      = "http://github.com/ecrane/gloo"
-  spec.license       = "MIT"
+  spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -20,19 +20,20 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  
-  spec.executables << "o"
-  spec.executables << "gloo"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-    
-  spec.add_dependency "activesupport", "~> 5.2", '>= 5.2.1'
-  spec.add_dependency "chronic", "~> 0.10", '>= 0.10.2'
-  spec.add_dependency "tty", "~> 0.8", '>= 0.8.1'
-  spec.add_dependency "colorize", "~> 0.8", '>= 0.8.1'
+  spec.require_paths = ['lib']
+
+  spec.executables << 'o'
+  spec.executables << 'gloo'
+
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+
+  spec.add_dependency "activesupport", '~> 5.2', ">= 5.2.4.3"
+  # spec.add_dependency 'activesupport', '~> 5.2', '>= 5.2.1'
+  spec.add_dependency 'chronic', '~> 0.10', '>= 0.10.2'
+  spec.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
+  spec.add_dependency 'tty', '~> 0.8', '>= 0.8.1'
 end

data/lib/gloo.rb

@@ -5,15 +5,15 @@
 #
 
 path = File.dirname( File.absolute_path( __FILE__ ) )
-root = File.join( path, "gloo", "**/*.rb" )
-Dir.glob( root ) { |ruby_file| require ruby_file }
-
-module Gloo  
+root = File.join( path, 'gloo', '**/*.rb' )
+Dir.glob( root ).each do |ruby_file|
+  require ruby_file
+end
 
+module Gloo
   def self.run
     params = []
-    ( params << "--cli" ) if ARGV.count == 0
+    ( params << '--cli' ) if ARGV.count.zero?
     Gloo::App::Engine.new( params ).start
   end
-
 end

data/lib/gloo/app/args.rb

@@ -11,61 +11,60 @@ require 'colorize'
 module Gloo
   module App
     class Args
-      
-      attr_reader :switches, :files 
-      
+
+      attr_reader :switches, :files
+
       def initialize( params = [] )
         @switches = []
         @files = []
-        
+
         params.each { |o| process_one_arg( o ) }
         ARGV.each { |o| process_one_arg( o ) }
       end
-      
+
       # Was the --quiet arg passed?
       def quiet?
-        return @switches.include?( "quiet" )
+        return @switches.include?( 'quiet' )
       end
-      
-      # 
+
+      #
       # Detect the mode to be run in.
       # Start by seeing if a mode is specified.
       # Then look for the presence of files.
       # Then finally use the default: embedded mode.
-      # 
+      #
       def detect_mode
-        if ENV[ 'GLOO_ENV' ] == "test"
-          mode = Mode::TEST
-        elsif @switches.include?( "version" )
-          mode = Mode::VERSION
-        elsif @switches.include?( "help" )
-          mode = Mode::HELP
-        elsif @switches.include?( "cli" )
-          mode = Mode::CLI
-        elsif @switches.include?( "embed" )
-          mode = Mode::EMBED
-        elsif @files.count > 0
-          mode = Mode::SCRIPT
-        else
-          mode = Mode.default_mode
-        end
+        mode = if ENV[ 'GLOO_ENV' ] == 'test'
+                 Mode::TEST
+               elsif @switches.include?( 'version' )
+                 Mode::VERSION
+               elsif @switches.include?( 'help' )
+                 Mode::HELP
+               elsif @switches.include?( 'cli' )
+                 Mode::CLI
+               elsif @switches.include?( 'embed' )
+                 Mode::EMBED
+               elsif @files.count.positive?
+                 Mode::SCRIPT
+               else
+                 Mode.default_mode
+               end
         $log.debug "running in #{mode} mode"
-        
+
         return mode
       end
 
-      
       private
-      
+
       # Process one argument or parameter.
-      def process_one_arg arg
-        if arg.start_with? "--"
-          switches << arg[2..-1]
+      def process_one_arg( arg )
+        if arg.start_with? '--'
+          switches << arg[ 2..-1 ]
         else
           files << arg
         end
       end
-      
+
     end
   end
 end

data/lib/gloo/app/engine.rb

@@ -15,24 +15,24 @@ module Gloo
       attr_reader :args, :mode, :running
       attr_reader :dictionary, :parser, :heap, :factory
       attr_accessor :last_cmd, :persist_man, :event_manager
-      
+
       # Set up the engine with basic elements.
       def initialize( params = [] )
         $engine = self
         @args = Args.new( params )
         $settings = Settings.new( ENV[ 'GLOO_ENV' ] )
         $log = Log.new( @args.quiet? )
-				$prompt = TTY::Prompt.new
-        $log.debug "engine intialized..."
+        $prompt = TTY::Prompt.new
+        $log.debug 'engine intialized...'
       end
-      
+
       # Start the engine.
       def start
-        $log.debug "starting the engine..."
+        $log.debug 'starting the engine...'
         $log.debug Info.display_title
         @mode = @args.detect_mode
         @running = true
-        
+
         @dictionary = Gloo::Core::Dictionary.instance
         @dictionary.init
         @parser = Gloo::Core::Parser.new
@@ -40,10 +40,10 @@ module Gloo
         @factory = Gloo::Core::Factory.new
         @persist_man = Gloo::Persist::PersistMan.new
         @event_manager = Gloo::Core::EventManager.new
-        
+
         run_mode
       end
-      
+
       # Run the selected mode.
       def run_mode
         if @mode == Mode::VERSION
@@ -56,14 +56,14 @@ module Gloo
           run
         end
       end
-      
+
       # Run files specified on the CLI.
       # Then quit.
       def run_files
         @args.files.each do |f|
           @persist_man.load( f )
         end
-        
+
         quit
       end
 
@@ -71,17 +71,17 @@ module Gloo
       def run
         # Open default files
         self.open_start_file
-        
+
         # TODO: open any files specifed in args
-        
+
         unless @mode == Mode::SCRIPT || @args.quiet?
           @cursor = TTY::Cursor
-          self.loop 
+          self.loop
         end
 
         quit
       end
-      
+
       # Get the setting for the start_with file and open it.
       def open_start_file
         name = $settings.start_with
@@ -96,7 +96,7 @@ module Gloo
 
         @last_cmd = $prompt.ask( "#{d.yellow} #{t.white} >" )
       end
-      
+
       # Is the last command entered blank?
       def last_cmd_blank?
         return true if @last_cmd.nil?
@@ -110,28 +110,28 @@ module Gloo
           process_cmd
         end
       end
-      
+
       # Process the command.
       def process_cmd
         if last_cmd_blank?
           clear_screen
           return
         end
-        
+
         @immediate = @parser.parse_immediate @last_cmd
-        @immediate.run if @immediate
+        Gloo::Core::Runner.go( @immediate ) if @immediate
       end
 
       # Request the engine to stop running.
       def stop_running
         @running = false
       end
-      
+
       # Do any clean up and quit.
       def quit
-        $log.debug "quitting..."
+        $log.debug 'quitting...'
       end
-      
+
       # Show the version information and then quit.
       def run_version
         puts Info.display_title unless @args.quiet?
@@ -139,20 +139,25 @@ module Gloo
       end
 
       # Show the help information and then quit.
-      def run_help keep_running=false
-        unless @args.quiet?
-          puts Info.display_title
-          puts Help.get_help_text
-        end
+      def run_help( keep_running = false )
+        out = "#{Info.display_title}\n"
+        out << Help.get_help_text
+        $engine.heap.it.set_to out
+        puts out unless @args.quiet?
         quit unless keep_running
       end
-      
+
       # Clear the screen.
       def clear_screen
         print @cursor.clear_screen
         print @cursor.move_to( 0, 0 )
       end
-      
+
+      # Did the last command result in an error?
+      def error?
+        return !@heap.error.value.nil?
+      end
+
     end
   end
 end