iruby 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5997055eaecf58941f72ef81ab8a064af9bbba7d
-  data.tar.gz: 067064e844eaddbcc56ea5857dfc4c6e868aa210
+  metadata.gz: f8536170d50f150a8c7c8bcce0585254deda4f70
+  data.tar.gz: ec4780f595b0bbfd3c28208fb5b9c4a591d767b4
 SHA512:
-  metadata.gz: a5bdc608880d0a01a44fb2ec1280725fa87b190c4cd3465caadab36656a1218dcb93efcc48f8b6dca904c8f5b4dc92e12f8114bbc70edc61c331ab2c966185fa
-  data.tar.gz: c17d036173d5a1440b4a44419afff328d70d8bf2515c1d3e4b8cd9a8fdce4bf5b399f3fd812afd824e897bae4c5b1b0800696c16542eca843fdf69a6b07e0729
+  metadata.gz: 78ffdfa9155b22d2251f63009ca1874a13def37a03f699a3e1b82b0bbeec7f7b5e3899d55362e10f207a87bf6d8fbd801667f0acae2ee8bfcd80f63239ab58a8
+  data.tar.gz: 3a582ce433ea3a18999a116eb26320d389749d7c768ece89107d02a7ee96d83e75a3a613d7ac9ac88cbc726510dd69786cb80761eb5896b08c6c431007f7439f

data/CHANGES

@@ -1,3 +1,8 @@
+0.2.6 (2015-06-21)
+
+  * Check registered kernel and Gemfile to prevent gem loading problems
+  * Support to_tex method for the rendering
+
 0.2.5 (2015-06-07)
 
   * Fix #29, empty signatures

data/README.md

@@ -45,4 +45,4 @@ Copyright © 2013-15, IRuby contributors and the Ruby Science Foundation.
 
 All rights reserved.
 
-IRuby, along with [SciRuby](http://sciruby.com/), is licensed under the MIT license. See the [LICENSE.txt](LICENSE.txt) file for details.
+IRuby, along with [SciRuby](http://sciruby.com/), is licensed under the MIT license. See the [LICENSE](LICENSE) file for details.

data/iruby.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/lib/iruby/version'
+require_relative 'lib/iruby/version'
 require 'date'
 
 Gem::Specification.new do |s|
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/SciRuby/iruby'
   s.license       = 'MIT'
 
-  s.files         = `git ls-files`.split($/).reject {|f| f =~ /\Aattic/ }
+  s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^test/})
   s.require_paths = %w(lib)

data/lib/iruby/command.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'multi_json'
 
 module IRuby
   class Command
@@ -9,9 +10,9 @@ module IRuby
       @args.each do |arg|
         ipython_dir = $1 if arg =~ /\A--ipython-dir=(.*)\Z/
       end
-      ipython_dir = File.expand_path(ipython_dir)
-      @kernel_dir = File.join(ipython_dir, 'kernels', 'ruby')
+      @kernel_dir = File.join(File.expand_path(ipython_dir), 'kernels', 'ruby')
       @kernel_file = File.join(@kernel_dir, 'kernel.json')
+      @iruby_path = File.expand_path $0
     end
 
     def run
@@ -22,7 +23,7 @@ module IRuby
       when 'help', '-h', '--help'
         print_help
       when 'register'
-        if File.exist?(@kernel_file) && !@args.include?('--force')
+        if registered_iruby_path && !@args.include?('--force')
           STDERR.puts "#{@kernel_file} already exists!\nUse --force to force a register."
           exit 1
         end
@@ -63,12 +64,7 @@ Try `ipython help` for more information.
       Dir.chdir(working_dir) if working_dir
 
       require boot_file if boot_file
-
-      begin
-        require 'bundler/setup'
-      rescue Exception => e
-        IRuby.logger.warn "Could not load bundler: #{e.message}\n#{e.backtrace.join("\n")}" unless LoadError === e
-      end
+      check_bundler {|e| IRuby.logger.warn "Could not load bundler: #{e.message}\n#{e.backtrace.join("\n")}" }
 
       require 'iruby'
       Kernel.new(config_file).run
@@ -87,27 +83,47 @@ Try `ipython help` for more information.
     end
 
     def run_ipython
-      check_version
-
-      # We must use the console to launch the whole 0MQ-client-server stack
+      # If no command is given, we use the console to launch the whole 0MQ-client-server stack
       @args = %w(console) + @args if @args.first.to_s !~ /\A\w/
-      register_kernel if %w(console qtconsole notebook).include?(@args.first) && !File.exist?(@kernel_file)
       @args += %w(--kernel ruby) if %w(console qtconsole).include? @args.first
 
+      check_version
+      check_registered_kernel
+      check_bundler {|e| STDERR.puts "Could not load bundler: #{e.message}" }
+
       Kernel.exec('ipython', *@args)
     end
 
+    def check_registered_kernel
+      if kernel = registered_iruby_path
+        STDERR.puts "#{@iruby_path} differs from registered path #{registered_iruby_path}.
+This might not work. Run 'iruby register --force' to fix it." if @iruby_path != kernel
+      else
+        register_kernel
+      end
+    end
+
+    def check_bundler
+      require 'bundler'
+      raise %q{iruby is missing from Gemfile. This might not work.
+Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.dependencies.any? {|s| s.name == 'iruby' }
+      Bundler.setup
+    rescue LoadError
+    rescue Exception => e
+      yield(e)
+    end
+
     def register_kernel
       FileUtils.mkpath(@kernel_dir)
-      File.write(@kernel_file, %{{
-  "argv":         [ "#{File.expand_path $0}", "kernel", "{connection_file}" ],
-  "display_name": "Ruby #{RUBY_VERSION}",
-  "language":     "ruby"
-}
-})
+      File.write(@kernel_file, MultiJson.dump(argv: [ @iruby_path, 'kernel', '{connection_file}' ],
+                                              display_name: "Ruby #{RUBY_VERSION}", language: 'ruby'))
       FileUtils.copy(Dir[File.join(__dir__, 'assets', '*')], @kernel_dir) rescue nil
     end
 
+    def registered_iruby_path
+      File.exist?(@kernel_file) && MultiJson.load(File.read(@kernel_file))['argv'].first
+    end
+
     def unregister_kernel
       FileUtils.rm_rf(@kernel_dir)
     end

data/lib/iruby/display.rb

@@ -247,6 +247,11 @@ module IRuby
         obj.to_latex
       end
 
+      respond_to :to_tex
+      format 'text/latex' do |obj|
+        obj.to_tex
+      end
+
       respond_to :to_javascript
       format 'text/javascript' do |obj|
         obj.to_javascript

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ files:
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/iruby