atomy 0.6.12 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 068466b3dfc8c044b62bb9f9ee89d2b26fe1ae2b
-  data.tar.gz: bd823b4edeca86beb03b073e6be4dae391713678
+  metadata.gz: c3cde8f2dfde4e4ef9b44378e3f34dad86a0bf6f
+  data.tar.gz: c9a49d6929d7c678a51324ac73324ec5f634d59a
 SHA512:
-  metadata.gz: 93862742056c9c253d3b8e8eb1d3ba3ef795e33938469e18b55c3b2de16e9335f987040122f1c174ab07fe46d26a44a280eb4c9ff8fc181f71e6c5e9463c4d21
-  data.tar.gz: 015bab9f5314108b9c83f5a6f7f19569872b36b06b796dabf8e5f6c674e61bfda7ea5a79342986dcbf9b2c0249edf732b83b9d7db0d00f36edbc798e951657a1
+  metadata.gz: 9bb5963c57be61b977db39df7aac6922da343157d9e35ec2911cfeba1db9fc4f19c3425606e8363d1b95f48b9fa4d079ad4dee40a95723f2a05a5b50b06a8e58
+  data.tar.gz: a635a73bf15dfdd26998b637bceb8f9e6bd1d71bcf4fc0ac17339230f43cec13a08cbab5f841fd81a4c7efd3ce234bc5d52c9f206c5de0e3a7ef87015f0d1da3

data/Gemfile

@@ -9,5 +9,4 @@ end
 group "development" do
   gem "pry"
   gem "benchmark-ips"
-  gem "rubinius-profiler"
 end

data/lib/atomy/codeloader.rb

@@ -81,6 +81,14 @@ module Atomy
     end
 
     def require(path)
+      synchronized_load(path, false)
+    end
+
+    def load(path)
+      synchronized_load(path, true)
+    end
+
+    def synchronized_load(path, check_up_to_date)
       file = find_source(path)
 
       return super unless file
@@ -114,7 +122,7 @@ module Atomy
       end
 
       begin
-        mod = load_atomy(file)
+        mod = load_atomy(file, check_up_to_date)
       else
         req.module = mod
         req.passed!
@@ -126,13 +134,17 @@ module Atomy
     end
 
     def register_feature(file, mod)
-      LOADED_MODULES[file] = mod
+      LOADED_MODULES[file] = {
+        module: mod,
+        time: Time.now
+      }
+
       $LOADED_FEATURES << file
     end
 
-    def load_atomy(file)
-      if loaded?(file)
-        LOADED_MODULES[file]
+    def load_atomy(file, check_up_to_date)
+      if loaded?(file, check_up_to_date)
+        LOADED_MODULES[file][:module]
       else
         _, mod = run_script(file)
         register_feature(file, mod)
@@ -149,7 +161,7 @@ module Atomy
       mod.file = file.to_sym
 
       compiled_file_name = CodeTools::Compiler.compiled_name(file)
-      if should_load_compiled_file(compiled_file_name, file)
+      if compiled_file_up_to_date(compiled_file_name, file)
         code_loader = Rubinius::CodeLoader.new(compiled_file_name)
         code = code_loader.load_compiled_file(compiled_file_name, 0, 0)
 
@@ -219,15 +231,25 @@ module Atomy
 
     private
 
-    def loaded?(file)
-      $LOADED_FEATURES.include?(file)
+    def loaded?(file, check_up_to_date)
+      loaded = LOADED_MODULES[file]
+      return false unless loaded
+
+      if check_up_to_date
+        return false if File.mtime(file) > loaded[:time]
+
+        compiled_file = CodeTools::Compiler.compiled_name(file)
+        return false unless compiled_file_up_to_date(compiled_file, file)
+      end
+
+      true
     end
 
     def source_extension
       ".ay"
     end
 
-    def should_load_compiled_file(compiled_file, source_file)
+    def compiled_file_up_to_date(compiled_file, source_file)
       return false unless compiled_file
       return false unless File.exists?(compiled_file)
 

data/lib/atomy/module.rb

@@ -70,8 +70,7 @@ module Atomy
     end
 
     def load(path)
-      _, mod = Atomy::CodeLoader.run_script(path)
-      mod
+      Atomy::CodeLoader.load(path)
     end
 
     def inspect

data/lib/atomy/version.rb

@@ -1,3 +1,3 @@
 module Atomy
-  VERSION = "0.6.12"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomy
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.7.0
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg