Skip to content
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.

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

🚑️ Remove circular dependency, fixes #55, #60 #59

Merged
merged 1 commit into from
Dec 15, 2022

Conversation

pboling
Copy link
Collaborator

@pboling pboling commented May 5, 2022

Fixes #55 & #60

Signed-off-by: Peter Boling peter.boling@gmail.com

@pboling
Copy link
Collaborator Author

pboling commented Aug 23, 2022

@rdp Ping!

Copy link
Collaborator Author

@pboling pboling left a comment

Choose a reason for hiding this comment

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

@@ -46,18 +46,15 @@ Gem::Specification.new do |s|
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<os>.freeze, [">= 0"])
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The os gem can't depend on itself. I think this is part of the messy legacy of jeweler.

Copy link
Owner

Choose a reason for hiding this comment

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

Yeah I think jeweler was auto inserting this, scary...

@rdp
Copy link
Owner

rdp commented Sep 27, 2022 via email

@pboling
Copy link
Collaborator Author

pboling commented Sep 29, 2022

@rdp No, I'll do that upgrade separately.

@pboling pboling force-pushed the bug/55-bundle-install branch from 15ccbae to 9bb625c Compare December 11, 2022 10:58
@pboling pboling changed the title 🚑️ Remove circular dependency, fixes #55 🚑️ Remove circular dependency, fixes #55, #60 Dec 11, 2022
@pboling
Copy link
Collaborator Author

pboling commented Dec 11, 2022

@rdp I have fixed the issues with the test suite. In order to delay the upgrade to a newer RSpec I had to constrain the gem version dependencies in the gemspec to the same patch level as what had been used in the last "known good" state, which I assumed was in the Gemfile.lock.

This branch now works for both bundle install, and bundle exec rspec, and all tests pass. There were two bugs in the test suite that have been fixed.

@pboling pboling force-pushed the bug/55-bundle-install branch from 9bb625c to 66bc609 Compare December 11, 2022 11:02

if OS.mac?
ENV.stub(:[]).with('HOME').and_return('/home/user')
assert OS.app_config_path('appname') == '/home/xdg/Library/Application Support/appname'
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It's clear you weren't running this on a Mac 😄

@@ -121,7 +121,8 @@
it "has working cpu count method" do
cpu_count = OS.cpu_count
assert cpu_count >= 1
assert (cpu_count & (cpu_count - 1)) == 0 # CPU count is normally a power of 2
Copy link
Collaborator Author

@pboling pboling Dec 11, 2022

Choose a reason for hiding this comment

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

I use a 6-core, 12 vCPU Macbook Pro. The power of 2 idea is no longer reasonable, so I have added "or an even number" as a secondary condition.

@rdp
Copy link
Owner

rdp commented Dec 14, 2022

OK is there a change in this PR? Or is it the following PR's? Github doesn't show it very clearly LOL.

@pboling
Copy link
Collaborator Author

pboling commented Dec 14, 2022

I am doing individual PRs, and this PR is one of those. It is a complete, internally consistent change set, which passes all specs.

In addition I have a separate tracking branch, and associated PR, which is a collection of the sum total of the work I am doing to modernize the gem. It helps put all the changes in context together... and it will shrink in size as the individual PRs are merged.

Do you not use GitHub from a computer?

@pboling
Copy link
Collaborator Author

pboling commented Dec 15, 2022

@rdp For some reason I do not have a merge option. Is a review required for a merge option to appear?

Update - I had to accept the invite. 🤦

@pboling pboling merged commit 497c0d6 into rdp:master Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Current master can't do bundle install
2 participants