twterm 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e25077b5997ac024770d29a7faa63b0367d200
-  data.tar.gz: 752e5cc8daf0a00ab054602a2bc1c437f98b80e1
+  metadata.gz: 9f8922ec344713188266282109b5d5a43a95948e
+  data.tar.gz: b1ac62bbd18b92a058b8f0753a1f34470b129fd0
 SHA512:
-  metadata.gz: 40f134f4fd0eeaaed2998883330a9d132b4e99862c0aeebeb2a57326be3c76b08ed2899c83d9366172f82cc8c7b871226e284751645b4bd45df145e9416ac60c
-  data.tar.gz: 7cba404740e73eefec2a29b5c64368d1cfd2882e58e9847c6aae858470bcca7e27c7b9fb7cbcbc588e206c7188df7b3b92fb0dae1ab15c4f27305ffde82057a8
+  metadata.gz: c08ff7689bd89c875051779cd9eda592c699df11a855a56dbe83fb4ac1a67728de75477ff8152332b36b632456169f7490759c81555542fe46dc546d0125392d
+  data.tar.gz: 6f920de275acdac03b647505fe37debe4defedd67f40dfb5c3eb9b0281a4382f688bd6266e4378c86411133b9ff4bd5197badf26c163fbb1f11775d2cfd86293

data/README.md

@@ -1,10 +1,34 @@
-# Twterm
+# twterm
 
