modulation 0.28 → 0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630df5ec1eef61abafa86781e8f73c892dcf01c738bc02b695e767586208c728
-  data.tar.gz: 4f98dbd921afc4c3e0f33d82d19083e56cfacffee7192bf0ad621e638b5cf6a0
+  metadata.gz: 933737f36bc12f47d347cb770b7f8d4464cd993b26da4d8d309be64c53dc551a
+  data.tar.gz: 5f385daa43a1ce9312243804be00fc2ddb1a1e728d37d7807d806eae08197ab7
 SHA512:
-  metadata.gz: 726ac2711660e422fac0caeeb41828d4fafea79c3ef6da7abb24ea0160990248b2c1830b4c69f278b2f798a0038bd9c2b361dc8152bd33f726bda4f67eb71fca
-  data.tar.gz: 4ccfd538a57c5a8183409e42e04d9a5df14f22068d2900b269841690fbec878473c1b52ed84e8e2ec1b87736a4f915463d829670731f80e732fe1dee8068cc26
+  metadata.gz: 8c411047feeb3ca76646b62db47434ff135d8e6645cfaf3b11a5994a65630e2ac13be18a96999410078d05dc68c3a70b108206a7cc8e9afea695d50cbd62851e
+  data.tar.gz: 5aa45a4ba33c41b0f25c73c70e247952b9943783823f47920296d0583fbbc2a357ecb82beac948fe7656eae7829f9c9c1d7e635b3a8e61d327be759b59410e57

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.29 2019-08-23
+---------------
+
+* Implement auto_import_map
+* Add preliminary inline Gemfile to packaged apps
+
 0.28 2019-08-23
 ---------------
 

data/README.md

@@ -588,6 +588,7 @@ Modulation can also be used to package your entire application into a single
 portable file that can be copied to another machine and run as is. To package
 your app, use `mdl pack`. This command will perform a dynamic analysis of all
 the app's dependencies and will put them together into a single Ruby file.
+
 For more information have a look at the [app](examples/app) example.
 
 ## Writing gems using Modulation

data/lib/modulation/core.rb

@@ -70,6 +70,18 @@ module Modulation
       end
     end
 
+    def auto_import_map(path, caller_location = caller(1..1).first)
+      abs_path = Paths.absolute_dir_path(path, caller_location)
+      Hash.new do |h, k|
+        fn = Paths.check_path(File.join(abs_path, k.to_s))
+        return nil unless fn
+        
+        mod = @loaded_modules[fn] || create_module_from_file(fn)
+        k = yield k, mod if block_given?
+        h[k] = mod
+      end
+    end
+
     # Creates a new module from a source file
     # @param path [String] source file name
     # @return [Module] module

data/lib/modulation/ext.rb

@@ -26,6 +26,10 @@ module Kernel
   def import_map(path, caller_location = caller(1..1).first, &block)
     Modulation.import_map(path, caller_location, &block)
   end
+
+  def auto_import_map(path, caller_location = caller(1..1).first, &block)
+    Modulation.auto_import_map(path, caller_location, &block)
+  end
 end
 
 # Module extensions

data/lib/modulation/packer.rb

@@ -7,16 +7,15 @@ require 'zlib'
 module Modulation
   # Implements packing functionality
   module Packer
-    BOOTSTRAP_CODE = <<~SRC.encode('ASCII-8BIT').chomp
+    BOOTSTRAP_CODE = <<~SRC
       # encoding: ASCII-8BIT
       require 'bundler/inline'
 
       gemfile do
         source 'https://rubygems.org'
-        gem 'modulation', '~> %<modulation_version>s'
+        gem 'modulation', '~> %<modulation_version>s', require: 'modulation/packer'
       end
 
-      require 'modulation/packer'
       Modulation::Bootstrap.setup(DATA, %<dictionary>s)
       import(%<entry_point>s).send(:main)
       __END__
@@ -43,7 +42,6 @@ module Modulation
       files = deps.each_with_object({}) do |path, dict|
         dict[path] = IO.read(path)
       end
-      # files[INLINE_GEMFILE_PATH] = generate_gemfile
       pack_files(files)
     end
 
@@ -53,7 +51,7 @@ module Modulation
       dictionary = files.each_with_object({}) do |(path, content), dict|
         zipped = Zlib::Deflate.deflate(content)
         size = zipped.bytesize
-        
+
         data << zipped
         dict[path] = [last_offset, size]
         last_offset += size
@@ -61,15 +59,15 @@ module Modulation
       [dictionary, data]
     end
 
-    # def self.generate_gemfile
-    #   format(INLINE_GEMFILE_CODE)
-    # end
-
     def self.generate_bootstrap(dictionary, data, entry_point)
-      format(BOOTSTRAP_CODE, modulation_version: Modulation::VERSION,
-                             dictionary: dictionary.inspect,
-                             entry_point: entry_point.inspect,
-                             data: data)
+      format(bootstrap_template, modulation_version: Modulation::VERSION,
+                                 dictionary: dictionary.inspect,
+                                 entry_point: entry_point.inspect,
+                                 data: data)
+    end
+
+    def self.bootstrap_template
+      BOOTSTRAP_CODE.encode('ASCII-8BIT').gsub(/^\s+/, '').chomp
     end
   end
 

data/lib/modulation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulation
-  VERSION = '0.28'
+  VERSION = '0.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulation
 version: !ruby/object:Gem::Version
-  version: '0.28'
+  version: '0.29'
 platform: ruby
 authors:
 - Sharon Rosner