lita-team 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 945a062a82c4db6d0ea8824c4ee928502a508384
-  data.tar.gz: 6414a2e1ae7767ef9ffab0efd839d922a7eb16f2
+  metadata.gz: 3063c4d97c93c2aec90fbca5c5cd0187be403e8b
+  data.tar.gz: c81a31b980fbac18ce25920033b69518657348d9
 SHA512:
-  metadata.gz: 680f79f31744eaaf86e3e7c651c7e01fdb2e9c34f5a8499e4eaa384f08ac60cc36e8079a0fe8c4201b50a62cc452ff0df5470daf1af9e100c4e2094b5f588436
-  data.tar.gz: eada9f3670d8ccc07d56bce78e093dfa68a260824cdf10c4d8b1fdbe8a036989903bef727bca68b420c228ebd321d264d9b547b7d5bfb77f78e7d2567aea02f6
+  metadata.gz: 3018309d640b32259fde30ccaf450515615fbd620398908b1ae0e5f3c887a4ad311f27f433f8e06b5e389efedcb0803f774cccf650eeaf9daeac0547118020c1
+  data.tar.gz: cde6b8fbcf5a6255981927ee0e50082398ada98d0ba33df1af6a58e331e40e8794160582445a549e0263c7071050f6a4a974bcaa22f9fb4e1f4f39576e77ce79

data/.ruby-gemset

@@ -0,0 +1 @@
+lita-team

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.0.0
+  - 2.2.2
 script: bundle exec rake
 before_install:
   - gem update --system

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/EdgarOrtegaRamirez/lita-team.svg?branch=master)](https://travis-ci.org/EdgarOrtegaRamirez/lita-team)
 [![Coverage Status](https://coveralls.io/repos/EdgarOrtegaRamirez/lita-team/badge.svg?branch=master)](https://coveralls.io/r/EdgarOrtegaRamirez/lita-team?branch=master)
+[![Code Climate](https://codeclimate.com/github/EdgarOrtegaRamirez/lita-team/badges/gpa.svg)](https://codeclimate.com/github/EdgarOrtegaRamirez/lita-team)
 
 Create and manage the members of a team with Lita
 

data/lib/lita/actions/add_member_to_team.rb

@@ -0,0 +1,38 @@
+module Lita
+  module Actions
+    class AddMemberToTeam < Base
+
+      def call
+        if team
+          count_was = team.members.count
+          if create_member
+            response.reply render_template(:member_added_to_team, member: member_name, team: team_name, count: count_was)
+          else
+            response.reply t(:member_already_in_team, member: member_name, team: team_name)
+          end
+        else
+          response.reply t(:team_not_found, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[1]
+      end
+
+      def member_name
+        response.match_data[3] || response.user.mention_name
+      end
+
+      def team
+        @team ||= Lita::Team.find(team_name)
+      end
+
+      def create_member
+        Lita::Store::Member.create(member_name: member_name, team_name: team_name)
+      end
+
+    end
+  end
+end

data/lib/lita/actions/base.rb

@@ -0,0 +1,28 @@
+module Lita
+  module Actions
+    class Base
+      include Lita::Handler::Common
+
+      attr :response
+      @@template_root = nil
+
+      def initialize(response)
+        @response = response
+      end
+
+      def self.template_root(path = nil)
+        @@template_root = path if path
+        @@template_root
+      end
+
+      def robot
+        response.message.instance_variable_get :"@robot"
+      end
+
+      def translate(key, options = {})
+        I18n.translate("lita.handlers.team.#{key}", options)
+      end
+      alias_method :t, :translate
+    end
+  end
+end

data/lib/lita/actions/clear_team.rb

@@ -0,0 +1,30 @@
+module Lita
+  module Actions
+    class ClearTeam < Base
+
+      def call
+        if team_exists?
+          destroy_members
+          response.reply t(:team_cleared, name: team_name)
+        else
+          response.reply t(:team_not_found, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[1]
+      end
+
+      def team_exists?
+        Lita::Team.find(team_name)
+      end
+
+      def destroy_members
+        Lita::Store::Member.destroy_all(team_name: team_name)
+      end
+
+    end
+  end
+end

data/lib/lita/actions/create_team.rb

@@ -0,0 +1,21 @@
+module Lita
+  module Actions
+    class CreateTeam < Base
+
+      def call
+        if Lita::Store::Team.create(team_name)
+          response.reply t(:team_created, name: team_name)
+        else
+          response.reply t(:team_already_exists, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[1]
+      end
+
+    end
+  end
+end

data/lib/lita/actions/delete_team.rb

@@ -0,0 +1,21 @@
+module Lita
+  module Actions
+    class DeleteTeam < Base
+
+      def call
+        if Lita::Store::Team.destroy(team_name)
+          response.reply t(:team_deleted, name: team_name)
+        else
+          response.reply t(:team_not_found, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[2]
+      end
+
+    end
+  end
+end

data/lib/lita/actions/list_team.rb

@@ -0,0 +1,25 @@
+module Lita
+  module Actions
+    class ListTeam < Base
+
+      def call
+        if team
+          response.reply render_template(:list_team, team: team)
+        else
+          response.reply t(:team_not_found, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[1]
+      end
+
+      def team
+        @team ||= Lita::Team.find(team_name)
+      end
+
+    end
+  end
+end

data/lib/lita/actions/list_teams.rb

@@ -0,0 +1,11 @@
+module Lita
+  module Actions
+    class ListTeams < Base
+
+      def call
+        response.reply render_template(:list_teams, teams: Lita::Team.all)
+      end
+
+    end
+  end
+end

data/lib/lita/actions/remove_member_from_team.rb

@@ -0,0 +1,37 @@
+module Lita
+  module Actions
+    class RemoveMemberFromTeam < Base
+
+      def call
+        if team
+          if destroy_member
+            response.reply render_template(:member_removed_from_team, member: member_name, team: team)
+          else
+            response.reply t(:member_already_out_of_team, member: member_name, team: team_name)
+          end
+        else
+          response.reply t(:team_not_found, name: team_name)
+        end
+      end
+
+      private
+
+      def team_name
+        response.match_data[1]
+      end
+
+      def member_name
+        response.match_data[3] || response.user.mention_name
+      end
+
+      def team
+        @team ||= Lita::Team.find(team_name)
+      end
+
+      def destroy_member
+        Lita::Store::Member.destroy(member_name: member_name, team_name: team_name)
+      end
+
+    end
+  end
+end

data/lib/lita/handlers/team.rb

@@ -1,116 +1,55 @@
 module Lita
   module Handlers
-    class Team < Handler
+    class Team
+      extend Lita::Handler::ChatRouter
 
-      route(/create (\S*) team/i, :create_team, command: true, help: {
+      route(/create (\S*) team/i, command: true, help: {
         "create <name> team" => "create team called <name>"
-      })
-      route(/(delete|remove) (\S*) team/i, :delete_team, command: true, help: {
+      }) do |response|
+        Lita::Actions::CreateTeam.new(response).call
+      end
+
+      route(/(delete|remove) (\S*) team/i, command: true, help: {
         "delete <name> team" => "delete team called <name>",
         "remove <name> team" => "delete team called <name>",
-      })
-      route(/list teams/i, :list_teams, command: true, help: {
+      }) do |response|
+        Lita::Actions::DeleteTeam.new(response).call
+      end
+
+      route(/list teams/i, command: true, help: {
         "list teams" => "list all teams"
-      })
-      route(/(\S*)? team (\+1|add me|add (\S*))/i, :add_member_to_team, command: true, help: {
+      }) do |response|
+        Lita::Actions::ListTeams.new(response).call
+      end
+
+      route(/(\S*) team (\+1|add me|add (\S*))/i, command: true, help: {
         "<name> team +1" => "add me to team",
         "<name> team add me" => "add me to team",
         "<name> team add <user>" => "add user to team",
-      })
-      route(/(\S*)? team (-1|remove me|remove (\S*))/i, :remove_member_from_team, command: true, help: {
+      }) do |response|
+        Lita::Actions::AddMemberToTeam.new(response).call
+      end
+
+      route(/(\S*) team (-1|remove me|remove (\S*))/i, command: true, help: {
         "<name> team -1" => "remove me from team",
         "<name> team remove me" => "remove me from team",
         "<name> team remove <user>" => "remove <user> from team",
-      })
-      route(/(\S*)? team (list|show)/i, :list_team, command: true, help: {
-        "<name> team list" => "list the people in the team",
-        "<name> team show" => "list the people in the team",
-      })
-      route(/(\S*)? team (clear|empty)/i, :clear_team, command: true, help: {
-        "<name> team clear" => "clear team list",
-        "<name> team empty" => "clear team list",
-      })
-
-      def create_team(response)
-        team = Lita::Team.new(response.match_data[1])
-        if redis.hsetnx(team.key, :name, team.name)
-          response.reply t(:team_created, name: team.display_name)
-        else
-          response.reply t(:team_already_exists, name: team.display_name)
-        end
+      }) do |response|
+        Lita::Actions::RemoveMemberFromTeam.new(response).call
       end
 
-      def delete_team(response)
-        team = Lita::Team.new(response.match_data[2])
-        if redis.exists(team.key)
-          redis.del team.key
-          response.reply t(:team_deleted, name: team.display_name)
-        else
-          response.reply t(:team_not_found, name: team.display_name)
-        end
-      end
-
-      def list_teams(response)
-        keys = redis.keys "team*"
-        teams = keys.map do |key|
-          team_data = redis.hgetall(key)
-          Lita::Team.new(team_data["name"])
-        end
-        response.reply render_template(:list_teams, teams: teams)
-      end
-
-      def add_member_to_team(response)
-        team = Lita::Team.new(response.match_data[1])
-        if redis.exists(team.key)
-          user = response.match_data[3] ? response.match_data[3] : response.user.name
-          count_was = redis.scard(team.members_key)
-          if redis.sadd(team.members_key, user)
-            message = t(:member_added_to_team, user: user, team: team.display_name)
-            message << t(:members_in_team, count: count_was) if count_was > 0
-            response.reply message
-          else
-            response.reply t(:member_already_in_team, user: user, team: team.display_name)
-          end
-        else
-          response.reply t(:team_not_found, name: team.display_name)
-        end
-      end
-
-      def remove_member_from_team(response)
-        team = Lita::Team.new(response.match_data[1])
-        if redis.exists(team.key)
-          user = response.match_data[3] ? response.match_data[3] : response.user.name
-          if redis.srem(team.members_key, user)
-            remaining = redis.scard(team.members_key)
-            message = t(:member_removed_from_team, user: user, team: team.display_name)
-            message << t(:members_in_team, count: remaining) if remaining > 0
-            response.reply message
-          else
-            response.reply t(:member_already_out_of_team, user: user, team: team.display_name)
-          end
-        else
-          response.reply t(:team_not_found, name: team.display_name)
-        end
-      end
-
-      def list_team(response)
-        team = Lita::Team.new(response.match_data[1])
-        if redis.exists(team.key)
-          members = redis.smembers(team.members_key)
-          response.reply render_template(:list_team, team: team.display_name, members: members)
-        else
-          response.reply t(:team_not_found, name: team.display_name)
-        end
+      route(/(\S*) team (list|show)/i, command: true, help: {
+        "<name> team list" => "list the people in the team",
+        "<name> team show" => "list the people in the team",
+      }) do |response|
+        Lita::Actions::ListTeam.new(response).call
       end
 
-      def clear_team(response)
-        team = Lita::Team.new(response.match_data[1])
-        if redis.exists(team.key)
-          redis.del(team.members_key)
-          response.reply t(:team_cleared, name: team.display_name)
-        else
-          response.reply t(:team_not_found, name: team.display_name)
-        end
+      route(/(\S*) team (clear|empty)/i, command: true, help: {
+        "<name> team clear" => "clear team list",
+        "<name> team empty" => "clear team list",
+      }) do |response|
+        Lita::Actions::ClearTeam.new(response).call
       end
     end
 

data/lib/lita/member.rb

@@ -0,0 +1,17 @@
+module Lita
+  class Member
+    attr :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    class << self
+      def all(team_name:)
+        Lita::Store::Member.all(team_name: team_name).map do |data|
+          new(data["name"])
+        end
+      end
+    end
+  end
+end

data/lib/lita/store/member.rb

@@ -0,0 +1,32 @@
+module Lita
+  module Store
+    module Member
+      extend self
+
+      def redis
+        @redis ||= Redis::Namespace.new("handlers:team:member", redis: Lita.redis)
+      end
+
+      def create(member_name:, team_name:)
+        redis.hsetnx("#{ team_name }:#{ member_name }", :name, member_name)
+      end
+
+      def destroy(member_name:, team_name:)
+        redis.del("#{ team_name }:#{ member_name }") != 0
+      end
+
+      def destroy_all(team_name:)
+        redis.keys("#{ team_name }:*").each do |key|
+          redis.del(key)
+        end
+      end
+
+      def all(team_name:)
+        redis.keys("#{ team_name }:*").sort.map do |key|
+          redis.hgetall(key)
+        end
+      end
+
+    end
+  end
+end

data/lib/lita/store/team.rb

@@ -0,0 +1,34 @@
+module Lita
+  module Store
+    module Team
+      extend self
+
+      def redis
+        @redis ||= Redis::Namespace.new("handlers:team:team", redis: Lita.redis)
+      end
+
+      def find(team_name)
+        redis.hgetall(team_name)
+      end
+
+      def exists?(team_name)
+        redis.exists(team_name)
+      end
+
+      def create(team_name)
+        redis.hsetnx(team_name, :name, team_name)
+      end
+
+      def destroy(team_name)
+        redis.del(team_name) != 0
+      end
+
+      def all
+        redis.keys.sort.map do |key|
+          redis.hgetall(key)
+        end
+      end
+
+    end
+  end
+end

data/lib/lita/team.rb

@@ -1,15 +1,27 @@
 module Lita
-  Team = Struct.new(:name) do
-    def key
-      "team:#{name}"
+  class Team
+    attr :name
+
+    def initialize(name)
+      @name = name
     end
 
-    def members_key
-      "members:#{name}"
+    class << self
+      def find(name)
+        return nil unless Lita::Store::Team.exists?(name)
+        new(Lita::Store::Team.find(name)["name"])
+      end
+
+      def all
+        Lita::Store::Team.all.map do |data|
+          new(data["name"])
+        end
+      end
     end
 
-    def display_name
-      "#{name} team"
+    def members
+      @members ||= Lita::Member.all(team_name: name)
     end
+
   end
 end

data/lib/lita-team.rb

@@ -4,10 +4,22 @@ Lita.load_locales Dir[File.expand_path(
   File.join("..", "..", "locales", "*.yml"), __FILE__
 )]
 
-require "lita/team"
 require "lita/handlers/team"
+require "lita/actions/base"
+require "lita/actions/create_team"
+require "lita/actions/delete_team"
+require "lita/actions/list_team"
+require "lita/actions/clear_team"
+require "lita/actions/list_teams"
+require "lita/actions/add_member_to_team"
+require "lita/actions/remove_member_from_team"
+require "lita/store/team"
+require "lita/store/member"
+require "lita/team"
+require "lita/member"
 
-Lita::Handlers::Team.template_root File.expand_path(
-  File.join("..", "..", "templates"),
- __FILE__
+template_root = File.expand_path(
+  File.join("..", "..", "templates"), __FILE__
 )
+Lita::Actions::Base.template_root template_root
+Lita::Handlers::Team.template_root template_root

data/lita-team.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-team"
-  spec.version       = "0.1.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Edgar Ortega"]
   spec.email         = ["edgarortegaramirez@gmail.com"]
   spec.description   = "create and manage the members of a team with Lita"
@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency "lita", ">= 4.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/locales/en.yml

@@ -4,16 +4,19 @@ en:
       team:
         teams_title: "Teams:"
         no_teams_has_been_created: "No team has been created so far"
-        team_not_found: "%{name} does not exist"
-        team_created: "%{name} created, add some people to it"
-        team_deleted: "%{name} deleted"
-        team_already_exists: "%{name} already exists"
-        member_already_in_team: "%{user} already in the %{team}"
-        member_added_to_team: "%{user} added to the %{team}"
+        team_not_found: "%{name} team does not exist"
+        team_created: "%{name} team created, add some people to it"
+        team_deleted: "%{name} team deleted"
+        team_already_exists: "%{name} team already exists"
+        member_already_in_team: "%{member} already in the %{team} team"
+        member_added_to_team: "%{member} added to the %{team} team"
         members_in_team:
           one: ", 1 other is in"
           other: ", %{count} others are in"
-        member_already_out_of_team: "%{user} already out of the %{team}"
-        member_removed_from_team: "%{user} removed from the %{team}"
-        team_empty: "There is no one in the %{team} currently"
-        team_cleared: "%{name} cleared"
+        member_already_out_of_team: "%{member} already out of the %{team} team"
+        member_removed_from_team: "%{member} removed from the %{team} team"
+        team_empty: "There is no one in the %{team} team currently"
+        team_cleared: "%{name} team cleared"
+        team_summary:
+          one: "%{name} (1 member)"
+          other: "%{name} (%{count} members)"

data/spec/lita/handlers/team_spec.rb

@@ -1,23 +1,6 @@
 require "spec_helper"
 
 describe Lita::Handlers::Team, lita_handler: true do
-  describe "routes" do
-    it { is_expected.to route_command("create testing team").to(:create_team) }
-    it { is_expected.to route_command("delete testing team").to(:delete_team) }
-    it { is_expected.to route_command("remove testing team").to(:delete_team) }
-    it { is_expected.to route_command("list teams").to(:list_teams) }
-    it { is_expected.to route_command("testing team add person").to(:add_member_to_team) }
-    it { is_expected.to route_command("testing team add me").to(:add_member_to_team) }
-    it { is_expected.to route_command("testing team +1").to(:add_member_to_team) }
-    it { is_expected.to route_command("testing team remove person").to(:remove_member_from_team) }
-    it { is_expected.to route_command("testing team remove me").to(:remove_member_from_team) }
-    it { is_expected.to route_command("testing team -1").to(:remove_member_from_team) }
-    it { is_expected.to route_command("testing team list").to(:list_team) }
-    it { is_expected.to route_command("testing team show").to(:list_team) }
-    it { is_expected.to route_command("testing team clear").to(:clear_team) }
-    it { is_expected.to route_command("testing team empty").to(:clear_team) }
-  end
-
   describe "create team" do
     it "creates a new team" do
       send_command "create testing team"
@@ -53,7 +36,7 @@ describe Lita::Handlers::Team, lita_handler: true do
       send_command "create testing team"
       send_command "create qa team"
       send_command "list teams"
-      expect(replies.last).to eq("Teams:\nqa\ntesting\n")
+      expect(replies.last).to eq("Teams:\nqa (0 members)\ntesting (0 members)\n")
     end
 
     context "without teams" do
@@ -178,10 +161,10 @@ describe Lita::Handlers::Team, lita_handler: true do
   describe "list team" do
     it "lists the members in the team" do
       send_command "create testing team"
-      send_command "testing team add john"
       send_command "testing team add james"
+      send_command "testing team add john"
       send_command "testing team list"
-      expect(replies.last).to eq("testing team (2 total):\n1. james\n2. john\n")
+      expect(replies.last).to eq("testing (2 members):\n1. james\n2. john\n")
     end
 
     context "team is empty" do

data/templates/list_team.erb

@@ -1,9 +1,9 @@
-<% if @members.empty? %>
-<%= I18n.translate("lita.handlers.team.team_empty", team: @team) %>
+<% if @team.members.empty? %>
+<%= I18n.t("lita.handlers.team.team_empty", team: @team.name) %>
 <% else %>
-<%= @team %> (<%= @members.count %> total):
-<% @members.each_with_index do |member, i| %>
-<%= i + 1 %>. <%= member %>
+<%= I18n.t("lita.handlers.team.team_summary", name: @team.name, count: @team.members.count) %>:
+<% @team.members.each_with_index do |member, i| %>
+<%= i + 1 %>. <%= member.name %>
 
 <% end %>
 <% end %>

data/templates/list_teams.erb

@@ -1,10 +1,10 @@
 <% if @teams.empty? %>
-<%= I18n.translate("lita.handlers.team.no_teams_has_been_created") %>
+<%= I18n.t("lita.handlers.team.no_teams_has_been_created") %>
 <% else %>
-<%= I18n.translate("lita.handlers.team.teams_title") %>
+<%= I18n.t("lita.handlers.team.teams_title") %>
 
 <% @teams.each do |team| %>
-<%= team.name %>
+<%= I18n.t("lita.handlers.team.team_summary", name: team.name, count: team.members.count) %>
 
 <% end %>
 <% end %>

data/templates/member_added_to_team.erb

@@ -0,0 +1,4 @@
+<%= I18n.t("lita.handlers.team.member_added_to_team", member: @member, team: @team) %>
+<% if @count > 0 %>
+<%= I18n.t("lita.handlers.team.members_in_team", count: @count) %>
+<% end %>

data/templates/member_removed_from_team.erb

@@ -0,0 +1,4 @@
+<%= I18n.t("lita.handlers.team.member_removed_from_team", member: @member, team: @team.name) %>
+<% if @team.members.count > 0 %>
+<%= I18n.t("lita.handlers.team.members_in_team", count: @team.members.count) %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-team
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Edgar Ortega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -131,12 +131,25 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - lib/lita-team.rb
+- lib/lita/actions/add_member_to_team.rb
+- lib/lita/actions/base.rb
+- lib/lita/actions/clear_team.rb
+- lib/lita/actions/create_team.rb
+- lib/lita/actions/delete_team.rb
+- lib/lita/actions/list_team.rb
+- lib/lita/actions/list_teams.rb
+- lib/lita/actions/remove_member_from_team.rb
 - lib/lita/handlers/team.rb
+- lib/lita/member.rb
+- lib/lita/store/member.rb
+- lib/lita/store/team.rb
 - lib/lita/team.rb
 - lita-team.gemspec
 - locales/en.yml
@@ -145,6 +158,8 @@ files:
 - templates/.gitkeep
 - templates/list_team.erb
 - templates/list_teams.erb
+- templates/member_added_to_team.erb
+- templates/member_removed_from_team.erb
 homepage: https://github.com/EdgarOrtegaRamirez/lita-team
 licenses:
 - MIT
@@ -156,9 +171,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="