iruby-dependencies 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d776a0bfc545dece58b742386bcee7eecb9c4069
-  data.tar.gz: e71834db955a0085aafa2380abde5b25602294f3
+  metadata.gz: 06994db526c0cc4552732ec1ad4f1b9a060a787d
+  data.tar.gz: dce88d5d259e11082f538a0df462bafc454f96cd
 SHA512:
-  metadata.gz: e8a0c38a50b91bb020a58987cc117756bcf18381045e0d646456a27fe07a6f24beea8f5899e0d350ea58fb4e12bfc175bbff39dd20dd36ccb275307d98fa4cd0
-  data.tar.gz: 0be6783def0c53f6cf176225f14af3f9cec3de9371f8a5914e2ef2c93598014dccfa5aed2f2da6bba25e330178e3878567b3bee9fecc33e9596a78b43e6ccd7c
+  metadata.gz: d5fa9fb4cff7898835c71163a793e4b1c68f9b97f1f487e148ff1a83ef927833c794885298a22307a43d228703edfa842575a003eda5ea6a255b68a396420cba
+  data.tar.gz: cd6f50c7e24341cd13f8b7544b3a02e7c21a92084474556d05cd8a93b21585cb6a5cc4b004439213a1b55f73a37b8336adadf7d83bae3456d4f81cef0d56288f

data/README.md

@@ -1,6 +1,6 @@
 # IRuby::Dependencies
 
-IRuby::Dependencies is a module for injecting Ruby dependencies into Jupyter Notebooks. For example, 
+`IRuby::Dependencies` is a module for injecting Ruby dependencies into Jupyter Notebooks. For example, 
 
 ```ruby 
 require 'iruby/dependencies'
@@ -21,14 +21,14 @@ You'll have to restart any IRuby kernels already running.
 
 ## Usage
 
-IRuby::Dependencies uses the [Bundler Gemfile syntax](http://bundler.io/v1.5/gemfile.html) with some additional methods:
+`IRuby::Dependencies` uses the [Bundler Gemfile syntax](http://bundler.io/v1.5/gemfile.html) with some additional methods:
 
 | Method | Description |
 | ------ | ----------- |
 | `script <url>` | Loads the javascript at the given url into the notebook as a `script` tag |
 | `define <hash>` | Defines alternate paths for requirejs modules. Keys are modules, values are paths |
 | `exec <string>` | Executes the system command, for example `yum install gsl` |
-| `css` | Loads the stylesheet at the given url into the notebook as a `link` tag 
+| `css <string>` | Loads the stylesheet at the given url into the notebook as a `link` tag 
 
 To see the normal bundler output, pass `verbose: true` to the dependencies method: 
 
@@ -41,4 +41,4 @@ end
 
 ## Active Gems
 
-Gems active at the time IRuby::Dependencies are added to the dependency bundle. This means that you cannot specify a different version of a gem already being used by IRuby. If you really need a different version of that gem, install it on the command line and restart the kernel.  
+When `IRuby::Dependencies` is first loaded, it saves a list of all active gems, which are added to the dependency bundle. For example, since IRuby uses multi_json, the multi_json gem is always included in the bundle. Active gems cannot be removed and their versions are fixed. If you need a different version of an active gem, install it on the command line and restart the kernel. To reduce the number of active gems, `require 'iruby/dependencies'` as early in your notebook as possible. 

data/lib/iruby/dependencies/config.rb

@@ -24,7 +24,8 @@ module IRuby
               end
 
               definition = builder.to_definition nil, true
-
+              definition.resolve_remotely!
+              
               definition.specs.each do |spec|
                 if commands = config.delete(spec.name)
                   commands.each do |command|
@@ -42,4 +43,4 @@ module IRuby
       end
     end
   end
-end
+end

data/lib/iruby/dependencies/version.rb

@@ -1,5 +1,5 @@
 module IRuby
   module Dependencies
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/iruby/dependencies.rb

@@ -3,6 +3,9 @@ require 'iruby/dependencies/dsl'
 require 'iruby/dependencies/config'
 require 'iruby/dependencies/version'
 
+# require 'mypki' if requested so it is an active gem
+require 'mypki' if Bundler.settings['dependencies.mypki']
+
 module IRuby
   module Dependencies
     paths = Gem.path.map {|p| File.join p, 'gems'}
@@ -16,15 +19,10 @@ module IRuby
 
     # this code is taken from bundler/inline with small changes
     def self.dependencies verbose: false, &gemfile
-      warn 'Dependencies installing. This could take a minute ...'
-
       Bundler.ui = verbose ? Bundler::UI::Shell.new : nil
-
-      if Bundler.settings['dependencies.mypki']
-        require 'mypki'
-        MyPKI.init
-      end
-
+      MyPKI.init if Bundler.settings['dependencies.mypki']
+      
+      warn 'Dependencies installing. This could take a minute ...'
       old_root = Bundler.method(:root)
       
       def Bundler.root
@@ -36,6 +34,7 @@ module IRuby
       builder = Dsl.new
       builder.instance_eval(&gemfile)
 
+      Gem::ConfigFile.new ['sources']
       Gem.sources.each {|s| builder.source s}
 
       ACTIVE_GEMS.each do |name,version|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iruby-dependencies
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kyle King
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iruby