twterm 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf7362652e3fa052f2a3baef88ad36f4e47c61f
-  data.tar.gz: 3aad720b6c5dfe38566c661bc00a4cae10f97bc6
+  metadata.gz: 52ffcecd46a9f09aacf0db6c809ce6f5fe71e874
+  data.tar.gz: f1340022b9fd1628be5bba96839321d381fdc94d
 SHA512:
-  metadata.gz: 484c292558b6abd51aff8fe22605805db5d3e1c7be6d2fb0a21b2168bdeeef98a9346d307ab90d6595de98b0dda090abc601586f4e5b3b5e8cb6492c48b37d2b
-  data.tar.gz: 9f4978776a77a77eab70a64f4b3a1565a83b3230569b44dd13f52d0b823b6caed7d8fc4dafc0e10bd1199c8db535c0f605822ed4f496a60bba27aa9d31d2632d
+  metadata.gz: 3b0732ac89eb6cdf4fc7475f8a47bbcdca9906cba71bffb3cad63ccbbaa7b298a9000ba82efa1e6353e776e8bd41b833e8343b8c63db495333263bf2bed7917c
+  data.tar.gz: 0451fec8a057f15b113785797673117cb99ca13eb25b7605af87657eeb2ae7f6048fb3f4ab7740ebffa2a0bf7e45ab2254b605cc1fe39228aaf2681532f0f1e6

data/lib/twterm/app.rb

@@ -2,7 +2,11 @@ module Twterm
   class App
     include Singleton
 
+    DATA_DIR = "#{ENV['HOME']}/.twterm"
+
     def initialize
+      Dir.mkdir(DATA_DIR, 700) unless File.directory?(DATA_DIR)
+
       Config.load
       Auth.authenticate_user if Config[:screen_name].nil?
 

data/lib/twterm/config.rb

@@ -1,6 +1,6 @@
 module Twterm
   module Config
-    CONFIG_FILE = "#{ENV['HOME']}/.twterm.yml"
+    CONFIG_FILE = "#{App::DATA_DIR}/config"
 
     def [](key)
       @config[key]

data/lib/twterm/history/base.rb

@@ -0,0 +1,36 @@
+module Twterm
+  module History
+    module Base
+      MAX_HISTORY_SIZE = 500
+
+      attr_reader :history
+
+      def initialize
+        unless File.exist?(history_file)
+          @history = []
+          return
+        end
+
+        @history = YAML.load(File.read(history_file)) || []
+      end
+
+      def add(hashtag)
+        @history.unshift(hashtag)
+        @history = @history.uniq.take(MAX_HISTORY_SIZE)
+        save
+      end
+
+      private
+
+      def save
+        File.open(history_file, 'w', 0600) do |f|
+          f.write @history.to_yaml
+        end
+      end
+
+      def history_file
+        fail NotImplementedError, 'history_file method must be implemented'
+      end
+    end
+  end
+end

data/lib/twterm/history/hashtag.rb

@@ -0,0 +1,13 @@
+module Twterm
+  module History
+    class Hashtag
+      include Singleton, Base
+
+      private
+
+      def history_file
+        "#{App::DATA_DIR}/hashtags"
+      end
+    end
+  end
+end

data/lib/twterm/history/screen_name.rb

@@ -0,0 +1,13 @@
+module Twterm
+  module History
+    class ScreenName
+      include Singleton, Base
+
+      private
+
+      def history_file
+        "#{App::DATA_DIR}/screen_names"
+      end
+    end
+  end
+end

data/lib/twterm/status.rb

@@ -42,6 +42,10 @@ module Twterm
 
       @touched_at = Time.now
 
+      tweet.hashtags.each do |hashtag|
+        History::Hashtag.instance.add(hashtag.text)
+      end
+
       @@instances[id] = self
     end
 
@@ -64,14 +68,17 @@ module Twterm
     end
 
     def favorite!
+      @favorite_count += 1
       @favorited = true
     end
 
     def unfavorite!
+      @favorite_count -= 1
       @favorited = false
     end
 
     def retweet!
+      @retweet_count += 1
       @retweeted = true
     end
 

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

@@ -48,10 +48,10 @@ module Twterm
           Thread.new do
             Notifier.instance.show_message('Loading lists ...')
             Client.current.lists do |lists|
-              @@lists = lists
+              @@lists = lists.sort_by(&:full_name)
               show_lists
               update_scrollbar_length
-              @window.refresh
+              @window.refresh if TabManager.instance.current_tab == self
             end
           end if @@lists.nil?
 

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

@@ -26,7 +26,7 @@ module Twterm
           input_thread = Thread.new do
             close_screen
             puts "\ninput search query"
-            query = readline('input query > ').strip
+            query = (readline('input query > ') || '').strip
             resetter.call
 
             tab = query.nil? || query.empty? ? Tab::New::Start.new : Tab::SearchTab.new(query)

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

@@ -26,7 +26,7 @@ module Twterm
           input_thread = Thread.new do
             close_screen
             puts "\nSearch user"
-            screen_name = readline('> @').strip
+            screen_name = (readline('> @') || '').strip
             resetter.call
 
             Client.current.show_user(screen_name) do |user|

data/lib/twterm/tweetbox.rb

@@ -23,12 +23,42 @@ module Twterm
 
       thread = Thread.new do
         close_screen
+
         if @in_reply_to.nil?
           puts "\nCompose new tweet:"
         else
           puts "\nReply to @#{@in_reply_to.user.screen_name}'s tweet: \"#{@in_reply_to.text}\""
         end
-        @status = readline(@in_reply_to.nil? ? '> ' : " @#{in_reply_to.user.screen_name} ", true)
+
+        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
+
+        loop do
+          msg = @in_reply_to.nil? || !@status.empty? ? '> ' : "> @#{in_reply_to.user.screen_name} "
+          line = (readline(msg, true) || '').strip
+          break if line.empty?
+
+          if line.end_with?('\\')
+            @status << line.chop.lstrip + "\n"
+          else
+            @status << line
+            break
+          end
+        end
+
         resetter.call
         post
       end
@@ -44,7 +74,7 @@ module Twterm
     end
 
     def post
-      return if @status.nil?
+      return if @status.nil? || @status.empty?
 
       Client.current.post(@status, @in_reply_to)
       clear

data/lib/twterm/user.rb

@@ -34,6 +34,9 @@ module Twterm
       @statuses_count = user.statuses_count
       @friends_count = user.friends_count
       @followers_count = user.followers_count
+
+      History::ScreenName.instance.add(user.screen_name)
+
       self
     end
   end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/twterm.rb

@@ -17,6 +17,9 @@ require 'twterm/auth'
 require 'twterm/client'
 require 'twterm/color_manager'
 require 'twterm/config'
+require 'twterm/history/base'
+require 'twterm/history/hashtag'
+require 'twterm/history/screen_name'
 require 'twterm/list'
 require 'twterm/notification/base'
 require 'twterm/notification/message'
@@ -47,6 +50,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.2'
+    REQUIRE_VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -129,6 +129,9 @@ files:
 - lib/twterm/client.rb
 - lib/twterm/color_manager.rb
 - lib/twterm/config.rb
+- lib/twterm/history/base.rb
+- lib/twterm/history/hashtag.rb
+- lib/twterm/history/screen_name.rb
 - lib/twterm/list.rb
 - lib/twterm/notification/base.rb
 - lib/twterm/notification/error.rb