twterm 2.5.0 → 2.9.0

data/shell.nix

@@ -0,0 +1,40 @@
+{ pkgs ? import <nixpkgs> { }, ruby ? 2.7 }:
+
+with pkgs;
+let
+  mri =
+    if ruby == 2.5
+    then ruby_2_5
+    else if ruby == 2.6
+    then ruby_2_6
+    else if ruby == 2.7
+    then ruby_2_7
+    else if ruby == 3.0
+    then ruby_3_0
+    else abort "Unsupported Ruby version";
+  gems = bundlerEnv {
+    pname = "twterm";
+    gemdir = ./.;
+    ruby = mri;
+  };
+in
+mkShell rec {
+  buildInputs = [
+    bundix
+    bundler
+    gems
+    libffi
+    libidn
+    mri
+    ncurses
+    readline
+  ];
+  shellHook = ''
+    alias twterm='bundle exec bin/twterm'
+
+    bundle install -j=4 --path=vendor/bundle
+
+    ruby --version
+    bundle --version
+  '';
+}

data/twterm.gemspec

@@ -16,21 +16,21 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |i| i == 'Gemfile.lock' }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
 
-  spec.add_dependency 'curses', '~> 1.2.2'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0.5'
-  spec.add_dependency 'launchy', '~> 2.4.3'
+  spec.add_dependency 'curses', '~> 1.4.0'
+  spec.add_dependency 'concurrent-ruby', '~> 1.1.7'
+  spec.add_dependency 'launchy', '~> 2.5.0'
   spec.add_dependency 'oauth', '~> 0.5.1'
   spec.add_dependency 'terminal-notifier', '~> 2.0.0'
-  spec.add_dependency 'toml-rb', '~> 0.3.14'
-  spec.add_dependency 'twitter', '~> 6.2.0'
-  spec.add_dependency 'twitter-text', '~> 2.1.0'
+  spec.add_dependency 'toml-rb', '~> 2.0.1'
+  spec.add_dependency 'twitter', '~> 7.0.0'
+  spec.add_dependency 'twitter-text', '~> 3.1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'hashie', '~> 3.5.6'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.7.0'
-  spec.add_development_dependency 'rubocop', '~> 0.51.0'
-  spec.add_development_dependency 'yard', '~> 0.9.12'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
+  spec.add_development_dependency 'hashie', '~> 4.1.0'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
+  spec.add_development_dependency 'rubocop', '~> 1.7.0'
+  spec.add_development_dependency 'yard', '~> 0.9.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Ryota Kameoka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -86,126 +86,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.6
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.6
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.26
 description: A full-featured TUI Twitter client
 email:
 - kameoka.ryota@gmail.com
@@ -214,14 +214,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - bin/twterm
+- default.nix
+- gemset.nix
 - lib/twterm.rb
 - lib/twterm/abstract_persistable_configuration.rb
 - lib/twterm/app.rb
@@ -234,19 +237,14 @@ files:
 - lib/twterm/completer/search_query_completer.rb
 - lib/twterm/completion_manager.rb
 - lib/twterm/config.rb
-- lib/twterm/direct_message.rb
-- lib/twterm/direct_message_composer.rb
-- lib/twterm/direct_message_manager.rb
 - lib/twterm/environment.rb
 - lib/twterm/event/abstract_event.rb
-- lib/twterm/event/direct_message/fetched.rb
 - lib/twterm/event/message/abstract_message.rb
 - lib/twterm/event/message/error.rb
 - lib/twterm/event/message/info.rb
 - lib/twterm/event/message/success.rb
 - lib/twterm/event/message/warning.rb
 - lib/twterm/event/notification/abstract_notification.rb
-- lib/twterm/event/notification/direct_message.rb
 - lib/twterm/event/notification/favorite.rb
 - lib/twterm/event/notification/follow.rb
 - lib/twterm/event/notification/list_member_added.rb
@@ -259,7 +257,6 @@ files:
 - lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/abstract_status_event.rb
 - lib/twterm/event/status/mention.rb
