iruby 0.3 → 0.4.0

data/lib/iruby.rb

@@ -4,7 +4,9 @@ require 'securerandom'
 require 'openssl'
 require 'tempfile'
 require 'set'
+
 require 'iruby/version'
+require 'iruby/jupyter'
 require 'iruby/kernel'
 require 'iruby/backend'
 require 'iruby/ostream'
@@ -13,18 +15,22 @@ require 'iruby/formatter'
 require 'iruby/utils'
 require 'iruby/display'
 require 'iruby/comm'
-require 'iruby/session/mixin'
 
-begin
-  require 'iruby/session/cztop'
-rescue LoadError
+if ENV.fetch('IRUBY_OLD_SESSION', false)
+  require 'iruby/session/mixin'
   begin
-    require 'iruby/session/rbczmq'
+    require 'iruby/session/ffi_rzmq'
   rescue LoadError
     begin
-      require 'iruby/session/ffi_rzmq'
+      require 'iruby/session/cztop'
     rescue LoadError
-      STDERR.puts "You should install cztop, rbczmq or ffi_rzmq before running iruby notebook. See README."
+      begin
+        require 'iruby/session/rbczmq'
+      rescue LoadError
+        STDERR.puts "You should install ffi-rzmq, cztop, or rbczmq before running iruby notebook. See README."
+      end
     end
   end
+else
+  require 'iruby/session'
 end

data/lib/iruby/command.rb

@@ -1,3 +1,5 @@
+require 'iruby/jupyter'
+
 require 'fileutils'
 require 'multi_json'
 
@@ -6,15 +8,18 @@ module IRuby
     def initialize(args)
       @args = args
 
-      ipython_dir = ENV['IPYTHONDIR'] || '~/.ipython'
-      @args.each do |arg|
-        ipython_dir = $1 if arg =~ /\A--ipython-dir=(.*)\Z/
-      end
-      @kernel_dir = File.join(File.expand_path(ipython_dir), 'kernels', 'ruby')
-      @kernel_file = File.join(@kernel_dir, 'kernel.json')
+      @ipython_dir = File.expand_path("~/.ipython")
+      @kernel_dir = resolve_kernelspec_dir.freeze
+      @kernel_file = File.join(@kernel_dir, 'kernel.json').freeze
       @iruby_path = File.expand_path $0
     end
 
+    attr_reader :ipython_dir, :kernel_dir, :kernel_file
+
+    def ipython_kernel_dir
+      File.join(File.expand_path(@ipython_dir), 'kernels', 'ruby')
+    end
+
     def run
       case @args.first
       when 'version', '-v', '--version'
@@ -23,11 +28,12 @@ module IRuby
       when 'help', '-h', '--help'
         print_help
       when 'register'
-        if registered_iruby_path && !@args.include?('--force')
+        force_p = @args.include?('--force')
+        if registered_iruby_path && !force_p
           STDERR.puts "#{@kernel_file} already exists!\nUse --force to force a register."
           exit 1
         end
-        register_kernel
+        register_kernel(force_p)
       when 'unregister'
         unregister_kernel
       when 'kernel'
@@ -39,6 +45,38 @@ module IRuby
 
     private
 
