brice 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d6f3cec45a0b45cb608322cde05228cc240695
-  data.tar.gz: e91c0741caaf6184197a24229c05f78ff8250b61
+  metadata.gz: d96bffd26231c8896400dfbc6f7ba78abfd71fe1
+  data.tar.gz: 08437c2a60a49448f72b0175653164708afdbc54
 SHA512:
-  metadata.gz: cebb5bd7516dc856accae7f1609bcf56008c5fce7faabf207238182e02a45c640965b1468e014031d65dfff6ecc71ce84c3bf35507d4af270a26fb70659232a6
-  data.tar.gz: 5ad2d699bd528635b643fd055a8feb2030bda369bcbcfc32c5a6c2e5237aa023cdfbeb4d2841086556a2e6bb9196c5ba86c84b39d8ce213851f7466da598a31d
+  metadata.gz: f551999b288415c4d70c87bf3c9591d150f1ac7059e7b3546689b9a9f53cfd53590a54011daed0b3cbff1e174e22baf1630b742764e95a612e2baffc80a930dc
+  data.tar.gz: 71cd29a11628b99ca99cf286109ef017d28b6647edff9a1aca741a21ab64731f5437f1164469b0c571755b8abb2aff7ef158facd189a16c817e1a8aac3af90cd

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for brice
 
+== 0.4.0 [2014-10-31]
+
+* Require at least Ruby 1.9.3.
+* Only set prompt if left at default.
+* Default package +added_methods+ now optional.
+
 == 0.0.1 [2008-11-14]
 
 * Birthday :-)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to brice version 0.3.0
+This documentation refers to brice version 0.4.0
 
 
 == DESCRIPTION
@@ -15,12 +15,10 @@ in that regard.
 
 Add this to your <tt>~/.irbrc</tt> and receive the default goodness:
 
-  require 'rubygems'
   require 'brice/init'  # equivalent to: require 'brice'; Brice.init
 
 Or get some more control over the configuration:
 
-  require 'rubygems'
   require 'brice'
 
   Brice.init { |config|
@@ -67,6 +65,7 @@ guaranteed to have any effect after <tt>Brice.init</tt> has been called.
 Documentation:: https://blackwinter.github.com/brice
 Source code::   https://github.com/blackwinter/brice
 RubyGem::       https://rubygems.org/gems/brice
+Travis CI::     https://travis-ci.org/blackwinter/brice
 
 
 == AUTHORS

data/Rakefile

@@ -1,18 +1,20 @@
-require File.expand_path(%q{../lib/brice/version}, __FILE__)
+require_relative 'lib/brice/version'
 
 begin
   require 'hen'
 
   Hen.lay! {{
-    :gem => {
-      :name         => %q{brice},
-      :version      => Brice::VERSION,
-      :summary      => %q{Extra cool IRb goodness for the masses},
-      :author       => %q{Jens Wille},
-      :email        => %q{jens.wille@gmail.com},
-      :license      => %q{AGPL-3.0},
-      :homepage     => :blackwinter,
-      :dependencies => %w[nuggets]
+    gem: {
+      name:         %q{brice},
+      version:      Brice::VERSION,
+      summary:      %q{Extra cool IRb goodness for the masses},
+      author:       %q{Jens Wille},
+      email:        %q{jens.wille@gmail.com},
+      license:      %q{AGPL-3.0},
+      homepage:     :blackwinter,
+      dependencies: %w[nuggets],
+
+      required_ruby_version: '>= 1.9.3'
     }
   }}
 rescue LoadError => err

data/lib/brice.rb

@@ -27,16 +27,11 @@
 require 'irb'
 require 'nuggets/env/user_home'
 
-require 'brice/version'
+require_relative 'brice/dsl'
+require_relative 'brice/version'
 
 module Brice
 
-  autoload :Config,    'brice/config'
-  autoload :Colours,   'brice/colours'
-  autoload :DSL,       'brice/dsl'
-  autoload :History,   'brice/history'
-  autoload :Shortcuts, 'brice/shortcuts'
-
   RC_DIR = __FILE__.sub(/\.rb\z/, '/rc')
 
   BRICE_HOME = File.join(ENV.user_home, '.brice')
@@ -59,18 +54,19 @@ module Brice
   def init(options = {})
     @irb_rc = []
 
-    @config = Config.new(rc_files(true).map { |rc|
-      File.basename(rc, '.rb').sub(/\A\d+_/, '')
-    })
-
     options.each { |key, value|
-      if respond_to?(method = "#{key}=")
-        send(method, value)
-      else
-        raise ArgumentError, "illegal option: #{key}"
-      end
+      respond_to?(set = "#{key}=") ? send(set, value) :
+        raise(ArgumentError, "illegal option: #{key}")
     }
 
+    packages = rc_files(true).map { |rc|
+      File.basename(rc, '.rb').sub(/\A\d+_/, '')
+    }.reject { |rc| rc.end_with?('?') }
+
+    warn "Default packages: #{packages.join(', ')}" if verbose
+
+    @config = Config.new(packages)
+
     yield config if block_given?
 
     load_rc_files(true)
@@ -85,11 +81,8 @@ module Brice
   # Set config to +config+. Raises a TypeError if +config+ is not a
   # Brice::Config.
   def config=(config)
-    if config.is_a?(Config)
-      @config = config
-    else
-      raise TypeError, "Brice::Config expected, got #{config.class}"
-    end
+    config.is_a?(Config) ? @config = config :
+      raise(TypeError, "Brice::Config expected, got #{config.class}")
   end
 
   # call-seq:
@@ -178,3 +171,8 @@ module Brice
   end
 
 end
+
+require_relative 'brice/config'
+require_relative 'brice/colours'
+require_relative 'brice/history'
+require_relative 'brice/shortcuts'

data/lib/brice/colours.rb

@@ -24,8 +24,6 @@
 ###############################################################################
 #++
 
-require 'brice'
-
 module Brice
 
   # Add colour support to IRb.
@@ -41,58 +39,58 @@ module Brice
     # Default IRb colour scheme.
     DEFAULT_COLOURS = {
       # delimiter colours
-      :comma              => :blue,
-      :refers             => :blue,
+      comma:              :blue,
+      refers:             :blue,
 
       # container colours (hash and array)
-      :open_hash          => :green,
-      :close_hash         => :green,
-      :open_array         => :green,
-      :close_array        => :green,
+      open_hash:          :green,
+      close_hash:         :green,
+      open_array:         :green,
+      close_array:        :green,
 
       # object colours
-      :open_object        => :light_red,
-      :object_class       => :white,
-      :object_addr_prefix => :blue,
-      :object_line_prefix => :blue,
-      :close_object       => :light_red,
+      open_object:        :light_red,
+      object_class:       :white,
+      object_addr_prefix: :blue,
+      object_line_prefix: :blue,
+      close_object:       :light_red,
 
       # symbol colours
-      :symbol             => :yellow,
-      :symbol_prefix      => :yellow,
+      symbol:             :yellow,
+      symbol_prefix:      :yellow,
 
       # string colours
-      :open_string        => :red,
-      :string             => :cyan,
-      :close_string       => :red,
+      open_string:        :red,
+      string:             :cyan,
+      close_string:       :red,
 
       # misc colours
-      :number             => :cyan,
-      :keyword            => :green,
-      :class              => :light_green,
-      :range              => :red,
-      :unknown            => :green
+      number:             :cyan,
+      keyword:            :green,
+      class:              :light_green,
+      range:              :red,
+      unknown:            :green
     }
 
     # Fruity testing colours.
     TESTING_COLOURS = {
-      :comma            => :red,
-      :refers           => :red,
-      :open_hash        => :blue,
-      :close_hash       => :blue,
-      :open_array       => :green,
-      :close_array      => :green,
-      :open_object      => :light_red,
-      :object_class     => :light_green,
-      :object_addr      => :purple,
-      :object_line      => :light_purple,
-      :close_object     => :light_red,
-      :symbol           => :yellow,
-      :symbol_prefix    => :yellow,
-      :number           => :cyan,
-      :string           => :cyan,
-      :keyword          => :white,
-      :range            => :light_blue
+      comma:              :red,
+      refers:             :red,
+      open_hash:          :blue,
+      close_hash:         :blue,
+      open_array:         :green,
+      close_array:        :green,
+      open_object:        :light_red,
+      object_class:       :light_green,
+      object_addr:        :purple,
+      object_line:        :light_purple,
+      close_object:       :light_red,
+      symbol:             :yellow,
+      symbol_prefix:      :yellow,
+      number:             :cyan,
+      string:             :cyan,
+      keyword:            :white,
+      range:              :light_blue
     }
 
     def init(opt = {})
@@ -109,51 +107,26 @@ module Brice
 
     # Enable colourized IRb results.
     def enable_irb
-      if IRB.const_defined?(:Inspector)
-        IRB::Inspector.class_eval {
-          unless method_defined?(:inspect_value_with_colour)
-            alias_method :inspect_value_without_colour, :inspect_value
-
-            def inspect_value_with_colour(value)
-              Colours.colourize(inspect_value_without_colour(value))
-            end
-          end
-
-          alias_method :inspect_value, :inspect_value_with_colour
-        }
-      else
-        IRB::Irb.class_eval {
-          unless method_defined?(:output_value_with_colour)
-            alias_method :output_value_without_colour, :output_value
+      IRB::Inspector.class_eval {
+        unless method_defined?(:inspect_value_with_colour)
+          alias_method :inspect_value_without_colour, :inspect_value
 
-            def output_value_with_colour
-              value = @context.last_value
-              value = Colours.colourize(value.inspect) if @context.inspect?
-
-              printf(@context.return_format, value)
-            end
+          def inspect_value_with_colour(value)
+            Colours.colourize(inspect_value_without_colour(value))
           end
+        end
 
-          alias_method :output_value, :output_value_with_colour
-        }
-      end
+        alias_method :inspect_value, :inspect_value_with_colour
+      }
     end
 
     # Disable colourized IRb results.
     def disable_irb
-      if IRB.const_defined?(:Inspector)
-        IRB::Inspector.class_eval {
-          if method_defined?(:inspect_value_without_colour)
-            alias_method :inspect_value, :inspect_value_without_colour
-          end
-        }
-      else
-        IRB::Irb.class_eval {
-          if method_defined?(:output_value_without_colour)
-            alias_method :output_value, :output_value_without_colour
-          end
-        }
-      end
+      IRB::Inspector.class_eval {
+        if method_defined?(:inspect_value_without_colour)
+          alias_method :inspect_value, :inspect_value_without_colour
+        end
+      }
     end
 
     def enable_pp
@@ -233,23 +206,23 @@ module Brice
       extend self
 
       COLOURS = {
-        :reset        => '0;0',
-        :black        => '0;30',
-        :red          => '0;31',
-        :green        => '0;32',
-        :brown        => '0;33',
-        :blue         => '0;34',
-        :cyan         => '0;36',
-        :purple       => '0;35',
-        :light_gray   => '0;37',
-        :dark_gray    => '1;30',
-        :light_red    => '1;31',
-        :light_green  => '1;32',
-        :yellow       => '1;33',
-        :light_blue   => '1;34',
-        :light_cyan   => '1;36',
-        :light_purple => '1;35',
-        :white        => '1;37'
+        reset:         '0;0',
+        black:         '0;30',
+        red:           '0;31',
+        green:         '0;32',
+        brown:         '0;33',
+        blue:          '0;34',
+        cyan:          '0;36',
+        purple:        '0;35',
+        light_gray:    '0;37',
+        dark_gray:     '1;30',
+        light_red:     '1;31',
+        light_green:   '1;32',
+        yellow:        '1;33',
+        light_blue:    '1;34',
+        light_cyan:    '1;36',
+        light_purple:  '1;35',
+        white:         '1;37'
       }
 
       # Return the escape code for a given colour.

data/lib/brice/config.rb

@@ -25,7 +25,6 @@
 #++
 
 require 'ostruct'
-require 'brice'
 
 module Brice
 

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.

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,6 @@
 
 brice 'init' => nil do |config|
 
-  $KCODE = 'u' if RUBY_VERSION < '1.9'
-
   IRB.conf[:AUTO_INDENT] = true
 
 end

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

@@ -53,6 +53,6 @@ brice 'prompt' => nil do |config|
     }
   )
 
-  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/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,10 +25,18 @@
 #++
 
 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
@@ -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,7 +3,7 @@ module Brice
   module Version
 
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     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,5 +1,4 @@
-$:.unshift('lib') unless $:.first == 'lib'
-
+require 'brice'
 require 'tempfile'
 
 RSpec.configure { |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brice
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nuggets
@@ -28,16 +28,22 @@ dependencies:
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +93,7 @@ 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
@@ -105,10 +111,17 @@ homepage: http://github.com/blackwinter/brice
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  brice-0.4.0 [2014-10-31]:
+
+  * Require at least Ruby 1.9.3.
+  * Only set prompt if left at default.
+  * Default package +added_methods+ now optional.
+
 rdoc_options:
 - "--title"
-- brice Application documentation (v0.3.0)
+- brice Application documentation (v0.4.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -121,7 +134,7 @@ 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:
   - - ">="
@@ -129,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Extra cool IRb goodness for the masses