slackcat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53ce3d01a0e4d82cc74c4b1190c9676b5f9c7d2
-  data.tar.gz: 6cf9c11682d18f38add4c9b24009a224181d96e1
+  metadata.gz: ec17396e6bab7b65c8e0d9d3973286e0e7f04b4f
+  data.tar.gz: 9221832546c13e35efd896d79a5546afff9e9c5e
 SHA512:
-  metadata.gz: 9e0ffdefff653d4ce2a32e055580dfe2820c210ff6d93d1f222e38f71fa3fd20d28f37ebab7f63852617f5d0d74c1307ec5f9b45911d4418a8e267afbe7569fd
-  data.tar.gz: 484d0339555de1aa0da775863209073b84b2fc4fd1ff204889b192f8379d312ea5ab8cc33c5ee87f9006d471c202eb3b25f1e8d92808e15805d2d9342c2aaf7e
+  metadata.gz: 655a405b4cb06eec4a0e1d038932580ccf5989766ffcc64b4e1a05f1545fcf68f8a3f63275841ae103d18974a7f389e4acc9af6fa7c4f7db9d66d22631e6e14d
+  data.tar.gz: dd7e81b21c457ee15cd1e82f0a1befea8cd2b18056138725c41c0b48abe42325a319c35492a8e002fd4ebc2c3d0dbee42fc11b6db9e4e6e55616a672e90fa03f

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: .
+  specs:
+    slackcat (0.1.0)
+      httmultiparty
+      trollop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    httmultiparty (0.3.16)
+      httparty (>= 0.7.3)
+      mimemagic
+      multipart-post
+    httparty (0.13.3)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    json (1.8.1)
+    mimemagic (0.2.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    rake (10.3.2)
+    trollop (2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake
+  slackcat!

data/bin/slackcat

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'httparty'
+require 'httmultiparty'
 require 'trollop'
 
 class Slackcat
-  include HTTParty
+  include HTTMultiParty
   base_uri 'https://slack.com/api'
 
   def initialize(token)
@@ -34,6 +34,11 @@ class Slackcat
     @users ||= get_objects('users.list', 'members')
   end
 
+  ## get my username
+  def auth
+    @auth ||= get_objects('auth.test', 'user')
+  end
+
   ## translate a username into an IM id
   def im_for_user(username)
     user = users.find do |user|
@@ -44,28 +49,35 @@ class Slackcat
     end
   end
 
+  ## upload a file or text snippet
   def upload(params)
     self.class.post('/files.upload', body: params.merge({token: @token})).tap do |response|
       raise "error uploading file: #{response.fetch('error', 'unknown error')}" unless response['ok']
     end
   end
 
+  ## send message to one channel as a single post, instead of file upload
+  def post_message(params)
+    self.class.post('/chat.postMessage', body: params.merge({token: @token})).tap do |response|
+      raise "error posting message: #{response.fetch('error', 'unknown error')}" unless response['ok']
+    end
+  end
+
 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',      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'
-  opt :initial_comment, 'Initial comment to add', type: :string, short: 'i'
+  opt :token,           'Slack API token',            type: :string,  short: 'k', default: ENV.fetch('SLACK_TOKEN', 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'
+  opt :initial_comment, 'Initial comment to add',     type: :string,  short: 'i'
+  opt :post,            'Post instead of upload',     type: :boolean, short: 'p', default: false
+  opt :multipart,       'Multipart upload each file', type: :boolean, short: 'm', default: false
 end
 
-## get this after opts parsed out of ARGV
-opts[:filename] ||= ARGV.first
-
 raise 'set slack API token using SLACK_TOKEN or -k option' unless opts[:token]
 slack = Slackcat.new(opts[:token])
 
@@ -82,7 +94,6 @@ ims = opts[:users].split(/[\s,]+/).map do |name|
 end
 
 params = {
-  content:         ARGF.read,
   filetype:        opts[:filetype],
   filename:        opts[:filename],
   title:           opts[:title],
@@ -90,4 +101,12 @@ params = {
   channels:        (channels + groups + ims).join(","),
 }.select { |_, value| value }
 
-slack.upload(params)
+if opts[:post] #simple text post
+  slack.post_message(text: ARGF.read, channel: params[:channels], username: slack.auth)
+elsif opts[:multipart] #upload multiple individual binary files
+  ARGV.each do |arg|
+    slack.upload({file: File.new(arg), filename: arg}.merge(params))
+  end
+else #upload concatenated text snippet
+  slack.upload(params.merge(content: ARGF.read))
+end

data/lib/slackcat/version.rb

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

data/slackcat.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'httparty'
+  spec.add_dependency 'httmultiparty'
   spec.add_dependency 'trollop'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slackcat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Lister
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile