modules 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b3e8df22cfbaf45a2aaca8d2a27f2f1408a962
-  data.tar.gz: 43bb05d97bf467b1723ff1f9afc36da59a373b7d
+  metadata.gz: eef64fa3eb9871089ea12f2546f30ef11e633724
+  data.tar.gz: 26dfffc9b37bc5cbeafa5d28d816bda2073b813d
 SHA512:
-  metadata.gz: 61ae2e1246455ba92b6ea0762b81d8b861eb0337e26a5c2beba6ab321e5c08bf02609d680cdcb0f92d1c5241d318f3ec8dfdb605c8c241f82f841e8bc045cfc9
-  data.tar.gz: 622e7875c5c4733b785508bee20bc6c0d0fedd20f822096b86b6e86b0355999fe0feb8ccca625f4a5d716a853ff31ed9d1b75a83cc5c08df5d1f6e15bbeac9df
+  metadata.gz: efd241f4ed2f94b33398f5d32bfba7bf77ed7030771949ff60833331b747118312b1f64fd194cd8593114d3084d3f7c65e1a60b5e3e501053c57295891079a8c
+  data.tar.gz: e8e416b04f0a16792134a13a08374c47d17d32cd7738bc61138cb8e86f1aac4caef8ea7ccab2694bdda7cd060e3a7076f46201339dc882c57e5d5a08c70f9ce0

data/lib/modules.rb

@@ -1,24 +1,21 @@
-require_relative './debug'
-require_relative './loader'
+require_relative './modules/loader'
 
-module Modules
-  def self.run(args, opts)
-    if opts.include?('debug')
-      Debug.enable(opts['debug'])
+class Object
+  def export(name=nil, value=nil)
+    if name.nil?
+      value = yield
+    else
+      value = {name => value}
     end
 
-    file = args[0]
-    abs = "#{Dir.pwd}/#{file}"
-    Loader::Api.config(basepath: File.dirname(abs))
-    Loader.import(File.basename(abs), 'internal')
+    Loader.export(value)
   end
 
-  def self.main(cmd, args, opts)
-    case cmd
-    when 'run'
-      run(args, opts)
-    else
-      raise "Invalid command #{cmd}"
-    end
+  def import(id, type=nil)
+    Loader.import(id, type)
+  end
+
+  def modules
+    Loader::Api
   end
 end

data/lib/{loader.rb → modules/loader.rb}

@@ -50,8 +50,8 @@ module Loader
       # Prefer loading local module since we found it.
       begin
         Kernel.load(filepath, true) unless @cache.include?(@path)
-      rescue
-        raise LoadError, "Could not load #{filepath} from #{container}"
+      rescue => e
+        raise LoadError, "Could not load #{filepath} from #{container}: #{e}"
       end
 
       result = @cache[@path]

data/lib/modules/modules.rb

@@ -0,0 +1,24 @@
+require_relative './debug'
+require_relative './loader'
+
+module Modules
+  def self.run(args, opts)
+    if opts.include?('debug')
+      Debug.enable(opts['debug'])
+    end
+
+    file = args[0]
+    abs = "#{Dir.pwd}/#{file}"
+    Loader::Api.config(basepath: File.dirname(abs))
+    Loader.import(File.basename(abs), 'internal')
+  end
+
+  def self.main(cmd, args, opts)
+    case cmd
+    when 'run'
+      run(args, opts)
+    else
+      raise "Invalid command #{cmd}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modules
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gareth (Ari) Aye
@@ -18,11 +18,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/modules
-- lib/debug.rb
-- lib/global.rb
-- lib/interop.rb
-- lib/loader.rb
 - lib/modules.rb
+- lib/modules/debug.rb
+- lib/modules/interop.rb
+- lib/modules/loader.rb
+- lib/modules/modules.rb
 homepage: https://github.com/lambdabaa/modules
 licenses:
 - MIT

data/lib/global.rb

@@ -1,21 +0,0 @@
-require_relative './loader'
-
-class Object
-  def export(name=nil, value=nil)
-    if name.nil?
-      value = yield
-    else
-      value = {name => value}
-    end
-
-    Loader.export(value)
-  end
-
-  def import(id, type=nil)
-    Loader.import(id, type)
-  end
-
-  def modules
-    Loader::Api
-  end
-end