devpack 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc62279883bef6f044e47c419b853c89b33e76f699d7106575cd87869967b36d
-  data.tar.gz: 48a959cbd1004dce6752b6fb723905ad40f92c02cf73cd8432b969309d94f5a8
+  metadata.gz: a1e05e13ceb910b6601399b116f59d3b11e62af8c7e34f8f6f1fc031c1b74fc4
+  data.tar.gz: fbca64d53a5a5085befabca5d649b5668ebd84bed67dd1668936ae7e28e9e845
 SHA512:
-  metadata.gz: a473937535208f922c6ceed0e137cfa758bf806bb39516e6f01906d748ef219c0fcb69fba33e195c49e95f045cf335267b7b997f300c30e6311792becba6a4ea
-  data.tar.gz: 5e4247975b02ec3432344755432bb887ca7036cdb9792a3c8377d3a091dc5c92a464e0e8cf5dcda82248f2039e4c6ca0efedacf4761bec870d0d2fe6101cd254
+  metadata.gz: 9a9e01ed128597f605fbd6d0225d3535e2eb8a7d333d9bc280f8047ee6f60c27878d565337c6cded53877995f27611679fa201a6c9d9076c43b58e94d0749224
+  data.tar.gz: 6f251f060455124c56fb4b19adb278d505af10cc9d008a55f3bab3d2cbc23d8756231c52d9eec21cc41a372ad5cbe2bb95c3cc5759a299da39fae2f9425bf91d

data/CHANGELOG.md

@@ -39,3 +39,8 @@ Rename `DISABLE_DEVPACK` environment variable to `DEVPACK_DISABLE` for consisten
 ## 0.2.1
 
 Fully activate gem on load: add gem spec to `Gem.loaded_specs` and set instance variables `@loaded` and `@activated` to `true`. This mimics `Gem::Specification#activate` to ensure that anything that depends on these characteristics will function as normal.
+
+## 0.4.2
+
+- Add support for gems which are not required automatically
+- Fix requiring gems where a hyphen in the gem name corresponds to a path slash in the require.

data/README.md

@@ -14,6 +14,10 @@ better_errors
 
 # Optionally specify a version:
 pry:0.13.1
+
+# Or add an asterisk at the start of a line to not require the gem automatically:
+# (equivalent to adding `require: false` to the gem's entry in the Gemfile)
+*brakeman
 ```
 
 Add _Devpack_ to any project's `Gemfile`:

data/lib/devpack/config.rb

@@ -17,6 +17,7 @@ module Devpack
       File.readlines(devpack_path)
           .map(&filter_comments)
           .compact
+          .map { |line| GemRef.parse(line) }
     end
 
     def devpack_path

data/lib/devpack/gem_ref.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Devpack
+  # Provides extended syntax for gem definitions, allowing `require: false` semantics via an
+  # asterisrk prefix in `.devpack` file, e.g. `*my_gem`
+  class GemRef
+    def self.parse(line)
+      name, _, version = line.partition(':')
+      no_require = name.start_with?('*')
+      name = name.sub('*', '') if no_require
+      new(name: name, version: version.empty? ? nil : Gem::Requirement.new(version), no_require: no_require)
+    end
+
+    def initialize(name:, version: nil, no_require: false)
+      @name = name
+      @version = version
+      @no_require = no_require
+    end
+
+    attr_reader :name, :version
+
+    def require?
+      !@no_require
+    end
+
+    def eql?(other)
+      name == other.name && version == other.version && require? == other.require?
+    end
+
+    def to_s
+      "#{require? ? '*' : ''}#{@name}:#{@version}"
+    end
+  end
+end

data/lib/devpack/gems.rb

@@ -34,14 +34,14 @@ module Devpack
     end
 
     def load_devpack
-      @config.requested_gems.map do |requested|
-        name, _, version = requested.partition(':')
-        load_gem(name, version.empty? ? nil : Gem::Requirement.new(version))
+      @config.requested_gems.map do |gem|
+        load_gem(gem)
       end.compact
     end
 
-    def load_gem(name, requirement)
-      [name, activate(name, requirement)]
+    def load_gem(gem)
+      name = gem.name
+      [name, activate(gem)]
     rescue LoadError => e
       deactivate(name)
       nil.tap { @failures << { name: name, message: load_error_message(e) } }
@@ -51,18 +51,27 @@ module Devpack
       nil.tap { @incompatible << e.meta }
     end
 
-    def activate(name, version)
-      spec = GemSpec.new(@gem_glob, name, version)
+    def activate(gem)
+      spec = GemSpec.new(@gem_glob, gem.name, gem.version)
       update_load_path(spec.require_paths)
       # NOTE: do this before we require, because some gems use the gemspec to
       # declare their version...
-      Gem.loaded_specs[name] = spec.gemspec
-      loaded = Kernel.require(name)
+      Gem.loaded_specs[gem.name] = spec.gemspec
+      loaded = require_gem(gem.name) if gem.require?
       spec.gemspec&.activated = true
       spec.gemspec&.instance_variable_set(:@loaded, true)
       loaded
     end
 
+    def require_gem(name)
+      Kernel.require(name)
+    rescue LoadError => e
+      raise e unless name.include?('-')
+
+      namespaced_file = name.tr('-', '/')
+      Kernel.require namespaced_file
+    end
+
     def deactivate(name)
       Gem.loaded_specs.delete(name)
     end

data/lib/devpack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Devpack
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/devpack.rb

@@ -6,6 +6,7 @@ require 'set'
 
 require 'devpack/timeable'
 require 'devpack/config'
+require 'devpack/gem_ref'
 require 'devpack/gems'
 require 'devpack/gem_glob'
 require 'devpack/gem_spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devpack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -121,6 +121,7 @@ files:
 - lib/devpack/config.rb
 - lib/devpack/exec.rb
 - lib/devpack/gem_glob.rb
+- lib/devpack/gem_ref.rb
 - lib/devpack/gem_spec.rb
 - lib/devpack/gems.rb
 - lib/devpack/initializers.rb