Skip to content

Make CodeManifest.load_manifes publict#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tubaxenor merged 4 commits into from
May 17, 2024
Merged

Make CodeManifest.load_manifes publict #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b54313
Make CodeManifest.load_manifes publict
tubaxenor May 16, 2024
fcb6744
Bump
tubaxenor May 16, 2024
44b6fb5
Fix
tubaxenor May 16, 2024
73ac6e1
Review tweaks
tubaxenor May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
PATH
remote: .
specs:
code_manifest (1.6.1)
code_manifest (1.7.0)
psych (>= 4.0.0)

GEM
remote: https://rubygems.org/
specs:
diff-lcs (1.5.0)
psych (5.1.2)
stringio
rake (13.0.6)
rspec (3.11.0)
rspec-core (~> 3.11.0)
Expand All@@ -21,6 +24,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.1)
stringio (3.1.0)

@urnicusurnicusJun 13, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is resulting in build failures in PBB 

/usr/local/lib/ruby/3.3.0/bundler/runtime.rb:304:in `check_for_activated_spec!': You have already activated stringio 3.1.0, but your Gemfile requires stringio 3.1.1. Since stringio is a default gem, you can either remove your dependency on it or try updating to a newer version of bundler that supports stringio as a default gem. (Gem::LoadError)

@tubaxenortubaxenorJun 13, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main reason here is to remove the YAML patch in https://github.com/rubyatscale/code_manifest/pull/5/files#diff-2aac61581ea2d39514c7db56a64c654b251315a2c74ec6e251e41ba75acabff4L48-L52 which was built-in in psych 4.

The problem here is that psych puts default gem as dependency: ruby/psych#525 Also from a gem's perspective, I don't think this change on code_manifest is inappropriate since we do want to only support psych >= 4.0.

I think the better way to tackle this is to make sure a gem update --system ran before bundle install.


PLATFORMS
arm64-darwin-21
Expand Down
2 changes: 1 addition & 1 deletion code_manifest.gemspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

# Uncomment to register a new dependency of your gem
# spec.add_dependency "example-gem", "~> 1.0"
spec.add_dependency "psych", ">= 4.0.0"

spec.add_development_dependency 'rspec', '~> 3.0'

Expand Down
27 changes: 10 additions & 17 deletions lib/code_manifest.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,20 +21,20 @@ def root(start_path: Dir.pwd, reset: false)
@root ||= find_root(start_path)
end

private
def load_file(manifest_file)
YAML.load_file(manifest_file, aliases: true).each_with_object({}) do |(name, patterns), collection|
next unless name.match?(KEY_PATTERN)

def manifests
@manifests ||= begin
manifest_file = root.join(MANIFEST_FILE)
raise ArgumentError, "#{name} defined multiple times in #{manifest_file}" if collection.key?(name)

load_manifest(manifest_file).each_with_object({}) do |(name, patterns), collection|
next unless name.match?(KEY_PATTERN)
collection[name] = Manifest.new(patterns.flatten)
end
end

raise ArgumentError, "#{name} defined multiple times in #{MANIFEST_FILE}" if collection.key?(name)
private

collection[name] = Manifest.new(patterns.flatten)
end
end
def manifests
@manifests ||= load_file(root.join(MANIFEST_FILE))
end

def find_root(path)
Expand All@@ -44,12 +44,5 @@ def find_root(path)

raise "#{MANIFEST_FILE} was not found in your project directory, please check README for instructions."
end

# https://stackoverflow.com/a/71192990
def load_manifest(file)
YAML.load_file(file, aliases: true)
rescue ArgumentError
YAML.load_file(file)
end
end
end
2 changes: 1 addition & 1 deletion lib/code_manifest/version.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module CodeManifest
VERSION = '1.6.1'
VERSION = '1.7.0'
end