murmur-rpc 0.0.1 → 0.0.2

data/Rakefile

@@ -4,7 +4,7 @@ require "rake/gempackagetask"
 require "rake/rdoctask"
 require "spec/rake/spectask"
 
-require 'lib/murmur-rpc'
+require 'lib/murmur'
 
 NAME = 'murmur-rpc'
 VERSION = MurmurRPC::VERSION

data/lib/{murmur-rpc.rb → murmur.rb}

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/interfaces/ice.rb'
 
 module MurmurRPC
-  VERSION="0.0.1"
+  VERSION="0.0.2"
 end

data/vendor/ice/Murmur.ice

@@ -165,7 +165,7 @@ module Murmur
 		/** Reason for ban. */
 		string reason;
 		/** Date ban was applied in unix time format. */
-		long start;
+		int start;
 		/** Duration of ban. */
 		int duration;
 	};
@@ -237,6 +237,8 @@ module Murmur
 	exception InvalidTextureException extends MurmurException {};
 	/** This is thrown when you supply an invalid callback. */
 	exception InvalidCallbackException extends MurmurException {};
+	/**  This is thrown when you supply the wrong secret in the calling context. */
+	exception InvalidSecretException extends MurmurException {};
 
 	/** Callback interface for servers. You can supply an implementation of this to receive notification
 	 *  messages from the server.
@@ -481,6 +483,12 @@ module Murmur
 		 */
 		idempotent ChannelMap getChannels() throws ServerBootedException;
 
+		/** Fetch certificate of user. This returns the complete certificate chain of a user.
+		 * @param session Connection ID of user. See [User::session].
+		 * @return Certificate list of user.
+		 */
+		idempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException;
+
 		/** Fetch all channels and connected users as a tree. This retrieves an easy-to-use representation of the server
 		 *  as a tree. This is primarily used for viewing the state of the server on a webpage.
 		 * @return Recursive tree of all channels and connected users.
@@ -616,7 +624,7 @@ module Murmur
 		idempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException;
 
 		/** Redirect whisper targets for user. If set, whenever a user tries to whisper to group "source", the whisper will be redirected to group "target".
-		 * This is intended for context groups.
+		 * To remove a redirect pass an empty target string. This is intended for context groups.
 		 * @param session Connection ID of user. See [User::session].
 		 * @param source Group name to redirect from.
 		 * @param target Group name to redirect to.
@@ -682,6 +690,11 @@ module Murmur
 		 * @param tex Texture to set for the user, or an empty texture to remove the existing texture.
 		 */
 		idempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException;
+
+		/** Get virtual server uptime.
+		 * @return Uptime of the virtual server in seconds
+		 */
+		idempotent int getUptime() throws ServerBootedException;
 	};
 
 	/** Callback interface for Meta. You can supply an implementation of this to recieve notifications
@@ -760,5 +773,10 @@ module Murmur
 		 * @param cb Callback interface to be removed.
 		 */
 		void removeCallback(MetaCallback *cb) throws InvalidCallbackException;
+		
+		/** Get murmur uptime.
+		 * @return Uptime of murmur in seconds
+		 */
+		idempotent int getUptime();
 	};
 };

data/vendor/ice/Murmur.rb

@@ -393,7 +393,7 @@ module Murmur
             ["name", ::Ice::T_string],
             ["_hash", ::Ice::T_string],
             ["reason", ::Ice::T_string],
-            ["start", ::Ice::T_long],
+            ["start", ::Ice::T_int],
             ["duration", ::Ice::T_int]
         ])
     end
@@ -845,6 +845,24 @@ module Murmur
         InvalidCallbackException::ICE_TYPE = T_InvalidCallbackException
     end
 
+    if not defined?(::Murmur::InvalidSecretException)
+        class InvalidSecretException < ::Murmur::MurmurException
+            def initialize
+            end
+
+            def to_s
+                'Murmur::InvalidSecretException'
+            end
+
+            def inspect
+                return ::Ice::__stringifyException(self)
+            end
+        end
+
+        T_InvalidSecretException = ::Ice::__defineException('::Murmur::InvalidSecretException', InvalidSecretException, ::Murmur::T_MurmurException, [])
+        InvalidSecretException::ICE_TYPE = T_InvalidSecretException
+    end
+
     if not defined?(::Murmur::ServerCallback_mixin)
         module ServerCallback_mixin
             include ::Ice::Object_mixin
@@ -1200,6 +1218,7 @@ module Murmur
             # def getLog(first, last, current=nil)
             # def getUsers(current=nil)
             # def getChannels(current=nil)
+            # def getCertificateList(session, current=nil)
             # def getTree(current=nil)
             # def getBans(current=nil)
             # def setBans(bans, current=nil)
@@ -1230,6 +1249,7 @@ module Murmur
             # def verifyPassword(name, pw, current=nil)
             # def getTexture(userid, current=nil)
             # def setTexture(userid, tex, current=nil)
+            # def getUptime(current=nil)
 
             def inspect
                 ::Ice::__stringify(self, T_Server)
@@ -1304,6 +1324,10 @@ module Murmur
                 Server_mixin::OP_getChannels.invoke(self, [], _ctx)
             end
 
+            def getCertificateList(session, _ctx=nil)
+                Server_mixin::OP_getCertificateList.invoke(self, [session], _ctx)
+            end
+
             def getTree(_ctx=nil)
                 Server_mixin::OP_getTree.invoke(self, [], _ctx)
             end
@@ -1423,6 +1447,10 @@ module Murmur
             def setTexture(userid, tex, _ctx=nil)
                 Server_mixin::OP_setTexture.invoke(self, [userid, tex], _ctx)
             end
+
+            def getUptime(_ctx=nil)
+                Server_mixin::OP_getUptime.invoke(self, [], _ctx)
+            end
         end
         class ServerPrx < ::Ice::ObjectPrx
             include ServerPrx_mixin
@@ -1462,6 +1490,7 @@ module Murmur
         Server_mixin::OP_getLog = ::Ice::__defineOperation('getLog', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_int], [], ::Murmur::T_LogList, [])
         Server_mixin::OP_getUsers = ::Ice::__defineOperation('getUsers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_UserMap, [::Murmur::T_ServerBootedException])
         Server_mixin::OP_getChannels = ::Ice::__defineOperation('getChannels', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ChannelMap, [::Murmur::T_ServerBootedException])
+        Server_mixin::OP_getCertificateList = ::Ice::__defineOperation('getCertificateList', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_CertificateList, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException])
         Server_mixin::OP_getTree = ::Ice::__defineOperation('getTree', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_Tree, [::Murmur::T_ServerBootedException])
         Server_mixin::OP_getBans = ::Ice::__defineOperation('getBans', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_BanList, [::Murmur::T_ServerBootedException])
         Server_mixin::OP_setBans = ::Ice::__defineOperation('setBans', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_BanList], [], nil, [::Murmur::T_ServerBootedException])
@@ -1492,6 +1521,7 @@ module Murmur
         Server_mixin::OP_verifyPassword = ::Ice::__defineOperation('verifyPassword', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string, ::Ice::T_string], [], ::Ice::T_int, [::Murmur::T_ServerBootedException])
         Server_mixin::OP_getTexture = ::Ice::__defineOperation('getTexture', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_Texture, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException])
         Server_mixin::OP_setTexture = ::Ice::__defineOperation('setTexture', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Murmur::T_Texture], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidTextureException])
+        Server_mixin::OP_getUptime = ::Ice::__defineOperation('getUptime', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [::Murmur::T_ServerBootedException])
     end
 
     if not defined?(::Murmur::MetaCallback_mixin)
@@ -1587,6 +1617,7 @@ module Murmur
             # def getVersion(current=nil)
             # def addCallback(cb, current=nil)
             # def removeCallback(cb, current=nil)
+            # def getUptime(current=nil)
 
             def inspect
                 ::Ice::__stringify(self, T_Meta)
@@ -1632,6 +1663,10 @@ module Murmur
             def removeCallback(cb, _ctx=nil)
                 Meta_mixin::OP_removeCallback.invoke(self, [cb], _ctx)
             end
+
+            def getUptime(_ctx=nil)
+                Meta_mixin::OP_getUptime.invoke(self, [], _ctx)
+            end
         end
         class MetaPrx < ::Ice::ObjectPrx
             include MetaPrx_mixin
@@ -1664,5 +1699,6 @@ module Murmur
         Meta_mixin::OP_getVersion = ::Ice::__defineOperation('getVersion', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [::Ice::T_int, ::Ice::T_int, ::Ice::T_int, ::Ice::T_string], nil, [])
         Meta_mixin::OP_addCallback = ::Ice::__defineOperation('addCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException])
         Meta_mixin::OP_removeCallback = ::Ice::__defineOperation('removeCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException])
+        Meta_mixin::OP_getUptime = ::Ice::__defineOperation('getUptime', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [])
     end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: murmur-rpc
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brian Stolz
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id001
 description: RPC interface for Murmur
 email: brian@tecnobrat.com
 executables: []
@@ -29,14 +38,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.textile
 files: 
-- README.rdoc
+- README.textile
 - Rakefile
 - lib/interfaces/ice.rb
-- lib/murmur-rpc.rb
-- vendor/ice/Murmur.ice
+- lib/murmur.rb
 - vendor/ice/Murmur.rb
+- vendor/ice/Murmur.ice
 has_rdoc: true
 homepage: http://github.com/tecnobrat/murmur-rpc
 licenses: []
@@ -47,25 +56,29 @@ rdoc_options:
 - --title
 - Murmur Ruby RPC
 - --main
-- README.rdoc
+- README.textile
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RPC interface for Murmur