-- A full-featured CLI Twitter client
-- http://twterm.ryota-ka.me/
+A full-featured CLI Twitter client
+
+## Screenshot
+
+![screenshot](http://twterm.ryota-ka.me/screenshot.png)
+
+## Requirements
+
+- Ruby (compiled with C Curses and Readline)
+- C curses
+- Readline
 
 ## Installation
 
 ```
-gem install twterm
+$ gem install twterm
+```
+
+## Execution
+
+```
+$ twterm
 ```
+
+## License
+
+See the LICENSE file for license rights and limitations (MIT).
+
+## Links
+
+- http://twterm.ryota-ka.me/
+- https://rubygems.org/gems/twterm

data/lib/twterm/client.rb

@@ -28,12 +28,25 @@ module Twterm
       @stream_client = TweetStream::Client.new
 
       @callbacks = {}
+
+      @mute_filter = -> _ { true }
+      fetch_muted_users do |muted_user_ids|
+        @mute_filter = lambda do |status|
+          !muted_user_ids.include?(status.user.id) &&
+            !(status.retweeted_status.is_a?(Twitter::NullObject) &&
+            muted_user_ids.include?(status.retweeted_status.user.id))
+        end
+      end
+
       @@instances << self
     end
 
     def stream
       @stream_client.on_friends do
+        break if @stream_connected
+
         Notifier.instance.show_message 'Connection established'
+        @stream_connected = true
       end
 
       @stream_client.on_timeline_status do |tweet|
@@ -53,6 +66,7 @@ module Twterm
       end
 
       @stream_client.on_no_data_received do
+        @stream_connected = false
         connect_stream
       end
 
@@ -87,19 +101,19 @@ module Twterm
 
     def home_timeline
       send_request do
-        yield @rest_client.home_timeline(count: 100).map(&CREATE_STATUS_PROC)
+        yield @rest_client.home_timeline(count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
       end
     end
 
     def mentions
       send_request do
-        yield @rest_client.mentions(count: 100).map(&CREATE_STATUS_PROC)
+        yield @rest_client.mentions(count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
       end
     end
 
     def user_timeline(user_id)
       send_request do
-        yield @rest_client.user_timeline(user_id, count: 100).map(&CREATE_STATUS_PROC)
+        yield @rest_client.user_timeline(user_id, count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
       end
     end
 
@@ -112,13 +126,13 @@ module Twterm
     def list(list)
       fail ArgumentError, 'argument must be an instance of List class' unless list.is_a? List
       send_request do
-        yield @rest_client.list_timeline(list.id, count: 100).map(&CREATE_STATUS_PROC)
+        yield @rest_client.list_timeline(list.id, count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
       end
     end
 
     def search(query)
       send_request do
-        yield @rest_client.search(query, count: 100).map(&CREATE_STATUS_PROC)
+        yield @rest_client.search(query, count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
       end
     end
 
@@ -186,6 +200,13 @@ module Twterm
       end
     end
 
+    def fetch_muted_users
+      send_request do
+        @muted_user_ids = @rest_client.muted_ids.to_a
+        yield @muted_user_ids if block_given?
+      end
+    end
+
     def on_timeline_status(&block)
       fail ArgumentError, 'no block given' unless block_given?
       on(:timeline_status, &block)

data/lib/twterm/color_manager.rb

@@ -3,7 +3,7 @@ module Twterm
     include Singleton
     include Curses
 
-    COLORS = [:black, :white, :red, :green, :blue, :yellow, :cyan, :magenta]
+    COLORS = [:black, :white, :red, :green, :blue, :yellow, :cyan, :magenta, :transparent]
     CURSES_COLORS = {
       black: COLOR_BLACK,
       white: COLOR_WHITE,
@@ -12,13 +12,15 @@ module Twterm
       blue: COLOR_BLUE,
       yellow: COLOR_YELLOW,
       cyan: COLOR_CYAN,
-      magenta: COLOR_MAGENTA
+      magenta: COLOR_MAGENTA,
+      transparent: -1
     }
 
     def initialize
       @colors = {
         black: {}, white: {}, red: {}, green: {},
-        blue: {}, yellow: {}, cyan: {}, magenta: {}
+        blue: {}, yellow: {}, cyan: {}, magenta: {},
+        transparent: {}
       }
       @count = 0
     end

data/lib/twterm/completion_mamanger.rb

@@ -0,0 +1,37 @@
+module Twterm
+  class CompletionManager
+    include Singleton
+
+    def initialize
+      Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{("
+      Readline.completion_case_fold = false
+    end
+
+    def set_default_mode!
+      Readline.completion_append_character = ' '
+
+      Readline.completion_proc = proc do |str|
+        if str.start_with?('#')
+          History::Hashtag.instance.history
+          .map { |tag| "##{tag}" }
+          .select { |tag| tag.start_with?(str) }
+        elsif str.start_with?('@')
+          History::ScreenName.instance.history
+          .map { |name| "@#{name}" }
+          .select { |name| name.start_with?(str) }
+        else
+          []
+        end
+      end
+    end
+
+    def set_screen_name_mode!
+      Readline.completion_append_character = ''
+
+      Readline.completion_proc = proc do |str|
+        History::ScreenName.instance.history
+          .select { |name| name.start_with?(str) }
+      end
+    end
+  end
+end

data/lib/twterm/extensions/curses/window.rb

@@ -0,0 +1,14 @@
+class Curses::Window
+  def bold(&block)
+    attron(Curses::A_BOLD)
+    block.call
+    attroff(Curses::A_BOLD)
+  end
+
+  def with_color(fg, bg = :transparent, &block)
+    color_pair_index = Twterm::ColorManager.instance.get_color_pair_index(fg, bg)
+    attron(Curses.color_pair(color_pair_index))
+    block.call
+    attroff(Curses.color_pair(color_pair_index))
+  end
+end

data/lib/twterm/extensions/integer.rb

@@ -0,0 +1,5 @@
+class Integer
+  def format
+    to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,')
+  end
+end

data/lib/{extentions.rb → twterm/extensions/string.rb}

@@ -28,24 +28,3 @@ class String
     chunks
   end
 end
-
-class Integer
-  def format
-    to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,')
-  end
-end
-
-class Curses::Window
-  def bold(&block)
-    attron(Curses::A_BOLD)
-    block.call
-    attroff(Curses::A_BOLD)
-  end
-
-  def with_color(fg, bg = :black, &block)
-    color_pair_index = Twterm::ColorManager.instance.get_color_pair_index(fg, bg)
-    attron(Curses.color_pair(color_pair_index))
-    block.call
-    attroff(Curses.color_pair(color_pair_index))
-  end
-end

data/lib/twterm/screen.rb

@@ -10,6 +10,7 @@ module Twterm
       curs_set(0)
       stdscr.keypad(true)
       start_color
+      use_default_colors
     end
 
     def wait

data/lib/twterm/tab/new/user.rb

@@ -23,6 +23,8 @@ module Twterm
             Screen.instance.refresh
           end
 
+          CompletionManager.instance.set_screen_name_mode!
+
           input_thread = Thread.new do
             close_screen
             puts "\nSearch user"

data/lib/twterm/tweetbox.rb

@@ -30,21 +30,7 @@ module Twterm
           puts "\nReply to @#{@in_reply_to.user.screen_name}'s tweet: \"#{@in_reply_to.text}\""
         end
 
-        Readline.completion_append_character = ' '
-        Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{("
-        Readline.completion_proc = proc do |str|
-          if str.start_with?('#')
-            History::Hashtag.instance.history
-              .map { |tag| "##{tag}" }
-              .select { |tag| tag.downcase.start_with?(str.downcase) }
-          elsif str.start_with?('@')
-            History::ScreenName.instance.history
-              .map { |name| "@#{name}" }
-              .select! { |name| name.downcase.start_with?(str.downcase) }
-          else
-            []
-          end
-        end
+        CompletionManager.instance.set_default_mode!
 
         loop do
           loop do

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/lib/twterm.rb

@@ -12,12 +12,15 @@ require 'twitter'
 require 'twitter-text'
 require 'yaml'
 
-require 'extentions'
 require 'twterm/app'
 require 'twterm/auth'
 require 'twterm/client'
 require 'twterm/color_manager'
+require 'twterm/completion_mamanger'
 require 'twterm/config'
+require 'twterm/extensions/curses/window'
+require 'twterm/extensions/integer'
+require 'twterm/extensions/string'
 require 'twterm/history/base'
 require 'twterm/history/hashtag'
 require 'twterm/history/screen_name'
@@ -51,6 +54,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.6'
+    REQUIRE_VERSION = '1.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -136,13 +136,16 @@ files:
 - README.md
 - Rakefile
 - bin/twterm
-- lib/extentions.rb
 - lib/twterm.rb
 - lib/twterm/app.rb
 - lib/twterm/auth.rb
 - lib/twterm/client.rb
 - lib/twterm/color_manager.rb
+- lib/twterm/completion_mamanger.rb
 - lib/twterm/config.rb
+- lib/twterm/extensions/curses/window.rb
+- lib/twterm/extensions/integer.rb
+- lib/twterm/extensions/string.rb
 - lib/twterm/history/base.rb
 - lib/twterm/history/hashtag.rb
 - lib/twterm/history/screen_name.rb