search

sibartlett / homebridge-wink3

Homebridge plugin for wink.com
https://sibartlett.github.io/homebridge-wink3
ISC License
54 stars 20 forks source link

"Merge" with homebridge-wink? #51

Open KraigM opened 6 years ago

KraigM commented 6 years ago

@sibartlett: As @pdlove and I likely both agree, you have done an excellent job revamping the plugin, would you want to just move forward as homebridge-wink (instead of homebridge-wink3. I think the wink2 and wink3 are confusing many people. And the way I see it, mine was v1, @pdlove's (wink2) was v2, and I see yours (wink3) as v3.

Today I went through and merged @pdlove's rewrite into the main homebridge-wink repo and released all the v2 versions to npm as homebridge-wink.

My proposal would be to publish your version as version 3.x.x to homebridge-wink and I can make you a contributor/owner to it in npm. As far as repo's go, I would suggest doing some git subtree magic to include both sources but make your source completely overtake the current source (which is now matches @pdlove's fork). My reasoning for that:

  1. It will finally unify everything
  2. It will give a better outlook as in the progression across the 4 rewrites (the original by various devs, my rewrite when I took it over, @pdlove's rewrite, and of course yours)
  3. Give credit to those who have done leg work on this (same reason I made sure the original developers commits show up on my repo when I severed/adopted it from the main homebridge repo)

Thoughts?

KraigM commented 6 years ago

^ There is a PR with my proposal, but I'm flexible.

thechrisreese commented 6 years ago

This is awesome if it happens. @sibartlett has done great work and as a Wink user I have appreciated all 3 versions and would love to see the whole group come together under one plugin.

sibartlett commented 6 years ago

Thanks for opening this issue @KraigM, and I appreciate tour kind words :)

I’m away on travels at the moment, but when I get back later this week I’d be happy to go ahead with this.

I took a quick look at the PR, and I think we could drop the commits where I bumped versions - but I can do that when I’m back.

pdlove commented 6 years ago

Glad to see this finally happening. It helps everyone to have homebridge-wink a single source for the best plugin.

schmittx commented 6 years ago

Any more progress on this merge?

sibartlett commented 6 years ago

I’m still planning to do the merge.

I’ve been a bit short for time, and have been prioritizing fixing user issues. Maybe I’ll be able to submit a pull request sometime during the upcoming holiday.

schmittx commented 6 years ago

Great, glad to hear it's still on the table.

No need to rush though...fixing bugs is always much appreciated!

philfreo commented 6 years ago

Still planning on merging? Any timeline?