twterm 2.1.0 → 2.2.0

data/lib/twterm/tab/preferences/notification_backend.rb

@@ -0,0 +1,85 @@
+require 'twterm/image'
+require 'twterm/preferences'
+require 'twterm/publisher'
+require 'twterm/tab/base'
+require 'twterm/tab/scrollable'
+
+module Twterm
+  module Tab
+    module Preferences
+      class NotificationBackend < Tab::Base
+        include Scrollable
+        include Publisher
+
+        def drawable_item_count
+          (window.maxy - 1) / 2
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            cursor = Image.cursor(1, scroller.current_index?(i))
+            checkbox = Image.checkbox(app.preferences[:notification_backend, item])
+            desc =
+              case item
+              when :inline
+                'Inline backend'
+              when :tmux
+                'Tmux backend'
+              when :terminal_notifier
+                'Terminal Notifier backend'
+              end
+
+              cursor - Image.whitespace - checkbox - Image.whitespace - Image.string(desc)
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          env = app.environment
+
+          [
+            :inline,
+            (:tmux if env.with_tmux?),
+            (:terminal_notifier if env.terminal_notifier_available?),
+          ].compact
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            perform_selected_action
+          end
+
+          false
+        end
+
+        def title
+          'Notification backend preferences'
+        end
+
+        private
+
+        def perform_selected_action
+          item = scroller.current_item
+
+          case item
+          when :inline
+            app.preferences[:notification_backend, :inline] =
+              !app.preferences[:notification_backend, :inline]
+          when :terminal_notifier
+            app.preferences[:notification_backend, :terminal_notifier] =
+              !app.preferences[:notification_backend, :terminal_notifier]
+          when :tmux
+            app.preferences[:notification_backend, :tmux] =
+              !app.preferences[:notification_backend, :tmux]
+          end
+
+          render
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/scrollable.rb

@@ -3,7 +3,6 @@ module Twterm
     module Scrollable
       extend Forwardable
 
-      attr_reader :scroller
       def_delegators :scroller, :current_item, :drawable_items
 
       def scroller

data/lib/twterm/tab/searchable.rb

@@ -1,5 +1,5 @@
-require 'twterm/event/notification/info'
-require 'twterm/event/notification/warning'
+require 'twterm/event/message/info'
+require 'twterm/event/message/warning'
 require 'twterm/search_query_window'
 
 module Twterm
@@ -10,7 +10,7 @@ module Twterm
 
       def_delegators :scroller, :search_query
 
-      def matches?(item, query)
+      def matches?(_item, _query)
         raise NotImplementedError, '`matches?` method must be implemented'
       end
 
@@ -96,7 +96,7 @@ module Twterm
           @search_query = search_query_window.last_query if search_query.empty?
 
           if @search_query.empty?
-            event = Event::Notification::Info.new("search query is empty. Press '/' or '?' to start searching.")
+            event = Event::Message::Info.new("search query is empty. Press '/' or '?' to start searching.")
             publish(event)
             return
           end
@@ -111,10 +111,10 @@ module Twterm
           _, index = xs.find { |x, _| tab.matches?(x, search_query) }
 
           if index.nil?
-            publish(Event::Notification::Warning.new("No matches found: \"#{search_query}\""))
+            publish(Event::Message::Warning.new("No matches found: \"#{search_query}\""))
           else
-            hit_bottom = Event::Notification::Info.new('search hit BOTTOM, continuing at TOP')
-            hit_top = Event::Notification::Info.new('search hit TOP, continuing at BOTTOM')
+            hit_bottom = Event::Message::Info.new('search hit BOTTOM, continuing at TOP')
+            hit_top = Event::Message::Info.new('search hit TOP, continuing at BOTTOM')
 
             publish(hit_bottom) if (searching_down? ^ searching_backward?) && index <= previous_index
             publish(hit_top) if (searching_up? ^ searching_backward?) && index >= previous_index

data/lib/twterm/tab/user_list_management.rb

@@ -1,6 +1,6 @@
 require 'concurrent'
 
-require 'twterm/event/notification/success'
+require 'twterm/event/message/success'
 require 'twterm/image'
 require 'twterm/publisher'
 require 'twterm/tab/dumpable'
