slackcat 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8998a4c43b391f21c4377190d0bfc9a5b186155a
-  data.tar.gz: 9325c7a36decaba80e4b3bbb45aef94ef272ac0e
+  metadata.gz: d53ce3d01a0e4d82cc74c4b1190c9676b5f9c7d2
+  data.tar.gz: 6cf9c11682d18f38add4c9b24009a224181d96e1
 SHA512:
-  metadata.gz: ea3a3d2c15820e024e53da67c6f26ec563ab92e8856deb087604427f9d4aff2eaf344f5850d7b15b7f654f5c38c41c0bac12d79183d3a5801435a00ecbc4f26c
-  data.tar.gz: 5ebfbbdb284fd3a33e814cbf0266840c39936aab039e131ecf2bce8b2fc03d0ddf2d4136ecf4de8c4e1caf099593a06f85abc08cde6e91483425f54b9ea807d5
+  metadata.gz: 9e0ffdefff653d4ce2a32e055580dfe2820c210ff6d93d1f222e38f71fa3fd20d28f37ebab7f63852617f5d0d74c1307ec5f9b45911d4418a8e267afbe7569fd
+  data.tar.gz: 484d0339555de1aa0da775863209073b84b2fc4fd1ff204889b192f8379d312ea5ab8cc33c5ee87f9006d471c202eb3b25f1e8d92808e15805d2d9342c2aaf7e

data/README.md

@@ -20,15 +20,14 @@ list filenames as arguments. Multiple files will be concatenated.
 Environment variables:
 
 * `SLACK_TOKEN`: your token from https://api.slack.com/.
-* `SLACK_CHANNELS`: default comma-separated list of channel names to share files
-* `SLACK_GROUPS`: default comma-separated list of private groups to share files
 
 Command-line options:
 
 ```
             --token, -k:   Slack API token
-         --channels, -c:   Channels to share into
-           --groups, -g:   Private groups to share into
+         --channels, -c:   Channels to share
+           --groups, -g:   Private groups to share
+            --users, -u:   Users (DMs) to share
          --filetype, -t:   File type identifier
             --title, -T:   Title of file
          --filename, -n:   Filename of file
@@ -43,22 +42,25 @@ content will be shared to them.
 
 Upload contents of buffer:
 
-`:%! slackcat`
+`:%! slackcat -c dev`
 
 ## Example usage from emacs
 
 Upload contents of region:
 
-`M-| slackcat`
+`M-| slackcat -c dev`
 
 To make a named function:
 
 ```lisp
 (setenv "SLACK_TOKEN" "<your api token>")
-(setenv "SLACK_CHANNELS" "<channel list")
+
+(defvar slackcat-bin  "slackcat" "Command to invoke slackcat.")
+(defvar slackcat-args "-c dev"   "Default arguments to pass to slackcat.")
 
 (defun slackcat (&optional b e)
   "Upload contents of region to slack chat."
   (interactive "r")
-  (shell-command-on-region b e "slackcat"))
+  (let ((args (read-from-minibuffer "slackcat args: " slackcat-args)))
+    (shell-command-on-region b e (format "%s %s" slackcat-bin args))))
 ```

data/bin/slackcat

@@ -11,15 +11,36 @@ class Slackcat
     @token = token
   end
 
+  ## get a channel, group, im or user list
+  def get_objects(method, key)
+    self.class.get("/#{method}", query: { token: @token }).tap do |response|
+      raise "error retrieving #{thing} list: #{response.fetch('error', 'unknown error')}" unless response['ok']
+    end.fetch(key)
+  end
+
   def channels
-    self.class.get('/channels.list', query: { token: @token }).tap do |response|
-      raise "error retrieving channel list: #{response.fetch('error', 'unknown error')}" unless response['ok']
-    end
+    @channels ||= get_objects('channels.list', 'channels')
   end
 
   def groups
-    self.class.get('/groups.list', query: { token: @token }).tap do |response|
-      raise "error retrieving group list: #{response.fetch('error', 'unknown error')}" unless response['ok']
+    @groups ||= get_objects('groups.list', 'groups')
+  end
+
+  def ims
+    @ims ||= get_objects('im.list', 'ims')
+  end
+
+  def users
+    @users ||= get_objects('users.list', 'members')
+  end
+
+  ## translate a username into an IM id
+  def im_for_user(username)
+    user = users.find do |user|
+      user['name'] == username
+    end
+    ims.find do |im|
+      im['user'] == user['id']
     end
   end
 
@@ -33,8 +54,9 @@ end
 
 opts = Trollop::options do
   opt :token,           'Slack API token',        type: :string, short: 'k', default: ENV.fetch('SLACK_TOKEN', nil)
-  opt :channels,        'Channels to share into', type: :string, short: 'c', default: ENV.fetch('SLACK_CHANNELS', nil)
-  opt :groups,          'Groups to share into',   type: :string, short: 'g', default: ENV.fetch('SLACK_GROUPS', nil)
+  opt :channels,        'Channels to share',      type: :string, short: 'c', default: ''
+  opt :groups,          'Groups to share',        type: :string, short: 'g', default: ''
+  opt :users,           'Users (DMs) to share',   type: :string, short: 'u', default: ''
   opt :filetype,        'File type identifier',   type: :string, short: 't'
   opt :title,           'Title of file',          type: :string, short: 'T'
   opt :filename,        'Filename of file',       type: :string, short: 'n'
@@ -47,25 +69,17 @@ opts[:filename] ||= ARGV.first
 raise 'set slack API token using SLACK_TOKEN or -k option' unless opts[:token]
 slack = Slackcat.new(opts[:token])
 
-## get channel IDs
-channels = if opts[:channels]
-  names = opts[:channels].gsub(/\#/, '').split(/[\s,]+/)   # array of names with no #
-  slack.channels['channels'].inject({}) do |hash, channel| # get channel list
-    hash[channel['name']] = channel['id']; hash            # index by name
-  end.values_at(*names)                                    # list of ids matching given names
+channels = opts[:channels].split(/[\s,]+/).map do |name|
+  slack.channels.find { |channel| channel['name'] == name }.fetch('id')
 end
 
-## get group IDs
-groups = if opts[:groups]
-  names = opts[:groups].gsub(/\#/, '').split(/[\s,]+/)     # array of names with no #, probably not an issue for groups, but whatever.
-  slack.groups['groups'].inject({}) do |hash, group |      # get channel list
-    hash[group['name']] = group['id']; hash                # index by name
-  end.values_at(*names)                                    # list of ids matching given names
+groups = opts[:groups].split(/[\s,]+/).map do |name|
+  slack.groups.find { |group| group['name'] == name }.fetch('id')
 end
 
-ids = []
-ids.concat(channels) if channels
-ids.concat(groups) if groups
+ims = opts[:users].split(/[\s,]+/).map do |name|
+  slack.im_for_user(name).fetch('id')
+end
 
 params = {
   content:         ARGF.read,
@@ -73,7 +87,7 @@ params = {
   filename:        opts[:filename],
   title:           opts[:title],
   initial_comment: opts[:initial_comment],
-  channels:        ids.join(","),
+  channels:        (channels + groups + ims).join(","),
 }.select { |_, value| value }
 
 slack.upload(params)

data/lib/slackcat/version.rb

@@ -1,3 +1,3 @@
 module Slackcat
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackcat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,4 +108,3 @@ signing_key:
 specification_version: 4
 summary: Upload a file to slack
 test_files: []
-has_rdoc: