mojodna-switchboard 0.0.4 → 0.0.5

data/Rakefile

@@ -1,5 +1,6 @@
-require 'switchboard'
+require File.join("lib", "switchboard", "version")
 
+desc "Generate the gemspec"
 task :gemspec do
   gemspec =<<-EOF
 Gem::Specification.new do |s|
@@ -15,6 +16,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("xmpp4r")
+  s.add_dependency("oauth")
+  s.add_dependency("rb-appscript")
+
 end
   EOF
 
@@ -25,4 +29,4 @@ end
   puts "gemspec successfully created."
 end
 
-task :default => :gemspec
+task :default => :gemspec

data/lib/switchboard/commands.rb

@@ -2,6 +2,7 @@ require 'switchboard/commands/command'
 require 'switchboard/commands/config'
 require 'switchboard/commands/default'
 require 'switchboard/commands/help'
+require 'switchboard/commands/pep'
 require 'switchboard/commands/pubsub'
 require 'switchboard/commands/register'
 require 'switchboard/commands/roster'

data/lib/switchboard/commands/pep.rb

@@ -0,0 +1,2 @@
+require 'switchboard/commands/pep/pep'
+require 'switchboard/commands/pep/tune'

data/lib/switchboard/commands/pep/pep.rb

@@ -0,0 +1,7 @@
+module Switchboard
+  module Commands
+    class PEP < Switchboard::Command
+      description "PEP (XEP-0163) manipulation"
+    end
+  end
+end

data/lib/switchboard/commands/pep/tune.rb

@@ -0,0 +1,84 @@
+begin
+  require 'appscript'
+rescue LoadError => e
+  gem = e.message.split("--").last.strip
+  puts "The #{gem} gem is required."
+  exit 1
+end
+require 'xmpp4r/tune'
+
+module Switchboard
+  module Commands
+    class PEP
+      class Tune < Switchboard::Command
+        description "Broadcasting UserTune (XEP-0118)"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            @tune_helper = Jabber::UserTune::Helper.new(client, nil)
+
+            itunes = Appscript.app('iTunes')
+            old_track_info = nil
+            last_state = :paused
+
+            while !shutdown?
+              track = itunes.current_track.get
+              state = itunes.player_state.get
+
+              if track && state == :playing
+
+                artist = track.artist.get
+                name = track.name.get
+                source = track.album.get
+                track_info = [artist, name, source]
+
+                if track_info != old_track_info
+                  duration = track.duration.get.to_i
+                  track = track.track_number.get.to_s
+
+                  puts "Now playing: #{name} by #{artist}"
+                  tune = Jabber::UserTune::Tune.new \
+                    artist,
+                    name,
+                    duration,
+                    track,
+                    source
+
+                  begin
+                    @tune_helper.now_playing(tune)
+                  rescue Jabber::ServerError => e
+                    puts e
+                  end
+                end
+
+              elsif state != last_state
+                track_info = nil
+                begin
+                  @tune_helper.stop_playing
+                rescue Jabber::ServerError => e
+                  puts e
+                end
+              end
+
+              old_track_info = track_info
+              last_state = state
+              sleep 1
+            end
+          end
+
+          switchboard.on_shutdown do
+            begin
+              @tune_helper.stop_playing
+            rescue Jabber::ServerError => e
+              puts e
+            end
+          end
+
+          switchboard.plug!(AutoAcceptJack)
+
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/items.rb

@@ -23,7 +23,7 @@ module Switchboard
               if items && items.any?
                 puts "Items:"
                 items.each do |id, item|
-                  puts [id, item] * ": "
+                  puts [id, item].compact * ": "
                 end
               else
                 puts "No items available for node '#{OPTIONS["pubsub.node"]}'."

data/lib/switchboard/commands/register.rb

@@ -19,7 +19,7 @@ module Switchboard
 
           # TODO consider using client.register_info.inspect
           begin
-            puts "Registering #{settings["jid"]} with password '#{settings["password"]}'."
+            puts "Registering #{settings["jid"]}"
             iq = client.register(settings["password"])
           rescue Jabber::ServerError => e
             puts "Could not register: #{e}"

data/lib/switchboard/core.rb

@@ -4,6 +4,7 @@ begin
 rescue LoadError => e
   gem = e.message.split("--").last.strip
   puts "The #{gem} gem is required."
+  exit 1
 end
 
 # allow local library modifications/additions to be loaded

data/lib/switchboard/helpers/pubsub.rb

@@ -2,24 +2,28 @@ require 'xmpp4r/pubsub'
 # TODO this is broken in XMPP4R 0.4.0
 # require 'xmpp4r/pubsub/helper/nodebrowser'
 
-module PubSubHelper
-  attr_reader :pubsub
+module Switchboard
+  module Helpers
+    module PubSubHelper
+      attr_reader :pubsub
 
