tunecore-announcer 0.0.2 → 0.1.0

data/.idea/workspace.xml

@@ -21,25 +21,43 @@
       <file leaf-file-name="announcer" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bin/announcer">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="16" selection-start="360" selection-end="360" vertical-scroll-proportion="0.0">
+            <state line="69" column="71" selection-start="2011" selection-end="2011" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="tunecore-announcer.rb" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="tunecore-announcer.rb" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="4" column="18" selection-start="181" selection-end="181" vertical-scroll-proportion="0.05381166">
+            <state line="14" column="0" selection-start="458" selection-end="458" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="xmpp_connection.rb" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="command_dictionary.rb" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer/command_dictionary.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="0" column="71" selection-start="14" selection-end="14" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="xmpp_connection.rb" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer/xmpp_connection.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="19" column="133" selection-start="404" selection-end="404" vertical-scroll-proportion="0.0">
+            <state line="37" column="6" selection-start="786" selection-end="786" vertical-scroll-proportion="0.23542601">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="example_dictionary.yml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/examples/example_dictionary.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="4" column="34" selection-start="68" selection-end="68" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -130,6 +148,20 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tunecore-announcer" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tunecore-announcer" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="examples" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="tunecore-announcer" />
@@ -164,6 +196,7 @@
     </navigator>
   </component>
   <component name="PropertiesComponent">
+    <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="options.searchVisible" value="true" />
@@ -270,7 +303,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1823" y="185" width="1524" height="1043" extended-state="0" />
+    <frame x="-1872" y="199" width="1524" height="1043" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
@@ -352,23 +385,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer/xmpp_connection.rb">
+    <entry file="file://$PROJECT_DIR$/examples/example_dictionary.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="133" selection-start="404" selection-end="404" vertical-scroll-proportion="0.0">
+        <state line="4" column="34" selection-start="68" selection-end="68" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="14" column="0" selection-start="458" selection-end="458" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer/command_dictionary.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="71" selection-start="14" selection-end="14" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/bin/announcer">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="16" selection-start="360" selection-end="360" vertical-scroll-proportion="0.0">
+        <state line="69" column="71" selection-start="2011" selection-end="2011" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer.rb">
+    <entry file="file://$PROJECT_DIR$/lib/tunecore-announcer/xmpp_connection.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="18" selection-start="181" selection-end="181" vertical-scroll-proportion="0.05381166">
+        <state line="37" column="6" selection-start="786" selection-end="786" vertical-scroll-proportion="0.23542601">
           <folding />
         </state>
       </provider>

data/Manifest.txt

@@ -13,6 +13,7 @@ README.rdoc
 Rakefile
 bin/announcer
 lib/tunecore-announcer.rb
+lib/tunecore-announcer/command_dictionary.rb
 lib/tunecore-announcer/logger.rb
 lib/tunecore-announcer/utils.rb
 lib/tunecore-announcer/xmpp_connection.rb

data/bin/announcer

@@ -5,7 +5,7 @@ class AnnouncerLauncher
 
   def self.parse_options(args)
 
-    mandatory_opts = %w(name_prefix jabber_server jabber_password admin_jids)
+    mandatory_opts = %w(name_prefix jabber_server jabber_password admin_jids dictionary_file)
 
     options = OpenStruct.new
     options.jabber_port = 5222
@@ -32,6 +32,10 @@ class AnnouncerLauncher
         options.admin_jids = admin_jids
       end
 
+      opts.on("-d", "--dictionary=DICTIONARY_FILE", "A YAML file containing definitions for the commands you want to accept via Jabber") do |dictionary_file|
+        options.dictionary_file = dictionary_file
+      end
+
       opts.separator ""
       opts.separator "Optional arguments:"
 

data/lib/tunecore-announcer.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module TunecoreAnnouncer
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 
   require "optparse"
   require 'ostruct'
@@ -11,4 +11,5 @@ module TunecoreAnnouncer
   require 'tunecore-announcer/utils'
   require 'tunecore-announcer/logger'
   require 'tunecore-announcer/xmpp_connection'
+  require 'tunecore-announcer/command_dictionary'
 end

data/lib/tunecore-announcer/command_dictionary.rb

@@ -0,0 +1,22 @@
+require 'yaml'
+
+class TunecoreAnnouncer::CommandDictionary
+
+  attr_reader :dictionary
+
+  def initialize(yaml_filename)
+    @logger = TunecoreAnnouncer::Logger.instance
+    load_dictionary(yaml_filename)
+  end
+
+  def load_dictionary(yaml_filename)
+    @logger.info "Loading command dictionary: #{yaml_filename}"
+    @dictionary = YAML.load_file(yaml_filename)
+    @logger.debug @dictionary.inspect
+  end
+
+  def lookup(message)
+    @dictionary[message]
+  end
+
+end

data/lib/tunecore-announcer/xmpp_connection.rb

@@ -23,6 +23,7 @@ class TunecoreAnnouncer::XmppConnection
 
     register
     @logger.info "Connected to XMPP server"
+    load_dictionary
     #@jabber.add(admin_jids)
     add_admins
     #@logger.debug "Added #{admin_jid} to roster"
@@ -34,7 +35,7 @@ class TunecoreAnnouncer::XmppConnection
 
 
    def disconnect
-     admins "Shutting down ... Sayonara!"
+     #admins "Shutting down ... Sayonara!"
      deregister
      @jabber.disconnect
      @listener_thread.join
@@ -69,6 +70,10 @@ private
     end
   end
 
+  def load_dictionary
+    @dictionary = TunecoreAnnouncer::CommandDictionary.new(@options.dictionary_file)
+  end
+
   def deregister
     @logger.debug "Removing registration"
     client = @jabber.client
@@ -92,16 +97,12 @@ private
 
   def process_incoming(message)
     @logger.debug "Jabber msg from #{message.from}: #{message.body}"
-    case message.body
-    when "uptime"
-      @jabber.deliver(message.from, `uptime`)
-    when "ps"
-      @jabber.deliver(message.from, `ps -ef`)
-    when "hostname"
-      @jabber.deliver(message.from, `hostname`)
-    else
-      @jabber.deliver(message.from, "Sorry, I don't know #{message.body}")
-    end
+    command = @dictionary.lookup(message.body)
+    @jabber.deliver(message.from, "I don't know #{message.body}") and return if command.nil?
+    @logger.debug "Running command: #{command}"
+    output = `#{command}`
+    @logger.debug "Replying with #{output}"
+    @jabber.deliver(message.from, output)
   end
 
   def set_vcard

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tunecore-announcer
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alex Kane
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - bin/announcer
 - lib/tunecore-announcer.rb
+- lib/tunecore-announcer/command_dictionary.rb
 - lib/tunecore-announcer/logger.rb
 - lib/tunecore-announcer/utils.rb
 - lib/tunecore-announcer/xmpp_connection.rb

metadata.gz.sig

@@ -1,2 +1,3 @@
-��Z��FP�~z�iԅ�X++΀}t�[t�g<����&�fp
-9#R��O&J����\i/1<�/hY0c�B�Y'Fw�X���'�do�w�y�d��u�����= �:�x���'�k*�qr}B��{�&����.-�.�㛟m���ZM���'�&�
+��0�$J�M-�w��o���
+j�Wb����M�d�.n[~2mN?J��a+Y��/$B寧kƯ�- �hPu
+ů����.h�q�Z�k"��x��=��>u�3ڿ#DO�W���5Ǝk��P^X��0�QDzQ��I���*g9�߂���