Compare commits

...

222 Commits

Author SHA1 Message Date
Arthur POULET 1aab6b69c7
documentation: Update forge urls 2021-03-27 11:32:35 +01:00
Arthur Poulet c21010a9d9
Merge pull request #18 from straight-shoota/patch-1
Fix dependency name
2021-01-25 11:36:08 +01:00
Johannes Müller d84ffb1d0c
Fix dependency name 2021-01-08 22:26:40 +01:00
Arthur POULET ffc405d1d4 Update version 0.5.1 2020-04-20 00:27:31 +02:00
Arthur POULET 82440d9290 Update makefile 2020-04-20 00:27:20 +02:00
Tatsiujin Chin a1e382a7e6 update to crystal 0.34.0 2020-04-13 17:49:27 +08:00
Arthur POULET ba7e04248b
Update version 2020-01-19 21:16:57 +01:00
Arthur POULET cb049c7312
Update version 2019-12-04 23:57:03 +01:00
Arthur POULET 35ffa801cf
Change LICENSE 2019-12-04 23:56:44 +01:00
Arthur POULET bbb333ac30
Update some doc 2019-12-04 23:54:52 +01:00
Arthur POULET d906de14b0
Merge branch 'c-cube-fix-ssl' 2019-09-11 17:50:37 +02:00
Simon Cruanes d5bf25ffaa add newline after sent message 2019-09-07 18:37:56 -05:00
Simon Cruanes 03c9b1db70 fix: flush socket on `client.puts`
with `ssl: true` the messages may be bufferized, causing the server to
drop the connection after a little while (tested both on freenode and
mozilla).
2019-09-07 18:00:30 -05:00
Arthur POULET e89037f48d
Merge branch 'greenbigfrog-crystal-update' 2018-12-25 18:35:21 +01:00
Jonathan B 26dc8556c6 Update to work with crystal v0.27.0 2018-12-25 02:46:55 +01:00
Arthur POULET d682bc5560
Improve Handler documentation 2018-03-11 10:10:27 +01:00
Arthur POULET fde0e844f1
Update README dependency example 2018-03-04 19:37:33 +01:00
Arthur POULET b7b2a4e876
Documentate the example_bot !help 2018-03-01 10:57:50 +01:00
Arthur POULET aaef6c887f
Fix documentation about interfaces 2018-03-01 10:54:51 +01:00
Arthur POULET 415bcf71de
Minor documentation fix 2018-03-01 10:48:27 +01:00
Arthur POULET 3cc038c2fb
More hooks doc and rename HookTest to Trigger 2018-03-01 10:47:11 +01:00
Arthur POULET 4027d3eafa
Add more documentation for controllers 2018-03-01 10:34:01 +01:00
Arthur POULET 2a7d37fdef
Add more documentation
* Controller::Controller
* Network::Network
* All the Protocol entities
2018-03-01 10:30:02 +01:00
Arthur POULET 7e817e1f8a
Documentate Command, and remove Command::Command 2018-03-01 10:20:27 +01:00
Arthur POULET c7aae78d6a
Documentate Broadcast 2018-03-01 10:05:41 +01:00
Arthur POULET 141f583fd7
Improve README Development section 2018-03-01 09:44:54 +01:00
Arthur POULET dd7ced2f43
Improve README with the exemple of DashBot 2018-03-01 09:39:34 +01:00
Arthur POULET ab08e9b2aa
Update README 2018-03-01 09:37:52 +01:00
Arthur POULET 568104bb47
Improve .travis.yml to deploy doc 2018-03-01 09:30:37 +01:00
Arthur POULET 547caf55a8
Fix README Crirc refs 2017-12-06 16:05:55 +01:00
Arthur POULET e67bf5a095
Improve documentation system 2017-11-30 00:18:34 +01:00
Arthur POULET 3c5844bda9
Remove trailing spaces in specs 2017-11-26 22:51:39 +01:00
Arthur POULET 7a6a801cd5
Merge branch 'master' of github.com:Meoowww/Crirc 2017-11-23 20:19:55 +01:00
Arthur POULET d1846cf842
Merge branch 'crirc' 2017-11-23 20:17:39 +01:00
Arthur POULET e5b5689610
Merge remote-tracking branch 'crirc/master' into crirc 2017-11-22 19:56:16 +01:00
Arthur POULET e8e9aac275
Add hook documentation and default command value to PRIVMSG 2017-11-22 18:35:59 +01:00
Lucie Dispot f6510966a1 Further improve QUIT, clean up code 2017-10-26 17:55:38 +02:00
Lucie Dispot 2d4cbb5d34 Improve QUIT & PART 2017-10-26 17:38:30 +02:00
Lucie Dispot e9a632f0ca Add QUIT command 2017-10-26 17:34:28 +02:00
Arthur POULET a0c42c2ed7
Merge branch 'master' of github.com:Meoowww/CrystalIrc 2017-10-26 17:26:07 +02:00
Arthur POULET a37f922320
Clean & document some basic_server code
Move some comment, documentate Client.validate, ...
2017-10-26 17:22:51 +02:00
Lucie Dispot 70f50c7dbf Fix connection bugs of NICK and USER 2017-10-26 17:12:14 +02:00
Arthur POULET d9bfe6bad5
Reduce basic_server ping 2017-10-26 17:11:25 +02:00
Lucie Dispot 39ed9be176 Merge branch 'master' of https://github.com/Meoowww/CrystalIrc 2017-10-26 00:57:52 +02:00
Lucie Dispot e858e276f2 Fix NICK command 2017-10-26 00:57:33 +02:00
Arthur POULET cef46aa8a8
Remove invalid encoded character 2017-10-26 00:46:19 +02:00
Lucie Dispot 3956eba0cc Add sender to numeric replies 2017-10-26 00:44:29 +02:00
Lucie Dispot 475d808100 Make code more readable 2017-10-26 00:30:11 +02:00
Lucie Dispot f703efda35 Fix PRIVMSG 2017-10-26 00:15:49 +02:00
Lucie Dispot 37c09f7b2b Make unit tests functional 2017-10-26 00:06:11 +02:00
Lucie Dispot 39da654194 Add PRIVMSG to channel 2017-10-25 23:20:38 +02:00
Lucie Dispot a10190d42a Change broadcast system for JOIN, NICK, PART 2017-10-25 23:03:23 +02:00
Lucie Dispot 0e64a4636b Crystal tool format 2017-10-25 21:27:10 +02:00
Lucie Dispot 54f7d81054 Further clean up of the code 2017-10-25 14:45:14 +02:00
Lucie Dispot 3aa70d77fe Clean up code 2017-10-25 13:23:23 +02:00
Lucie Dispot e607970f55 Change bindings of file and add TOPIC command 2017-10-25 12:45:29 +02:00
Arthur POULET c6bec9683d
Disable some old specs 2017-10-25 00:05:11 +02:00
Arthur POULET 16ed25b8fb
Fix basic server so it allows multi-client 2017-10-24 23:57:52 +02:00
Lucie Dispot e09030e4ab Add modes to chan 2017-10-24 16:00:59 +02:00
Lucie Dispot e216f7a592 Add motd and userlist to JOIN 2017-10-24 13:10:30 +02:00
Lucie Dispot 3cc01f53db Fix part command 2017-10-24 12:42:54 +02:00
Lucie Dispot 201d3ea932 Add part command 2017-10-24 12:29:39 +02:00
Lucie Dispot c273474f74 Fix connection, now valid & working 2017-10-24 11:47:36 +02:00
Lucie Dispot bb1b91a0e6 Add broadcast to JOIN & NICK on server 2017-10-20 19:41:49 +02:00
Lucie Dispot 079d6decf1 Add ultra basic JOIN & NICK commands for server 2017-10-20 19:28:57 +02:00
Arthur POULET 6da55c69bc
Prepare the server to the next work 2017-10-09 22:18:33 +02:00
Arthur POULET 923859be1b
Merge branch 'master' of github.com:Meoowww/CrystalIrc 2017-10-09 21:48:36 +02:00
Arthur POULET acadefcb4b
Change license to gpl3 2017-10-09 21:48:09 +02:00
Arthur POULET 29433f1074
update shards.yaml 2017-09-18 21:20:56 +02:00
Arthur POULET c0063011b6
Improve user name parsing 2017-09-18 21:02:30 +02:00
Arthur POULET e77a909abd
Merge branch 'master' of github.com:Meoowww/CrystalIrc 2017-09-18 19:12:42 +02:00
Arthur POULET 78fde1b275
Fix trailing \n in a failing spec 2017-09-18 19:12:27 +02:00
Arthur POULET b5a19acecf
Add /lib/ to gitignore 2017-09-18 19:12:16 +02:00
Arthur POULET 11bbad8494
Fix message to allow empty Message.msg 2017-09-18 19:10:40 +02:00
Arthur POULET 9c3c751a62
Improve input and output to be displayed on the STDOUT instead of STDERR 2017-08-24 09:44:38 +01:00
Arthur POULET 9d9b8efb40
Merge branch 'develop' 2017-08-23 18:35:57 +01:00
Arthur POULET b6742edf45
Fix PASS display
PASS command should never be displayed on the console
2017-08-23 18:32:04 +01:00
Arthur POULET 34e05dbc3c
Update README 2017-06-30 01:45:35 +01:00
Arthur POULET 2865620dec
Improve version reader 2017-04-14 00:22:18 +01:00
Arthur POULET 15752befcf
Improve makefile (it runs the specs by default) 2017-04-14 00:20:44 +01:00
Arthur POULET 30a8fa2b15
Fix specs, minor readme update 2017-04-14 00:17:27 +01:00
Arthur POULET c2c9102c66
Fix verbosity 2016-09-14 14:05:03 +01:00
Arthur POULET 9b55e335c4
Update to crystal 0.19 2016-09-08 12:45:24 +01:00
Arthur POULET 8ebf20a680
Improve message logging
* HasSocket.send_raw takes an optional secondary output as parameter
* Same thing for HasSocket.answer_raw and IrcSocket.answer_raw
* Improve $verbose lisibility
2016-08-31 14:16:19 +02:00
Arthur POULET e32248b311
Fix Command::Chan default arguments
* some functions now takes nil arguments by default
* some functions now cannot take nil arguments
2016-08-28 12:32:43 +02:00
Arthur POULET 2d60b66a85
Fix crystal format
* use `crystal tools format`
* use inline scope resolution (module A::B::C; end instead of module A;
  module B; module C; end; end; end)
2016-08-25 02:23:54 +02:00
Arthur POULET 1fb57fd295
Add some protocol/user specs and todo
* Add the pipe ("|" char) in authorized chars for User nick
* Add some specs in the User parser
* Add some TODO entries in the code. Simple fix, should be done quickly
2016-08-23 19:03:23 +02:00
Arthur POULET b8fdd5284f
Improve: Message.reply
* Fix bug on reply:
  Reply on an user was not targeting the source but the bot himself (as
  it was based on the channel/user of the command)
* Add the methods Message.target and Message.reply_to
  Message.target is emitter
  Message.reply_to is to target to reply (the chan or the user source of
  the messsage)
2016-08-17 11:15:19 +02:00
Arthur POULET d00735773d
Add: bot/commands to be a high level irc api
add the method Bot.join(*String) as a high level api for Client.join(Enumerable(CrystalIrc::Chan))
2016-08-16 18:30:34 +02:00
Arthur POULET 4168c9615d
Fix: make Command::Chan#format_list protected 2016-08-16 18:30:01 +02:00
Arthur POULET 461acf1ac0
Improve Command::Chan
functions require Enumerable(T) instead of Array(T)
2016-08-16 18:28:41 +02:00
Lucie-Dispot cbc32e9b22 Update client/binding.cr to support all privileges 2016-08-16 14:23:49 +02:00
Arthur POULET 917eaf2a5e
Fix crystal 0.18.7 (crystal build)
- `crystal compile` il now depreciated
2016-08-15 23:55:53 +02:00
Arthur POULET 0b73146992
Fix Client.chan and Chan.user
- Fix Client.chan and Chan.user (use select.first? instead of bsearch)
- Add Client.has? and Chan.has?
- Add specs for those functions
- Move client specs using network to client_network.cr and
  client_network_online.cr
2016-08-10 14:49:37 +02:00
Arthur POULET 53c306f307
hot and ugly fix on client/binding 2016-08-09 18:16:19 +02:00
Arthur POULET 96f78689ad
Merge branch 'ft-client-binds'
- Improved documentation
- Some specs on new features (not every feature has been documented)
- Some API changes
  - Client.source is "0" by default
  - Improve Client.source_xxx
  - Remove some Nil values in favor to new Exceptions
  - Add few useful helpers (Chan.user, Client.chan, ...)
  - Add Chan.users
  - Add Client.chans
  - Fix chaining
- Add defaults bindings for the client
  - Handles JOIN, PART, PING, ...
  - Handles successful connections (Client.on_ready binds "001" message)
2016-08-09 17:53:38 +02:00
Arthur POULET 04767ec21f
rename andfix Client.on_connect
- Client.on_connect renamed to Client.on_ready
- Client.on_ready now binds "001" instead of atest
- Client binds "451" error
2016-08-09 17:40:07 +02:00
Arthur POULET 6ae4ff370f
Add Client.on_connect method 2016-08-09 17:18:58 +02:00
Arthur POULET 5589f052e7
add some documentation points 2016-08-09 16:01:08 +02:00
Arthur POULET c0eca6e024 Merge branch 'improve-interfaces' into ft-client-binds
- Fix some interfaces lacks
  - Improve returns (Fix some of them)
  - Improve chaining methods (return self in some cases)
  - Minor fix on specs
  - Add Chan.user() and Client.chan() to search a specific item by name
2016-08-09 15:21:01 +02:00
Arthur POULET 24eab97905
Improve global interface (fix return and chaining) 2016-08-09 15:19:16 +02:00
Arthur POULET 24a97bc9f3
Add Chan.user(String) to search an user 2016-08-09 15:14:34 +02:00
Arthur POULET 316cf2da24
Add Client.chan(String) to search a chan 2016-08-09 15:10:56 +02:00
Arthur POULET e6e6d253a7
Improve client.connect(&b)
- connect returns self
- spec renamed
- spec using connect(&b) does not close the socket twice
2016-08-09 14:51:36 +02:00
Arthur POULET 960ef23ed9
reformat client/binding 2016-08-08 23:10:36 +02:00
Arthur POULET 6f29e91ca8
Merge branch 'improve-api' into ft-client-binds
+ change "sleep 10" by "sleep 1"
2016-08-08 22:59:57 +02:00
Arthur POULET 2bb194fc1f
move online client's specs to separated file 2016-08-08 22:48:14 +02:00
Arthur POULET 814f8670a8
Improve Message.source...
3rd time i write this commit fuck it
2016-08-08 22:39:41 +02:00
Lucie Dispot e5ae4eb815 Updating userlist and chanlist upon kick or part 2016-08-08 22:05:29 +02:00
Lucie Dispot b48570e640 Fixed the userlist and chanlist update on JOIN 2016-08-08 21:52:46 +02:00
Arthur POULET 26e61f94c0
add Chan.users and associated Bind 2016-08-08 15:10:41 +02:00
Arthur POULET 6ae6f8018e
Default binds on the client
- add Client.chans
- JOIN add a chan to the list (PART / kick does not remove it)
- PING
2016-08-08 14:17:24 +02:00
Arthur POULET 2a05dcc73f
Fix Command::Chan#format_list 2016-08-05 14:11:37 +02:00
Arthur POULET 14d90da6b3
update README 2016-08-05 04:26:47 +02:00
Arthur POULET 60c98261f8
Improve Handler.handle
Add a second parameter to the hook (match) which represents the data
matched on the message if a regex has been used.