-  delegate :create_node, :create_collection_node, :delete_node,
-    :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
-    :publish_item_with_id_to, :purge_items_from, :set_config_for,
-    :subscribe_to, :unsubscribe_from, :to => :pubsub
+      delegate :create_node, :create_collection_node, :delete_node,
+        :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
+        :publish_item_with_id_to, :purge_items_from, :set_config_for,
+        :subscribe_to, :unsubscribe_from, :to => :pubsub
 
-  def on_pubsub_event(&block)
-    register_hook(:pubsub_event, &block)
-  end
+      def on_pubsub_event(&block)
+        register_hook(:pubsub_event, &block)
+      end
 
-  def subscriptions(node = nil)
-    # NOTE: node-specific subscriptions do not appear to work in ejabberd 2.0.2
-    if node
-      pubsub.get_subscriptions_from(node)
-    else
-      pubsub.get_subscriptions_from_all_nodes
+      def subscriptions(node = nil)
+        # NOTE: node-specific subscriptions do not appear to work in ejabberd 2.0.2
+        if node
+          pubsub.get_subscriptions_from(node)
+        else
+          pubsub.get_subscriptions_from_all_nodes
+        end
+      end
     end
   end
 end

data/lib/switchboard/settings.rb

@@ -6,6 +6,7 @@ module Switchboard
       @path = path
 
       if File.exists?(path)
+        set_perms
         @config = YAML.load(File.read(path))
       end
 
@@ -21,6 +22,7 @@ module Switchboard
     def set!(key, value)
       set(key, value)
       write
+      set_perms
     end
 
     def set(key, value)
@@ -36,5 +38,10 @@ module Switchboard
         f << @config.to_yaml
       end
     end
+
+    def set_perms
+      File.chmod 0600, @path
+    end
+
   end
 end

data/lib/switchboard/version.rb

@@ -1,3 +1,3 @@
 module Switchboard
-  VERSION = [0, 0, 4]
+  VERSION = [0, 0, 5]
 end

data/switchboard.gemspec

@@ -1,14 +1,17 @@
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.summary = "XMPP toolkit."
   s.description = "A toolkit for assembling XMPP clients and interacting with XMPP servers."
   s.authors = ["Seth Fitzsimmons"]
   s.email = ["seth@mojodna.net"]
 
-  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pubsub/affiliations.rb", "lib/switchboard/commands/pubsub/config.rb", "lib/switchboard/commands/pubsub/create.rb", "lib/switchboard/commands/pubsub/delete.rb", "lib/switchboard/commands/pubsub/info.rb", "lib/switchboard/commands/pubsub/items.rb", "lib/switchboard/commands/pubsub/listen.rb", "lib/switchboard/commands/pubsub/nodes.rb", "lib/switchboard/commands/pubsub/options.rb", "lib/switchboard/commands/pubsub/publish.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/purge.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/core.rb", "lib/switchboard/ext/delegate.rb", "lib/switchboard/ext/instance_exec.rb", "lib/switchboard/helpers/oauth_pubsub.rb", "lib/switchboard/helpers/pubsub.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard.gemspec"]
+  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pep/pep.rb", "lib/switchboard/commands/pep/tune.rb", "lib/switchboard/commands/pep.rb", "lib/switchboard/commands/pubsub/affiliations.rb", "lib/switchboard/commands/pubsub/config.rb", "lib/switchboard/commands/pubsub/create.rb", "lib/switchboard/commands/pubsub/delete.rb", "lib/switchboard/commands/pubsub/info.rb", "lib/switchboard/commands/pubsub/items.rb", "lib/switchboard/commands/pubsub/listen.rb", "lib/switchboard/commands/pubsub/nodes.rb", "lib/switchboard/commands/pubsub/options.rb", "lib/switchboard/commands/pubsub/publish.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/purge.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/core.rb", "lib/switchboard/ext/delegate.rb", "lib/switchboard/ext/instance_exec.rb", "lib/switchboard/helpers/oauth_pubsub.rb", "lib/switchboard/helpers/pubsub.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard.gemspec"]
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
   s.add_dependency("xmpp4r")
+  s.add_dependency("oauth")
+  s.add_dependency("rb-appscript")
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -21,6 +21,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rb-appscript
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A toolkit for assembling XMPP clients and interacting with XMPP servers.
 email: 
 - seth@mojodna.net
@@ -40,6 +58,9 @@ files:
 - lib/switchboard/commands/default.rb
 - lib/switchboard/commands/help/help.rb
 - lib/switchboard/commands/help.rb
+- lib/switchboard/commands/pep/pep.rb
+- lib/switchboard/commands/pep/tune.rb
+- lib/switchboard/commands/pep.rb
 - lib/switchboard/commands/pubsub/affiliations.rb
 - lib/switchboard/commands/pubsub/config.rb
 - lib/switchboard/commands/pubsub/create.rb