cirrocumulus 0.6.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/.idea/workspace.xml +49 -69
  2. data/VERSION +1 -1
  3. data/cirrocumulus.gemspec +2 -2
  4. data/lib/cirrocumulus/message.rb +1 -1
  5. data/lib/cirrocumulus/saga.rb +1 -1
  6. metadata +24 -24
data/.idea/workspace.xml CHANGED
@@ -1,13 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
- <list default="true" id="e3b220a8-b188-4d05-b90e-58a7fdef7470" name="Default" comment="">
5
- <change type="DELETED" beforePath="$PROJECT_DIR$/lib/test.rb" afterPath="" />
6
- <change type="DELETED" beforePath="$PROJECT_DIR$/lib/test2.rb" afterPath="" />
7
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb" afterPath="$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb" />
9
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/cirrocumulus/rules/run_queue.rb" afterPath="$PROJECT_DIR$/lib/cirrocumulus/rules/run_queue.rb" />
10
- </list>
4
+ <list default="true" id="e3b220a8-b188-4d05-b90e-58a7fdef7470" name="Default" comment="" />
11
5
  <ignored path="cirrocumulus.iws" />
12
6
  <ignored path=".idea/workspace.xml" />
13
7
  <option name="TRACKING_ENABLED" value="true" />
@@ -28,26 +22,29 @@
28
22
  </component>
29
23
  <component name="FileEditorManager">
30
24
  <leaf>
31
- <file leaf-file-name="engine.rb" pinned="false" current="true" current-in-tab="true">
25
+ <file leaf-file-name="engine.rb" pinned="false" current="false" current-in-tab="false">
32
26
  <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb">
33
27
  <provider selected="true" editor-type-id="text-editor">
34
- <state line="31" column="34" selection-start="695" selection-end="695" vertical-scroll-proportion="0.48969072">
35
- <folding>
36
- <element signature="e#135#414#0" expanded="false" />
37
- <element signature="e#1123#1253#0" expanded="false" />
38
- <element signature="e#1259#1381#0" expanded="false" />
39
- <element signature="e#1387#1610#0" expanded="false" />
40
- <element signature="e#1616#1856#0" expanded="false" />
41
- <element signature="e#2026#2265#0" expanded="false" />
42
- <element signature="e#3920#4010#0" expanded="false" />
43
- <element signature="e#4904#4941#0" expanded="false" />
44
- <element signature="e#6358#6981#0" expanded="false" />
45
- <element signature="e#8221#8546#0" expanded="false" />
46
- <element signature="e#9218#10074#0" expanded="false" />
47
- <element signature="e#10376#10492#0" expanded="false" />
48
- <element signature="e#10498#10618#0" expanded="false" />
49
- <element signature="e#10624#10750#0" expanded="false" />
50
- </folding>
28
+ <state line="31" column="34" selection-start="695" selection-end="695" vertical-scroll-proportion="0.0">
29
+ <folding />
30
+ </state>
31
+ </provider>
32
+ </entry>
33
+ </file>
34
+ <file leaf-file-name="saga.rb" pinned="false" current="false" current-in-tab="false">
35
+ <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/saga.rb">
36
+ <provider selected="true" editor-type-id="text-editor">
37
+ <state line="48" column="32" selection-start="959" selection-end="959" vertical-scroll-proportion="0.0">
38
+ <folding />
39
+ </state>
40
+ </provider>
41
+ </entry>
42
+ </file>
43
+ <file leaf-file-name="message.rb" pinned="false" current="true" current-in-tab="true">
44
+ <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/message.rb">
45
+ <provider selected="true" editor-type-id="text-editor">
46
+ <state line="67" column="0" selection-start="1744" selection-end="1744" vertical-scroll-proportion="0.85318106">
47
+ <folding />
51
48
  </state>
52
49
  </provider>
53
50
  </entry>
@@ -86,27 +83,25 @@
86
83
  <option value="$PROJECT_DIR$/lib/cirrocumulus/rule_engine.rb" />
87
84
  <option value="$PROJECT_DIR$/lib/cirrocumulus/engine.rb" />
88
85
  <option value="$PROJECT_DIR$/lib/cirrocumulus/agent_wrapper.rb" />
89
- <option value="$PROJECT_DIR$/lib/cirrocumulus/message.rb" />
90
86
  <option value="$PROJECT_DIR$/lib/cirrocumulus.rb" />
91
87
  <option value="$PROJECT_DIR$/cirrocumulus.gemspec" />
92
88
  <option value="$PROJECT_DIR$/Rakefile" />
93
89
  <option value="$PROJECT_DIR$/Gemfile" />
94
90
  <option value="$PROJECT_DIR$/lib/cirrocumulus/jabber_bus.rb" />
95
91
  <option value="$PROJECT_DIR$/lib/cirrocumulus/ontology.rb" />
96
- <option value="$PROJECT_DIR$/lib/cirrocumulus/saga.rb" />
97
92
  <option value="$PROJECT_DIR$/lib/cirrocumulus/agent.rb" />
98
93
  <option value="$PROJECT_DIR$/lib/test.rb" />
99
94
  <option value="$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb" />
100
95
  <option value="$PROJECT_DIR$/lib/cirrocumulus/rules/run_queue.rb" />
101
96
  <option value="$PROJECT_DIR$/test/test.rb" />
97
+ <option value="$PROJECT_DIR$/lib/cirrocumulus/saga.rb" />
98
+ <option value="$PROJECT_DIR$/lib/cirrocumulus/message.rb" />
102
99
  </list>
103
100
  </option>
104
101
  </component>
105
102
  <component name="ProjectFrameBounds">
106
- <option name="x" value="-2" />
107
- <option name="y" value="-3" />
108
- <option name="width" value="1284" />
109
- <option name="height" value="769" />
103
+ <option name="width" value="1280" />
104
+ <option name="height" value="762" />
110
105
  </component>
111
106
  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
112
107
  <OptionsSetting value="true" id="Add" />
@@ -435,14 +430,14 @@
435
430
  <servers />
436
431
  </component>
437
432
  <component name="ToolWindowManager">
438
- <frame x="-2" y="-3" width="1284" height="769" extended-state="6" />
433
+ <frame x="0" y="0" width="1280" height="762" extended-state="6" />
439
434
  <editor active="true" />
440
435
  <layout>
441
436
  <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
442
437
  <window_info id="Changes" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3287879" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
443
438
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
444
439
  <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.67121214" order="4" side_tool="false" content_ui="tabs" />
445
- <window_info id="Project" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33468395" sideWeight="0.0" order="3" side_tool="false" content_ui="combo" />
440
+ <window_info id="Project" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34634146" sideWeight="0.0" order="3" side_tool="false" content_ui="combo" />
446
441
  <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
447
442
  <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
448
443
  <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -512,11 +507,6 @@
512
507
  <breakpoint-manager />
513
508
  </component>
514
509
  <component name="editorHistoryManager">
515
- <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/message.rb">
516
- <provider selected="true" editor-type-id="text-editor">
517
- <state line="4" column="4" selection-start="125" selection-end="125" vertical-scroll-proportion="0.0" />
518
- </provider>
519
- </entry>
520
510
  <entry file="file:///usr/local/rvm/rubies/ruby-1.9.3-p0/lib/ruby/1.9.1/thread.rb">
521
511
  <provider selected="true" editor-type-id="text-editor">
522
512
  <state line="182" column="6" selection-start="3565" selection-end="3565" vertical-scroll-proportion="0.33278957" />
@@ -527,16 +517,9 @@
527
517
  <state line="115" column="34" selection-start="3354" selection-end="3354" vertical-scroll-proportion="1.375" />
528
518
  </provider>
529
519
  </entry>
530
- <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/saga.rb">
531
- <provider selected="true" editor-type-id="text-editor">
532
- <state line="43" column="45" selection-start="837" selection-end="837" vertical-scroll-proportion="0.0" />
533
- </provider>
534
- </entry>
535
520
  <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/rule_engine.rb">
536
521
  <provider selected="true" editor-type-id="text-editor">
537
- <state line="2" column="0" selection-start="73" selection-end="73" vertical-scroll-proportion="0.050675675">
538
- <folding />
539
- </state>
522
+ <state line="2" column="0" selection-start="73" selection-end="73" vertical-scroll-proportion="0.050675675" />
540
523
  </provider>
541
524
  </entry>
542
525
  <entry file="file://$PROJECT_DIR$/lib/cirrocumulus.rb">
@@ -581,9 +564,7 @@
581
564
  </entry>
582
565
  <entry file="file://$APPLICATION_HOME_DIR$/rubystubs19/thread.rb">
583
566
  <provider selected="true" editor-type-id="text-editor">
584
- <state line="7" column="6" selection-start="208" selection-end="208" vertical-scroll-proportion="0.0">
585
- <folding />
586
- </state>
567
+ <state line="7" column="6" selection-start="208" selection-end="208" vertical-scroll-proportion="0.0" />
587
568
  </provider>
588
569
  </entry>
589
570
  <entry file="file://$APPLICATION_HOME_DIR$/rubystubs19/array.rb">
@@ -593,9 +574,16 @@
593
574
  </state>
594
575
  </provider>
595
576
  </entry>
596
- <entry file="file://$PROJECT_DIR$/test/test.rb">
577
+ <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb">
597
578
  <provider selected="true" editor-type-id="text-editor">
598
- <state line="37" column="48" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.0">
579
+ <state line="31" column="34" selection-start="695" selection-end="695" vertical-scroll-proportion="0.0">
580
+ <folding />
581
+ </state>
582
+ </provider>
583
+ </entry>
584
+ <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/saga.rb">
585
+ <provider selected="true" editor-type-id="text-editor">
586
+ <state line="48" column="32" selection-start="959" selection-end="959" vertical-scroll-proportion="0.0">
599
587
  <folding />
600
588
  </state>
601
589
  </provider>
@@ -607,25 +595,17 @@
607
595
  </state>
608
596
  </provider>
609
597
  </entry>
