whois_slacking 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b4aca75b625140a4019efa60cb8af78e89d80dc
-  data.tar.gz: 75a6421c82aac3cf1b57a5d98ff65ebf0c8da180
+  metadata.gz: 2c12a90fd78ffc81ec00d90aa15e50c61bb53041
+  data.tar.gz: 95ae875b987913537d79c40de5676a8ea3df0392
 SHA512:
-  metadata.gz: 88115cc516d9739cfd9d524ac50487f130d4578d973929e05dd2eff76beb9acc595abfa7d3a2a2f99d0a2773c6db3b3f4c0938a667284326f986e349dae1c200
-  data.tar.gz: 449be7d50e8830191efcce26284a22f3ad49c68299c49c2a1ea4742f983c12fa96a4da5070628c9f00ef51c84cf1268e943dd51d357dd10e61e687e8c122270a
+  metadata.gz: b343af7a6be9858de23f6285a7a9d33729c7b16982580155d871493fb978d4221c52bc5ed2e0b84db0ab52ce28b4a8fe8bcd964ddacd572613af6a495a66e2d6
+  data.tar.gz: 4d4e91bc2a20bedff2b746a9335371034f17b94ff64998932eb2b19bec54e87dc9548631d6c8625d438fa373b80959bab328776b8dc92a6c566d2432aa025cd7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whois_slacking (0.0.2)
+    whois_slacking (0.0.4)
       dotenv (~> 2.0.2)
       moneta (~> 0.8.0)
       multi_xml (~> 0.5)

data/README.md

@@ -21,9 +21,10 @@ gem install whois_slacking
 ```
 Update the .env file with the proper tokens
 
-Make the following call in a ruby file and call it in cron job that runs daily:
+Call the slackcron.rb file in the base directory (or create your own cronscript).
+Create a cronjob that calls the script e.g.:
 ```