Specs and documentation has been added
2016-08-04 17:14:25 +02:00
Arthur POULET 8f1cd4190e
update dash example 2016-08-04 15:25:58 +02:00
Arthur POULET 14d4e22b40
add Message.source.source_nick/source_id/... 2016-08-04 15:23:56 +02:00
Arthur POULET 7a00931d1b
update CHANGELOG and README 2016-08-04 14:22:09 +02:00
Arthur POULET 74ca191d1b
update readme and dash example 2016-08-03 20:04:48 +02:00
Arthur POULET 40cc678a2b
add Message.hl 2016-08-03 19:51:44 +02:00
Arthur POULET 09caa41a86
add list of commands which have a chan associated 2016-08-03 18:28:48 +02:00
Arthur POULET 5e80eefd52
Add Message.reply 2016-08-03 13:32:07 +02:00
Arthur POULET 965fd51afb
Change Message.chan implementation (no nil return) 2016-08-01 02:06:12 +02:00
Arthur POULET aaf490ea41
Implement first version of Message.chan
Fix:
- Remove unexisting scopes (Protocol:: ???)
- Message.arguments cannot return nil (empty array instead)
- Message.raw_argments cannot return nil (empty string instead)
- Update the specs

Additions:
- Add Target (interface) for the Command::Talk methods
- User < Target
- Chan < Target instead of Chan < User
- User has now a nick, id, and whois instead of name and whois
2016-07-30 18:06:20 +02:00
Arthur POULET 536e04bab4
Improve Protocol::Message Api
- prepare Message.chan, Message.user
- add Message.raw
2016-07-29 03:30:36 +02:00
Arthur POULET 19101db34b
Improve protocol/message
Message.arguments and Message.raw_arguments now include the last
argument (message).
Still, the last argument (if the preceded by ":") is accessible with
Message.message (even if not very expressive)

Update the documentation and associated specs
2016-07-29 03:21:57 +02:00
Arthur POULET 09970c6a8f
Nephos is bad in english 2016-07-26 22:28:50 +02:00
Arthur POULET 33562eb627
add "[Time.now]" in the send_raw's output 2016-07-22 17:30:43 +02:00
Arthur POULET 4b6d152a6f
refactorize HookRules.test_xxx with a macro 2016-07-06 19:09:02 +02:00
Arthur POULET c199a817bf
fix format 2016-07-06 19:06:35 +02:00
Arthur POULET 205848aecf
add and fix some documentation 2016-07-06 18:58:46 +02:00
Arthur POULET cf7190c3cc
minor name refactorization 2016-07-06 18:42:12 +02:00
Arthur POULET 001fd1982c
Refactorize some errors
- Invalid... -> ParsingError
- NoConnection -> NetworkError
2016-07-06 16:21:50 +02:00
Arthur POULET 7c82bae80f
Improve Message parsing (args with :) 2016-07-06 15:44:27 +02:00
Arthur POULET 74a6f8ed2d
Fix Message parsing
command should only be [A-9]+ or \d{3}
2016-07-06 15:13:26 +02:00
Arthur POULET 6cc6cf2dcc
Improve Message parsing lisibility and fix bugs
- add constants to contain every parts of the parsing regexp
- fix cmd (can contains A-Z0-9-)
2016-07-06 14:58:33 +02:00
Arthur POULET 72e36cd459
Message.arguments_raw to Message.raw_arguments 2016-07-06 14:41:47 +02:00
Arthur POULET 4ba5d51d50
fix format (crystal tool format) 2016-07-03 00:51:55 +02:00
Arthur POULET cd433c22fe
fix client spec 2016-07-03 00:50:53 +02:00
Arthur POULET 621256cf2d
update email 2016-06-28 22:10:56 +02:00
Arthur Poulet 110a57935d
improve Command::Ping.pong to handle nil message 2016-06-21 18:40:47 +02:00
Arthur Poulet 9ac31af8b7
Improve and add test to Server::Binding 2016-06-21 18:35:26 +02:00
Arthur Poulet 0f3735b249
Fix coding style 2016-06-21 18:15:07 +02:00
Arthur Poulet 0bf9df213a
Add PING-PONG binding in Server::Binding.attach
- When server recv a ping :message, it respond with pong :message
- Improve Command (ping and pong send full message, with :)
2016-06-21 17:59:03 +02:00
Arthur Poulet d2485f775c
Prepare the server binding architecture
- add CrystalIrc::IrcSender.from (implemented in client and server)
- add HasSocket.answer_raw(from, raw)
- add IrcSender.answer_raw(raw) (using HasSocket.answer_raw but using
  the from required in IrcSender)
- create the module Server::Binding and Server::Binding.attach(obj) to
  attach the basic binding of an Irc server (JOIN, ...)
  It does only handle JOIN for now
2016-06-21 16:58:26 +02:00
Arthur Poulet a53a49beb5
Improve server hooking
- Handle can take a "sender" parameter.
  It allows the server to specify the client for each message to handle:
  > s.accept{|c| s.handle c.gets, c}
  Then, in the hook, you can write :
  > s.on("JOIN") {|cli| cli.send_raw ":0 NOTICE JOIN #chan" }
- Make send_raw public, but puts protected.
  It should be a protected interface and a public interface to avoid
  mistakes or synchronization issues
- Coding style fix in the server specs
2016-06-20 22:10:36 +02:00
Arthur Poulet 108b5f65a3
fix offline specs 2016-06-20 21:53:28 +02:00
Arthur Poulet 72bc570de7
fix unitary tests with sleep between each connect 2016-06-20 21:01:01 +02:00
Arthur Poulet 5f3838dc3a
fix Client.connect (calls client.send_login) 2016-06-20 20:03:53 +02:00
Arthur Poulet d5b7e4e1e5
Improve CrystalIrc architecture
- move client/nick.cr to utils/cr. and renamed to ::Nick
- remove circular buffer
- fix Server.clients (previoulsy named users)
- add some optional verbose (if $verbose is true)
- Client.connect now returns self insted of the socket
2016-06-20 19:56:27 +02:00
Arthur Poulet 6c3c0d5eff improve dash.cr 2016-06-20 19:56:18 +02:00
Arthur Poulet 9da5fa6fdf
Improve handler (remove useless block argument) 2016-06-19 19:18:59 +02:00
Arthur Poulet 2301196f39
Global architecture improvement
- HasSocket is not an simple interface anymore. It's still abstract but
  does define "close", "closed?", "gets", "gets(&block)", "puts(e)" and
  a pure virtual "socket"
