xify 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 670138629af686c5ae8d7fe7bd773a6a24ab23e4a1cac1e43ec2c5b1d6a1d6d7
-  data.tar.gz: ba760cff71020f421c22ec7c100c9bad5193c439fa5af222aeb4f0467a335c35
+SHA1:
+  metadata.gz: a399f02dbab5c7417063d2d1223487c16887d249
+  data.tar.gz: 86a1847c1f3e928efa7083b100d7b57e26438e5a
 SHA512:
-  metadata.gz: e8628de616941c4f2b450739af88d4d60eca6f393babd3f08261b9c178e5a983d332c4ddfa775f6da50f644df3c6a4727c4ea7442d08d70e04a769f7ab172beb
-  data.tar.gz: 27132224d15386e6e23be525e9e030461643643c2deccfedc3ec2f8a0c4d6f70ac2d5680ff6a2f17279ff3ed718afc3f1e063271576b4e2deacdbc2125cc5dff
+  metadata.gz: 0d35c9c553fa24f87024bb60fbd51490e61a5b0ead5e2db3959fd265f47b15b4c86916deebf875a81de69e0fa9b5406701be40b85302377577bc77c4cdf511e1
+  data.tar.gz: 94b1bb9808f4a56e8b46d54e9a4511038a8fffdfb1a34c6a5c91cf7d0db9d96edd4f6eafea5b7149a9d3ebf847a1fa90e1092f03208b462c9bf71f2907b92d2a

data/bin/xify

@@ -4,4 +4,4 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 
 require 'xify'
 
-Xify.run ARGV
+Xify.run

data/lib/xify.rb

@@ -1,42 +1,77 @@
+require 'rufus-scheduler'
 require 'yaml'
 
 require 'xify/input/pipe'
 require 'xify/input/prompt'
+require 'xify/input/rocket_chat'
 require 'xify/input/shell'
 require 'xify/output/stdout'
 require 'xify/output/rocket_chat'
 
 class Xify
-  def self.run(args)
+  @verbose = false
+
+  def self.run
     working_dir = "#{ENV['HOME']}/.xify"
     Dir.mkdir working_dir rescue Errno::EEXIST
-
     config_file = "#{working_dir}/config.yml"
-    if args.first == '-c'
-      args.shift
-      config_file = args.shift
+    files = []
+
+    while arg = ARGV.shift do
+      case arg
+      when '-c', '--config'
+        config_file = ARGV.shift
+      when '-v', '--verbose'
+        @verbose = true
+      else
+        files << arg
+      end
     end
 
-    puts "Loading config from #{config_file}"
+    ARGV.unshift(*files)
+
+    debug "Loading config from #{config_file}"
     config = YAML::load_file config_file
 
-    config.keys.each do |c|
-      config[c].map! do |handler|
+    config.keys.each do |section|
+      type = section[0...-1]
+      config[section].map! do |handler|
         next unless handler['enabled']
-        Object.const_get(handler['class']).new(handler)
+        debug "Setting up #{handler['class']} as #{type}"
+        Object.const_get("#{type.capitalize}::#{handler['class']}").new handler
       end.compact!
     end
 
-    config['inputs'].each do |i|
-      i.updates do |u|
-        config['outputs'].each do |o|
-          begin
-            o.process u
-          rescue => e
-            $stderr.puts e.message
+    begin
+      config['inputs'].each do |i|
+        begin
+          i.updates do |u|
+            config['outputs'].each do |o|
+              begin
+                o.process u
+              rescue => e
+                error e
+              end
+            end
           end
+        rescue => e
+          error e
         end
       end
+
+      Rufus::Scheduler.singleton.join
+    rescue Interrupt => e
+      $stderr.puts "\nExiting."
     end
   end
+
+  def self.debug(str)
+    puts str if @verbose
+  end
+
+  def self.error(e)
+    return $stderr.puts e.message unless @verbose
+
+    $stderr.puts "#{e.backtrace.first}: #{e.message} (#{e.class})", e.backtrace.drop(1).map{|s| "\t#{s}"}
+  end
 end

data/lib/xify/base/rocket_chat.rb

@@ -0,0 +1,75 @@
+require 'json'
+require 'net/https'
+require 'time'
+
+module Base
+  class RocketChat
+    def initialize(config)
+      @config = config
+
+      uri = URI.parse config['uri']
+      @http = Net::HTTP.new uri.host, uri.port
+      @http.use_ssl = true
+
+      working_dir = "#{ENV['HOME']}/.xify/RocketChat"
+      Dir.mkdir working_dir rescue Errno::EEXIST
+      @auth_file = "#{working_dir}/#{@config['user']}.json"
+    end
+
+    def request(method, path, &block)
+      login unless @auth_data
+
+      req = Object.const_get("Net::HTTP::#{method.capitalize}").new path,
+        'X-User-Id' => @auth_data['userId'],
+        'X-Auth-Token' => @auth_data['authToken']
+
+      yield req if block_given?
+
+      res = @http.request req
+
+      case res
+      when Net::HTTPUnauthorized
+        relogin
+        request method, path, &block
+      when Net::HTTPSuccess
+        # nothing
+      else
+        $stderr.puts res.body
+        raise "Error on #{method.upcase} #{@config['uri']}#{path}: #{res.code} #{res.message}"
+      end
+
+      res
+    end
+
+    private
+
+    def login
+      if File.exists? @auth_file
+        @auth_data = JSON.parse File.read @auth_file
+        return
+      end
+
+      req = Net::HTTP::Post.new '/api/v1/login',
+        'Content-Type' => 'application/json'
+      req.body = {
+        username: @config['user'],
+        password: @config['pass']
+      }.to_json
+
+      res = @http.request req
+
+      unless res.is_a? Net::HTTPSuccess
+        $stderr.puts res.body
+        raise "Error while authenticating to #{@config['uri']}: #{res.code} #{res.message}"
+      end
+
+      @auth_data = JSON.parse(res.body)['data']
+      File.write @auth_file, @auth_data.to_json
+    end
+
+    def relogin
+      File.delete @auth_file
+      login
+    end
+  end
+end

data/lib/xify/input/pipe.rb

@@ -1,10 +1,12 @@
-class Pipe
-  def initialize(config)
-    @author = config['author']
-  end
+module Input
+  class Pipe
+    def initialize(config)
+      @author = config['author']
+    end
 
-  def updates
-    out = ARGF.read.chomp
-    yield Event.new @author, out if out && out.length != 0
+    def updates
+      out = ARGF.read.chomp
+      yield Event.new @author, out if out && out.length != 0
+    end
   end
-end
+end

data/lib/xify/input/prompt.rb

@@ -1,37 +1,35 @@
 require 'xify/event'
 
-class Prompt
-  def initialize(config)
-    @author = config['author']
-  end
+module Input
+  class Prompt
+    def initialize(config)
+      @author = config['author']
+    end
 
-  def updates
-    loop do
-      begin
-        input = prompt
+    def updates
+      loop do
+        begin
+          input = prompt
 
-        unless input
-          # Stop on CTRL+D
-          puts
-          break
-        end
+          unless input
+            raise Interrupt
+          end
 
-        if input.length != 1
-          yield Event.new @author, input.chomp
+          if input.length != 1
+            yield Event.new @author, input.chomp
+          end
+        rescue Interrupt
+          raise
         end
-      rescue Interrupt
-        # Stop on CTRL+C
-        puts
-        break
       end
     end
-  end
 
-  private
+    private
 
-  def prompt
-    print '> '
+    def prompt
+      print '> '
 
-    gets
+      gets
+    end
   end
 end

data/lib/xify/input/rocket_chat.rb

@@ -0,0 +1,39 @@
+require 'eventmachine'
+require 'json'
+require 'metybur'
+require 'net/https'
+require 'time'
+
+require 'xify/base/rocket_chat'
+
+module Input
+  class RocketChat < Base::RocketChat
+    def updates
+      login
+
+      EM.run do
+        config = @config
+        uri = URI.parse config['uri']
+        meteor = Metybur.connect "wss://#{uri.host}:#{uri.port}/websocket"
+        meteor.login resume: @auth_data['authToken'] do
+          meteor.subscribe 'stream-notify-user', "#{result[:id]}/rooms-changed", false
+          messages = meteor.collection 'stream-notify-user'
+          messages.on(:changed) do |id, attributes|
+             event = attributes[:args].last
+             room = event[:name]
+             message = event[:lastMessage]
+
+             next if message[:editedAt] || room != config['channel'][1..-1]
+
+             author = message[:u][:name]
+             text = message[:msg]
+             time = message[:ts][:'$date']
+             type = event[:t] == 'p' ? 'group' : 'channel'
+
+             yield Event.new author, text, parent: "##{room}", parent_link: "#{config['uri']}/#{type}/#{room}", time: Time.at(time / 1000)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xify/input/shell.rb

@@ -1,10 +1,22 @@
-class Shell
-  def initialize(config)
-    @config = config
-  end
+module Input
+  class Shell
+    def initialize(config)
+      @config = config
+    end
+
+    def run
+      out = `#{@config['shell']}`.chomp
+      yield Event.new @config['author'], out, parent: @config['shell'] if out && out.length != 0
+    end
+
+    def updates(&block)
+      return run(&block) unless @config['trigger']
 
