ripl-profiles 0.1.4 → 0.2.0

data/.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = "This ripl plugin adds a --profile option to ripl that loads profile files in ~/.ripl/profiles."
   s.description = "This ripl plugin adds a --profile option to ripl that loads profile files in ~/.ripl/profiles before starting ripl."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.8'
+  s.add_dependency 'ripl', '>= 0.3.6'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.2.0
+* Load profiles before Shell#before_loop (be compatible with ripl-multi_line 0.3.0).
+
 == 0.1.4
 * Load profiles before irbrc.
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2010 Jan Lelis
+Copyright (c) 2010-2011 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/ripl/profiles.rb

@@ -1,11 +1,11 @@
 require 'ripl'
 
 module Ripl::Profiles
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 
   @loaded = []
   
-  Ripl::Runner::OPTIONS << ['-p', '--profile NAME', 'Use a profile']
+  Ripl::Runner::OPTIONS << ['-p, --profile NAME', 'Use a profile']
 
   class << self
     attr_reader :loaded
@@ -28,6 +28,17 @@ module Ripl::Profiles
         end
       }
     end
+
+    def load_from_config
+      if Ripl.config[:profiles_default] && Ripl::Profiles.loaded.empty?
+        Ripl::Profiles.load Ripl.config[:profiles_default]
+      end
+
+      if Ripl.config[:profiles_base]
+        Ripl::Profiles.load Ripl.config[:profiles_base]
+      end
+    end
+
   end
 
   # command shortcuts
@@ -45,22 +56,6 @@ module Ripl::Profiles
     end
   end
 
-  module Shell
-    # load default profile if non is set
-    def before_loop
-      if Ripl.config[:profiles_default] && Ripl::Profiles.loaded.empty?
-        Ripl::Profiles.load Ripl.config[:profiles_default]
-      end
-
-      if Ripl.config[:profiles_base]
-        Ripl::Profiles.load Ripl.config[:profiles_base]
-      end
-
-      # next plugins, load irbrc and make Ripl::Commands available
-      super
-    end
-  end
- 
   module Runner
     # add command line option
     def parse_option( option, argv )
@@ -73,9 +68,18 @@ module Ripl::Profiles
   end
 end
 
-Ripl::Runner.send :extend,    Ripl::Profiles::Runner
-Ripl::Shell.send :include,    Ripl::Profiles::Shell
-Ripl::Commands.send :include, Ripl::Profiles::Commands
+# hack into Shell#loop to get extra rights (run before before_loop)
+class Ripl::Shell
+  def loop
+    Ripl::Profiles.load_from_config
+    before_loop
+    catch(:ripl_exit) { while(true) do; loop_once; end }
+    after_loop
+  end
+end
+
+Ripl::Runner.extend    Ripl::Profiles::Runner
+Ripl::Commands.include Ripl::Profiles::Commands
 
 Ripl.config[:profiles_prefix]  ||= "~/.ripl/profiles/"
 Ripl.config[:profiles_verbose] ||= false

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-profiles
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
-default_executable: 
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ripl
@@ -25,11 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 8
-        version: 0.2.8
+        version: 0.3.6
   type: :runtime
   version_requirements: *id001
 description: This ripl plugin adds a --profile option to ripl that loads profile files in ~/.ripl/profiles before starting ripl.
@@ -49,7 +40,6 @@ files:
 - deps.rip
 - Rakefile
 - .gemspec
-has_rdoc: true
 homepage: http://github.com/janlelis/ripl-profiles
 licenses: 
 - MIT
@@ -63,23 +53,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: This ripl plugin adds a --profile option to ripl that loads profile files in ~/.ripl/profiles.