+    def resolve_kernelspec_dir
+      if ENV.has_key?('JUPYTER_DATA_DIR')
+        if ENV.has_key?('IPYTHONDIR')
+          warn 'both JUPYTER_DATA_DIR and IPYTHONDIR are supplied; IPYTHONDIR is ignored.'
+        end
+        if @args.find {|x| /\A--ipython-dir=/ =~ x }
+          warn 'both JUPYTER_DATA_DIR and --ipython-dir are supplied; --ipython-dir is ignored.'
+        end
+        jupyter_data_dir = ENV['JUPYTER_DATA_DIR']
+        return File.join(jupyter_data_dir, 'kernels', 'ruby')
+      end
+
+      if ENV.has_key?('IPYTHONDIR')
+        warn 'IPYTHONDIR is deprecated. Use JUPYTER_DATA_DIR instead.'
+        ipython_dir = ENV['IPYTHONDIR']
+      end
+
+      @args.each do |arg|
+        next unless /\A--ipython-dir=(.*)\Z/ =~ arg
+        ipython_dir = Regexp.last_match[1]
+        warn '--ipython-dir is deprecated. Use JUPYTER_DATA_DIR environment variable instead.'
+        break
+      end
+
+      if ipython_dir
+        @ipython_dir = ipython_dir
+        ipython_kernel_dir
+      else
+        File.join(Jupyter.kernelspec_dir, 'ruby')
+      end
+    end
+
     def print_help
       puts %{
 Usage:
@@ -56,6 +94,8 @@ Try `ipython help` for more information.
     def run_kernel
       require 'iruby/logger'
       IRuby.logger = MultiLogger.new(*Logger.new(STDOUT))
+      STDOUT.sync = true # FIXME: This can make the integration test.
+
       @args.reject! {|arg| arg =~ /\A--log=(.*)\Z/ && IRuby.logger.loggers << Logger.new($1) }
       IRuby.logger.level = @args.delete('--debug') ? Logger::DEBUG : Logger::INFO
 
@@ -64,7 +104,7 @@ Try `ipython help` for more information.
       Dir.chdir(working_dir) if working_dir
 
       require boot_file if boot_file
-      check_bundler {|e| IRuby.logger.warn "Could not load bundler: #{e.message}\n#{e.backtrace.join("\n")}" }
+      check_bundler {|e| IRuby.logger.warn "Could not load bundler: #{e.message}" }
 
       require 'iruby'
       Kernel.new(config_file).run
@@ -95,7 +135,7 @@ Try `ipython help` for more information.
     end
 
     def check_registered_kernel
-      if kernel = registered_iruby_path
+      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
@@ -113,7 +153,12 @@ Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.specs.an
       yield(e)
     end
 
-    def register_kernel
+    def register_kernel(force_p=false)
+      if force_p
+        unregister_kernel_in_ipython_dir
+      else
+        return unless check_existing_kernel_in_ipython_dir
+      end
       FileUtils.mkpath(@kernel_dir)
       unless RUBY_PLATFORM =~ /mswin(?!ce)|mingw|cygwin/
         File.write(@kernel_file, MultiJson.dump(argv: [ @iruby_path, 'kernel', '{connection_file}' ],
@@ -127,6 +172,13 @@ Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.specs.an
       FileUtils.copy(Dir[File.join(__dir__, 'assets', '*')], @kernel_dir) rescue nil
     end
 
+    def check_existing_kernel_in_ipython_dir
+      return true unless File.file?(File.join(ipython_kernel_dir, 'kernel.json'))
+      warn "IRuby kernel file already exists in the deprecated IPython's data directory."
+      warn "Using --force, you can replace the old kernel file with the new one in Jupyter's data directory."
+      false
+    end
+
     def registered_iruby_path
       File.exist?(@kernel_file) && MultiJson.load(File.read(@kernel_file))['argv'].first
     end
@@ -134,5 +186,9 @@ Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.specs.an
     def unregister_kernel
       FileUtils.rm_rf(@kernel_dir)
     end
+
+    def unregister_kernel_in_ipython_dir
+      FileUtils.rm_rf(ipython_kernel_dir)
+    end
   end
 end

data/lib/iruby/input/README.md

@@ -0,0 +1,299 @@
+
+# IRuby Input
+
+This README is generated from README.ipynb. Please do not edit this file directly.
+
+The `IRuby::Input` class makes it easier for IRuby users to get input from users. For example:
+
+
+```ruby
+name = IRuby.input 'Enter your name'
+```
+
+The following input methods are supported on the `IRuby` module:
+
+| method | description |
+| -------- | -------- |
+| `input(prompt)`   | Prompts the user for a line of input |
+| `password(prompt)`   | Prompts the user for a password |
+| `form(&block)`   | Presents a form to the user |
+| `popup(title,&block)`   | Displays a form to the user as a popup |
+
+## Forms
+
+Forms are groups of inputs to be collected from the user. For example:
+
+
+```ruby
+result = IRuby.form do 
+  input :username
+  password :password
+  button
+end
+```
+
+The following methods are available to build forms: 
+
+| method | description |
+| -------- | -------- |
+| `input(key=:input)`   | Prompts the user for a line of input |
+| `textarea(key=:textarea),`   | Adds a textarea to the form |
+| `password(key=:password)`   | Prompts the user for a password |
+| `button(key=:done, color: :blue)`   | Adds a submit button to the form |
+| `cancel(prompt='Cancel')`   | Adds a cancel button to the form |
+| `text(string)`   | Adds text to the form |
+| `html(&block)`   | Inserts HTML from the given [erector block](https://github.com/erector/erector)   |
+| `file(key=:file)`   | Adds a file input to the form |
+| `date(key=:date)`   | Adds a date picker to the form |
+| `select(*options)`   | Adds a dropdown select input to the form |
+| `radio(*options)`   | Adds a radio select input to the form |
+| `checkbox(*options)`   | Adds checkbox inputs to the form |
+
+## Popups
+ 
+Popups are just forms in a bootstrap modal. They are useful when users **Run All** in a notebook with a lot of inputs. The popups always appear in the same spot, so users don't have to scroll down to find the next input. 
+
+Popups accept a `title` argument, for example: 
+
+
+```ruby
+result = IRuby.popup 'Please enter your name' do 
+  input
+  button
+end
+```
+
+## Submit and cancel
+
+The enter key will submit an input or form and the escape key will cancel it. Canceled inputs are returned as `nil`. Inputs are automatically canceled if destroyed. An input can be destroyed by clearing its cell's output. The `cancel` button will cancel a form and all other buttons will submit it. 
+
+After a form destroyed, the cell's output is cleared. Be careful not to prompt for input in a block that has previous output you would like to keep. Output is cleared to prevent forms from interferring with one another and to ensure that inputs are not inadvertently saved to the notebook. 
+
+
+```ruby
+result = IRuby.popup 'Confirm' do 
+  text 'Are you sure you want to continue?'
+  cancel 'No'
+  button 'Yes'
+end
+```
+
+## Custom keys
+
+Every widget has an entry in the final results hash. A custom key can be passed as the first parameter to the hash. If no key is provided, the widget name is used as the key. The `cancel` widget has no key; it's first parameter is its label. 
+
+
+```ruby
+result = IRuby.form do
+  input :username
+  password :password
+end
+```
+
+## Custom labels
+
+Field labels appear to the left of the field. Button labels appear as the text on the button. `cancel` labels are passed as the first argument. All other widgets' labels are set using the `label` parameter. 
+
+
+```ruby
+result = IRuby.form do 
+  input :name, label: 'Please enter your name'
+  cancel 'None of your business!'
+  button :submit, label: 'All done'
+end
+```
+
+## Defaults
+
+Most inputs will accept a `default` parameter. If no default is given, the deault is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. 
+
+
+```ruby
+result = IRuby.form do 
+  checkbox :one, 'Fish', 'Cat', 'Dog', default: 'Fish'
+  checkbox :many, 'Fish', 'Cat', 'Dog', default: ['Cat', 'Dog']
+  checkbox :all, 'Fish', 'Cat', 'Dog', default: true
+  button :submit, label: 'All done'
+end
+```
+
+## Dates
+
+The `date` widget provides a calendar popup and returns a `Time` object. It's default should also be a `Time` object. 
+
+
+```ruby
+result = IRuby.form do 
+  date :birthday
+  date :today, default: Time.now
+  button
+end
+```
+
+## Buttons
+
+Buttons do not appear in the final hash unless they are clicked. If clicked, their value is `true`. Here are the various colors a button can be:
+
+
+```ruby
+result = IRuby.form do 
+  IRuby::Input::Button::COLORS.each_key do |color|
+    button color, color: color
+  end
+end
+```
+
+## Textareas
+
+Textareas are multiline inputs that are convenient for larger inputs. If you need a line return when typing in a textarea, use shift+enter since enter will submit the form.
+
+
+```ruby
+result = IRuby.form do 
+  text 'Enter email addresses, one per line (use shift+enter for newlines)'
+  textarea :emails
+end
+```
+
+## Text and HTML
+
+You can insert lines of text or custom html using their respective helpers:
+
+
+```ruby
+result = IRuby.form do 
+  html { h1 'Choose a Stooge' }
+  text 'Choose your favorite stooge'
+  select :stooge, 'Moe', 'Larry', 'Curly'
+  button
+end
+```
+
+## Dropdowns
+
+A `select` is a dropdown of options. Use a `multiple` to allow multiple selections. `multiple` widgets accept an additional `size` parameters that determines the number of rows. The default is 4. 
+
+
+```ruby
+result = IRuby.form do 
+  select :stooge, 'Moe', 'Larry', 'Curly'
+  select :stooge, 'Moe', 'Larry', 'Curly', default: 'Moe'
+  multiple :stooges, 'Moe', 'Larry', 'Curly', default: true, size: 3
+  multiple :stooges, 'Moe', 'Larry', 'Curly', default: ['Moe','Curly']
+  button
+end
+```
+
+## Radio selects and checkboxes
+
+Like selects, radio selects and checkboxes take multiple arguments, each one an option. If the first argument is a symbol, it is used as the key. 
+
+Note that the `checkbox` widget will always return `nil` or an array. 
+
+
+```ruby
+result = IRuby.form do 
+  radio :children, *(0..12), label: 'How many children do you have?'
+  checkbox :gender, 'Male', 'Female', 'Intersex', label: 'Select the genders of your children'
+  button
+end
+```
+
+## Files
+
+Since file widgets capture the enter key, you should include a button when creating forms that contain only a file input:
+
+
+```ruby
+IRuby.form do 
+  file :avatar, label: 'Choose an Avatar'
+  button :submit
+end
+```
+
+File widgets return a hash with three keys: 
+
+* `data`: The contents of the file as a string
+* `content_type`: The type of file, such as `text/plain` or `image/jpeg`
+* `name`: The name of the uploaded file
+
+## Example
+
+Here is an example form that uses every built-in widget. 
+
+
+```ruby
+result = IRuby.form do 
+  html { h1 'The Everything Form' }
+  text 'Marvel at the strange and varied inputs!'
+  date
+  file
+  input :username
+  password
+  textarea
+  radio *(1..10)
+  checkbox 'Fish', 'Cat', 'Dog', label: 'Animals'
+  select :color, *IRuby::Input::Button::COLORS.keys
+  cancel                     
+  button    
+end
+```
+
+## Writing your own widget
+
+Most form methods are `IRuby::Input::Widget` instances. A `Widget` is an [`Erector::Widget`](https://github.com/erector/erector) with some additional helpers. Here is the `cancel` widget:
+
+```ruby
+module IRuby
+  module Input
+    class Cancel < Widget
+      needs :label
+
+      builder :cancel do |label='Cancel'|
+        add_button Cancel.new(label: label)
+      end
+
+      def widget_css
+        ".iruby-cancel { margin-left: 5px; }"
+      end
+
+      def widget_js
+        <<-JS
+          $('.iruby-cancel').click(function(){
+            $('#iruby-form').remove();
+          });
+        JS
+      end
+
+      def widget_html
+        button(
+          @label,
+          type: 'button', 
+          :'data-dismiss' => 'modal',
+          class: "btn btn-danger pull-right iruby-cancel"
+        )
+      end
+    end
+  end
+end
+```
+
+The following methods are available for widgets to use or override: 
+
+| method | description |
+| -------- | -------- |
+| `widget_js`   | Returns the widget's Javascript |
+| `widget_css`   | Returns the widget's CSS |
+| `widget_html`   | Returns the widget's   |
+| `builder(method,&block)`   | Class method to add form building helpers. |
+
+The following methods are available in the `builder` block:
+
+| method | description |
+| -------- | -------- |
+| `add_field(field)` | Adds a widget to the form's field area |
+| `add_button(button)` | Adds a button to the form's button area |
+| `process(key,&block)`   | Register a custom processing block for the given key in the results hash |
+| `unique_key(key)` | Returns a unique key for the given key. Use this to make sure that there are no key collisions in the final results hash. |
+
+A canceled form always returns `nil`. Otherwise, the form collects any element with a `data-iruby-key` and non-falsey `data-iruby-value` and passes those to the processor proc registered for the key. See the `File` widget for a more involved example of processing results.