@@ -94,12 +94,12 @@ module Twterm
         if list_ids.include?(list.id)
           client.remove_list_member(list.id, user_id).then do
             @list_ids.delete(list.id)
-            publish(Event::Notification::Success.new("Removed @#{user.screen_name} from #{list.name}"))
+            publish(Event::Message::Success.new("Removed @#{user.screen_name} from #{list.name}"))
           end
         else
           client.add_list_member(list.id, user_id).then do
             @list_ids.push(list.id)
-            publish(Event::Notification::Success.new("Added @#{user.screen_name} to #{list.name}"))
+            publish(Event::Message::Success.new("Added @#{user.screen_name} to #{list.name}"))
           end
         end
           .then { render }

data/lib/twterm/tab/user_tab.rb

@@ -62,8 +62,6 @@ module Twterm
       def respond_to_key(key)
         return true if scroller.respond_to_key(key)
 
-        k = KeyMapper.instance
-
         case key
         when 10
           perform_selected_action
@@ -85,7 +83,7 @@ module Twterm
           render
 
           user = users.first
-          publish(Event::Notification::Success.new('Blocked @%s' % user.screen_name))
+          publish(Event::Message::Success.new('Blocked @%s' % user.screen_name))
         end
       end
 
@@ -107,7 +105,7 @@ module Twterm
           else
             msg = "Followed @#{user.screen_name}"
           end
-          publish(Event::Notification::Success.new(msg))
+          publish(Event::Message::Success.new(msg))
         end
       end
 
@@ -128,7 +126,7 @@ module Twterm
           render
 
           user = users.first
-          publish(Event::Notification::Success.new('Muted @%s' % user.screen_name))
+          publish(Event::Message::Success.new('Muted @%s' % user.screen_name))
         end
       end
 
@@ -207,7 +205,7 @@ module Twterm
           render
 
           user = users.first
-          publish(Event::Notification::Success.new('Unblocked @%s' % user.screen_name))
+          publish(Event::Message::Success.new('Unblocked @%s' % user.screen_name))
         end
       end
 
@@ -216,7 +214,7 @@ module Twterm
           render
 
           user = users.first
-          publish(Event::Notification::Success.new('Unfollowed @%s' % user.screen_name))
+          publish(Event::Message::Success.new('Unfollowed @%s' % user.screen_name))
         end
       end
 
@@ -225,7 +223,7 @@ module Twterm
           render
 
           user = users.first
-          publish(Event::Notification::Success.new('Unmuted @%s' % user.screen_name))
+          publish(Event::Message::Success.new('Unmuted @%s' % user.screen_name))
         end
       end
 

data/lib/twterm/tab_manager.rb

@@ -45,7 +45,7 @@ module Twterm
       current_tab.render
       refresh_window
     rescue Tab::NotClosableError
-      publish(Event::Notification::Warning.new('this tab cannot be closed'))
+      publish(Event::Message::Warning.new('this tab cannot be closed', 'this tab cannot be closed'))
     end
 
     def current_tab
@@ -104,8 +104,8 @@ module Twterm
         tab = klass.recover(app, client, title, arg)
         add(tab)
       end
-    rescue
-      publish(Event::Notification::Error.new('Failed to recover tabs'))
+    rescue StandardError
+      publish(Event::Message::Error.new('Failed to recover tabs'))
     end
 
     def refresh_window
@@ -195,7 +195,7 @@ module Twterm
 
     attr_reader :app, :client
 
-    def resize(event)
+    def resize(_event)
       @window.resize(3, stdscr.maxx)
       @window.move(0, 0)
     end

data/lib/twterm/tweetbox.rb

@@ -1,5 +1,5 @@
 require 'twterm/publisher'
-require 'twterm/event/notification/error'
+require 'twterm/event/message/error'
 
 module Twterm
   class Tweetbox

data/lib/twterm/uri_opener.rb

@@ -3,7 +3,7 @@ require 'singleton'
 require 'twterm/event/open_uri'
 require 'twterm/publisher'
 require 'twterm/subscriber'
