lita-standups 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093b8849f95cbd28e3c7892a06ef819729cde1b7
-  data.tar.gz: b27390757f8417ff58a6bff72230e8fb77a7311a
+  metadata.gz: 0c6fb95c83938f29cf9d4a66cd0de5d358c326fd
+  data.tar.gz: 6e782535b601fd6c64975ad03ed71f1f7ee99e37
 SHA512:
-  metadata.gz: 87a69834610b47d05d26e836722c9d920b39bac02b87e17a5c529ff1d78091818343dd92b406bd6668038feb8b37984df522c483aff945aebc19a895f14ce6e9
-  data.tar.gz: 80ce24f6aa512088204dd4e0eefd74f7b1c449a3780c43ec6bf93952f6624cb7339c74af8d86f9058894e99a654a6654dadceecced9c040b80823546febe5a5e
+  metadata.gz: b916ab7c0626b48c9c72659588c69f905d5e4f5bbe6a6a5367250b2b072b3951d3ab834ea3e12b8f851a9113ff19f59c10445594f10b54975b28c7b8914ba9c6
+  data.tar.gz: c57430753b2cce21b4f5a67150f86a164a69cac87e6448a819370e7ae7928ed6d3bca2369aec69616165bded7c2d9261dbf874d3672c8c0b0651e629cb5ced6e

data/lib/lita-standups.rb

@@ -13,7 +13,7 @@ require "lita-wizard"
 require "rufus-scheduler"
 require "ohm"
 require "ohm/contrib"
-require "active_support/all"
+require "active_support"
 
 require "lita/handlers/standups"
 require "lita/standups/wizards"
@@ -23,5 +23,5 @@ require "lita/standups/mixins/robot"
 
 Lita::Handlers::Standups.template_root File.expand_path(
   File.join("..", "..", "templates"),
- __FILE__
+  __FILE__
 )

data/lib/lita/standups/manager.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/time"
+
 module Lita
   module Standups
     class Manager
@@ -14,19 +16,29 @@ module Lita
       end
 
       def self.run_schedule(robot:, schedule_id:)
+        Lita.logger.debug "Running scheduled standup for schedule ID=#{schedule_id}"
         schedule = Models::StandupSchedule[schedule_id]
-        session = Models::StandupSession.create(
-          standup_id: schedule.standup_id,
-          standup_schedule_id: schedule.id,
+        Lita.logger.debug "Found scheduled standup: #{schedule.inspect}"
+        session = Lita::Standups::Models::StandupSession.create(
+          standup: schedule.standup,
+          standup_schedule: schedule,
           recipients: schedule.recipients,
           room: schedule.channel
         )
+        Lita.logger.debug "Created session: #{session.inspect}"
         new(robot: robot, session: session).run
+      rescue Exception => e
+        Lita.logger.debug "Got exception while trying to run schedule ID #{schedule_id}"
+        Lita.logger.debug e.inspect
+        Lita.logger.debug e.backtrace.join("\n")
+        raise e
       end
 
       def self.abort_expired_standups(robot:)
+        Lita.logger.debug "Checking for expired standups"
         Lita::Standups::Models::StandupResponse.find(status: "pending").union(status: "running").each do |response|
           next unless Time.current - response.created_at > EXPIRATION_TIME
+          Lita.logger.debug "Found expired standup response: #{response.inspect}. Expiring ..."
           response.expired!
           response.save
           Lita::Wizard.cancel_wizard(response.user.id)
@@ -36,7 +48,9 @@ module Lita
       end
 
       def self.complete_finished_standups(robot:)
-        Lita::Standups::Models::StandupSession.find(status: "completed", results_sent: false).each do |session|
+        Lita.logger.debug "Checking for finished sesssions"
+        Lita::Standups::Models::StandupSession.find(status: "completed", results_sent: "0").each do |session|
+          Lita.logger.debug "Found finished session: #{session.inspect}. Posting results ..."
           new(robot: robot, session: session).post_results
         end
       end
@@ -57,6 +71,7 @@ module Lita
       end
 
       def run
+        Lita.logger.debug "Running standup for session ID=#{session.id}"
         session.running!
         session.save
         session.recipients.each { |recipient| ask_questions(recipient) }
@@ -64,20 +79,29 @@ module Lita
 
       def ask_questions(recipient)
         user = Lita::User.fuzzy_find(recipient)
+        Lita.logger.debug "Running the wizard for recipient #{recipient} (#{user.inspect})"
         response = Models::StandupResponse.create(
           standup_session_id: session.id,
           user_id: user.id
         )
         dummy_source = Lita::Source.new(user: user, room: nil, private_message: true)
         dummy_message = Lita::Message.new(robot, '', dummy_source)
-        Wizards::RunStandup.start robot, dummy_message, 'response_id' => response.id
+        begin
+          Wizards::RunStandup.start robot, dummy_message, 'response_id' => response.id
+        rescue Exception => e
+          Lita.logger.debug "Got exception while trying to run the standup with #{recipient}"
+          Lita.logger.debug e.inspect
+          Lita.logger.debug e.backtrace.join("\n")
+          response.aborted!
+          response.save
+        end
       end
 
       def post_results
-        return if session.results_sent
+        return if session.results_sent == "1"
         message = "The standup '#{standup.name}' has finished. Here's what everyone posted:\n\n#{session.report_message}"
         robot.send_message room, message
-        session.results_sent = true
+        session.results_sent = "1"
         session.save
       end
 

data/lib/lita/standups/mixins/robot.rb

@@ -19,13 +19,18 @@ module Lita
 
         def schedule_standups
           return unless scheduler_enabled?
+          Lita.logger.debug "Unscheduling any existing jobs"
           scheduler.jobs.each(&:unschedule)
-          scheduler.cron '* * * * *', tags: [:standup_schedules, :abort_expired] do |job|
+          Lita.logger.debug "Scheduling standup status jobs"
+          scheduler.cron '*/15 * * * * *', tags: [:standup_schedules, :abort_expired] do |job|
+            Ohm.redis = Redic.new(Ohm.redis.url)
             Lita::Standups::Manager.abort_expired_standups(robot: self)
           end
-          scheduler.cron '* * * * *', tags: [:standup_schedules, :complete_finished] do |job|
+          scheduler.cron '*/15 * * * * *', tags: [:standup_schedules, :complete_finished] do |job|
+            Ohm.redis = Redic.new(Ohm.redis.url)
             Lita::Standups::Manager.complete_finished_standups(robot: self)
           end
+          Lita.logger.debug "Scheduling standups"
           Models::StandupSchedule.all.each do |standup_schedule|
             schedule_standup(standup_schedule)
           end
@@ -35,21 +40,27 @@ module Lita
           return unless scheduler_enabled?
           scheduler.cron standup_schedule.cron_line, schedule_id: standup_schedule.id,
             tags: [:standup_schedules, "standup_schedule_#{standup_schedule.id}"] do |job|
-            Lita::Standups::Manager.run_schedule(robot: self, schedule_id: job.opts[:schedule_id])
+              Ohm.redis = Redic.new(Ohm.redis.url)
+              Lita.logger.debug "Calling run_schedule on Manager for #{job.opts[:schedule_id]}"
+              Lita::Standups::Manager.run_schedule(robot: self, schedule_id: job.opts[:schedule_id])
           end
         end
 
         def unschedule_standup(standup_schedule)
           return unless scheduler_enabled?
+          Lita.logger.debug "Unscheduling standup scheduled #{standup_schedule.id}"
           scheduler.jobs(tags: [:standup_schedules, "standup_schedule_#{standup_schedule.id}"]).each(&:unschedule)
         end
 
         def run_standup(standup_id, recipients, room_id)
           if scheduler_enabled?
             scheduler.in "5s", tags: [:standup_schedules, :run_standup] do |job|
+              Ohm.redis = Redic.new(Ohm.redis.url)
+              Lita.logger.debug "Calling run on Manager for standup #{standup_id} (recipients: #{recipients.join(", ")}"
               Lita::Standups::Manager.run(robot: self, standup_id: standup_id, recipients: recipients, room: room_id)
             end
           else
+            Lita.logger.debug "Calling run on Manager for standup #{standup_id} (recipients: #{recipients.join(", ")}"
             Lita::Standups::Manager.run(robot: self, standup_id: standup_id, recipients: recipients, room: room_id)
           end
         end

data/lib/lita/standups/models.rb

@@ -1,12 +1,12 @@
 module Lita
   module Standups
     module Models
-      extend ActiveSupport::Autoload
-
-      autoload :Standup
-      autoload :StandupResponse
-      autoload :StandupSchedule
-      autoload :StandupSession
     end
   end
 end
+
+require "lita/standups/models/base"
+require "lita/standups/models/standup"
+require "lita/standups/models/standup_response"
+require "lita/standups/models/standup_schedule"
+require "lita/standups/models/standup_session"

data/lib/lita/standups/models/base.rb

@@ -0,0 +1,18 @@
+module Lita
+  module Standups
+    module Models
+      class Base < Ohm::Model
+
+        include Ohm::Callbacks
+        include Ohm::Timestamps
+        include Ohm::DataTypes
+
+        def self.redis
+          Ohm.redis
+        end
+
+      end
+    end
+  end
+end
+

data/lib/lita/standups/models/standup.rb

@@ -1,7 +1,9 @@
+require "lita/standups/models/standup_schedule"
+
 module Lita
   module Standups
     module Models
-      class Standup < Ohm::Model
+      class Standup < Base
 
         include Ohm::Callbacks
         include Ohm::Timestamps
@@ -10,7 +12,7 @@ module Lita
         attribute :name
         attribute :questions, Type::Array
 
-        collection :schedules, StandupSchedule, :standup
+        collection :schedules, "Lita::Standups::Models::StandupSchedule", :standup
 
         def summary
           "#{name} (ID: #{id}) - #{questions.size} question(s)"

data/lib/lita/standups/models/standup_response.rb

@@ -1,7 +1,9 @@
+require "lita/standups/models/standup_session"
+
 module Lita
   module Standups
     module Models
-      class StandupResponse < Ohm::Model
+      class StandupResponse < Base
 
         include Ohm::Callbacks
         include Ohm::Timestamps
@@ -11,7 +13,7 @@ module Lita
         attribute :user_id
         attribute :answers, Type::Array
 
-        reference :standup_session, StandupSession
+        reference :standup_session, "Lita::Standups::Models::StandupSession"
 
         index :status
         index :user_id

data/lib/lita/standups/models/standup_schedule.rb

@@ -1,7 +1,9 @@
+require "lita/standups/models/standup"
+
 module Lita
   module Standups
     module Models
-      class StandupSchedule < Ohm::Model
+      class StandupSchedule < Base
 
         include Ohm::Callbacks
         include Ohm::Timestamps
@@ -13,7 +15,7 @@ module Lita
         attribute :recipients, Type::Array
         attribute :channel
 
-        reference :standup, Standup
+        reference :standup, "Lita::Standups::Models::Standup"
 
         def cron_line
           [

data/lib/lita/standups/models/standup_session.rb

@@ -1,7 +1,11 @@
+require "lita/standups/models/standup"
+require "lita/standups/models/standup_schedule"
+require "lita/standups/models/standup_response"
+
 module Lita
   module Standups
     module Models
-      class StandupSession < Ohm::Model
+      class StandupSession < Base
 
         include Ohm::Callbacks
         include Ohm::Timestamps
@@ -11,18 +15,18 @@ module Lita
         attribute :room
         attribute :counts, Type::Hash
         attribute :recipients, Type::Array
-        attribute :results_sent, Type::Boolean
+        attribute :results_sent
 
-        reference :standup, Standup
-        reference :standup_schedule, StandupSchedule
-        collection :standup_responses, StandupResponse, :standup_session
+        reference :standup, "Lita::Standups::Models::Standup"
+        reference :standup_schedule, "Lita::Standups::Models::StandupSchedule"
+        collection :standup_responses, "Lita::Standups::Models::StandupResponse", :standup_session
 
         index :status
         index :results_sent
 
         def before_create
           self.status = 'pending'
-          self.results_sent = false
+          self.results_sent = "0"
         end
 
         %w(pending running completed).each do |status_name|
@@ -32,12 +36,13 @@ module Lita
         end
 
         def update_status
-          self.counts = { 'total' => 0, 'finished' => 0 }
+          counts = { 'total' => 0, 'finished' => 0 }
           standup_responses.each do |r|
             counts[r.status] = counts[r.status].to_i + 1
             counts['total'] = counts['total'] + 1
             counts['finished'] = counts['finished'] + 1 if r.finished?
           end
+          self.counts = counts
           completed! if counts['total'] == counts['finished']
           save
         end

data/lib/lita/standups/wizards.rb

@@ -1,11 +1,10 @@
 module Lita
   module Standups
     module Wizards
-      extend ActiveSupport::Autoload
-
-      autoload :CreateStandup
-      autoload :RunStandup
-      autoload :ScheduleStandup
     end
   end
 end
+
+require "lita/standups/wizards/create_standup"
+require "lita/standups/wizards/run_standup"
+require "lita/standups/wizards/schedule_standup"

data/lib/lita/standups/wizards/create_standup.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/object/blank"
+
 module Lita
   module Standups
     module Wizards
@@ -11,10 +13,12 @@ module Lita
              multiline: true
 
         def finish_wizard
+          Lita.logger.debug "Finishing wizard CreateStandup for user #{user_id}"
           @standup = Models::Standup.create(
             name: value_for(:name),
             questions: value_for(:questions).to_s.split("\n").map(&:strip).map(&:presence).compact
           )
+          Lita.logger.debug "Created standup: #{@standup.summary}"
         end
 
         def final_message

data/lib/lita/standups/wizards/run_standup.rb

@@ -45,8 +45,6 @@ module Lita
           "Hey. I'm running the '#{standup.name}' standup. Please answer the following questions."
         end
 
-
-
         def final_message
           "You're done. Thanks"
         end

data/lita-standups.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-standups'
-  spec.version       = '1.0.1'
+  spec.version       = '1.0.2'
   spec.authors       = ['Cristian Bica']
   spec.email         = ['cristian.bica@gmail.com']
   spec.description   = 'Lita standups'

data/spec/lita/standups/manager_spec.rb

@@ -32,6 +32,15 @@ describe Lita::Standups::Manager do
       end.to change { Lita::Standups::Models::StandupSession.all.count }.by(1)
     end
 
+    it "should log exceptions and raise them when trying to run a schedule" do
+      allow_any_instance_of(described_class).to receive(:run).and_raise(Exception)
+      allow(Lita.logger).to receive(:debug)
+      expect(Lita.logger).to receive(:debug).at_least(:once).with(/^Got exception/)
+      expect do
+        described_class.run_schedule(robot: robot, schedule_id: "1")
+      end.to raise_exception(Exception)
+    end
+
     it "should mark expired reponses as expired" do
       responses = [Lita::Standups::Models::StandupResponse[1], Lita::Standups::Models::StandupResponse[2]]
       responses[0].created_at = Time.now - 100_000
@@ -63,6 +72,20 @@ describe Lita::Standups::Manager do
         expect(Lita::Standups::Wizards::RunStandup).to receive(:start)
         described_class.run(robot: robot, standup_id: "1", recipients: %w(1), room: "#a")
       end
+
+      it "should log exceptions when ask_question raises an exception" do
+        allow(Lita::Standups::Wizards::RunStandup).to receive(:start).and_raise(Exception)
+        allow(Lita.logger).to receive(:debug)
+        expect(Lita.logger).to receive(:debug).at_least(:once).with(/^Got exception/)
+        described_class.run(robot: robot, standup_id: "1", recipients: %w(1), room: "#a")
+      end
+
+      it "should mark the response as aborted when ask_question raises an exception" do
+        allow(Lita::Standups::Wizards::RunStandup).to receive(:start).and_raise(Exception)
+        expect_any_instance_of(Lita::Standups::Models::StandupResponse).to \
+          receive(:aborted!).once
+        described_class.run(robot: robot, standup_id: "1", recipients: %w(1), room: "#a")
+      end
     end
 
     context "posting results" do
@@ -77,12 +100,12 @@ describe Lita::Standups::Manager do
         allow(robot).to receive(:send_message)
         expect do
           described_class.new(robot: robot, session: session).post_results
-        end.to change { Lita::Standups::Models::StandupSession[1].results_sent }.to(true)
+        end.to change { Lita::Standups::Models::StandupSession[1].results_sent }.to("1")
       end
 
       it "sholdn't post anything if already posted" do
         session = Lita::Standups::Models::StandupSession[1]
-        session.results_sent = true
+        session.results_sent = "1"
         session.save
         expect(robot).to receive(:send_message).never
         described_class.new(robot: robot, session: session).post_results

data/spec/lita/standups/mixins/robot_spec.rb

@@ -41,7 +41,7 @@ describe "Robot Mixin" do
     it "should try to run a standup inline" do
       expect(scheduler).to receive(:in).never
       expect(Lita::Standups::Manager).to receive(:run).once
-      robot.run_standup("standup_id", "recipients", "room_id")
+      robot.run_standup("standup_id", ["recipients"], "room_id")
     end
   end
 
@@ -75,7 +75,7 @@ describe "Robot Mixin" do
     it "should try to run a standup in the scheduler" do
       expect(scheduler).to receive(:in).once
       expect(Lita::Standups::Manager).to receive(:run).never
-      robot.run_standup("standup_id", "recipients", "room_id")
+      robot.run_standup("standup_id", ["recipients"], "room_id")
     end
   end
 
@@ -100,7 +100,7 @@ describe "Robot Mixin" do
     end
 
     it "should run a standup inside the scheduler" do
-      robot.run_standup("standup_id", "recipients", "room_id")
+      robot.run_standup("standup_id", ["recipients"], "room_id")
       expect(Lita::Standups::Manager).to receive(:run)
       scheduler.jobs(tags: [:run_standup]).first.call
     end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ require "lita/rspec"
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f }
 
+Ohm.redis = Redic.new("redis://127.0.0.1:6379/13")
+
 # A compatibility mode is provided for older plugins upgrading from Lita 3. Since this plugin
 # was generated with Lita 4, the compatibility mode should be left disabled.
 Lita.version_3_compatibility_mode = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-standups
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cristian Bica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -255,6 +255,7 @@ files:
 - lib/lita/standups/manager.rb
 - lib/lita/standups/mixins/robot.rb
 - lib/lita/standups/models.rb
+- lib/lita/standups/models/base.rb
 - lib/lita/standups/models/standup.rb
 - lib/lita/standups/models/standup_response.rb
 - lib/lita/standups/models/standup_schedule.rb