610
- <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/rules/engine.rb">
598
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
599
+ <provider selected="true" editor-type-id="text-editor">
600
+ <state line="37" column="48" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.0">
601
+ <folding />
602
+ </state>
603
+ </provider>
604
+ </entry>
605
+ <entry file="file://$PROJECT_DIR$/lib/cirrocumulus/message.rb">
611
606
  <provider selected="true" editor-type-id="text-editor">
612
- <state line="31" column="34" selection-start="695" selection-end="695" vertical-scroll-proportion="0.48969072">
613
- <folding>
614
- <element signature="e#135#414#0" expanded="false" />
615
- <element signature="e#1123#1253#0" expanded="false" />
616
- <element signature="e#1259#1381#0" expanded="false" />
617
- <element signature="e#1387#1610#0" expanded="false" />
618
- <element signature="e#1616#1856#0" expanded="false" />
619
- <element signature="e#2026#2265#0" expanded="false" />
620
- <element signature="e#3920#4010#0" expanded="false" />
621
- <element signature="e#4904#4941#0" expanded="false" />
622
- <element signature="e#6358#6981#0" expanded="false" />
623
- <element signature="e#8221#8546#0" expanded="false" />
624
- <element signature="e#9218#10074#0" expanded="false" />
625
- <element signature="e#10376#10492#0" expanded="false" />
626
- <element signature="e#10498#10618#0" expanded="false" />
627
- <element signature="e#10624#10750#0" expanded="false" />
628
- </folding>
607
+ <state line="67" column="0" selection-start="1744" selection-end="1744" vertical-scroll-proportion="0.85318106">
608
+ <folding />
629
609
  </state>
630
610
  </provider>
631
611
  </entry>
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.2
1
+ 0.6.3
data/cirrocumulus.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "cirrocumulus"
8
- s.version = "0.6.2"
8
+ s.version = "0.6.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Anton Kosyakin"]
12
- s.date = "2012-05-22"
12
+ s.date = "2012-05-23"
13
13
  s.description = "Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages"
14
14
  s.email = "deil@mneko.net"
15
15
  s.extra_rdoc_files = [
data/lib/cirrocumulus/message.rb CHANGED
@@ -16,7 +16,7 @@ module Cirrocumulus
16
16
  end
17
17
 
18
18
  def context
19
- Context.new(@sender, @reply_with)
19
+ Context.new(self.sender, self.reply_with, self.conversation_id)
20
20
  end
21
21
 
22
22
  def self.parse_params(content, subroutine = false)
data/lib/cirrocumulus/saga.rb CHANGED
@@ -46,7 +46,7 @@ class Saga
46
46
  clear_timeout()
47
47
  change_state(STATE_FINISHED)
48
48
  @finished = true
49
- Log4r::Logger['agent'].info "[#{id}] finished"
49
+ Log4r::Logger['agent'].debug "[#{id}] finished"
50
50
  end
51
51
 
52
52
  def error()
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cirrocumulus
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.6.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-22 00:00:00.000000000 Z
12
+ date: 2012-05-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &73627510 !ruby/object:Gem::Requirement
16
+ requirement: &85563920 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 2.3.11
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *73627510
24
+ version_requirements: *85563920
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: log4r
27
- requirement: &73643310 !ruby/object:Gem::Requirement
27
+ requirement: &85563510 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.1.9
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *73643310
35
+ version_requirements: *85563510
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: systemu
38
- requirement: &73642400 !ruby/object:Gem::Requirement
38
+ requirement: &85563140 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *73642400
46
+ version_requirements: *85563140
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: xmpp4r
49
- requirement: &73641880 !ruby/object:Gem::Requirement
49
+ requirement: &85562690 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0.5'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *73641880
57
+ version_requirements: *85562690
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: xmpp4r-simple
60
- requirement: &73641210 !ruby/object:Gem::Requirement
60
+ requirement: &85562350 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *73641210
68
+ version_requirements: *85562350
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: eventmachine
71
- requirement: &73640730 !ruby/object:Gem::Requirement
71
+ requirement: &85561900 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *73640730
79
+ version_requirements: *85561900
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: deil_sexpistol
82
- requirement: &73640160 !ruby/object:Gem::Requirement
82
+ requirement: &85577400 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *73640160
90
+ version_requirements: *85577400
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: guid
93
- requirement: &73639900 !ruby/object:Gem::Requirement
93
+ requirement: &85576890 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *73639900
101
+ version_requirements: *85576890
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rdoc
104
- requirement: &73639300 !ruby/object:Gem::Requirement
104
+ requirement: &85576560 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '3.12'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *73639300
112
+ version_requirements: *85576560
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bundler
115
- requirement: &73638710 !ruby/object:Gem::Requirement
115
+ requirement: &85575850 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.0.0
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *73638710
123
+ version_requirements: *85575850
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: jeweler
126
- requirement: &73638370 !ruby/object:Gem::Requirement
126
+ requirement: &85575310 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: 1.8.3
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *73638370
134
+ version_requirements: *85575310
135
135
  description: Engine for building your own agents, providing you base functionality
136
136
  for loading ontologies, communicating with other agents and parsing FIPA-ACL messages
137
137
  email: deil@mneko.net