edi 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cd1ecd1dfe2276c05383418944154c354e38c5
-  data.tar.gz: f6ce67c78c00bfb147301ac1a517827aa36753e9
+  metadata.gz: 50bb136e028227131c63fd05cb6da3023e6b2f73
+  data.tar.gz: e93e3b4442e0093d3d26fc8cf9705e6fcd5ce99f
 SHA512:
-  metadata.gz: 7c4992e4f5a69eb983c8d6bf2fdf010b875380868aceb7b67806866782f4a4b0eae58b86c3b12f0f01d5e13b1e928e0b6af3eb07b4dcc6c9d464f2e4bd82f98e
-  data.tar.gz: a297db943b8d07203a9310d4894923db6d5ac6af38a5dd338dd82e39993bbf0ba08274aff9111640089453877e125902963de4563cdf1a2684c5df20c6e4b373
+  metadata.gz: c58e98ef70831b8bc33d3ef84caca41482dfbfd3962800c8fd86838c8aa8f4a4c118cf523f31a5b10155432205c2aee84761a24420cd8fb9a5a184a540ec7762
+  data.tar.gz: 2868280f66c7062bcf7b294d9f021f98f93af6cef1e6229496ae6162a7ddccca4dedc7252f0d23d9a041800bd475ad61b68883f8649ee6f299a2516f70898850

data/lib/edi.rb

@@ -62,6 +62,10 @@ module EDI
       ServiceRunner
     end
 
+    def bot_name
+      self.config.bot_name
+    end
+
   end
   include EDI::HTTPUtilities
   include EDI::Configuration

data/lib/edi/application.rb

@@ -3,9 +3,9 @@ module EDI
     require 'active_support/dependencies'
 
     def self.initialize!
-      add_jarvis_root_to_load_path
+      add_edi_root_to_load_path
       autoload_paths
-      require File.join EDI.root, "bot/server"
+      require File.join EDI.root, "bot/core"
       require_initializers
       connect_websocket
     end
@@ -20,7 +20,7 @@ module EDI
       ActiveSupport::Dependencies.autoload_paths += EDI.config.autoload_paths
     end
 
-    def self.add_jarvis_root_to_load_path
+    def self.add_edi_root_to_load_path
       $: << EDI.root
     end
 

data/lib/edi/cli.rb

@@ -13,11 +13,8 @@ module EDI
 
     desc "start", "Bootup the EDI Application"
     def start(*args)
-      EDI.config.port = args.include?("-p") ? args[args.find_index("-p")+1] : "3030"
-      set_environment_stuff(args)
-      ENV["JARVIS_PORT"] = EDI.config.port
-      command = "rackup -p #{EDI.config.port}"
-      run_command(command)
+      puts "Starting EDI Slackbot"
+      run_command("ruby boot.rb")
     end
 
     desc "generate", "Generate service NAME"
@@ -36,25 +33,5 @@ private
       template("services/%name%.rb.tt", "bot/services/#{name}.rb")
     end
 
-    def set_environment_stuff(args)
-      if ENV["RACK_ENV"]
-        EDI.env = ENV["RACK_ENV"]
-      else
-        figure_out_environment(args)
-      end
-    end
-
-    def figure_out_environment(args)
-      ENV["JARVIS_ENV"] = case args
-      when args.include?("production")
-        puts "production"
-        "production"
-      when args.include?("test")
-        "test"
-      else
-        "development"
-      end
-    end
-
   end
 end

data/lib/edi/slack/websocket_incoming_message.rb

@@ -23,7 +23,7 @@ module Slack
 
     def mentions_edi?
       if text
-        text.match /edi/i
+        text.match /#{EDI.bot_name}/i
       else
         false
       end

data/lib/edi/version.rb

@@ -1,3 +1,3 @@
 module EDI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/edi/websocket/client.rb

@@ -21,10 +21,10 @@ module Websocket
 
         # Respond to Messages
         client.on :message do |event|
-          incoming_message = Slack::WebsocketIncomingMessage.new(event.data).message
+          incoming_message = Slack::WebsocketIncomingMessage.new(event.data)
           if incoming_message.should_respond?
             response_text = ""
-            service = Proc.new { response_text = EDI.runner.new(message: incoming_message).execute }
+            service = Proc.new { response_text = EDI.runner.new(message: incoming_message.text).execute }
             response = Proc.new { client.send Slack::WebsocketOutgoingMessage.new(text: response_text, channel: incoming_message.channel, id: id).to_json }
             EM.defer service, response
             increment_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - DVG