murmur 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1259617317e6bbc9ad7e46549c60ff602ee94e67
-  data.tar.gz: edd4ddca53daa47f9a060aecfe8f7e0f65dfdfbd
+  metadata.gz: 34fd0e204dab5c258464d3c24cfe83f12600a387
+  data.tar.gz: 874a501df0f9b1936c7b57c21084a878a036e4e2
 SHA512:
-  metadata.gz: 9334506b594d43ba1a56a99e245a7515cc58c7671d3e84263b4eb462f292fcb1b61e9cff48b5c329f52756f770924aeb2755a8a91b5083e4fe0c6161bf7e7d7e
-  data.tar.gz: e51ff1b751142f76384754cb48051d30e0ddc29b810e69175f4558d891bedef3d16728902f4c9a4ac6b1234ff987f84908daf688c5fb4221a147d38a0b9e6974
+  metadata.gz: 33380e6ebbcd1110c4c43f1d656c93cf37c00fe2c63aaa2014cf892fcb697d6dcfdc2a63832a32add195423f5466749d3b36d0356c945b8e21460bb016094db3
+  data.tar.gz: 2e34515d392f30a97a5d4579c6c505732931387b68a9fe2a5fae413c4d62bec566969e11bf7342967de9a27c25de006f98705b4abe073801d19077aa75bc88fc

data/README.md

@@ -56,6 +56,11 @@ channel.name = "New name!"
 # Get the clients of a server
 server = Murmur.server 1
 users = server.users
+
+# Change a user's name
+server = Murmur.server 1
+user = server.users.first
+user.name = "New name!"
 ```
 
 The #raw function on Murmur::API objects will return the raw Murmur object, allowing calling of unimplemented functions.

data/lib/murmur/channel.rb

@@ -67,6 +67,10 @@ module Murmur
                 update
             end
 
+            def raw
+                @channel
+            end
+
             private
 
             def update

data/lib/murmur/ice_interface.rb

@@ -85,7 +85,7 @@ module Murmur
                 true
             end
 
-            def meta
+            def raw
                 @meta
             end
 

data/lib/murmur/server.rb

@@ -30,6 +30,7 @@ module Murmur
 
                 @channels = {}
                 @users = {}
+                @registered_users = {}
             end
 
             def id
@@ -62,6 +63,14 @@ module Murmur
                 @users
             end
 
+            def registered_users
+                @registered_users = {}
+                @interface.getRegisteredUsers.each do |_, user|
+                    @registered_users[user.session] = User.new(@host, @meta, self, user)
+                end
+                @registered_users
+            end
+
             def user(session)
                 users
 
@@ -79,6 +88,14 @@ module Murmur
             end
             alias :delete :destroy!
 
+            def start!
+                @interface.start unless running?
+            end
+
+            def stop!
+                @interface.stop if running?
+            end
+
             def restart!
                 @interface.stop if running?
                 @interface.start
@@ -99,6 +116,10 @@ module Murmur
                 key = key.to_s
                 self[key] = val
             end
+            
+            def raw
+                @interface
+            end
 
             def method_missing(method, *args)
                 method = method.to_s

data/lib/murmur/user.rb

@@ -1,7 +1,7 @@
 module Murmur
     module API
         class User
-            
+
             def initialize(host, meta, server, user)
                 @host = host
                 @meta = meta
@@ -18,38 +18,82 @@ module Murmur
                 @user.userid
             end
 
+            def registered?
+                @user.userid != -1
+            end
+
             def muted?
                 @user.mute
             end
 
+            def muted=(muted)
+                @user.mute = muted
+                update
+            end
+
             def deafened?
                 @user.deaf
             end
 
+            def deafened=(deafened)
+                @user.deaf = deafened
+                update
+            end
+
             def suppressed?
                 @user.suppress
             end
 
+            def suppressed=(suppressed)
+                @user.suppress = suppressed
+                update
+            end
+
             def priorityspeaker?
                 @user.prioritySpeaker
             end
 
+            def priorityspeaker=(priorityspeaker)
+                @user.prioritySpeaker = priorityspeaker
+                update
+            end
+
             def clientmuted?
                 @user.selfMute
             end
 
+            def clientmuted=(clientmuted)
+                @user.selfMute = clientmuted
+                update
+            end
+
             def clientdeafened?
                 @user.selfDeaf
             end
 
+            def clientdeafened=(clientdeafened)
+                @user.selfDeaf = clientdeafened
+                update
+            end
+
             def recording?
                 @user.recording
             end
 
+            def recording=(recording)
+                @user.recording
+                update
+            end
+
             def channel
                 @server.channel @user.channel
             end
 
+            def channel=(channel)
+                @user.channel = channel
+                update
+            end
+
             def server
                 @server
             end
@@ -58,10 +102,15 @@ module Murmur
                 @user.name
             end
 
+            def name=(name)
+                @user.name = name
+                update
+            end
+
             def seconds_connected
                 @user.onlinesecs 
             end
-            
+
             def seconds_idle
                 @user.idlesecs
             end
@@ -98,10 +147,20 @@ module Murmur
                 @user.comment
             end
 
+            def comment=(comment)
+                @user.comment = comment
+                update
+            end
+
             def tcponly?
                 @user.tcponly
             end
 
+            def tcponly=(tcponly)
+                @user.tcponly = tcponly
+                update
+            end
+
             def ping
                 {:udp => @user.udpPing, :tcp => @user.tcpPing}
             end
@@ -114,6 +173,50 @@ module Murmur
                 ping[:tcp]
             end
 
+            def kick!(reason="Kicked by server")
+                @server.kickUser(@user.session, reason)
+            end
+
+            def raw
+                @user
+            end
+
+            private
+
+            def update
+                user_state = @server.getState(id)
+
+                {
+                    :muted? => :mute,
+                    :deafened? => :deaf,
+                    :suppressed? => :suppress,
+                    :priorityspeaker? => :prioritySpeaker,
+                    :clientmuted? => :selfMute,
+                    :clientdeafened? => :selfDeaf,
+                    :recording? => :recording,
+                    :tcponly? => :tcponly,
+                    :name => :name
+                }.each do |local, state|
+                    user_state.send("#{state}=", send(local))
+                end
+
+                # Set 'channel' normally.
+                user_state.channel = channel.id
+
+                @server.setState(user_state)
+            end 
+
+            # Aliases for update function to work properly.
+            # Maybe one day I'll fix this.
+            # alias :mute :muted?
+            # alias :deaf :deafened?
+            # alias :suppress :suppressed?
+            # alias :prioritySpeaker :priorityspeaker?
+            # alias :selfMute :clientmuted?
+            # alias :selfDeaf :clientdeafened?
+            # alias :recording :recording?
+            # alias :tcponly :tcponly?
+
         end
     end
 end

data/lib/murmur/version.rb

@@ -1,3 +1,3 @@
 module Murmur
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: murmur
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ranndom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeroc-ice