slackbot_frd 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2240170ccf01432884e8c7074a50cb0f64dfa69
-  data.tar.gz: e7c68384e40e0c33eb2ba5e1d4559642165d0406
+  metadata.gz: 5bb68aca99439d177c185daf2ca3009ed2926868
+  data.tar.gz: 8d35953ceec1d879df5d1cd0735cbef50b63f439
 SHA512:
-  metadata.gz: 201766121026759cf6d3d0c49e9251b0fd5513d0101ceb8d89d47e81a8241f6e3eb67f99659c022299d74f5fef8354721e2e9570b32f27791c21c880b46a6689
-  data.tar.gz: de8ed18267661681bb6f9d0238b285ec2d4419b156674db40a94a2b4bf5e3cb82baad9eb7e0c252023338ad28f953a5de034d48545900a17ec6409ba5731d713
+  metadata.gz: a6e04365893893331d10d2a7f4c31cf9f23e78d9a9d18263b051d41a889ad5760133bf376aa28f8816f6518aae187166f8302ec5b658a4066bf69af9fba86177
+  data.tar.gz: f34fed3e5bb0ff20ac207834f17838160322cdc295c52cbc342992319806b597b39751184966e7695b865bdddb7918905e599c99b6217db36c300aa441c1129c

data/bin/slackbot-frd

@@ -3,6 +3,8 @@
 require 'thor'
 require 'json'
 
+require 'active_support/core_ext/string'
+
 require 'slackbot_frd/initializer/bot_starter'
 require 'slackbot_frd/lib/slack_connection'
 require 'slackbot_frd/lib/bot'
@@ -45,8 +47,31 @@ class SlackbotFrdBin < Thor
   long_desc <<-LONGDESC
     new will generate a skeleton for a new slackbot_frd project
   LONGDESC
-  def genconfig
-
+  option :nospec, type: :boolean, aliases: 'n'
+  def new(proj_name)
+    if Dir.exists?(proj_name)
+      puts "Directory '#{proj_name}' already exists".red
+      return
+    end
+    Dir.mkdir(proj_name)
+    Dir.chdir(proj_name)
+    genconfig
+    File.write("Gemfile", <<-GEMFILE.strip_heredoc)
+      source "https://rubygems.org"
+
+      gem "slackbot_frd"
+    GEMFILE
+    Dir.mkdir("bots")
+    write_example_bot("bots/example_bot.rb")
+    Dir.mkdir("lib")
+
+    unless options[:nospec]
+      File.append("Gemfile", <<-GEMFILE.strip_heredoc)
+
+      gem "rspec", "~> 3.2"
+      GEMFILE
+      Dir.mkdir("spec")
+    end
   end
 
   desc "genconfig", "Generate a skeleton config file"
@@ -55,7 +80,7 @@ class SlackbotFrdBin < Thor
     can be customized
   LONGDESC
   def genconfig
