modules 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDhlZDkxNjg1MDc3OTRlNWI3Mjk2NjkzZjlhM2Q4OWFjZWQ2ZWUwMw==
-  data.tar.gz: !binary |-
-    MjYzYzQxYTU3NGRkZjllYjU2OGIxMTNkMmQ4ZmNjZmI3NmI1YjUyMg==
+SHA1:
+  metadata.gz: 7699497008a6418461da4427558e32f53b914775
+  data.tar.gz: ac706ced9a11c7b0470aa03ddd92bb24205496c6
 SHA512:
-  metadata.gz: !binary |-
-    ZTAxY2JlOWVkY2IxZGQ5OGZhZmMzYjEwYjIwOTYyN2M2NjhhMDBkOGUwOTk2
-    ZWRiNzBhNzQxMTdjYjEzYTdkOTJkZGNlZjhkNzFiN2I3ODkxNGM4ZWNiOWZm
-    MGNiZTZkZWUwYThkODExM2FlMGNkNWY3ZjU0MzFmYWFhYjdkOGU=
-  data.tar.gz: !binary |-
-    MDEyOGVlM2ZhZmUzNWEyMDY3NGU1ODVhOGNiNzg2ZWE2OTM2MTViNmVmZDVm
-    ZjFiMjQwMzdmMWZiOTA5Y2I0MzY4ZGRhZDRmN2VhZWY5NGM1NGU2YTA2Njcw
-    MTdiYTNlMWQxODA1ZjNjOTJmZjhhN2FjMGVlM2JkNzk5NjRhODU=
+  metadata.gz: 6efb175efebc3ce581ed8eecea657aaedd5ad20be1aa5d35800dac0c73cf08ebdee061238cfc9b6f5210d0c2cf524e38aab1c9806e9da065f10199b75b30336c
+  data.tar.gz: c10b0f98d1e7de2f66df1e1f84b7345a214c9a3d5203a6a360bfba7960e4744352ee3c3d348722a8f2b50ebe71188cadcb92c22f8f6cf4844bf8a1adcb708553

data/bin/modules

@@ -2,12 +2,13 @@
 
 require 'optparse'
 
+require_relative '../lib/global'
 require_relative '../lib/modules'
 
 def main
   options = {}
   parser = OptionParser.new do |opts|
-    opts.banner = 'Usage requirerb run [options]'
+    opts.banner = 'Usage: modules run [options]'
     opts.separator ''
     opts.on('-d', '--debug', 'Print debug information to stdout') do |debug|
       options['debug'] = debug

data/lib/modules.rb

@@ -1,85 +1,11 @@
-module Modules
-  # (String) root path for module resolution
-  @basepath = '/'
-
-  # (Hash) map from module identifier to resolved module
-  @cache = {}
-
-  # (String) most recent directory that import was invoked on
-  @dirname = '/'
-
-  # (String) most recent path that import was invoked on
-  @path = '/'
-
-  def self.internal_import(dirname, basename)
-    path = File.join @basepath, dirname, basename
-    if @cache.include? @path
-      puts "Already cached local module #{path}"
-      return @cache[path]
-    end
-
-    puts "Loading local module #{path}"
-    prev_dirname = @dirname
-    prev_path = @path
-    @dirname = dirname
-    @path = path
-    require @path
-    @dirname = prev_dirname
-    @path = prev_path
-    return @cache[path]
-  end
-
-  def self.external_import(name)
-    if @cache.include? name
-      puts "Already cached external module #{name}"
-      return @cache[name]
-    end
-
-    puts "Loading external module #{name}"
-    snapshot = Module.constants
-    require name
-    defined = Module.constants - snapshot
-    p defined
-    plucked = []
-    resolved = {}
-    while defined.length > 0
-      todo = defined.pop
-      plucked.push todo
-      str = todo.to_s
-      const = eval str
-      next if const.nil?
-      resolved[str] = const.class == Module ? Class.new.extend(const) : const
-      if const.respond_to? :constants
-        children = const
-          .constants
-          .map {|child| "#{str}::#{child.to_s}"}
-          .select {|id|
-            parts = id.split '::'
-            groups = parts.group_by {|x| x}
-            groups.values.all? {|group| group.length < 3}
-          }
-
-        defined += children
-      end
-    end
-
-    puts "Found #{resolved}"
-    @cache[name] = resolved
-    plucked
-      .select {|item| item.class == Symbol}
-      .each {|item| Object.send(:remove_const, item)}
-    return resolved
-  end
+require_relative './loader'
 
+module Modules
   def self.run(args, opts)
     file = args[0]
     abs = "#{Dir.pwd}/#{file}"
-    dirname = File.dirname abs
-    basename = File.basename abs
-
-    puts "Set default basepath to #{dirname}"
-    @basepath = dirname
-    internal_import '', basename
+    Loader.set_basepath(File.dirname(abs))
+    Loader.import(File.basename(abs), 'internal')
   end
 
   def self.main(cmd, args, opts)
@@ -91,25 +17,3 @@ module Modules
     end
   end
 end
-
-class Object
-  def export
-    cache = Modules.instance_variable_get :@cache
-    path = Modules.instance_variable_get :@path
-    cache[path] = yield
-  end
-
-  def import(name)
-      if name[0] == '.'
-        # Treat as local module.
-        dirname = Modules.instance_variable_get :@dirname
-        child_path = File.join dirname, name[1..-1]
-        child_dirname = File.dirname child_path
-        child_basename = File.basename child_path
-        Modules.internal_import child_dirname, child_basename
-      else
-        # Treat as external ruby import.
-        Modules.external_import name
-      end
-  end
-end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: modules
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gareth (Ari) Aye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-01-15 00:00:00.000000000 Z
@@ -23,24 +23,24 @@ homepage: https://github.com/lambdabaa/modules
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Port of js module loader to ruby
 test_files: []