-- lib/twterm/event/status/timeline.rb
 - lib/twterm/event/status_deleted.rb
 - lib/twterm/event/status_garbage_collected.rb
 - lib/twterm/event/user_garbage_collected.rb
@@ -280,6 +277,7 @@ files:
 - lib/twterm/image/horizontal_sequential_image.rb
 - lib/twterm/image/parens.rb
 - lib/twterm/image/string_image.rb
+- lib/twterm/image/underlined.rb
 - lib/twterm/image/vertical_sequential_image.rb
 - lib/twterm/image_builder/user_name_image_builder.rb
 - lib/twterm/key_mapper.rb
@@ -309,7 +307,6 @@ files:
 - lib/twterm/repository/abstract_entity_repository.rb
 - lib/twterm/repository/abstract_expirable_entity_repository.rb
 - lib/twterm/repository/abstract_repository.rb
-- lib/twterm/repository/direct_message_repository.rb
 - lib/twterm/repository/friendship_repository.rb
 - lib/twterm/repository/hashtag_repository.rb
 - lib/twterm/repository/list_repository.rb
@@ -320,11 +317,8 @@ files:
 - lib/twterm/screen.rb
 - lib/twterm/search_query_window.rb
 - lib/twterm/status.rb
-- lib/twterm/streaming_client.rb
 - lib/twterm/subscriber.rb
 - lib/twterm/tab/abstract_tab.rb
-- lib/twterm/tab/direct_message/conversation.rb
-- lib/twterm/tab/direct_message/conversation_list.rb
 - lib/twterm/tab/dumpable.rb
 - lib/twterm/tab/exceptions.rb
 - lib/twterm/tab/key_assignments_cheatsheet.rb
@@ -333,6 +327,7 @@ files:
 - lib/twterm/tab/new/list.rb
 - lib/twterm/tab/new/search.rb
 - lib/twterm/tab/new/user.rb
+- lib/twterm/tab/preferences/control.rb
 - lib/twterm/tab/preferences/index.rb
 - lib/twterm/tab/preferences/notification_backend.rb
 - lib/twterm/tab/preferences/photo_viewer_backend.rb
@@ -361,6 +356,10 @@ files:
 - lib/twterm/utils.rb
 - lib/twterm/version.rb
 - lib/twterm/view.rb
+- nix/Gemfile
+- nix/Gemfile.lock
+- nix/gemset.nix
+- shell.nix
 - spec/fixtures/list.json
 - spec/fixtures/status.json
 - spec/fixtures/user.json
@@ -395,24 +394,23 @@ homepage: http://twterm.ryota-ka.me/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A full-featured TUI Twitter client
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-
-before_install: gem update --system
-
-script: bundle exec rubocop --parallel --fail-level warning && bundle exec rspec

data/lib/twterm/direct_message.rb

@@ -1,60 +0,0 @@
-require 'twterm/user'
-require 'twterm/utils'
-
-module Twterm
-  class DirectMessage
-    attr_reader :id, :created_at, :recipient_id, :sender_id, :text
-
-    def initialize(message)
-      @id = message.id
-      update!(message)
-    end
-
-    def ==(other)
-      other.is_a?(self.class) && id == other.id
-    end
-
-    def date
-      format = Time.now - @created_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
-      @created_at.strftime(format)
-    end
-
-    def update!(message)
-      @created_at = message.created_at.dup.localtime
-      @recipient_id = message.recipient.id
-      @sender_id = message.sender.id
-      @text = message.text
-
-      self
-    end
-
-    class Conversation
-      include Utils
-
-      attr_reader :collocutor_id, :messages
-
-      def initialize(collocutor_id)
-        @collocutor_id = collocutor_id
-        @messages = []
-      end
-
-      def <<(message)
-        @messages << message if messages.find { |m| m == message }.nil?
-        @messages.sort_by!(&:created_at).reverse!
-
-        self
-      end
-
-      def preview
-        messages.sort_by(&:created_at).last.text.gsub("\n", ' ')
-      end
-
-      def updated_at
-        updated_at = @messages.map(&:created_at).max
-
-        format = Time.now - updated_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
-        updated_at.strftime(format)
-      end
-    end
-  end
-end