-WhoIsSlacking::Start.now
+0 8 * * * /bin/bash -l -c 'rvm use 2.1.5 ; . $HOME/path-to-env/.env ; ruby $HOME/path-to-cronscript/slackcron.rb > /tmp/slackcron.log'
 ```
 
 ## Contribution

data/lib/whois_slacking.rb

@@ -61,7 +61,7 @@ module WhoIsSlacking
             task.current_state != 'unestimated' &&
             task.current_state != 'unscheduled' &&
             task.current_state != 'accepted' 
-          WhoIsSlacking::DataTools.save_task(project_object.name, task.id, task.name, task.owned_by, task.current_state, task.accepted_at )
+          WhoIsSlacking::DataTools.save_task(project_object.name, task.id, task.name, task.owned_by, task.current_state, task.accepted_at, task.url )
         end
       end
     end
@@ -124,17 +124,18 @@ module WhoIsSlacking
       end 
     end 
 
-    def self.save_task(project, task_id, task, user, current_state, accepted_at, options={})
+    def self.save_task(project, task_id, task, user, current_state, accepted_at, url, options={})
 
       # dont use accepted_at
       accepted_at = accepted_at 
+      url = url 
       created_dt = DateTime.now.to_s
       start_dt = DateTime.now.to_s
       updated_dt = created_dt
       current_state = current_state 
       active = true
       message = nil 
-      task_entity = {project: project, task_id: task_id, task: task, user: user, current_state: current_state, active: active, start_dt: start_dt, created_dt: created_dt, accepted_at: accepted_at, updated_dt: updated_dt}
+      task_entity = {project: project, task_id: task_id, task: task, user: user, current_state: current_state, url: url, active: active, start_dt: start_dt, created_dt: created_dt, accepted_at: accepted_at, updated_dt: updated_dt}
       # initialize datastore type
       store = whois_store
       mutex = Moneta::Mutex.new(store, 'moneta')
@@ -143,7 +144,9 @@ module WhoIsSlacking
         entity_exists = store[mkey]
 
         if entity_exists && 
-            entity_exists[:current_state] != 'finished' #   -- if task/username combo exists and is not delivered/finished in db
+            entity_exists[:current_state] != 'finished' &&
+            entity_exists[:current_state] != 'delivered' && 
+            entity_exists[:current_state] != 'accepted' #   -- if task/username combo exists and is not delivered/finished in db
           #     -- calculate how long (realtime) the task has been worked on in days (.5, 1.5 etc)
           #     -- update time on task
           #     -- save who started task
@@ -152,45 +155,58 @@ module WhoIsSlacking
           # keep created at date 
 
           start_dt = entity_exists[:start_dt].to_datetime
+          puts "start_dt in db was #{start_dt}"
 
           days_worked = TimeDifference.between(DateTime.now,  start_dt).in_days 
           if days_worked >= 1.0 
-            message = "*#{user} has spent #{days_worked.to_i} days working on #{task}*"
+            message = "*#{user}* has spent *#{days_worked.to_i} days* working on <#{url}|#{task}>"
           else # show hours instead
-            hours_worked = TimeDifference.between(DateTime.now,  start_dt).in_hours
-            message = "*#{user} has spent #{hours_worked.to_i} hours working on #{task}*"
+            # hours_worked = TimeDifference.between(DateTime.now,  start_dt).in_hours
+            # message = "*#{user} has spent #{hours_worked.to_i} hours working on #{task}*"
+            message = "*#{user}* has spent *less than a day* working on <#{url}|#{task}>"
           end
           # keep the created dt and start_dt
           created_dt = entity_exists[:created_dt]
           start_dt = entity_exists[:start_dt].to_datetime
           task_entity["created_dt"] = created_dt
-          task_entity["start_dt"] = start_dt
+          task_entity["start_dt"] = start_dt.to_s
+          puts "start_dt in db will be #{start_dt}"
           store[mkey] = task_entity 
 
+        elsif entity_exists && entity_exists[:current_state] == 'delivered' && current_state == 'delivered'
+          start_dt = entity_exists[:start_dt].to_datetime
+          puts "start_dt in db for delivered state was #{start_dt}"
+
+          days_worked = TimeDifference.between(DateTime.now,  start_dt).in_days 
+          if days_worked >= 1.0 
+            message = "Task <#{url}|#{task}> has been in a *delivered state for #{days_worked.to_i} days*"
+          else
+            message = "Task <#{url}|#{task}> has been in a *delivered state for less than a day*"
+          end
         elsif entity_exists && entity_exists[:current_state] == 'finished' 
-          # don't do anything
+          # don't do anything if entity already exists as delivered
         else #   -- if task/username combo does not exist in db
           #     -- save project/task/user 
           #     -- save when task was started
           #     -- save who started task
           store[mkey] = task_entity 
 
-          if current_state != "finished" #     -- if task is not-completed in pivotal
+          if current_state != "finished" && current_state != "delivered" #     -- if task is not-completed in pivotal and is not in db
             #       -- save status as status not-completed
             #       -- publish message task/user started today
             #         -- "Today Johnny started 'As a user I should be able to log in'"
-            message = "*Today #{user} started #{task}*"
+            message = "Now tracking *#{user}* as doing <#{url}|#{task}>"
 
-          elsif current_state == "finished" #     -- if task is completed in pivotal
+          elsif current_state == "finished" #     -- if task is completed in pivotal and is not in db
             #       -- save status as status completed
             #       -- publish message task/user started today
             #         -- "Today Johnny completed 'As a user I should be able to log in'"
-            message = "*Today #{user} finished #{task}*"
+            message = "Today *#{user} finished* <#{url}|#{task}> and it is *waiting to be delivered*"
           elsif current_state == "delivered" #     -- if task is completed in pivotal
             #       -- save status as status completed
             #       -- publish message task/user started today
             #         -- "Today Johnny completed 'As a user I should be able to log in'"
-            message = "*Today #{user} delivered #{task}*"
+            message = "Today *#{user} delivered* <#{url}|#{task}> and it is *waiting to be accepted*"
           end
 
         end

data/lib/whois_slacking/version.rb

@@ -1,3 +1,3 @@
 module WhoIsSlacking 
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/spec/client_spec.rb

@@ -51,6 +51,10 @@ describe "json client" do
   def current_state
     'started'
   end
+
+  def url 
+    'https://www.pivotaltracker.com/story/show/98984232'
+  end
  
   def accepted_dt
     DateTime.now 
@@ -88,7 +92,7 @@ describe "json client" do
   end
 
   it "should save a project task" do
-    WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)
+    WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
     expect(@store.key?(whois_key)).to eql true
   end
 
@@ -101,17 +105,22 @@ describe "json client" do
     expect(WhoIsSlacking::SlackWrapper.post_to_slack(message)["ok"]).to eql true 
   end
 
-  it "should post to slack 'Today xx started xxx' when a non completed task exists in pivotal but not in the db" do
-    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)
-      .fetch("message", nil).fetch("text", nil)) .to eql "*Today user started task*"
+  it "should post to slack 'Now tracking xx as doing xxx' when a non completed task exists in pivotal but not in the db" do
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "Now tracking *user* as doing <https://www.pivotaltracker.com/story/show/98984232|task>" 
   end
 
   it "should post to slack 'Today xx completed xxx' when a completed task exists in pivotal but not in the db" do
     current_state = 'finished'
-    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)
-      .fetch("message", nil).fetch("text", nil)) .to eql "*Today user finished task*"
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "Today *user finished* <https://www.pivotaltracker.com/story/show/98984232|task> and it is *waiting to be delivered*" 
   end
 
+  it "should post to slack 'Today xx delivered xxx' when a delivered task exists in pivotal but not in the db" do
+    current_state = 'delivered'
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "Today *user delivered* <https://www.pivotaltracker.com/story/show/98984232|task> and it is *waiting to be accepted*" 
+  end
 
   def direct_save(start_dt = (DateTime.now - 1), cstate = current_state)
     accepted_at = accepted_at 
@@ -131,21 +140,30 @@ describe "json client" do
   it "should not post to slack when a finished task exists in pivotal *and* in the db" do
     accepted_dt = DateTime.now - 1
     direct_save(accepted_dt, 'finished')
-    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)).to eql nil
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)).to eql nil
+  end
+
+  it "should post to slack when a delivered task exists in pivotal *and* is still in the db" do
+    accepted_dt = DateTime.now - 1
+    current_state = 'delivered'
+    puts current_state 
+    direct_save(accepted_dt, 'delivered')
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "Task <https://www.pivotaltracker.com/story/show/98984232|task> has been in a *delivered state for 1 days*"  
   end
 
   it "should post to slack 'xx has spent xx days working on xxx' when a non completed task exists in pivotal and in the db" do
     accepted_dt = DateTime.now - 1
     direct_save
-    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)
-      .fetch("message", nil).fetch("text", nil)) .to eql "*user has spent 1 days working on task*"  
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "*user* has spent *1 days* working on <https://www.pivotaltracker.com/story/show/98984232|task>"  
   end
 
   it "should post to slack 'xx has spent xx hours working on xxx' when a non completed task exists in pivotal and in the db and the days worked is less than 1" do
     start_dt = DateTime.now - 0.5
     direct_save(start_dt)
-    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt)
-      .fetch("message", nil).fetch("text", nil)) .to eql "*user has spent 12 hours working on task*"  
+    expect(WhoIsSlacking::DataTools.save_task(project, task_id, task, user, current_state, accepted_dt, url)
+      .fetch("message", nil).fetch("text", nil)) .to eql "*user* has spent *less than a day* working on <https://www.pivotaltracker.com/story/show/98984232|task>" 
   end
 
   it "should run through all tasks for a project, sending a message into slack for each of them" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whois_slacking
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - W Watson