- Add the abstract IrcSender < HasSocket wich can send messages as an
  Irc Client or Server
- Move IrcSocket to Project Scope
- Fix specs
2016-06-19 18:01:54 +02:00
Arthur Poulet c8d8a55dee
Update makefile and readme to crystal 0.18 2016-06-17 15:39:25 +02:00
Arthur Poulet b5ac4e0c46
update gitignore and fix dash
note: there is some code to rewrite (architecture is broken and requires
casts)
2016-06-17 15:29:00 +02:00
Arthur Poulet 92c88da8d1
Update OpenSSL and some specs fix
- Update OpenSSL (breaking changes in crystal 0.18)
- Fix specs (OFFLINE tests)
- Fix HasSocket.gets with no specified return (String?) instead of
  String
2016-06-17 15:12:23 +02:00
Arthur Poulet cdd60843d3
Update has_socket interface
- add gets with block
- remove delegate
- fix virtual puts
2016-06-17 14:58:08 +02:00
Arthur Poulet 156eeafa73
improve Handler.handle 2016-05-26 14:49:34 +02:00
Arthur Poulet a607ae4c7a
Working Server with handler
- Client, Server, Server::Client inherit HasSocket
- improve close
- improve Server.accept to be usable in spawn()
- fix Server attributes (clients, chans, chans.users)
- add specs to connect Client and Server and user Server.handle
2016-05-26 14:46:32 +02:00
Arthur Poulet f58b7b56f1
Create the module Handler
- move the Bot methods relatives to the handler (on, handle, @hooks
  initialization) to the module Handler
- Bot and Server now includes Handler
2016-05-25 13:42:10 +02:00
Arthur Poulet 9b6e6298a4
more specs for Server and Server::Client
- fix specs for Server (Server should close after usage)
- add specs for Server::Client (and fix the last build failure)
2016-05-24 16:21:06 +02:00
Arthur Poulet 849157eb9a
crete subdirs utils/ and protocol/ 2016-05-24 15:31:14 +02:00
Arthur Poulet 6abef9c8b6
add Server::Client
- Server::Client handle puts, gets, close, closed?
- Server.accept now yields a Server::Client
- prepare Server.chans and Server.users
- add Server.closed?
- Client.socket is now protected (instead of public)
2016-05-24 15:05:46 +02:00
Arthur Poulet c2b9a8bd9e
add more specs
- add Client.gets without block
- fix default port value for Server
- add Client.close/closed?
2016-05-23 22:57:49 +02:00
Arthur Poulet 581b17f308
add some specs to server
- server can accept connection
- server has self.open { ... }
- server.socket can be closed
2016-05-23 22:32:32 +02:00
Arthur Poulet 2c0fa47576
fix build failure (empty directory not pushed) 2016-05-22 12:47:01 +02:00
Arthur Poulet 2efff3d492
move HookRules in the Bot scope 2016-05-22 12:42:50 +02:00
Arthur Poulet 8be09f8834
prepare the irc server 2016-05-22 12:42:39 +02:00
Arthur Poulet 96efd95daa
improve makefile 2016-05-22 12:40:43 +02:00
Arthur Poulet 2da263ed6f
use property instead of getter+setter 2016-05-22 12:34:38 +02:00
Arthur Poulet ceb51a0b0c
update CHANGELOG 2016-05-21 23:36:56 +02:00
Arthur Poulet 7e75806f45
add Message.arguments_raw & HookRule defaults val
- HookRule has now default values for @command (PRIVMSG) and nil for the
  others
- HookRule.command can be a Regexp now (to allow /PRIVMSG|NOTICE/)
- HookRule.test_arguments test on the new Message.arguments_raw instrad
  of Message.arguments
- Message.arguments_raw renamed to Message.arguments
- Message.arguments returns now an Array(String) of arguments including
  @message if not nil
- Update the specs
2016-05-20 13:13:36 +02:00
Arthur Poulet b98ede789c
update readme 2016-05-20 00:43:58 +02:00
Arthur Poulet b719cc7a74
fix dash bot 2016-05-19 13:36:31 +02:00
Arthur Poulet 38d9b84641
add Message.message and HookRule.message
arguments contains every argument except the last :.....
2016-05-19 13:32:33 +02:00
Arthur Poulet c644e6c476
fix nick parser 2016-05-19 13:31:49 +02:00
Arthur Poulet 17181b8f40
update changelog and dash example 2016-05-19 00:05:24 +02:00
Arthur Poulet b97496677a
Improve Bot Hook system
- add a class Hook to test the rules
- improve Bot.on and Bot.handle to use theses rules
- only command rule is required (String "JOIN" ...)
- source and arguments are optionals (String Regex or Nil)
- add specs
2016-05-18 23:54:41 +02:00
Arthur Poulet 5eac78c84f
add ping pong handler for dash 2016-05-18 20:22:58 +02:00
Arthur Poulet 1520cde452
improve message parser 2016-05-18 20:11:48 +02:00
Arthur Poulet e7383ffd49
move ping -> command::ping 2016-05-18 19:38:50 +02:00
Arthur Poulet 3519dc3e41
add dash.cr as example, and user parsing
An user can have a whois.
User.parse(String) will be able to transform a Nick!user@domain to User
2016-05-18 19:34:35 +02:00
Arthur Poulet 7e2dbc5d17
add errors specs to CrystalIrc::Bot 2016-05-18 15:09:00 +02:00
Arthur Poulet c7b50677f3
add Bot.handle(String) and some tests 2016-05-18 14:22:03 +02:00
Arthur Poulet bb775b6c64
Add class Message, and improve bot hooks
- Message parse a string
- Bot.on use blocks instead of simple Lambda
- Update readme and specs
2016-05-18 13:43:27 +02:00
Arthur Poulet 20f799ca47
upxate bot (add irc argument) 2016-05-18 10:34:22 +02:00
Arthur Poulet b3caa91617
Improve hooks handle 2016-05-18 03:18:51 +02:00
Arthur Poulet 822a26014e
add bot with handler and hook register 2016-05-18 02:38:59 +02:00
Arthur Poulet 50e6538311
improve client by optional port 2016-05-18 02:38:37 +02:00
Arthur Poulet a84a21d0fd
update README 2016-05-17 19:14:25 +02:00
Arthur Poulet d0632b1203
add tests for Client::Nick 2016-05-17 19:12:23 +02:00
Arthur Poulet 4fbf8c8d52
rfc ? We don't give a f 2016-05-17 15:20:02 +02:00
Arthur Poulet ab106ac947
chan and user names checks 2016-05-17 15:12:35 +02:00
Arthur Poulet 5312a13e04
move client specs, add client.gets 2016-05-17 14:04:05 +02:00
Arthur Poulet 5986847c7e
add circular buffer 2016-05-16 22:31:16 +02:00
Arthur Poulet b083413c32
add class Client::Nick and OFFLINE test
Client::Nick handles the nick changes.
Client::Nick.next make a new nick based on the original string.
ex: Nick.new("hi").next generate "hi_1"

