lita-tox 0.3.0 → 0.4.0

data/README.md

@@ -2,36 +2,11 @@ Lita::Adapters::Tox
 ===================
 
 [![Gem Version](https://badge.fury.io/rb/lita-tox.svg)](http://badge.fury.io/rb/lita-tox)
-[![Build Status](https://travis-ci.org/braiden-vasco/lita-tox.svg)](https://travis-ci.org/braiden-vasco/lita-tox)
-[![Coverage Status](https://coveralls.io/repos/braiden-vasco/lita-tox/badge.svg)](https://coveralls.io/r/braiden-vasco/lita-tox)
+[![Build Status](https://travis-ci.org/toxon/lita-tox.svg)](https://travis-ci.org/toxon/lita-tox)
+[![Coverage Status](https://coveralls.io/repos/github/toxon/lita-tox/badge.svg)](https://coveralls.io/github/toxon/lita-tox)
 
 [Tox](https://tox.chat) adapter for the [Lita](http://lita.io) chat bot.
 
-**WARNING**
-
-Still in development. Read the README carefully.
-
-
-TODO
-----
-
-Current development version have some limitations
-which should be fixed in first release:
-
-* [\[issue #16\]](https://github.com/braiden-vasco/lita-tox/issues/16)
-  **libtoxcore** is not included in the gem. It should be compiled manually
-  to build the gem native extension successfully. Follow the instructions in
-  [that file](https://github.com/irungentoo/toxcore/blob/2ab3b14731061cc04d3ccc50a35093c11d018298/INSTALL.md)
-
-* [\[issue #17\]](https://github.com/braiden-vasco/lita-tox/issues/17)
-  JRuby is not supported. Only C extension for Tox is implemented
-
-* [\[issue #18\]](https://github.com/braiden-vasco/lita-tox/issues/18)
-  Message length is limited to value of `TOX_MAX_MESSAGE_LENGTH`
-  (see [source code of **libtoxcore**](https://github.com/irungentoo/toxcore/blob/2ab3b14731061cc04d3ccc50a35093c11d018298/toxcore/tox.h#L252-L255))
-
-* Adapter has incomplete API for Lita. Only basic methods are implemented
-
 
 Usage
 -----
@@ -48,7 +23,7 @@ When **libtoxcore** is installed, add **lita-tox**
 to your Lita instance's Gemfile:
 
 ```ruby
-gem 'lita-tox', '~> 0.3.0'
+gem 'lita-tox', '~> 0.4.0'
 ```
 
 ### Configuration
@@ -74,7 +49,7 @@ Lita.configure do |config|
 
   config.robot.adapter = :tox
 
-  config.savedata_filename = 'savedata'
-  config.status = "Send me \"#{config.robot.name}: help\""
+  config.adapters.tox.savedata_filename = 'savedata'
+  config.adapters.tox.status = "Send me \"#{config.robot.name}: help\""
 end
 ```

data/Rakefile

@@ -1,37 +1,34 @@
-require 'rubygems'
-
-gemspec = Gem::Specification.load('lita-tox.gemspec')
-
-github_user, github_project =
-  gemspec.homepage.scan(%r{^https://github\.com/([^/]+)/([^/]+)/?$})[0]
+# frozen_string_literal: true
 
 require 'bundler/gem_tasks'
 
-task default: [:spec, :lint]
+GEMSPEC = Gem::Specification.load 'lita-tox.gemspec'
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-task lint: [:rubocop]
+github_user, github_project =
+  GEMSPEC.homepage.scan(%r{^https://github\.com/([^/]+)/([^/]+)/?$})[0]
 
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
+task default: %i[spec lint]
 
-require 'yard'
-YARD::Rake::YardocTask.new
+task lint: :rubocop
 
-desc 'Generate changelog'
-task :changelog, [:token] do |_t, args|
-  cmd = 'github_changelog_generator'
-  cmd << " -u #{github_user}"
-  cmd << " -p #{github_project}"
-  cmd << " -t #{args[:token]}" if args[:token]
+task fix: 'rubocop:auto_correct'
 
-  sh cmd
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
+rescue LoadError
+  nil
 end
 
-require 'rake/extensiontask'
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue LoadError
+  nil
+end
 
-Rake::ExtensionTask.new 'tox' do |ext|
-  ext.lib_dir = 'lib/tox'
+desc 'Generate changelog'
+task :changelog, [:token] do |_t, args|
+  raise 'please provide access token' unless args[:token]
+  sh "github_changelog_generator -u #{github_user} -p #{github_project} -t #{args[:token]}"
 end

data/bin/build/libsodium

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+pushd 'vendor/libsodium'
+./autogen.sh
+./configure
+make install
+popd

data/bin/build/libtoxcore

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+pushd 'vendor/libtoxcore'
+autoreconf -i
+./configure
+make install
+popd

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'lita-tox'

data/example/.gitignore

@@ -0,0 +1 @@
+/savedata

data/example/Gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'lita', '~> 4.7'
+
+gem 'lita-tox', path: '..'

data/example/Gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: ..
+  specs:
+    lita-tox (0.3.0)
+      lita (~> 4.7)
+      tox (~> 0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (0.12.1)
+      multipart-post (>= 1.2, < 3)
+    http_router (0.11.2)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (0.8.6)
+    ice_nine (0.11.2)
+    lita (4.7.1)
+      bundler (>= 1.3)
+      faraday (>= 0.8.7)
+      http_router (>= 0.11.2)
+      i18n (>= 0.6.9)
+      ice_nine (>= 0.11.0)
+      multi_json (>= 1.7.7)
+      puma (>= 2.7.1)
+      rack (>= 1.5.2, < 2.0.0)
+      rb-readline (>= 0.5.1)
+      redis-namespace (>= 1.3.0)
+      thor (>= 0.18.1)
+    multi_json (1.12.1)
+    multipart-post (2.0.0)
+    puma (3.9.1)
+    rack (1.6.8)
+    rb-readline (0.5.4)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
+      redis (~> 3.0, >= 3.0.4)
+    thor (0.19.4)
+    tox (0.0.1)
+    url_mount (0.2.1)
+      rack
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lita (~> 4.7)
+  lita-tox!
+
+BUNDLED WITH
+   1.13.6

data/example/lita_config.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Lita.configure do |config|
+  config.robot.name = 'Lita'
+
+  config.robot.adapter = :tox
+
+  config.adapters.tox.savedata_filename = 'savedata'
+  config.adapters.tox.status = "Send me \"#{config.robot.name}: help\""
+end

data/lib/lita-tox.rb

@@ -1,4 +1,20 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
+
+# lita-tox - Tox adapter for the Lita chat bot
+# Copyright (C) 2015-2017  Braiden Vasco
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'lita'
 

data/lib/lita/adapters/tox.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
+# lita-tox - Tox adapter for the Lita chat bot
+# Copyright (C) 2015-2017  Braiden Vasco
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'tox'
 
 ##
@@ -15,54 +33,42 @@ module Lita
       config :savedata_filename, type: String
       config :status, type: String
 
-      def initialize(robot)
+      def initialize(robot) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         super
 
         options = ::Tox::Options.new
 
         if config.savedata_filename && File.exist?(config.savedata_filename)
           savedata_file = open(config.savedata_filename)
-          options.data = savedata_file.read
+          options.savedata = savedata_file.read
           savedata_file.close
         end
 
-        @tox = ::Tox.new(options)
+        @tox = ::Tox::Client.new(options)
+
+        log.info("ID: #{@tox.address.to_hex}")
 
-        log.info("ID: #{@tox.id}")
+        @tox.bootstrap_official
 
         @tox.name = robot.name if robot.name
         @tox.status_message = config.status if config.status
 
-        @tox.on_friend_request do |key|
-          @tox.friend_add_norequest(key)
+        @tox.on_friend_request do |public_key|
+          @tox.friend_add_norequest(public_key)
         end
 
-        @tox.on_friend_message do |friend_number, text|
-          user = User.new(friend_number)
+        @tox.on_friend_message do |friend, text|
+          user = User.new(friend.number)
           source = Source.new(user: user)
           message = Message.new(robot, text, source)
 
           message.command!
           robot.receive(message)
         end
-
-        @tox.on_group_invite do |friend_number, data|
-          @tox.join_groupchat(friend_number, data)
-        end
-
-        @tox.on_group_message do |group_number, peer_number, text|
-          unless @tox.group_peernumber_is_ours(group_number, peer_number)
-            user = User.new(-1 - peer_number) # TODO
-            source = Source.new(user: user, room: group_number)
-            message = Message.new(robot, text, source)
-
-            robot.receive(message)
-          end
-        end
       end
 
       def run
-        @tox.loop
+        @tox.run
       end
 
       def shut_down
@@ -72,16 +78,12 @@ module Lita
           savedata_file.close
         end
 
-        @tox.kill
+        @tox.stop
       end
 
       def send_messages(target, messages)
         messages.reject(&:empty?).each do |message|
-          if target.user.id.to_i >= 0
-            @tox.friend_send_message(target.user.id.to_i, message)
-          else
-            @tox.group_message_send(target.room.to_i, message)
-          end
+          ::Tox::Friend.new(@tox, target.user.id.to_i).send_message(message)
         end
       end
     end

data/lita-tox.gemspec

@@ -1,38 +1,42 @@
 # coding: utf-8
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__).freeze
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 
 Gem::Specification.new do |spec|
-  spec.name          = 'lita-tox'
-  spec.version       = '0.3.0'
-  spec.authors       = ['Braiden Vasco']
-  spec.email         = ['braiden-vasco@mailtor.net']
+  spec.name     = 'lita-tox'
+  spec.version  = '0.4.0'
+  spec.license  = 'GPL-3.0'
+  spec.homepage = 'https://github.com/toxon/lita-tox'
+  spec.summary  = 'Tox adapter for the Lita chat bot'
+  spec.platform = Gem::Platform::RUBY
+
+  spec.authors = ['Braiden Vasco']
+  spec.email   = %w[braiden-vasco@users.noreply.github.com]
 
-  spec.summary       = 'Tox adapter for the Lita chat bot'
-  spec.description   = 'Tox adapter for the Lita chat bot.'
-  spec.homepage      = 'https://github.com/braiden-vasco/lita-tox'
-  spec.license       = 'MIT'
+  spec.required_ruby_version = '~> 2.3'
+
+  spec.description = 'Tox adapter for the Lita chat bot.'
 
   spec.metadata['lita_plugin_type'] = 'adapter'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match %r{^(test|spec|features)/}
   end
 
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.extensions << 'ext/tox/extconf.rb'
+  spec.bindir      = 'exe'
+  spec.executables = spec.files.grep %r{^exe/}, &File.method(:basename)
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.31'
-  spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'simplecov', '~> 0.10'
-  spec.add_development_dependency 'yard', '~> 0.8'
-  spec.add_development_dependency 'redcarpet', '~> 3.3'
+  spec.add_development_dependency 'bundler',                    '~> 1.7'
+  spec.add_development_dependency 'rake',                       '~> 10.0'
+  spec.add_development_dependency 'rubocop',                    '~> 0.49.1'
+  spec.add_development_dependency 'rspec',                      '~> 3.3'
+  spec.add_development_dependency 'simplecov',                  '~> 0.10'
+  spec.add_development_dependency 'redcarpet',                  '~> 3.3'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.6'
-  spec.add_development_dependency 'rake-compiler', '~> 0.9'
-  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry',                        '~> 0.10'
 
-  spec.add_runtime_dependency 'lita', '~> 4.4'
+  spec.add_runtime_dependency 'lita', '~> 4.7'
+  spec.add_runtime_dependency 'tox',  '~> 0.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-tox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Braiden Vasco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -123,56 +109,56 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
+        version: '4.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: lita
+  name: tox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 0.0.1
 description: Tox adapter for the Lita chat bot.
 email:
-- braiden-vasco@mailtor.net
+- braiden-vasco@users.noreply.github.com
 executables: []
-extensions:
-- ext/tox/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
@@ -183,18 +169,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/build/libsodium
+- bin/build/libtoxcore
 - bin/console
 - bin/setup
-- ext/tox/extconf.rb
-- ext/tox/tox.c
+- example/.gitignore
+- example/Gemfile
+- example/Gemfile.lock
+- example/lita_config.rb
 - lib/lita-tox.rb
 - lib/lita/adapters/tox.rb
-- lib/tox.rb
 - lita-tox.gemspec
 - locales/en.yml
-homepage: https://github.com/braiden-vasco/lita-tox
+homepage: https://github.com/toxon/lita-tox
 licenses:
-- MIT
+- GPL-3.0
 metadata:
   lita_plugin_type: adapter
 post_install_message: 
@@ -203,9 +192,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,9 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Tox adapter for the Lita chat bot
 test_files: []
-has_rdoc: