sr 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 840b10dde9c75efdffc21996c199a7bfb4dfd3c8
-  data.tar.gz: be910e535a257a2dc572c6709b59c2f5d85b0c3f
+  metadata.gz: f1bc2d0b60073323e10a7be29431f0b40d87a869
+  data.tar.gz: 4cf0d268cb08eebfb551225a1b9227cc6b6b28c6
 SHA512:
-  metadata.gz: 3533e3f363322ca51324c7a23239115c0fbf1f2b27711f3259730c20f0ba4b359895f3b4d16ec1324b7567c5b1cbe4136b8843d18b44c81def07fb6900c0232d
-  data.tar.gz: fadced5d39bd00241518406353a3d4930cdd876ee4fc183c8299cfb957ec5a841fa411410646299cefa46040176286f08b1b75c23a3caf540d0bdb09f38e3232
+  metadata.gz: c57141042b502fbbfdf33bee545d90ad48172b8cf549950fa53d59f7500253f82f5e347155d4164077b780ae6e548c7e4f20fd44b4e3895fb5439f9ec6f843d0
+  data.tar.gz: ec40659eb174978cebb80c6e2f4ae9996fde55cdd5bc06f18756294cf19b2d876303c14b52127ae5fa22bb757e9d61b42e8c002e1aadff8f3b261bfdd65d1fa2

data/README.md

@@ -81,7 +81,7 @@ and resets the default binding to the given object.
 **$XDG_CONFIG_DIRS** and **$XDG_CONFIG_HOME**. By default, these files would
 be '/etc/xdg/sr/config.rb' for system-wide configuration and
 '~/.config/sr/config.rb' for user-specific configuration. These files are
-simply Ruby files which are loaded into `sr` via `require`.
+simply Ruby files which are loaded into `sr` via `Kernel#load`.
 
 You may also tell `sr` to load alternative configuration files (or suppress all
 configuration) with the '-f' option. Given no arguments, this option suppresses
@@ -94,8 +94,8 @@ $ sr -f        # start with no configuration
 $ sr -f alt.rb # start with alt.rb as configuration
 ```
 
-In addition to this, `sr` simply uses `gets` as its default input method; if
-you would prefer to use Readline, simply add the following to your `sr`
+In addition to this, `sr` simply uses `STDIN.gets` as its default input method;
+if you would prefer to use Readline, simply add the following to your `sr`
 configuration file:
 
 ```ruby

data/bin/sr

@@ -3,35 +3,8 @@
 
 require 'optparse'
 
-$0.start_with?('/') ? require('sr') : require_relative('../lib/sr')
-
-module SR
-  options = {}
-  parser = OptionParser.new do |opts|
-    opts.on('-c', '--context=obj', 'set the sr context to obj') do |obj|
-      options[:context] = eval(obj)
-    end
-    opts.on('-f [FILE]', 'suppress configuration (load FILE if given)') do |f|
-      options[:config_files] =
-        f ? (options[:config_files] ||= []).push(File.expand_path(f)) : []
-    end
-    opts.on('-v', '--version', 'display sr version') do
-      puts "sr #{SR::VERSION} [ruby #{RUBY_VERSION} #{RUBY_PLATFORM}]"
-      exit
-    end
-    opts.on('-h', '--help', 'display this message') do
-      puts opts
-      exit
-    end
-  end
-
-  begin
-    parser.parse!
-  rescue OptionParser::InvalidOption => ex
-    $stderr.puts ex.message
-    $stderr.puts parser.help
-    exit 1
-  end
-
-  ARGV.empty? ? repl(options) : ($stderr.puts parser.help ; exit 1)
+($0 =~ /^\// ? %w(sr sr/cli) : %w(../lib/sr ../lib/sr/cli)).each do |file|
+  file =~ /^\./ ? require_relative(file) : require(file)
 end
+
+SR::CLI.call

data/lib/sr.rb

@@ -33,14 +33,17 @@ module SR
 
   @prompt = {
     error:  proc { |e| "!! #{e.class}: #{e.message}" },
-    input:  proc { "== #{@context.receiver}:\n>> " },
+    input:  proc do
+      c = @context
+      "== #{c.respond_to?(:receiver) ? c.receiver : c.eval('self')}:\n>> "
+    end,
     more:   '..   ',
     return: proc { |v| "-> #{v.inspect}" },
   }
 
   @input_handler ||= ->(more) do
     print(call_prompt(more ? :more : :input))
-    input = gets
+    input = STDIN.gets
     input = "#{more}#{input}" if more
     input
   end
@@ -108,8 +111,8 @@ module SR
   #   given input
   # @return [Object] the return value of the given input
   private_class_method def self.read_eval_print(more = nil)
-    input = @input_handler.call(more)
-    value = @context.eval("_ = #{input}")
+    value = @context.eval(input = @input_handler.call(more), '(sr)', 0)
+    @context.local_variable_set(:_, value)
     puts call_prompt(:return, value) if @prompt[:return]
   rescue *@exception_handlers.keys => ex
     @exception_handlers.find { |(c,_)| ex.is_a?(c) }[1].call(ex, input, more)
@@ -124,7 +127,7 @@ module SR
   #   `:config_files` (`Array<String>`) and `:context` (`#__binding__`)
   # @return [void]
   def self.repl(context = nil, **options)
-    options.fetch(:config_files, CONFIGURATION_FILES).each(&method(:require))
+    options.fetch(:config_files, CONFIGURATION_FILES).each(&method(:load))
     context = context || options[:context]
     reset_binding(context) unless context.nil?
     @enabled = true

data/lib/sr/cli.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module SR
+  module CLI
+    def self.call
+      options = {}
+      parser = OptionParser.new do |opts|
+        opts.on('-c', '--context=obj', 'set the sr context to obj') do |obj|
+          options[:context] = eval(obj, TOPLEVEL_BINDING)
+        end
+        opts.on('-f [FILE]', 'suppress configuration (or load FILE)') do |f|
+          if f && File.exist?(f)
+            (options[:config_files] ||= []).push(File.expand_path(f))
+          else
+            fail "#{f} is not a valid file" if f
+            options[:config_files] = []
+          end
+        end
+        opts.on('-v', '--version', 'display sr version') do
+          puts "sr #{SR::VERSION} [ruby #{RUBY_VERSION} #{RUBY_PLATFORM}]"
+          exit
+        end
+        opts.on('-h', '--help', 'display this message') do
+          puts opts
+          exit
+        end
+      end
+      parser.parse!(ARGV)
+      SR.repl(options)
+    rescue SystemExit
+      # Do nothing -- this exists so the exception handling below doesn't pick
+      # up system exits from the option parser itself.
+    rescue Exception => ex
+      $stderr.puts ex.message
+      exit 1
+    end
+  end
+end

data/lib/sr/version.rb

@@ -2,5 +2,5 @@
 
 module SR
   # Semantic version of `sr`.
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Robin Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxdg
@@ -50,6 +50,7 @@ files:
 - UNLICENSE.md
 - bin/sr
 - lib/sr.rb
+- lib/sr/cli.rb
 - lib/sr/core_patches.rb
 - lib/sr/input/readline.rb
 - lib/sr/version.rb
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: sr is a simple, tiny, hackable REPL for Ruby.