set the env variable "OFFLINE" to "true" will skip the online tests (as
connect, ...) and only keeps offline specs (like nick test, ...)
2016-05-16 20:31:00 +02:00
Arthur Poulet 9510718b4a
update README 2016-05-16 02:36:11 +02:00
Arthur Poulet 01ac456c73
add timeouts, keepalive, ssl 2016-05-16 00:08:47 +02:00
Arthur Poulet 8bbd75941f
add test for privmsg 2016-05-15 23:33:11 +02:00
Arthur Poulet 1d420b0d81
improve chan commands
- format_list replace format_chan
- remove empty lines
2016-05-15 23:27:32 +02:00
Arthur Poulet 0ae4f8d262
Merge branch 'master' of github.com:Meoowww/CrystalIrc 2016-05-15 23:21:53 +02:00
Lucie afda77df0e Fixed format of passwords and users in chans.cr 2016-05-15 23:21:08 +02:00
Arthur Poulet dc423d811e
add User.name, add Chan.name, add connection specs 2016-05-15 23:20:52 +02:00
Lucie da06276617 Cleaned some command functions 2016-05-15 23:03:29 +02:00
Lucie 125b1c75ad Merge branch 'master' of https://github.com/Meoowww/CrystalIrc 2016-05-15 22:57:47 +02:00
Arthur Poulet 4823108e03 Merge branch 'master' of github.com:Meoowww/CrystalIrc 2016-05-15 22:57:24 +02:00
Lucie 7a402e8c99 Added documentation 2016-05-15 22:57:21 +02:00
Arthur Poulet 7aadb3e477
remove @client from User, add some doc 2016-05-15 22:56:54 +02:00
Lucie 4880054d85 Simplified format_chans function 2016-05-15 22:45:12 +02:00
Lucie 2fa4fd290c Merge branch 'master' of https://github.com/Meoowww/CrystalIrc 2016-05-15 22:41:49 +02:00
Lucie 7d5c36d618 Implemented chan, user and talk commands 2016-05-15 22:41:38 +02:00
Arthur Poulet bc627282d6
fix Client.connect 2016-05-15 22:32:35 +02:00
Arthur Poulet caed1ea91f
fix connect and ping
- ping uses send_raw
- fix socket getter to allways return a TCPSocket or raise error if not
  connected