-    File.write(config_file_location, <<-CONFIG_FILE_SKELETON)
+    File.write(config_file_location, <<-CONFIG_FILE_SKELETON.strip_heredoc)
       {
           "token" : "<put-token-here>",
           "botdir" : ".",
@@ -77,8 +102,10 @@ class SlackbotFrdBin < Thor
   LONGDESC
   option :daemonize, type: :boolean, aliases: 'd'
   option :botdir, type: :string, aliases: 'b'
-  option 'config-file'.to_sym, type: :string, aliases: 'c'
   option :token, type: :string, aliases: 't'
+  option 'config-file', type: :string, aliases: 'c'
+  option 'log-level', type: :string, aliases: 'll'
+  option 'log-file', type: :string, aliases: 'lf'
   def start(*bots)
     if running?(watcher_pid)
       SlackbotFrd::Log.warn("Already running.  Not starting again")
@@ -88,7 +115,7 @@ class SlackbotFrdBin < Thor
     delete_pid_files
     delfile(ERROR_FILE)
 
-    config_file = options['config-file'.to_sym]
+    config_file = options['config-file']
     config_file = config_file_location unless config_file
     json = config_file_json(config_file) if config_file
     json ||= {}
@@ -105,8 +132,35 @@ class SlackbotFrdBin < Thor
     botdir = File.expand_path(botdir)
 
     SlackbotFrd::Log.logfile = "#{botdir}/#{LOG_FILE}"
+    SlackbotFrd::Log.logfile = json["log_file"] if json["log_file"]
+    SlackbotFrd::Log.logfile = ENV["SLACKBOT_FRD_LOG_FILE"] if ENV["SLACKBOT_FRD_LOG_FILE"]
+    SlackbotFrd::Log.logfile = options["log-file"] if options['log-file']
+
+    SlackbotFrd::Log.level = :info
+    SlackbotFrd::Log.level = json["log_level"] if json["log_level"]
+    SlackbotFrd::Log.level = ENV["SLACKBOT_FRD_LOG_LEVEL"] if ENV["SLACKBOT_FRD_LOG_LEVEL"]
+    SlackbotFrd::Log.level = options["log-level"] if options['log-level']
+
+    # If we got a number for log level that is valid, just use that
+    if SlackbotFrd::Log.level =~ /\d+/ && SlackbotFrd::Log.levels.values.include?(SlackbotFrd::Log.level.to_i)
+      SlackbotFrd::Log.level = SlackbotFrd::Log.levels.key(SlackbotFrd::Log.level.to_i)
+    else
+      SlackbotFrd::Log.level = SlackbotFrd::Log.level.to_sym
+    end
+
+    if !SlackbotFrd::Log.levels.keys.include?(SlackbotFrd::Log.level) &&
+       !SlackbotFrd::Log.levels.values.include?(SlackbotFrd::Log.level)
+      setval = SlackbotFrd::Log.level
+      SlackbotFrd::Log.level = :info
+      SlackbotFrd::Log.error("Invalid log level '#{setval}'.  Possible levels: #{SlackbotFrd::Log.levels.keys.map(&:to_s).join(" | ")}")
+      return
+    end
+
     SlackbotFrd::Log.info("Logging to file '#{SlackbotFrd::Log.logfile}'")
 
+    SlackbotFrd::Log.warn("Logging to file '#{SlackbotFrd::Log.logfile}'")
+    SlackbotFrd::Log.warn("Logging level set to '#{SlackbotFrd::Log.level}'")
+
     token = json["token"]
     token = ENV["SLACKBOT_FRD_TOKEN"] if ENV["SLACKBOT_FRD_TOKEN"]
     token = options[:token] if options[:token]
@@ -248,6 +302,34 @@ class SlackbotFrdBin < Thor
     delfile(PID_FILE_WATCHER)
     delfile(PID_FILE_CONNECTION)
   end
+
+  private
+  def write_example_bot(file)
+    File.write(file, <<-EXAMPLE_BOT.strip_heredoc)
+      require 'slackbot_frd'
+
+      # Subclass SlackbotFrd::Bot so that slackbot-frd start runs our bot
+      class ExampleBot < SlackbotFrd::Bot
+        def add_callbacks(slack_connection)
+          # When a user sends a message, echo that message back in reverse
+          slack_connection.on_message do |user, channel, message|
+            slack_connection.send_message(channel, message.reverse)
+          end
+
+          # When a user joins a channel, greet that user as a bot
+          slack_connection.on_channel_joined do |user, channel|
+            slack_connection.send_message_as_user(
+              channel,
+              ":skull: ohai \#{user}, welcome to #\#{channel}! :ghost:",
+              "Graveyard Greeting Bot",
+              ":graveyard:",
+              true
+            )
+          end
+        end
+      end
+    EXAMPLE_BOT
+  end
 end
 
 SlackbotFrdBin.start(ARGV)

data/lib/slackbot_frd/lib/log.rb

@@ -3,11 +3,12 @@ require 'colorize'
 module SlackbotFrd
   class Log
     @levels = {verbose: 1, debug: 2, info: 3, warn: 4, error: 5}
-    @default_level = :debug
+    @default_level = :info
 
     class << self
       attr_writer :level
       attr_accessor :logfile
+      attr_reader :levels
     end
 
     def self.level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -190,3 +204,4 @@ specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more
   slack bots
 test_files: []
+has_rdoc: