boty 0.0.17.1 → 0.1.0

data/spec/boty/slack/users_spec.rb

@@ -1,44 +1,70 @@
 module Boty
   module Slack
     RSpec.describe Users do
-      subject(:users) { described_class.new }
-
-      let(:action) { :info }
-
-      let(:url) {
+      def url_for(action)
         "https://slack.com/api/users.#{action}?"+
         "token=#{ENV['SLACK_BOT_API_TOKEN']}"
-      }
+      end
+
+      subject(:users) { described_class.new }
 
       before do
-        allow(Slack::URL).to receive(:get).with(url + "&user=U023BECGF").
+        allow(Slack::URL).to receive(:get).with(url_for(:info) + "&user=U123456").
+          and_return(
+            "ok" => true,
+            "user" => {
+              "id" => "U123456",
+              "name" => "julian"
+            }
+        )
+
+        allow(Slack::URL).to receive(:get).with(url_for(:list)).
           and_return(
             {
               "ok" => true,
-              "user" => {
-                  "id" => "U023BECGF",
+              "members" => [
+                {
+                  "id"   => "U023BECGF",
+                  "name" => "bobby"
+                },
+                {
+                  "id" => "U123456",
                   "name" => "julian"
-              }
+                }
+              ]
             }
         )
       end
 
       describe "#info" do
         it "calls Slack::URL get with token and user" do
-          expect(Slack::URL).to receive(:get).with(url + "&user=U023BECGF")
+          expect(Slack::URL).to receive(:get).with(url_for(:info) + "&user=U123456")
 
-          users.info "U023BECGF"
+          users.info "U123456"
         end
 
         it "returns a channel object with the im channel information" do
-          expect(Slack::URL).to receive(:get).with(url + "&user=U023BECGF")
+          expect(Slack::URL).to receive(:get).with(url_for(:info) + "&user=U123456")
 
-          user = users.info("U023BECGF")
+          user = users.info("U123456")
 
-          expect(user.id).to eq "U023BECGF"
+          expect(user.id).to eq "U123456"
           expect(user.name).to eq "julian"
         end
       end
+
+      describe "#list" do
+        it "retrieves the users list" do
+          list = Slack.users.list
+          expect(list.map(&:name)).to eq ["bobby", "julian"]
+        end
+      end
+
+      describe "#by_name" do
+        it "uses the users.list to discover info on a given user.name" do
+          expect(Slack.users.by_name("julian").id).to eq "U123456"
+        end
+      end
     end
   end
 end

data/spec/happy_path_spec.rb

@@ -15,7 +15,7 @@ module Boty
     end
 
     def message(message)
-      faye.message(message, {user: current_user_id})
+      faye.message(message, user: current_user_id)
     end
 
     let(:bot_name) { "boty" }
@@ -25,25 +25,35 @@ module Boty
     let(:current_user) { user_name }
     let(:current_user_id) { user_id }
 
-    before do
-      @dir = Dir.pwd
-      dry_run
-      capture(:stdout) do
-        create_bot bot_name, company: "omg", api_key: "lol"
-      end
-    end
-
     after do
-      Dir.chdir @dir
       Boty.locale = :en
     end
 
-    it "creates the bot directory" do
-      expect(Dir.exists? bot_name).to eq true
+    context "creating a new project from template" do
+      it "creates the project" do
+        capture(:stdout) do
+          expect(cli).to receive(:run).with "chmod +x bot"
+          expect(cli).to receive(:run).with "bundle install"
+          allow(cli).to receive(:ask).and_return "omg", "lol"
+          cli.new bot_name
+        end
+        expect(Dir.exists? bot_name).to eq true
+
+        Dir.chdir bot_name
+
+        expect(File.read ".env.local").to eq %{SLACK_COMPANY=omg
+SLACK_BOT_API_TOKEN=lol
+}
+      end
     end
 
     context "on the bot directory" do
       before do
+        capture(:stdout) do
+          dry_run
+          create_bot bot_name, company: "omg", api_key: "lol"
+        end
+
         Dir.chdir bot_name
       end
 

data/spec/script/i18n_spec.rb

@@ -5,18 +5,24 @@ RSpec.describe "I18n on default scripts", :session do
 
   it "describes scripts in :en locale (default)" do
     session = Boty::Session.new
+    _know_how = nil
     session.start do |bot|
-      expect(bot.know_how["knows"]).
-        to eq "List all the commands known by this bot."
+      _know_how = know_how
     end
+
+    expect(_know_how["knows"]).
+      to eq "List all the commands known by this bot."
   end
 
   it "describes scripts in :pt-br local when forced" do
     Boty.locale = :"pt-br"
     session = Boty::Session.new