- add @domain to Client
2016-05-15 22:25:32 +02:00
Arthur Poulet ff8de11935
remove duplicate "def whois" 2016-05-15 22:01:54 +02:00
Arthur Poulet d28e7f6b86
change architecture, add send_raw and some attr
- add the attributes realname, pass, irc_server, user (String optional)
- include every Client::modules in Client
- add Client.send_raw(String)
- fix connect/send_login
2016-05-15 21:59:39 +02:00
Arthur Poulet 30c975be24
udpate README 2016-05-15 20:54:43 +02:00
Arthur Poulet eddade0bff
add chan, user, fix architecture
client does not include client/* anymore
2016-05-15 18:37:08 +02:00
Arthur Poulet c1b6f2d8d6
add send_login, ping, pong 2016-05-15 15:54:25 +02:00
Arthur Poulet ff2ed91894
add talk commands (empty) 2016-05-15 15:35:49 +02:00
Arthur Poulet d844de4d2b
add commands (empty def) for chan and user 2016-05-15 15:34:00 +02:00
Arthur Poulet fc639d2e07
connection almost ready, prepare ping pong 2016-05-15 15:25:25 +02:00
Arthur Poulet 356e4583a9
Initialize the project with a simple tcp client 2016-05-15 14:49:01 +02:00
36 changed files with 335 additions and 169 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
# Libraries don't need dependency lock
# Dependencies will be locked in application that uses them
/shard.lock
/docs

View File

@ -1 +1,14 @@
language: crystal
script:
- crystal spec
- crystal docs
deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
project_name: Crirc
on:
branch: master
local_dir: docs

23
CHANGELOG.md Normal file
View File

@ -0,0 +1,23 @@
# v0.1.0
* Initialize the project
* IRC API
* Objects
* User (represent a nick, id, whois)
* Chan (a chan with users, name)
* Client (a socket associated to an user)
* Nick (availability, ...)
* Actions
* Handles one <-> one messages)
* Handles one <-> many messages
* Handles the connection and IO (connect, send, recv)
* Masks (rights, ...)
* Use Commands (Talk, Chan, User)
* JOIN, PRIVSG, NOTICE, MODE, ...
* OP, DEOP, BAN, ...
* Bot Framework
* Set hooks and rules to trigger actions
* Manage connected Users and Channels
* Robust testing and documentation
* Specs on the complete API and protocol
* Specs on the Framwork with basic and advanced use-cases
* Real bot samples

153
LICENSE
View File

@ -1,23 +1,21 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
@ -72,7 +60,7 @@ modification follow.
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
@ -631,44 +629,33 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.

View File

@ -3,9 +3,7 @@ all: deps_opt test
test:
crystal spec
deps:
crystal deps install
deps_update:
crystal deps update
shards install
deps_opt:
@[ -d lib/ ] || make deps
doc:

View File

@ -2,36 +2,36 @@
A crystal library to create irc client/bot/server.
Works with crystal v0.23.0
## Installation
[![travis](https://travis-ci.org/Meoowww/Crirc.svg)](https://travis-ci.org/Meoowww/Crirc)
github mirror: [![travis](https://travis-ci.org/Meoowww/Crirc.svg)](https://travis-ci.org/Meoowww/Crirc)
To install the lib, you will have to add the CrystalIrc dependancy to your project.
To install the lib, you will have to add the Crirc dependency to your project.
Add this to your application's `shard.yml`:
```yaml
dependencies:
CrystalIrc:
github: Meoowww/Crirc
crirc:
git: https://git.sceptique.eu/Sceptique/Crirc
branch: master
```
Then, run ``crystal deps install`` to fetch the lib.
## Development
## Documentation
- Network: A network object manage a socket / IO
- Controller: A controller belongs to a network object, and handle the logic and data
- Protocol: A protocol object represent a IRC entity (chan, user, message, ...)
- Binding: The binding socket to allow the system to respond to incoming transmissions
The documentation is built automaticaly when a commit is pushed on master on github, via Travis: <https://meoowww.github.io/Crirc/>.
This explains the architecture and design on the library, and details the technical informations about the internal & external API.
Specifications (unit tests) are written into the `/spec` directory.
A full implementation of a bot is published and maintained on <https://git.sceptique.eu/Sceptique/DashBot>.
## Contributing
1. Fork it ( https://github.com/Meoowww/Crirc/fork )
1. Fork it ( https://git.sceptique.eu/Sceptique/Crirc/fork )
2. Create your feature branch (git checkout -b my-new-feature)
3. Commit your changes (git commit -am 'Add some feature')
4. Push to the branch (git push origin my-new-feature)
@ -40,5 +40,5 @@ Then, run ``crystal deps install`` to fetch the lib.
## Contributors
- [Nephos](https://github.com/Nephos) Arthur Poulet - creator, maintainer
- [Sceptique](https://git.sceptique.eu/Sceptique) Arthur Poulet - creator, maintainer
- [Damaia](https://github.com/Lucie-Dispot) Lucie Dispot - developer

View File

@ -1,9 +1,9 @@
name: crirc
version: 0.1.0
version: 0.5.1
authors:
- Arthur Poulet <arthur.poulet@sceptique.eu>
crystal: 0.23.1
crystal: 1.0.0
license: MIT

View File

@ -1,10 +1,10 @@
describe Crirc::Binding::HookTest do
describe Crirc::Binding::Trigger do
it "simple test" do
m1 = Crirc::Protocol::Message.new ":source PRIVMSG arguments :message"
t1 = Crirc::Binding::HookTest.new "PRIVMSG"
t2 = Crirc::Binding::HookTest.new "PRIVMSG", "source"
t3 = Crirc::Binding::HookTest.new "PRIVMSG", "source", "arguments"
t4 = Crirc::Binding::HookTest.new "PRIVMSG", "source", "arguments", "message"
t1 = Crirc::Binding::Trigger.new "PRIVMSG"
t2 = Crirc::Binding::Trigger.new "PRIVMSG", "source"
t3 = Crirc::Binding::Trigger.new "PRIVMSG", "source", "arguments"
t4 = Crirc::Binding::Trigger.new "PRIVMSG", "source", "arguments", "message"
t1.test(m1).should be_true
t2.test(m1).should be_true
t3.test(m1).should be_true
@ -13,7 +13,7 @@ describe Crirc::Binding::HookTest do
it "simple test" do
m = Crirc::Protocol::Message.new ":source PRIVMSG nick :!ping me"
t = Crirc::Binding::HookTest.new "PRIVMSG", message: /^!ping/
t = Crirc::Binding::Trigger.new "PRIVMSG", message: /^!ping/
t.test(m).should be_a(Regex::MatchData)
end
end

View File

@ -3,7 +3,7 @@ module Crirc::Test::Controller::Command::Chan
extend self
def puts(data)
data
data.strip
end
end
@ -12,9 +12,9 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.join({chan}).should eq("JOIN #patate ")
Crirc::Test::Controller::Command::Chan.join(chan).should eq("JOIN #patate ")
Crirc::Test::Controller::Command::Chan.join({chan, chan2}).should eq("JOIN #patate,#nyu ")
Crirc::Test::Controller::Command::Chan.join({chan}).should eq("JOIN #patate")
Crirc::Test::Controller::Command::Chan.join(chan).should eq("JOIN #patate")
Crirc::Test::Controller::Command::Chan.join({chan, chan2}).should eq("JOIN #patate,#nyu")
Crirc::Test::Controller::Command::Chan.join({chan}, {"bloup"}).should eq("JOIN #patate bloup")
Crirc::Test::Controller::Command::Chan.join({chan, chan2}, {"bloup", "blip"}).should eq("JOIN #patate,#nyu bloup,blip")
end
@ -23,9 +23,9 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.part({chan}).should eq("PART #patate ")
Crirc::Test::Controller::Command::Chan.part(chan).should eq("PART #patate ")
Crirc::Test::Controller::Command::Chan.part({chan, chan2}).should eq("PART #patate,#nyu ")
Crirc::Test::Controller::Command::Chan.part({chan}).should eq("PART #patate")
Crirc::Test::Controller::Command::Chan.part(chan).should eq("PART #patate")
Crirc::Test::Controller::Command::Chan.part({chan, chan2}).should eq("PART #patate,#nyu")
Crirc::Test::Controller::Command::Chan.part({chan}, "I'm out").should eq("PART #patate :I'm out")
Crirc::Test::Controller::Command::Chan.part(chan, "I'm out").should eq("PART #patate :I'm out")
Crirc::Test::Controller::Command::Chan.part({chan, chan2}, "I'm out").should eq("PART #patate,#nyu :I'm out")
@ -36,10 +36,10 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.mode(chan, "+a").should eq("MODE #patate +a ")
Crirc::Test::Controller::Command::Chan.mode(chan, "+a").should eq("MODE #patate +a")
Crirc::Test::Controller::Command::Chan.mode(chan, "+b", target).should eq("MODE #patate +b nyupnyup")
Crirc::Test::Controller::Command::Chan.topic(chan).should eq("TOPIC #patate ")
Crirc::Test::Controller::Command::Chan.topic(chan).should eq("TOPIC #patate")
Crirc::Test::Controller::Command::Chan.topic(chan, "bloup").should eq("TOPIC #patate :bloup")
Crirc::Test::Controller::Command::Chan.invite(chan, target).should eq("INVITE nyupnyup #patate")
@ -49,7 +49,7 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.names(nil).should eq("NAMES ")
Crirc::Test::Controller::Command::Chan.names(nil).should eq("NAMES")
Crirc::Test::Controller::Command::Chan.names(chan).should eq("NAMES #patate")
Crirc::Test::Controller::Command::Chan.names({chan}).should eq("NAMES #patate")
Crirc::Test::Controller::Command::Chan.names({chan, chan2}).should eq("NAMES #patate,#nyu")
@ -59,7 +59,7 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.list(nil).should eq("LIST ")
Crirc::Test::Controller::Command::Chan.list(nil).should eq("LIST")
Crirc::Test::Controller::Command::Chan.list(chan).should eq("LIST #patate")
Crirc::Test::Controller::Command::Chan.list({chan}).should eq("LIST #patate")
Crirc::Test::Controller::Command::Chan.list({chan, chan2}).should eq("LIST #patate,#nyu")
@ -71,13 +71,13 @@ describe Crirc::Controller::Command::Chan do
chan = Crirc::Protocol::Chan.new "#patate"
chan2 = Crirc::Protocol::Chan.new "#nyu"
Crirc::Test::Controller::Command::Chan.kick({chan}, {target}).should eq("KICK #patate nyupnyup ")
Crirc::Test::Controller::Command::Chan.kick(chan, target).should eq("KICK #patate nyupnyup ")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, {target}).should eq("KICK #patate,#nyu nyupnyup ")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, target).should eq("KICK #patate,#nyu nyupnyup ")
Crirc::Test::Controller::Command::Chan.kick({chan}, {target, target2}).should eq("KICK #patate nyupnyup,gloubi ")
Crirc::Test::Controller::Command::Chan.kick(chan, {target, target2}).should eq("KICK #patate nyupnyup,gloubi ")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, {target, target2}).should eq("KICK #patate,#nyu nyupnyup,gloubi ")
Crirc::Test::Controller::Command::Chan.kick({chan}, {target}).should eq("KICK #patate nyupnyup")
Crirc::Test::Controller::Command::Chan.kick(chan, target).should eq("KICK #patate nyupnyup")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, {target}).should eq("KICK #patate,#nyu nyupnyup")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, target).should eq("KICK #patate,#nyu nyupnyup")
Crirc::Test::Controller::Command::Chan.kick({chan}, {target, target2}).should eq("KICK #patate nyupnyup,gloubi")
Crirc::Test::Controller::Command::Chan.kick(chan, {target, target2}).should eq("KICK #patate nyupnyup,gloubi")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, {target, target2}).should eq("KICK #patate,#nyu nyupnyup,gloubi")
Crirc::Test::Controller::Command::Chan.kick({chan, chan2}, {target, target2}, "Get out").should eq("KICK #patate,#nyu nyupnyup,gloubi :Get out")
Crirc::Test::Controller::Command::Chan.kick({chan}, {target}, "Get out").should eq("KICK #patate nyupnyup :Get out")
Crirc::Test::Controller::Command::Chan.kick(chan, target, "Get out").should eq("KICK #patate nyupnyup :Get out")

View File

@ -3,7 +3,7 @@ module Crirc::Test::Controller::Command::Ping
extend self
def puts(data)
data
data.strip
end
end

View File

@ -3,7 +3,7 @@ module Crirc::Test::Controller::Command::Talk
extend self
def puts(data)
data
data.strip
end
end

View File

@ -3,7 +3,7 @@ module Crirc::Test::Controller::Command::User
extend self
def puts(data)
data
data.strip
end
end

View File

@ -1,3 +1,20 @@
# The Crirc module contains all the object related to the project.
# It uses 4 layers of objects:
#
# 1. **Network**: A network object manage a socket / I0.
# The interface is described by `Crirc::Network::Network`.
# 2. **Controller**: A controller belongs to a network object,
# and handle the logic and data. Its interface is described by
# `Crirc::Controller::Controller`.
# 3. **Protocol**: A protocol object represent a IRC entity
# (chan, user, message, ...).
# 4. **Broadcast**: The `Broadcast` allows the system to send transmission to
# several IRC entity as one.
# 5. **Binding**: The `Binding::Handler` allows a given `Controller` to respond
# to incoming transmissions.
module Crirc
end
require "./crirc/network/*"
require "./crirc/controller/*"
require "./crirc/protocol/*"

View File

@ -1,29 +1,55 @@
require "./hook_test"
require "./trigger"
# Register hooks to handle the behavior of a system based on a message.
# This class is designed to be able to automaticaly respond to incoming IRC
# messages on a set conditions.
# The flow of this system is the following:
# 1. With `.on()`, defines a Trigger and the associated Hook
# 2. Call `.handle()` to process the incoming IRC message.
#
# ```
# bot.on("PRIVMSG", message: /^(Hello|Hi)$/) { |msg, data| bot.reply(msg, "Hello !") }
# while (incoming_message = io.gets) do
# bot.handle(incoming_message)
# end
# ```
module Crirc::Binding::Handler
alias HookRule = String | Regex | Nil
alias Hook = (Crirc::Protocol::Message, Regex::MatchData?) ->
getter hooks : Hash(HookTest, Array(Hook))
# Hooks associated with `Trigger`
getter hooks : Hash(Trigger, Array(Hook))
# Documentation lines for each hook
getter docs : Hash(String, String)
def initialize(**opts)
super(**opts)
@hooks = Hash(HookTest, Array(Hook)).new
@hooks = Hash(Trigger, Array(Hook)).new
@docs = Hash(String, String).new
end
# Register a hook on a command name (JOIN, PRIVMSG, ...) and other rules
def on(command : String, source : HookRule = nil, arguments : HookRule = nil, message : HookRule = nil, &hook : Hook)
rule = HookTest.new(command, source, arguments, message)
# Register a news Hook that is called when the incoming messages meet a set
# of conditions: command name (JOIN, PRIVMSG, ...), source, arguments, message.
#
# - command : Condition that match exactly with the command of the incomming message.
# - source : Condition that match with the source of the incomming message.
# - arguments : Condition that match with the arguments of the incomming message.
# - message : Condition that match with the message of the incomming message.
# - doc : Documentation lines (`{short, long}`)
# - hook : function to call if the conditions are met (with the parameters `message` and `match`).
def on(command : String = "PRIVMSG", source : HookRule = nil, arguments : HookRule = nil, message : HookRule = nil,
doc : {String, String}? = nil, &hook : Hook)
rule = Trigger.new(command, source, arguments, message)
self.hooks.fetch(rule) { self.hooks[rule] = Array(Hook).new }
self.hooks[rule] << hook
@docs[doc[0]] = doc[1] unless doc.nil?
self
end
# Handle one `Message`
# It goes through the registred hooks, select the one to trigger.
# Then, it execute every hooks associated, and send as parameters the current message and the regex match if possible
# TODO: msg should NEVER be modified in the hook. (copy ? readonly ?)
# TODO: msg should NEVER be modified in the hook. (copy ? readonly ? struct ?)
def handle(msg : Crirc::Protocol::Message)
selected_hooks = self.hooks.select { |rule, hooks| rule.test(msg) }
selected_hooks.each do |rule, hooks|
@ -40,6 +66,7 @@ module Crirc::Binding::Handler
self
end
# Sugar for `handle` that parse the string as a `Crirc::Protocol::Message`
def handle(msg : String)
handle Crirc::Protocol::Message.new(msg)
end

View File

@ -1,6 +1,6 @@
# The `HookRules` define a set of rules.
# The `Trigger` define a set of rules.
# Theses rules can test an event (message) to "match" with.
class Crirc::Binding::HookTest
class Crirc::Binding::Trigger
@source : String | Regex | Nil
@command : String | Regex
@arguments : String | Regex | Nil
@ -19,6 +19,7 @@ class Crirc::Binding::HookTest
def initialize(@command = "PRIVMSG", @source = nil, @arguments = nil, @message = nil)
end
# returns true if the the message match with the condition of this trigger
def test(msg : Crirc::Protocol::Message)
test_command(msg) && test_source(msg) && test_arguments(msg) && test_message(msg)
end

View File

@ -1,3 +1,5 @@
# Allow to send data to several IRC entity as one.
module Crirc::Broadcast
# TODO
abstract def puts(context : Controller::Controller, data)
end

View File

@ -2,6 +2,10 @@ require "../protocol/chan"
require "./user_list"
require "./broadcast"
# TODO
# A ChanList is the associated list of `Protocol::Chan` and a `UserList`.
# It is useful for a server that need to keep a track of all the uers
# connected to any of its chans.
class Crirc::ChanList
getter chans : Hash(Protocol::Chan, UserList)
include Broadcast
@ -10,6 +14,7 @@ class Crirc::ChanList
@chans = Hash(Protocol::Chan, UserList).new
end
# TODO
# Broadcast a message to the users
def puts(context : Controller::Controller, data)
@chans.each { |chan, userlist| userlist.puts context, data }

View File

@ -2,6 +2,14 @@ require "../protocol/user"
require "./broadcast"
require "../controller/controller"
# TODO.
# UserList is used to send message to a list of `Protocol::User`.
#
# ```
# chan1 = UserList.new
# chan1.users << user_joined
# chan1.puts current_controller, crafted_message
# ```
class Crirc::UserList
getter users : Array(Protocol::User)
include Broadcast
@ -10,8 +18,10 @@ class Crirc::UserList
@users = Array(Protocol::User)
end
# TODO
# NOTE: combine data+user
# Broadcast a message to the users
def puts(context : Controller::Controller, data)
@users.each { context.puts data }
@users.each { |user| context.puts data }
end
end

View File

@ -15,28 +15,50 @@ class Crirc::Controller::Client
include Binding::Handler
getter network : Network::Client
# TODO Not used yet
getter chanlist : ChanList
# delegated to the `Network`
delegate nick, to: :network
# delegated to the `Network`
delegate puts, to: :network
# delegated to the `Network`
delegate gets, to: :network
# New `Client` that controls the given `Network`.
def initialize(@network)
super()
@chanlist = ChanList.new
end
# Initialize the connection with the IRC server (send pass, nick and user).
def init
puts "PASS #{@network.pass}" if @network.pass
puts "NICK #{@network.nick.to_s}"
puts "USER #{@network.user.to_s} \"#{@network.domain}\" \"#{@network.irc_server}\" :#{@network.realname.to_s}"
end
# Start the callback when the server is ready to receive messages.
#
# ```
# bot.on_ready do
# amazing_stuff(bot)
# end
# ```
def on_ready(&b) : Client
self.on("001") { b.call }
self
end
# Reply to a given message with a privmsg.
#
# ```
# bot.on("JOIN") do |msg, _|
# nick = msg.source.source_nick
# context.reply(msg, "Welcome to #{nick}")
# end
# ```
def reply(msg, data)
target = msg.argument_list.first
target_object = (target[0] == '#' ? Crirc::Protocol::Chan : Crirc::Protocol::User).new(target).as(Crirc::Protocol::Target)

View File

@ -0,0 +1,7 @@
# The module `Command` is the scope for the IRC commands
# defined in the standard.
# Each of these commands is included by a `Controller`, so the `puts` function
# is implemented by the `Controller`.
module Crirc::Controller::Command
abstract def puts(data)
end

View File

@ -1,7 +1,8 @@
require "./command"
require "../command"
# Defines the IRC commands that are related to chans (join, part, ...).
module Crirc::Controller::Command::Chan
include Crirc::Controller::Command::Command
include Crirc::Controller::Command
# Format the chans to join: #chan1,#chan2 (works with users by the same way)
protected def format_list(chans : Enumerable(Crirc::Protocol::Target)) : String

View File

@ -1,3 +0,0 @@
module Crirc::Controller::Command::Command
abstract def puts(data)
end

View File

@ -1,7 +1,8 @@
require "./command"
require "../command"
# Defines the IRC ping.
module Crirc::Controller::Command::Ping
include Crirc::Controller::Command::Command
include Crirc::Controller::Command
# Send a ping to check if the other end is alive
def ping(msg : String? = "0")

View File

@ -1,7 +1,8 @@
require "./command"
require "../command"
# Defines the IRC commands related to communicating between "humans".
module Crirc::Controller::Command::Talk
include Crirc::Controller::Command::Command
include Crirc::Controller::Command
# Send a notice to a target
def notice(target : Crirc::Protocol::Target, msg : String)

View File

@ -1,7 +1,8 @@
require "./command"
require "../command"
# Defines the IRC commands related to the users (whois, mode).
module Crirc::Controller::Command::User
include Crirc::Controller::Command::Command
include Crirc::Controller::Command
# Request data about a given target
def whois(target : Crirc::Protocol::Target)

View File

@ -1,4 +1,9 @@
module Crirc::Controller::Controller
abstract def puts(data)
abstract def gets
# A `Controller` is controlling a `Network`.
# It is in charge to manage IRC messages at the IRC protocol level.
module Crirc::Controller
# Interface implemented by every `Crirc::Controller`
module Controller
abstract def puts(data)
abstract def gets
end
end

View File

@ -1,6 +1,7 @@
require "../network/server"
require "./controller"
# TODO
class Crirc::Controller::Server
include Controller

View File

@ -1,6 +1,8 @@
require "../network/server_client"
require "./controller"
# TODO
# Handles the clients connected to a `Server`
class Crirc::Controller::ServerClient
include Controller

View File

@ -37,7 +37,7 @@ class Crirc::Network::Client
@socket.as(IrcSocket)
end
# Connect to the server
# Connect to the target server
def connect
tcp_socket = TCPSocket.new(@ip, @port)
tcp_socket.read_timeout = @read_timeout
@ -62,7 +62,9 @@ class Crirc::Network::Client
# Send a message to the server
def puts(data)
socket.puts data
socket.puts data.strip
socket.puts "\r\n"
socket.flush
end
# End the connection

View File

@ -1,4 +1,9 @@
module Crirc::Network::Network
abstract def puts(data)
abstract def gets
# A `Network` is controlling a I/O.
# It is in charge to manage TCP messages at the TCP protocol level.
module Crirc::Network
# Interface implemented by every `Crirc::Network`.
module Network
abstract def puts(data)
abstract def gets
end
end

View File

@ -1,6 +1,6 @@
require "./target"
# Represent an IRC channel.
# Represents an IRC channel.
class Crirc::Protocol::Chan < Crirc::Protocol::Target
class Motd
getter message : String
@ -8,11 +8,11 @@ class Crirc::Protocol::Chan < Crirc::Protocol::Target
getter timestamp : Int64
def initialize(@message, @user)
@timestamp = Time.now.epoch
@timestamp = Time.utc.to_unix
end
def set_motd(@message, @user)
@timestamp = Time.now.epoch
@timestamp = Time.utc.to_unix
end
end

View File

@ -1,8 +1,22 @@
# `Message` is the object that parse the raw TCP body as a IRC message.
#
# Message are a IRC core part. They contain a command, the arguments, and
# the message (last argument in the IRC protocol).
# TODO: improve the message to appear in as the last argument. cf: fast_irc
class Crirc::Protocol::Message
# Raw message without parsing
getter raw : String
# Source of the message (ex: "0", "abc@xyz", ...)
getter source : String
# The command ("PRIVMSG", "PING", ...)
getter command : String
# The arguments as a string ("user1 +0", "pingmessage", ...)
getter arguments : String?
# The last argument when ":" ("This is a privmsg message", ...)
getter message : String?
R_SRC = "(\\:(?<src>[^[:space:]]+) )"
@ -20,7 +34,12 @@ class Crirc::Protocol::Message
@message = m["msg"]?
end
# Concatenation of `arguments` and `message`. If the message exists, it is preceded by ':'
# Concatenation of `arguments` and `message`.
# If the message exists, it is preceded by ':'
#
# ```
# msg.raw_arguments # => "user1 +0 :do something"
# ```
def raw_arguments : String
return "" if @arguments.nil? && @message.nil?
return @arguments.to_s if @message.nil?
@ -28,6 +47,11 @@ class Crirc::Protocol::Message
return "#{@arguments} :#{@message}"
end
# The arguments formated into an Array.
#
# ```
# msg.argument_list # => ["user1", "+0"]
# ```
def argument_list : Array(String)
return Array(String).new if @arguments.nil? && @message.nil?
return (@arguments.as(String)).split(" ") if @message.nil?

View File

@ -1,4 +1,4 @@
# A target is a virtuel IRC entity that can receive message (`User`, `Chan`)
# A target is a virtuel IRC entity that can receive message (`User`, `Chan`).
abstract class Crirc::Protocol::Target
abstract def name : String
end

View File

@ -1,3 +1,3 @@
module Crirc
VERSION = "0.2.0"
VERSION = "0.4.0"
end

View File

@ -12,16 +12,22 @@ private def bind_example(bot)
end.on("JOIN") do |msg|
# Greet message on join
if extract_nick(msg.source) == bot.nick
chan = msg.message if msg.message
bot.privmsg Crirc::Protocol::Chan.new(chan), "Hello, world!" if chan
bot.reply msg, "Hello, world!"
end
end.on("PING") do |msg|
# Server pong
bot.pong(msg.message)
end.on("PRIVMSG", message: /^!ping */) do |msg|
end.on("PRIVMSG", message: /^!ping */, doc: {"!ping", "the bot respond by `pong nick`"}) do |msg|
# !ping command : answer !pong to the user
chan = msg.arguments if msg.arguments
bot.privmsg Crirc::Protocol::Chan.new(chan), "pong #{extract_nick msg.source}" if chan
bot.reply msg, "pong #{extract_nick msg.source}" if chan
end.on(message: /^!help *$/, doc: {"!help", "`!help` to list the modules\n`!help cmd` to advanced description of the cmd"}) do |msg|
# take each documented bind (those with on("...", doc: ....)) and send the short documentation
bot.reply msg, bot.docs.keys.join(", ")
end.on(message: /^!help *(.*[^ ]) *$/) do |msg, match|
# take one documented bind (those with on("...", doc: ....)) and send the long documentation
doc = bot.docs[match.as(Regex::MatchData)[1]]?
doc.split("\n").each { |split| bot.reply msg, split } unless doc.nil?
end
end

7
src/example_server.cr Normal file
View File

@ -0,0 +1,7 @@
require "./crirc"
server = Crirc::Network::Server.new "0.0.0.0", 6667, ssl: false
server.start
client.close