brice 0.2.8 → 0.4.2

data/lib/brice/config.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of brice, the extra cool IRb goodness donator                   #
 #                                                                             #
-# Copyright (C) 2008-2011 Jens Wille                                          #
+# Copyright (C) 2008-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -25,7 +25,6 @@
 #++
 
 require 'ostruct'
-require 'brice'
 
 module Brice
 
@@ -62,7 +61,7 @@ module Brice
 
     def initialize(packages = [])
       @packages = Hash.new { |h, k| h[k] = PackageConfig.new }
-      packages.each { |package| self[package] }
+      self.include(*packages)
     end
 
     # call-seq:

data/lib/brice/dsl.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of brice, the extra cool IRb goodness donator                   #
 #                                                                             #
-# Copyright (C) 2008-2012 Jens Wille                                          #
+# Copyright (C) 2008-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -27,8 +27,6 @@
 require 'nuggets/object/silence_mixin'
 require 'nuggets/env/set'
 
-require 'brice'
-
 module Brice
 
   # Certain global helper methods for use inside IRb extensions. Also

data/lib/brice/history.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of brice, the extra cool IRb goodness donator                   #
 #                                                                             #
-# Copyright (C) 2008-2012 Jens Wille                                          #
+# Copyright (C) 2008-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -24,8 +24,6 @@
 ###############################################################################
 #++
 
-require 'brice'
-
 module Brice
 
   # IRb history support.
@@ -45,11 +43,11 @@ module Brice
   class History
 
     DEFAULTS = {
-      :path   =>  ENV['IRB_HISTORY_FILE'] || File.join(ENV.user_home, '.irb_history'),
-      :size   => (ENV['IRB_HISTORY_SIZE'] || 1000).to_i,
-      :perms  => File::WRONLY | File::CREAT | File::TRUNC,
-      :uniq   => :reverse,
-      :merge  => true
+      path:   ENV['IRB_HISTORY_FILE'] || File.join(ENV.user_home, '.irb_history'),
+      size:  (ENV['IRB_HISTORY_SIZE'] || 1000).to_i,
+      perms: File::WRONLY | File::CREAT | File::TRUNC,
+      uniq:  :reverse,
+      merge: true
     }
 
     def self.init(opt = {})
@@ -93,6 +91,8 @@ module Brice
     end
 
     def load_history(history = @history)
+      @first_line = nil
+
       return unless File.readable?(@path)
       read_history { |line| history << line }
 

data/lib/brice/loud.rb

@@ -1,2 +1,2 @@
 require 'brice'
-Brice.init(:quiet => false)
+Brice.init(quiet: false)

data/lib/brice/rc/060_init.rb

@@ -2,8 +2,8 @@
 
 brice 'init' => nil do |config|
 
-  $KCODE = 'u' if RUBY_VERSION < '1.9'
-
-  IRB.conf[:AUTO_INDENT] = true
+  IRB.conf[:AUTO_INDENT]        = true
+  IRB.conf[:ECHO_ON_ASSIGNMENT] = true
+  IRB.conf[:USE_MULTILINE]      = false
 
 end

data/lib/brice/rc/070_prompt.rb

@@ -17,8 +17,8 @@ brice 'prompt' => nil do |config|
       alias_method :_brice_original_evaluate, :evaluate
 
       # Capture execution time
-      def evaluate(*a)
-        @_brice_tms = Benchmark.measure { _brice_original_evaluate(*a) }
+      def evaluate(*a, **o)
+        @_brice_tms = Benchmark.measure { _brice_original_evaluate(*a, **o) }
       end
     end
   end