-  def updates
-    out = `#{@config['shell']}`.chomp
-    yield Event.new @config['author'], out, parent: @config['shell'] if out && out.length != 0
+      opts = {}
+      opts[:first] = :now if @config['trigger']['now']
+      Rufus::Scheduler.singleton.repeat @config['trigger']['schedule'], opts do
+        run(&block)
+      end
+    end
   end
 end

data/lib/xify/output/rocket_chat.rb

@@ -2,83 +2,25 @@ require 'json'
 require 'net/https'
 require 'time'
 
-class RocketChat
-  def initialize(config)
-    @channel = config['channel']
-    uri = URI.parse config['uri']
-    @http = Net::HTTP.new uri.host, uri.port
-    @http.use_ssl = true
-
-    @user = config['user']
-    @pass = config['pass']
-
-    working_dir = "#{ENV['HOME']}/.xify/RocketChat"
-    Dir.mkdir working_dir rescue Errno::EEXIST
-    @auth_file = "#{working_dir}/#{@user}.json"
-  end
-
-  def login
-    if File.exists? @auth_file
-      @auth_data = JSON.parse File.read @auth_file
-      return
-    end
-
-    req = Net::HTTP::Post.new '/api/v1/login',
-      'Content-Type' => 'application/json'
-    req.body = {
-      username: @user,
-      password: @pass
-    }.to_json
-
-    res = @http.request req
-
-    raise "Error: #{res.code} #{res.message}\n#{res.body}" unless res.is_a? Net::HTTPSuccess
-
-    @auth_data = JSON.parse(res.body)['data']
-    File.write @auth_file, @auth_data.to_json
-  end
-
-  def reset_auth
-    @auth_data = nil
-    File.delete @auth_file
-  end
-
-  def authenticated_request
-    login unless @auth_data
-
-    req = Net::HTTP::Post.new '/api/v1/chat.postMessage',
-      'Content-Type' => 'application/json',
-      'X-User-Id' => @auth_data['userId'],
-      'X-Auth-Token' => @auth_data['authToken']
-
-    yield req
-
-    req
-  end
-
-  def process(event)
-    res = @http.request(authenticated_request do |req|
-      req.body = {
-        channel: @channel,
-        alias: event.author,
-        attachments: [
-          {
-            title: event.args[:parent],
-            title_link: event.args[:parent_link],
-            text: event.args[:link] ? "#{event.message.chomp} ([more](#{event.args[:link]}))" : event.message.chomp
-          }
-        ]
-      }.to_json
-    end)
-
-    case res
-    when Net::HTTPUnauthorized
-      reset_auth
-      process event
-    when Net::HTTPSuccess
-      # nothing
-    else
-      $stderr.puts "Error: #{res.code} #{res.message}\n#{res.body}"
+require 'xify/base/rocket_chat'
+
+module Output
+  class RocketChat < Base::RocketChat
+    def process(event)
+      request :post, '/api/v1/chat.postMessage' do |req|
+        req['Content-Type'] = 'application/json'
+        req.body = {
+          channel: @config['channel'],
+          alias: event.author,
+          attachments: [
+            {
+              title: event.args[:parent],
+              title_link: event.args[:parent_link],
+              text: event.args[:link] ? "#{event.message.chomp} ([more](#{event.args[:link]}))" : event.message.chomp
+            }
+          ]
+        }.to_json
+      end
     end
   end
 end

data/lib/xify/output/stdout.rb

@@ -1,10 +1,12 @@
 require 'time'
 
-class Stdout
-  def initialize(config)
-  end
+module Output
+  class Stdout
+    def initialize(config)
+    end
 
-  def process(event)
-    puts "[#{event.args[:time] || Time.now.iso8601}] #{event.author}:\n#{event.message}"
+    def process(event)
+      puts "[#{(event.args[:time] || Time.now).iso8601}] #{event.author}:\n#{event.message}"
+    end
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: xify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Finn Glöe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
-dependencies: []
+date: 2018-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: metybur
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Cross-post content from one service to another.
 email: fgloee@united-internet.de
 executables:
@@ -19,9 +47,11 @@ extra_rdoc_files: []
 files:
 - bin/xify
 - lib/xify.rb
+- lib/xify/base/rocket_chat.rb
 - lib/xify/event.rb
 - lib/xify/input/pipe.rb
 - lib/xify/input/prompt.rb
+- lib/xify/input/rocket_chat.rb
 - lib/xify/input/shell.rb
 - lib/xify/output/rocket_chat.rb
 - lib/xify/output/stdout.rb
@@ -44,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Cross-post content from one service to another.