+    _know_how = nil
     session.start do |bot|
-      expect(bot.know_how["knows"]).
-        to eq "Lista os comandos conhecidos por esse bot."
+      _know_how = know_how
     end
+
+    expect(_know_how["knows"]).
+      to eq "Lista os comandos conhecidos por esse bot."
   end
 end

data/spec/script/pug_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe "script/pug", :session do
     before do
       requests.get("/random") { |env|
         [200,
-         { "Content-Type" => "application/json;charset=utf-8" },
+         {"Content-Type" => "application/json;charset=utf-8"},
          {pug: "some_pug"}.to_json]
       }
     end

data/spec/spec_helper.rb

@@ -18,8 +18,11 @@ RSpec.configure do |config|
   config.include ThorSupport, thor: true
   config.include TemplateProjectSupport, project: true
   config.include FaradaySupport, faraday: true
-
+  config.include LoggerSupport, logger: true
   config.include SlackSupport::Users, users: true
 
-  Boty::Logger.adapter = Boty::Logger::Null.new
+  null_logger = Boty::Logger::Null.new
+  config.before do
+    Boty::Logger.adapter = null_logger
+  end
 end

data/spec/support/logger_support.rb

@@ -0,0 +1,20 @@
+module LoggerSupport
+  def self.included(base)
+    base.instance_eval do
+      let(:logger) { Boty::Logger.adapter }
+
+      before do
+        @adapter = Boty::Logger.adapter
+        Boty::Logger.adapter = Boty::Logger::Memory.new
+      end
+
+      around do |example|
+        example.run
+      end
+
+      after do
+        Boty::Logger.adapter = @adapter
+      end
+    end
+  end
+end

data/spec/support/session_support.rb

@@ -10,8 +10,8 @@ module SessionSupport
       include FayeSupport
       include SlackSupport::Users
 
-      let(:bot) { ::Boty::ScriptDSL.new @session.bot }
-      let(:dsl) { bot }
+      let(:dsl) { ::Boty::DSL.new @session.bot }
+      let(:bot) { dsl.bot }
       let(:bot_name) { "jeeba" }
       let(:bot_id) { "U1234" }
       let(:rtm_ws_url) { "ws://example.org/slack/sse/url" }

data/template/project/bot.tt

@@ -1,21 +1,12 @@
 #!/usr/bin/env ruby
 require "./<%= bot_name %>"
 
-def set_locale(locale)
-  begin
-    Boty.locale = locale || :en
-  rescue I18n::InvalidLocale
-    Boty.locale = :en
-  end
-  Boty::Locale.reload
-end
-
-set_locale ARGV.pop
+Boty.locale = ARGV.pop || :en
 
 session = Boty::Session.new
