Sutto-marvin 0.1.20081120 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. data/README.textile +8 -0
  2. data/VERSION.yml +2 -2
  3. data/bin/marvin +88 -55
  4. data/config/settings.yml.sample +6 -1
  5. data/config/setup.rb +19 -4
  6. data/handlers/debug_handler.rb +2 -2
  7. data/handlers/hello_world.rb +1 -1
  8. data/lib/marvin.rb +14 -9
  9. data/lib/marvin/abstract_client.rb +10 -2
  10. data/lib/marvin/console.rb +54 -0
  11. data/lib/marvin/daemon.rb +71 -0
  12. data/lib/marvin/distributed.rb +14 -0
  13. data/lib/marvin/distributed/dispatch_handler.rb +82 -0
  14. data/lib/marvin/distributed/drb_client.rb +78 -0
  15. data/lib/marvin/distributed/ring_server.rb +41 -0
  16. data/lib/marvin/exception_tracker.rb +1 -1
  17. data/lib/marvin/irc.rb +4 -5
  18. data/lib/marvin/irc/client.rb +13 -2
  19. data/lib/marvin/irc/server.rb +57 -0
  20. data/lib/marvin/irc/server/abstract_connection.rb +79 -0
  21. data/lib/marvin/irc/server/base_connection.rb +66 -0
  22. data/lib/marvin/irc/server/channel.rb +111 -0
  23. data/lib/marvin/irc/server/named_store.rb +14 -0
  24. data/lib/marvin/irc/server/user.rb +5 -0
  25. data/lib/marvin/irc/server/user/handle_mixin.rb +138 -0
  26. data/lib/marvin/irc/server/user_connection.rb +127 -0
  27. data/lib/marvin/loader.rb +111 -36
  28. data/lib/marvin/logger.rb +2 -2
  29. data/lib/marvin/options.rb +11 -2
  30. data/lib/marvin/parsers/command.rb +43 -11
  31. data/lib/marvin/settings.rb +7 -6
  32. data/lib/marvin/status.rb +72 -0
  33. data/lib/marvin/test_client.rb +5 -1
  34. data/lib/marvin/util.rb +18 -1
  35. data/script/client +2 -18
  36. data/script/console +9 -0
  37. data/script/distributed_client +9 -0
  38. data/script/ring_server +12 -0
  39. data/script/server +12 -0
  40. data/script/status +11 -0
  41. data/test/parser_comparison.rb +27 -1
  42. data/test/parser_test.rb +254 -10
  43. data/test/test_helper.rb +1 -1
  44. metadata +62 -8
  45. data/lib/marvin/drb_handler.rb +0 -12
  46. data/lib/marvin/irc/abstract_server.rb +0 -4
  47. data/lib/marvin/irc/base_server.rb +0 -11
  48. data/script/daemon-runner +0 -12
data/test/test_helper.rb CHANGED
@@ -1,4 +1,4 @@
1
- BASE_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..")
1
+ BASE_DIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
2
2
 
3
3
  require 'rubygems'
4
4
  require 'shoulda'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: Sutto-marvin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20081120
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darcy Laycock
@@ -9,10 +9,45 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-11-22 00:00:00 -08:00
12
+ date: 2008-12-05 00:00:00 -08:00
13
13
  default_executable: marvin
14
- dependencies: []
15
-
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ name: json
17
+ version_requirement:
18
+ version_requirements: !ruby/object:Gem::Requirement
19
+ requirements:
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: "0"
23
+ version:
24
+ - !ruby/object:Gem::Dependency
25
+ name: activesupport
26
+ version_requirement:
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ requirements:
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
31
+ version: 2.1.0
32
+ version:
33
+ - !ruby/object:Gem::Dependency
34
+ name: eventmachine
35
+ version_requirement:
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: 0.12.0
41
+ version:
42
+ - !ruby/object:Gem::Dependency
43
+ name: thor
44
+ version_requirement:
45
+ version_requirements: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: 0.9.7
50
+ version:
16
51
  description: Marvin is a Ruby IRC library / framework for ultimate awesomeness and with an evented design.
17
52
  email: sutto@sutto.net
18
53
  executables:
@@ -30,19 +65,33 @@ files:
30
65
  - lib/marvin/abstract_parser.rb
31
66
  - lib/marvin/base.rb
32
67
  - lib/marvin/command_handler.rb
68
+ - lib/marvin/console.rb
33
69
  - lib/marvin/core_ext.rb
70
+ - lib/marvin/daemon.rb
34
71
  - lib/marvin/data_store.rb
35
72
  - lib/marvin/dispatchable.rb
36
- - lib/marvin/drb_handler.rb
73
+ - lib/marvin/distributed
74
+ - lib/marvin/distributed/dispatch_handler.rb
75
+ - lib/marvin/distributed/drb_client.rb
76
+ - lib/marvin/distributed/ring_server.rb
77
+ - lib/marvin/distributed.rb
37
78
  - lib/marvin/exception_tracker.rb
38
79
  - lib/marvin/exceptions.rb
39
80
  - lib/marvin/handler.rb
40
81
  - lib/marvin/irc
41
- - lib/marvin/irc/abstract_server.rb
42
- - lib/marvin/irc/base_server.rb
43
82
  - lib/marvin/irc/client.rb
44
83
  - lib/marvin/irc/event.rb
45
84
  - lib/marvin/irc/replies.rb
85
+ - lib/marvin/irc/server
86
+ - lib/marvin/irc/server/abstract_connection.rb
87
+ - lib/marvin/irc/server/base_connection.rb
88
+ - lib/marvin/irc/server/channel.rb
89
+ - lib/marvin/irc/server/named_store.rb
90
+ - lib/marvin/irc/server/user
91
+ - lib/marvin/irc/server/user/handle_mixin.rb
92
+ - lib/marvin/irc/server/user.rb
93
+ - lib/marvin/irc/server/user_connection.rb
94
+ - lib/marvin/irc/server.rb
46
95
  - lib/marvin/irc.rb
47
96
  - lib/marvin/loader.rb
48
97
  - lib/marvin/logger.rb
@@ -60,6 +109,7 @@ files:
60
109
  - lib/marvin/parsers/simple_parser.rb
61
110
  - lib/marvin/parsers.rb
62
111
  - lib/marvin/settings.rb
112
+ - lib/marvin/status.rb
63
113
  - lib/marvin/test_client.rb
64
114
  - lib/marvin/util.rb
65
115
  - lib/marvin.rb
@@ -70,8 +120,12 @@ files:
70
120
  - spec/marvin/abstract_client_test.rb
71
121
  - spec/spec_helper.rb
72
122
  - script/client
73
- - script/daemon-runner
123
+ - script/console
124
+ - script/distributed_client
74
125
  - script/install
126
+ - script/ring_server
127
+ - script/server
128
+ - script/status
75
129
  - handlers/debug_handler.rb
76
130
  - handlers/hello_world.rb
77
131
  - handlers/logging_handler.rb
data/lib/marvin/drb_handler.rb DELETED
@@ -1,12 +0,0 @@
1
- module Marvin
2
- class DRBHandler
3
-
4
- attr_accessor :port
5
-
6
- # Will do the appropriate things to dispatch
7
- # a message to the different DRB clients.
8
- def handle(message, opts = {})
9
- end
10
-
11
- end
12
- end
data/lib/marvin/irc/abstract_server.rb DELETED
@@ -1,4 +0,0 @@
1
- module Marvin::IRC
2
- class AbstractServer
3
- end
4
- end
data/lib/marvin/irc/base_server.rb DELETED
@@ -1,11 +0,0 @@
1
- require 'webrick'
2
-
3
- module Marvin::IRC
4
- class BaseServer < WEBrick::GenericServer
5
-
6
- def run(sock)
7
- File.open("x", "w+") { |f| f.puts sock.inspect }
8
- end
9
-
10
- end
11
- end
data/script/daemon-runner DELETED
@@ -1,12 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require 'rubygems'
3
- require 'daemons'
4
-
5
- DIR = File.join(File.dirname(__FILE__), "..")
6
-
7
- Daemons.run(File.join(DIR, "script/client"),
8
- {:mode => :exec,
9
- :dir => DIR,
10
- :dir_mode => :normal,
11
- :log_output => true,
12
- :app_name => 'marvin'})