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

develop #33

Merged
merged 39 commits into from Jan 16, 2014
Merged

develop #33

merged 39 commits into from Jan 16, 2014

Conversation

pvsvarma
Copy link

Venkat - requesting for pull for original develop version.

nlloyd and others added 30 commits June 26, 2013 13:45
- added initial vagrant configuration for setting up a test SubliminalCollaborator peer (currently only installs sublime text 2 and a few packages)
- ubuntu inspircd packages were a mess, trying centos out
- ngircd on centos, working on the local VM (tested wout ssl) but not with the host
- removed puppet modules that proved ineffective
- gtk2 package included
- dbus service now properly named messagebus
…labs/firewall module

- should open up ports for ircd and, later on, other messaging services
- sublime_text module with sublime text setup instructions
- ssl_client module with client private and public ssl keys
- removed hiera config (hold over from inspircd experimentation)
- properly creating required directory path for Accounts.sublime-settings file
- x11 setup now moved to its own module
- xvfb-run execution of sublime text now happening to generate default plugin packages directory for the vagrant user
- SubliminalCollaborator plugin "install" and configuration working
- reactor initialization refactored with proper initialization exception handling, much safer integration particularly for other plugins using twisted
- check to see if ThreadedSelectReactor is being used and warning logged if not
- better? logging support, i hope
- twisted updated to 13.1 and patches removed to go into subclasses later while official twisted patches move through their release process
- sublime keymap and mousemap settings disabled, for now
- commented out most of the plugin root commands.py to ease refactoring process
- sub_collab/negotiator/interface.py renamed to */base.py, BaseNegotiator class added implementing constructor that accepts a config dict and provides a getter for that config dict
- registry handled negotiator instances instead of separated config maps and negotiator maps
- finished negotiator configuration loading refactor including  connect-all-on-startup mechanism
- commented out sections of old code around logging and configuration now removed
- uncommented OpenSublimeSettingsCommand
- starting to refactor CollaborateCommand
- initial stab at a NegotiatorListener interface for UI callbacks
- BaseNegotiator now stores and provides a getter for an id, registry module sets that as the negotiator key
…registry

- lib/sub_collab/negotiator/base now includes PatchedServerSupportedFeatures and PatchedIRCClient classes which capture twisted ticket #3275 changes until that ticket is merged and released
- sub_collab.registry now has session storage and handling methods
… session

- openSession() triggers chooseNegotiator() which triggers choosePeer(), all using the sub_collab registry
- IRCNegotiator extends base.PatchedIRCClient
- rewrote connect() and isConnected()
- sub_collab/peer/base.py is now sub_collab/peer/basic with BasicPeer class
- Observer and Observable interface and object moved to sub_collab/common.py
- event constants put into sub_collab/event.py
- added to Negotiator interface acceptSessionRequest() and rejectSessionRequest() methods in place of onNegotiateSession()
- added handling of incoming session request events to CollaborateCommand plugin along with event notification in doDccChat() method in IRCNegotiator
- dcc chat api changes applied to PatchedIRCClient (@todo put into a twisted ticket)
- barely started rewriting negotiateSession()
…establishment and confirmation

- IRCNegotiator can now handle accept/retry/reject events with proper session registration and removal
- registry can handle removal of sessions, cleaned up session registration method
- sub_collab/peer/interface.py renamed to sub_collab/peer/base.py
- BasicPeer can now handle removal of session from registry on connection lost or failed
- cleaned up commented out code
- commenting out reactor.callFromThread() calls... evaluating which are necessary
- added anchors to all modules
- firewall setup was broken... vm would stall during setup... now this is just opening up the irc ports because that is all we care about and this is just a test vm after all
- connectToChat() and disconnectFromChat() refactored
- minor registry additions
- still not working BUT working my way through bugs including missed refactorings
- negotiator constructor map moved to commands.py and provided to registry as an argument to avoid circular import issue
- issues in versions up from there on linux due to missing core python library, and I am too lazy to mess with including yet another binary library in this plugin for a specific OS
- can now connect/disconnect irc negotiator cleanly
- addressed various issues uncovered during refactor and can now open a new session again and share a view (basic, unsecure connection)
- Vagrantfile needed updates following latest upgrade to vagrant
- plugin commands to show, start, and stop sessions now working correctly, includes fixes to session registration uncovered during testing
- pyopenssl module and libraries for windows 32bit, windows 64bit, mac 64bit added under libs/OS/ARCH
- twisted ssl connection used for irc negotiator client if useSSL flag set to true in the config
- added pyopenssl binaries for windows (32 and 64bit, untested currently), linux (64bit only right now), and mac os x (64bit only right now)
- added pyopenssl license for reference
- useSSL flag added to configurable options in Accounts.sublime-settings, defaults to false
- vagrant vm configuration now has unsecure and ssl configurations for testing
@nlloyd
Copy link
Owner

nlloyd commented Jan 15, 2014

Yep :-) I will take care of this, I just need to update the documentation which I will do this evening.

@ghost ghost assigned nlloyd Jan 16, 2014
nlloyd added a commit that referenced this pull request Jan 16, 2014
@nlloyd nlloyd merged commit 5c619e1 into master Jan 16, 2014
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.

None yet

2 participants