-session.start do |bot|
-  bot.desc bot.name, I18n.t("template.presence", bot_name: bot.name)
-  bot.hear(/#{bot.name}/i) do
+session.start do
+  desc name, I18n.t("template.presence", bot_name: name)
+  hear(/#{name}/i) do
     next if message_from_me?
     say I18n.t "template.hello", user_name: user.name
   end

data/template/project/script/ping.rb

@@ -1,11 +1,11 @@
-respond(/ping/i) do
+command(/ping/i) do
   say "pong"
 end
 
-respond(/echo (.*)$/i) do |message|
+command(/echo (.*)$/i) do |message|
   say message.match[1]
 end
 
-respond(/time/i) do
+command(/time/i) do
   say "reeepitaaa: #{Time.now}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boty
 version: !ruby/object:Gem::Version
-  version: 0.0.17.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ricardo Valeriano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -173,23 +173,28 @@ files:
 - bin/console
 - bin/setup
 - boty.gemspec
+- docs/images/readme-01-screen-integration.png
+- docs/images/readme-02-screen-integration.png
+- docs/images/readme-03-screen-integration.png
 - exe/boty
 - gemfiles/Gemfile.rbx
 - lib/boty.rb
 - lib/boty/action.rb
 - lib/boty/bot.rb
 - lib/boty/cli.rb
+- lib/boty/dsl.rb
+- lib/boty/eventable.rb
+- lib/boty/http.rb
 - lib/boty/locale.rb
 - lib/boty/logger.rb
-- lib/boty/message.rb
 - lib/boty/rspec.rb
-- lib/boty/script_dsl.rb
 - lib/boty/script_loader.rb
 - lib/boty/session.rb
 - lib/boty/slack.rb
 - lib/boty/slack/channel.rb
 - lib/boty/slack/chat.rb
 - lib/boty/slack/im.rb
+- lib/boty/slack/message.rb
 - lib/boty/slack/rtm.rb
 - lib/boty/slack/url.rb
 - lib/boty/slack/user.rb
@@ -204,12 +209,15 @@ files:
 - script/remember.rb
 - spec/boty/bot_spec.rb
 - spec/boty/cli_spec.rb
+- spec/boty/dsl_spec.rb
+- spec/boty/http_spec.rb
 - spec/boty/logger_spec.rb
-- spec/boty/message_spec.rb
 - spec/boty/rspec_spec.rb
+- spec/boty/script_loader_spec.rb
 - spec/boty/session_spec.rb
 - spec/boty/slack/chat_spec.rb
 - spec/boty/slack/im_spec.rb
+- spec/boty/slack/message_spec.rb
 - spec/boty/slack/rtm_spec.rb
 - spec/boty/slack/url_spec.rb
 - spec/boty/slack/users_spec.rb
@@ -224,6 +232,7 @@ files:
 - spec/support/faraday_support.rb
 - spec/support/faye_support.rb
 - spec/support/file_system_matchers.rb
+- spec/support/logger_support.rb
 - spec/support/session_support.rb
 - spec/support/slack_support.rb
 - spec/support/template_project_support.rb

data/lib/boty/message.rb

@@ -1,27 +0,0 @@
-module Boty
-  class Message
-    attr_accessor :text, :user, :channel, :ts, :team
-    attr_reader :match
-
-    def initialize(data, match: nil)
-      @text = data["text"]
-      @user = Slack.users.info data["user"]
-      @channel = data["channel"]
-      @ts = data["ts"]
-      @team = data["team"]
-      @match = match
-    end
-
-    def match!(regex)
-      @match = regex.match @text
-    end
-
-    def from?(author)
-      if author.respond_to? :id
-        @user.id == author.id
-      else
-        @user.id == author
-      end
-    end
-  end
-end

data/lib/boty/script_dsl.rb

@@ -1,80 +0,0 @@
-require "forwardable"
-
-module Boty
-  class ScriptDSL
-    INSTANCES = {}
-    private_constant :INSTANCES
-    class << self
-      alias original_constructor new
-    end
-
-    attr_accessor :bot
-
-    extend Forwardable
-    def_delegators :bot, :desc, :respond, :name, :brain, :know_how, :im, :say,
-      :match, :no_match, :no_respond, :no
-    def_delegators :message, :user, :channel
-
-    def self.new(bot)
-      INSTANCES[bot] ||= original_constructor bot
-    end
-
-    def initialize(bot)
-      @bot = bot
-    end
-
-    def message
-      @bot.trigger_message
-    end
-
-    def message_from_me?
-      message.from? @bot
-    end
-
-    def hear(*args, &block)
-      match(*args, &block)
-    end
-
-    def command(*args, &block)
-      respond(*args, &block)
-    end
-
-    def match_im(*args, &block)
-      command(*args, &block)
-    end
-
-    def http
-      @http ||= HTTP.new
-    end
-  end
-
-  class HTTP
-    [:get, :post, :put, :delete, :head, :patch, :options].each do |verb|
-      define_method verb do |url, params = {}|
-        response = connection verb, url, params
-        handle_response response
-      end
-    end
-
-    private
-
-    def connection(verb, url, params)
-      uri = URI url
-      Faraday.new(url: "#{uri.scheme}://#{uri.host}") { |builder|
-        builder.adapter(*Faraday.default_adapter)
-      }.public_send(verb) { |req|
-        req.url uri.path, params
-      }
-    end
-
-    def handle_response(response)
-      # TODO: use a response parser accordingly to the
-      body = response.body
-      if /application\/json/.match response.headers["Content-Type"]
-        JSON.parse body
-      else
-        body
-      end
-    end
-  end
-end

data/spec/boty/message_spec.rb

@@ -1,32 +0,0 @@
-module Boty
-  RSpec.describe Message, :users do
-    subject(:message) { described_class.new message_json }
-
-    let(:user_id) { "U7777" }
-    let(:user_name) { "julian" }
-
-    let(:message_json) {{
-      "type" => "message",
-      "text" => "omg lol bbq",
-      "user" => "U7777",
-      "channel" => "333",
-      "ts" => "1234",
-      "team" => "3452"
-    }}
-
-    it "uses Slack.users.info to create a User instance" do
-      expect(message.user.id).to eq "U7777"
-      expect(message.user.name).to eq "julian"
-    end
-
-    describe "#from?" do
-      it "returns true if the param is the message author" do
-        expect(message.from? "U7777").to eq true
-      end
-
-      it "returns true if the param `respond_to? :id` returning the message author" do
-        expect(message.from? OpenStruct.new(id: "U7777")).to eq true
-      end
-    end
-  end
-end