@@ -39,20 +39,20 @@ brice 'prompt' => nil do |config|
     lambda { |rt| "#{rt} => %s\n" } : "=> %s\n"
 
   IRB.conf[:PROMPT].update(
-    :BRICE_SIMPLE => {
-      :PROMPT_I => '  ',
-      :PROMPT_S => '  ',
-      :PROMPT_C => '  ',
-      :RETURN   => prompt_return
+    BRICE_SIMPLE: {
+      PROMPT_I: '  ',
+      PROMPT_S: '  ',
+      PROMPT_C: '  ',
+      RETURN:   prompt_return
     },
-    :BRICE_VERBOSE => {
-      :PROMPT_I => "#{prefix}> ",
-      :PROMPT_S => "#{prefix}> ",
-      :PROMPT_C => "#{prefix}> ",
-      :RETURN   => prompt_return
+    BRICE_VERBOSE: {
+      PROMPT_I: "#{prefix}> ",
+      PROMPT_S: "#{prefix}> ",
+      PROMPT_C: "#{prefix}> ",
+      RETURN:   prompt_return
     }
   )
 
-  IRB.conf[:PROMPT_MODE] = RUBY_VERSION < '1.9' ? :BRICE_SIMPLE : :BRICE_VERBOSE
+  IRB.conf[:PROMPT_MODE] = :BRICE_VERBOSE if IRB.conf[:PROMPT_MODE] == :DEFAULT
 
 end

data/lib/brice/rc/080_rails.rb

@@ -24,10 +24,10 @@ brice 'rails' => nil do |config|
     IRB.conf[:PROMPT] ||= {}
 
     IRB.conf[:PROMPT][:BRICE_RAILS] = {
-      :PROMPT_I => prompt,
-      :PROMPT_S => prompt,
-      :PROMPT_C => prompt,
-      :RETURN   => IRB.conf[:PROMPT][:BRICE_SIMPLE] ?
+      PROMPT_I: prompt,
+      PROMPT_S: prompt,
+      PROMPT_C: prompt,
+      RETURN:   IRB.conf[:PROMPT][:BRICE_SIMPLE] ?
         IRB.conf[:PROMPT][:BRICE_SIMPLE][:RETURN] : "=> %s\n"
     }
 
@@ -40,7 +40,7 @@ brice 'rails' => nil do |config|
         Object.const_set(:RAILS_DEFAULT_LOGGER, Logger.new(STDOUT))
       }
 
-      define_irb_method(:logger) { |*args|
+      define_irb_method(:logger) { |*args, &block|
         if args.empty?
           RAILS_DEFAULT_LOGGER
         else
@@ -51,7 +51,7 @@ brice 'rails' => nil do |config|
 
           if block_given?
             begin
-              yield  # RDoc: Warning: yield outside of method
+              block.call
             ensure
               logger.level = previous_level
             end

data/lib/brice/really_loud.rb

@@ -1,2 +1,2 @@
 require 'brice'
-Brice.init(:quiet => false, :verbose => true)
+Brice.init(quiet: false, verbose: true)

data/lib/brice/shortcuts.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of brice, the extra cool IRb goodness donator                   #
 #                                                                             #
-# Copyright (C) 2008-2012 Jens Wille                                          #
+# Copyright (C) 2008-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -25,14 +25,22 @@
 #++
 
 require 'nuggets/file/which'
-require 'brice'
 
 module Brice
 
+  EDITORS = %W[
+    #{ENV['VISUAL']}
+    #{ENV['EDITOR']}
+    /usr/bin/sensible-editor
+    /usr/bin/xdg-open
+    open
+    vi
+  ]
+
   # Convenient shortcut methods.
   #
-  # Set <tt>config.shortcuts.opt = { :object => false }</tt> to disable
-  # ObjectShortcuts, or <tt>config.shortcuts.opt = { :ri => false }</tt>
+  # Set <tt>config.shortcuts.opt = { object: false }</tt> to disable
+  # ObjectShortcuts, or <tt>config.shortcuts.opt = { ri: false }</tt>
   # to disable #ri shortcuts.
 
   module Shortcuts
@@ -55,7 +63,7 @@ module Brice
         end
 
         def ri!(*args)
-          opts, args = args.partition { |arg| arg.to_s =~ /\A--/ }
+          opts, args = args.partition { |arg| arg.to_s.start_with?('--') }
 
           args.empty? ? args << name : args.map! { |arg|
             arg, method = arg.to_s, nil
@@ -124,14 +132,7 @@ module Brice
         YAML.dump(obj, tempfile)
         tempfile.close
 
-        if editor ||= File.which_command(%W[
-          #{ENV['VISUAL']}
-          #{ENV['EDITOR']}
-          /usr/bin/sensible-editor
-          /usr/bin/xdg-open
-          open
-          vi
-        ])
+        if editor ||= File.which_command(EDITORS)
           system(editor, path = tempfile.path)
           return obj unless File.exists?(path)
         else

data/lib/brice/version.rb

@@ -3,8 +3,8 @@ module Brice
   module Version
 
     MAJOR = 0
-    MINOR = 2
-    TINY  = 8
+    MINOR = 4
+    TINY  = 2
 
     class << self
 

data/spec/brice/history_spec.rb

@@ -1,5 +1,3 @@
-require 'brice/history'
-
 describe Brice::History do
 
   def hist
@@ -7,7 +5,7 @@ describe Brice::History do
   end
 
   def init_hist(opt = {})
-    @hist = Brice::History.new(opt.merge(:path => @path), hist)
+    @hist = Brice::History.new(opt.merge(path: @path), hist)
   end
 
   def saved_hist
@@ -23,8 +21,8 @@ describe Brice::History do
 
   describe 'no uniq, no merge' do
 
-    before :each do
-      init_hist(:uniq => false, :merge => false)
+    before do
+      init_hist(uniq: false, merge: false)
     end
 
     example { compare_hist(%w[]) }
@@ -37,8 +35,8 @@ describe Brice::History do
 
   describe 'uniq, no merge' do
 
-    before :each do
-      init_hist(:uniq => true, :merge => false)
+    before do
+      init_hist(uniq: true, merge: false)
     end
 
     example { compare_hist(%w[]) }
@@ -51,8 +49,8 @@ describe Brice::History do
 
   describe 'uniq, merge' do
 
-    before :each do
-      init_hist(:uniq => true, :merge => true)
+    before do
+      init_hist(uniq: true, merge: true)
     end
 
     example { compare_hist(%w[]) }
@@ -66,8 +64,8 @@ describe Brice::History do
 
   describe 'reverse uniq, no merge' do
 
-    before :each do
-      init_hist(:uniq => :reverse, :merge => false)
+    before do
+      init_hist(uniq: :reverse, merge: false)
     end
 
     example { compare_hist(%w[]) }
@@ -80,8 +78,8 @@ describe Brice::History do
 
   describe 'reverse uniq, merge' do
 
-    before :each do
-      init_hist(:uniq => :reverse, :merge => true)
+    before do
+      init_hist(uniq: :reverse, merge: true)
     end
 
     example { compare_hist(%w[]) }

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-$:.unshift('lib') unless $:.first == 'lib'
-
+require 'brice'
 require 'tempfile'
 
 RSpec.configure { |config|
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+
   config.before(:each) { open_tempfile }
   config.after(:each) { close_tempfile }
 

metadata

@@ -1,29 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: brice
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.4.2
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: hen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extra cool IRb goodness for the masses
 email: jens.wille@gmail.com
 executables: []
@@ -33,6 +81,11 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
+- COPYING
+- ChangeLog
+- README
+- Rakefile
+- TODO
 - lib/brice.rb
 - lib/brice/colours.rb
 - lib/brice/config.rb
@@ -40,10 +93,10 @@ files:
 - lib/brice/history.rb
 - lib/brice/init.rb
 - lib/brice/loud.rb
-- lib/brice/rc/010_added_methods.rb
+- lib/brice/rc/010_added_methods_.rb
 - lib/brice/rc/020_libs.rb
 - lib/brice/rc/030_history.rb
-- lib/brice/rc/040_colours.rb
+- lib/brice/rc/040_colours_.rb
 - lib/brice/rc/050_shortcuts.rb
 - lib/brice/rc/060_init.rb
 - lib/brice/rc/070_prompt.rb
@@ -52,42 +105,41 @@ files:
 - lib/brice/really_loud.rb
 - lib/brice/shortcuts.rb
 - lib/brice/version.rb
-- COPYING
-- ChangeLog
-- README
-- Rakefile
-- TODO
 - spec/brice/history_spec.rb
 - spec/spec_helper.rb
-- .rspec
 homepage: http://github.com/blackwinter/brice
-licenses: []
+licenses:
+- AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  brice-0.4.2 [2020-09-17]:
+
+  * Ruby 2.7 compatibility.
+
 rdoc_options:
-- --charset
+- "--title"
+- brice Application documentation (v0.4.2)
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --title
-- brice Application documentation (v0.2.8)
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extra cool IRb goodness for the masses