-require 'twterm/event/notification/warning'
+require 'twterm/event/message/warning'
 
 module Twterm
   class URIOpener
@@ -20,7 +20,7 @@ module Twterm
     def open(uri)
       Launchy.open(uri)
     rescue Launchy::CommandNotFoundError
-      publish(Event::Notification::Warning.new('Browser not found'))
+      publish(Event::Message::Warning.new('Browser not found'))
     end
   end
 end

data/lib/twterm/user.rb

@@ -2,7 +2,7 @@ module Twterm
   class User
     attr_reader :color, :description, :favorites_count, :followers_count,
                 :friends_count, :id, :location, :name, :protected,
-                :screen_name, :statuses_count, :verified, :website
+                :screen_name, :statuses_count, :url, :verified, :website
     alias_method :protected?, :protected
     alias_method :verified?, :verified
 
@@ -25,6 +25,7 @@ module Twterm
       @favorites_count = user.favorites_count
       @friends_count = user.friends_count
       @followers_count = user.followers_count
+      @url = user.url
       @verified = user.verified?
 
       self

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/twterm.gemspec

@@ -22,12 +22,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby', '~> 1.0.5'
   spec.add_dependency 'launchy', '~> 2.4.3'
   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.1.0'
+  spec.add_dependency 'twitter', '~> 6.2.0'
   spec.add_dependency 'twitter-text', '1.14.5'
 
   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.5.0'
+  spec.add_development_dependency 'rspec', '~> 3.7.0'
+  spec.add_development_dependency 'rubocop', '~> 0.51.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 0.51.0
 description: A full-featured TUI Twitter client
 email:
 - kameoka.ryota@gmail.com
@@ -181,6 +209,7 @@ files:
 - Rakefile
 - bin/twterm
 - lib/twterm.rb
+- lib/twterm/abstract_persistable_configuration.rb
 - lib/twterm/app.rb
 - lib/twterm/auth.rb
 - lib/twterm/client.rb
@@ -194,15 +223,22 @@ files:
 - lib/twterm/direct_message.rb
 - lib/twterm/direct_message_composer.rb
 - lib/twterm/direct_message_manager.rb
+- lib/twterm/environment.rb
 - lib/twterm/event/base.rb
 - lib/twterm/event/direct_message/fetched.rb
-- lib/twterm/event/favorite.rb
-- lib/twterm/event/follow.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/error.rb
-- lib/twterm/event/notification/info.rb
-- lib/twterm/event/notification/success.rb
-- lib/twterm/event/notification/warning.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
+- lib/twterm/event/notification/mention.rb
+- lib/twterm/event/notification/quote.rb
+- lib/twterm/event/notification/retweet.rb
 - lib/twterm/event/open_uri.rb
 - lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/base.rb
@@ -238,7 +274,14 @@ files:
 - lib/twterm/key_mapper/status_key_mapper.rb
 - lib/twterm/key_mapper/tab_key_mapper.rb
 - lib/twterm/list.rb
-- lib/twterm/notifier.rb
+- lib/twterm/message_window.rb
+- lib/twterm/notification_backend/abstract_notification_backend.rb
+- lib/twterm/notification_backend/inline_backend.rb
+- lib/twterm/notification_backend/terminal_notifier_backend.rb
+- lib/twterm/notification_backend/tmux_backend.rb
+- lib/twterm/notification_dispatcher.rb
+- lib/twterm/persistable_configuration_proxy.rb
+- lib/twterm/preferences.rb
 - lib/twterm/publisher.rb
 - lib/twterm/repository/abstract_entity_repository.rb
 - lib/twterm/repository/abstract_expirable_entity_repository.rb
@@ -268,6 +311,8 @@ files:
 - lib/twterm/tab/new/search.rb
 - lib/twterm/tab/new/start.rb
 - lib/twterm/tab/new/user.rb
+- lib/twterm/tab/preferences/index.rb
+- lib/twterm/tab/preferences/notification_backend.rb
 - lib/twterm/tab/rate_limit_status.rb
 - lib/twterm/tab/scrollable.rb
 - lib/twterm/tab/searchable.rb
@@ -341,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A full-featured TUI Twitter client