hobostove 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 86c7295b9bbe575c31eb65da98a8fe03550f6208
+  data.tar.gz: 931f5f3e8b558e871950dda4736c1794ddda0b22
+SHA512:
+  metadata.gz: c604d75ce1366ba30b857da0ca58797625bfb62779db89cf0d940513fdb622fe6d15c0dc3764be4e8686ab1ce03903eefcad2fd098137731ebfea2403839db4c
+  data.tar.gz: ec9ecffc302cde28fc91eeca3a9459ea296520dcf39dddbc6dabe525c59325e5aae31f5e8af82f7e624fa57df4f08c0d4bfc4e15ba91e48fac636421757962e7

data/bin/hobostove

@@ -11,15 +11,15 @@ program_desc "A command line Campfire client"
 desc "Start hobostove"
 command :start do |c|
   c.action do
-    if Hobostove::Setup.run_setup?
-      Hobostove::Setup.new($stdin, $stdout).run
+    if Hobostove::Cli::Setup.run_setup?
+      Hobostove::Cli::Setup.new($stdin, $stdout).run
     end
 
-    if Hobostove::Upgrade.upgrade_config?
-      Hobostove::Upgrade.perform
+    if Hobostove::Cli::Upgrade.upgrade_config?
+      Hobostove::Cli::Upgrade.perform
     end
 
-    Hobostove::RoomPicker.new($stdin, $stdout).run
+    Hobostove::Cli::RoomPicker.new($stdin, $stdout).run
 
     Hobostove::Window.new.connect
   end

data/lib/hobostove/cli/room_picker.rb

@@ -0,0 +1,34 @@
+module Hobostove
+  module Cli
+    class RoomPicker
+      def initialize(stdin, stdout)
+        @stdin = stdin
+        @stdout = stdout
+      end
+
+      def run
+        @config = YAML.load(File.read(Hobostove::Configuration.config_file))
+
+        if @config.count == 1
+          Hobostove::Configuration.current_room = 0
+        else
+          pick_room
+        end
+      end
+
+      private
+
+      def pick_room
+        @stdout.puts "Which room would you like to connect to?"
+
+        @config.each_with_index do |account, index|
+          @stdout.puts "#{index + 1}. #{account["subdomain"]} - #{account["room"]}"
+        end
+
+        room_index = @stdin.gets.chomp
+
+        Hobostove::Configuration.current_room = room_index.to_i - 1
+      end
+    end
+  end
+end

data/lib/hobostove/cli/setup.rb

@@ -0,0 +1,31 @@
+module Hobostove
+  module Cli
+    class Setup
+      def self.run_setup?
+        !File.exists?(Hobostove::Configuration.config_file)
+      end
+
+      def initialize(stdin, stdout)
+        @stdin = stdin
+        @stdout = stdout
+        @settings = {}
+      end
+
+      def run
+        File.open(Hobostove::Configuration.config_file, "w") do |file|
+          @stdout.puts "~/.hobostove.yml not found. Running setup"
+          @stdout.puts "Subdomain?"
+          @settings["subdomain"] = @stdin.gets.chomp
+
+          @stdout.puts "Token?"
+          @settings["token"] = @stdin.gets.chomp
+
+          @stdout.puts "Room (full name)?"
+          @settings["room"] = @stdin.gets.chomp
+
+          file.write [@settings].to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/hobostove/cli/upgrade.rb

@@ -0,0 +1,16 @@
+module Hobostove
+  module Cli
+    class Upgrade
+      def self.upgrade_config?
+        !YAML.load(File.read(Hobostove::Configuration.config_file)).is_a?(Array)
+      end
+
+      def self.perform
+        settings = YAML.load(File.read(Hobostove::Configuration.config_file))
+        File.open(Hobostove::Configuration.config_file, "w") do |file|
+          file.write [settings].to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/hobostove/configuration.rb

@@ -17,6 +17,11 @@ module Hobostove
         user = Etc.getlogin
         File.join(Dir.home(user), ".hobostove.yml")
       end
+
+      def log_file
+        user = Etc.getlogin
+        File.join(Dir.home(user), ".hobostove.log")
+      end
     end
   end
 end

data/lib/hobostove/input_panel.rb

@@ -13,7 +13,7 @@ module Hobostove
     end
 
     def update_cursor
-      Ncurses.move(Ncurses.LINES - 2, message.size + 2)
+      Curses.setpos(Curses.lines - 2, message.size + 2)
     end
   end
 end

data/lib/hobostove/message_renderer.rb

@@ -0,0 +1,28 @@
+module Hobostove
+  class MessageRenderer < Struct.new(:subdomain, :room_id, :window_size)
+    def render_lines(message)
+      message = render(message)
+      return [] if message.nil?
+      message.scan(/.{1,#{window_size}}/)
+    end
+
+    def render(message)
+      case message.type
+      when "TextMessage"
+        "#{message.username}: #{message.body}"
+      when "EnterMessage"
+        "\t#{message.username} joined"
+      when "LeaveMessage"
+        "\t#{message.username} left"
+      when "TimestampMessage"
+        "\t#{message.timestamp.strftime("%H:%M")}"
+      when "PasteMessage"
+        "#{message.username} (paste message):\n#{message.body}"
+      when "TweetMessage"
+        "#{message.username} (tweet message): #{message.body}"
+      when "UploadMessage"
+        "#{message.username} (upload message): #{message.body}"
+      end
+    end
+  end
+end

data/lib/hobostove/models/message.rb

@@ -0,0 +1,23 @@
+module Hobostove
+  module Models
+    class Message < Value.new(:id, :timestamp, :type, :user, :body)
+      def self.convert(tinder_message)
+        # Tinder explicitly sets nil for "user"
+        tinder_user = tinder_message.fetch("user", {}) || {}
+        user = User.convert(tinder_user)
+
+        new(
+          tinder_message["id"],
+          tinder_message["created_at"],
+          tinder_message["type"],
+          user,
+          tinder_message["body"]
+        )
+      end
+
+      def username
+        user.name
+      end
+    end
+  end
+end

data/lib/hobostove/models/user.rb

@@ -0,0 +1,20 @@
+module Hobostove
+  module Models
+    class User < Value.new(:id, :name)
+      def self.convert(tinder_user)
+        new(
+          tinder_user[:id],
+          tinder_user[:name]
+        )
+      end
+
+      def eql?(other)
+        id == other.id
+      end
+
+      def hash
+        id.hash
+      end
+    end
+  end
+end

data/lib/hobostove/panel.rb

@@ -2,10 +2,15 @@ module Hobostove
   class Panel < Struct.new(:height, :width, :starty, :startx, :options)
     def initialize(*args)
       super
-      @win = Ncurses.newwin(height, width, starty, startx)
-      Ncurses.box(@win, 0, 0)
-      @panel = Ncurses::Panel.new_panel(@win)
+
+      @win = Curses::Window.new(height, width, starty, startx)
+      @win.box(0, 0)
+
+      Curses.refresh
+      @win.refresh
+
       @strings = []
+      @scroll = 0
     end
 
     def options
@@ -16,42 +21,51 @@ module Hobostove
       !options[:nowrap]
     end
 
-    def <<(string)
+    def <<(string, do_update = true)
       if wrap_lines?
         @strings << string.first(width - 4)
       else
-        word_wrap(string, width - 5).each do |line|
-          @strings << line
-        end
+        @strings << string
       end
 
+      refresh if do_update
+    end
+
+    def scroll_up
+      if @strings.size > printable_area + @scroll
+        @scroll += 1
+      end
       refresh
     end
 
-    private
+    def scroll_down
+      if @scroll > 0
+        @scroll -= 1
+      end
+      refresh
+    end
+
+    def refresh!
+      @win.refresh
+    end
 
     def refresh
-      Ncurses.werase(@win)
+      @win.clear
 
-      @strings.last(height - 2).each_with_index do |string, i|
-        @win.mvaddstr(i + 1, 2, string)
-      end
+      @win.box(0, 0)
 
-      Ncurses.box(@win, 0, 0)
+      @strings.last(printable_area + @scroll).first(printable_area).each_with_index do |string, i|
+        @win.setpos(i + 1, 2)
+        @win.addstr(string)
+      end
 
-      Ncurses::Panel.update_panels
-      Ncurses.doupdate
-      Ncurses.refresh
+      refresh!
     end
 
-    def word_wrap(text, line_width)
-      text.scan(/.{1,#{line_width}}/).each_with_index.map do |line, index|
-        if index > 0
-          " #{line}"
-        else
-          line
-        end
-      end
+    private
+
+    def printable_area
+      height - 2
     end
   end
 end

data/lib/hobostove/user_panel.rb

@@ -1,15 +1,32 @@
 module Hobostove
   class UserPanel < Panel
-    def add_user(username)
-      @strings.push(username)
-      @strings.sort!
-      refresh
+    def initialize(*args)
+      super
+
+      @users = Set.new
+    end
+
+    def user_names
+      @users.map(&:name)
     end
 
-    def remove_user(username)
-      @strings.delete(username)
+    def add_user(user, do_refresh = true)
+      @users.add(user)
+
+      refresh if do_refresh
+    end
+
+    def remove_user(user, do_refresh = true)
+      @users.delete(user)
+
+      refresh if do_refresh
+    end
+
+    def refresh
+      @strings = @users.map(&:name)
       @strings.sort!
-      refresh
+
+      super
     end
   end
 end

data/lib/hobostove/window.rb

@@ -5,31 +5,38 @@ module Hobostove
     def connect
       @current_message = ""
       @running = true
-      @user_names = []
       @messages = []
 
-      start_ncurses
-
-      load_users
-
-      stream
-
-      main
-
-      stop_ncurses
+      begin
+        start_curses
+        load_users
+        stream
+        main
+      ensure
+        Hobostove.logger.debug("terminated")
+        stop_curses
+      end
     end
 
     def main
       room.join
 
-      while @running && (ch = Ncurses.getch)
+      while @running && (ch = Curses.getch)
+        Hobostove.logger.debug("#{ch} - #{ch.chr.inspect} pressed")
+
         case ch
+        when 14 # C+n
+          @messages_panel.scroll_down
+        when 16 # C+p
+          @messages_panel.scroll_up
         when 10 # enter
           speak
+        when 21 # C-u
+          @current_message = ""
         when 127 # backspace
           @current_message = @current_message.first(@current_message.size - 1)
         when 9 # tab
-          @current_message = "#{@user_names.find { |user| user =~ /^#@current_message/ }}: "
+          @current_message = "#{@users_panel.user_names.find { |user| user =~ /^#@current_message/ }}: "
         else
           @current_message << ch.chr
         end
@@ -53,7 +60,7 @@ module Hobostove
 
     def stream
       Thread.new do
-        while true do
+        loop do
           recent = room.recent(10)
           recent.each do |message|
             next if messages.include?(message[:id])
@@ -62,26 +69,41 @@ module Hobostove
             handle_message(message)
           end
 
+          @messages_panel.refresh
+
           sleep 1
         end
       end
     end
 
     def handle_message(message)
+      Hobostove.logger.debug(message.inspect)
+      message = Models::Message.convert(message)
+
       case message.type
       when "TextMessage"
-        username = user(message[:user_id])[:name]
-        Notify.notify username, message[:body]
-        @messages_panel <<   "#{username}: #{message[:body]}"
+        Notify.notify message.username, message.body
       when "EnterMessage"
-        username = user(message[:user_id])[:name]
-        @messages_panel << "\t#{username} joined"
-        @users_panel.add_user(username)
+        @users_panel.add_user(message.user)
       when "LeaveMessage"
-        username = user(message[:user_id])[:name]
-        @messages_panel << "\t#{username} left"
-        @users_panel.remove_user(username)
+        @users_panel.remove_user(message.user)
+      when "UploadMessage"
+        upload = room.send(:get, "messages/#{message.id}/upload")
+        Hobostove.logger.debug(upload.inspect)
+        message = Models::Message.new(
+          message.id,
+          message.timestamp,
+          message.type,
+          message.user,
+          upload.upload.full_url
+        )
+      end
+
+      message_renderer.render_lines(message).each do |line|
+        @messages_panel.<<(line, false)
       end
+    rescue => e
+      Hobostove.logger.fatal(e.inspect)
     end
 
     def room
@@ -90,38 +112,37 @@ module Hobostove
 
     private
 
-    def start_ncurses
-      Ncurses.initscr
-      Ncurses.cbreak
-      Ncurses.noecho
+    def message_renderer
+      @message_renderer ||=
+        MessageRenderer.new(Configuration.subdomain, room.id, Curses.cols - 25)
+    end
 
-      @users_panel = UserPanel.new(Ncurses.LINES, 20, 0, Ncurses.COLS - 20)
-      @messages_panel = Panel.new(Ncurses.LINES - 3, Ncurses.COLS - 20, 0, 0, :nowrap => true)
-      @message_panel = InputPanel.new(3, Ncurses.COLS - 20, Ncurses.LINES - 3, 0)
+    def start_curses
+      Curses.init_screen
+      Curses.cbreak
+      Curses.noecho
 
-      Ncurses::Panel.update_panels
+      @users_panel = UserPanel.new(Curses.lines, 20, 0, Curses.cols - 20)
+      @messages_panel = Panel.new(Curses.lines - 3, Curses.cols - 20, 0, 0, :nowrap => true)
+      @message_panel = InputPanel.new(3, Curses.cols - 20, Curses.lines - 3, 0)
 
-      Ncurses.move(Ncurses.LINES - 2, 2)
+      Curses.setpos(Curses.lines - 2, 2)
 
-      Ncurses.doupdate
-      Ncurses.refresh
+      @users_panel.refresh!
+      @messages_panel.refresh!
+      @message_panel.refresh!
     end
 
-    def stop_ncurses
-      Ncurses.echo
-      Ncurses.endwin
+    def stop_curses
+      Curses.echo
     end
 
     def load_users
       room.users.each do |user|
-        @user_names << user["name"]
-        @users_panel.add_user(user["name"])
+        Hobostove.logger.info user.name
+        @users_panel.add_user(Models::User.convert(user), false)
       end
-    end
-
-    def user(user_id)
-      @users ||= {}
-      @users[user_id] ||= room.user(user_id)
+      @users_panel.refresh
     end
 
     def campfire

data/lib/hobostove.rb

@@ -1,15 +1,30 @@
 #!/usr/bin/env ruby
 
 require 'tinder'
+require 'active_support'
 require 'active_support/core_ext'
-require 'ncurses'
+require 'curses'
 require 'notify'
+require 'values'
+require 'yaml'
+
+require 'hobostove/models/message'
+require 'hobostove/models/user'
+
+require 'hobostove/message_renderer'
+
+require 'hobostove/cli/setup'
+require 'hobostove/cli/upgrade'
+require 'hobostove/cli/room_picker'
 
 require 'hobostove/configuration'
 require 'hobostove/panel'
 require 'hobostove/input_panel'
 require 'hobostove/user_panel'
 require 'hobostove/window'
-require 'hobostove/setup'
-require 'hobostove/upgrade'
-require 'hobostove/room_picker'
+
+module Hobostove
+  def self.logger
+    @logger ||= Logger.new(Configuration.log_file, 1, 1024000)
+  end
+end

metadata

@@ -1,126 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: hobostove
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Oestrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: ncurses-ruby
+  name: notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: notify
+  name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: values
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Command line client for campfire
@@ -131,39 +130,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/hobostove
+- lib/hobostove.rb
+- lib/hobostove/cli/room_picker.rb
+- lib/hobostove/cli/setup.rb
+- lib/hobostove/cli/upgrade.rb
 - lib/hobostove/configuration.rb
 - lib/hobostove/input_panel.rb
+- lib/hobostove/message_renderer.rb
+- lib/hobostove/models/message.rb
+- lib/hobostove/models/user.rb
 - lib/hobostove/panel.rb
-- lib/hobostove/room_picker.rb
-- lib/hobostove/setup.rb
-- lib/hobostove/upgrade.rb
 - lib/hobostove/user_panel.rb
 - lib/hobostove/window.rb
-- lib/hobostove.rb
-- bin/hobostove
 homepage: http://github.com/oestrich/hobostove
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line client for campfire
 test_files: []

data/lib/hobostove/room_picker.rb

@@ -1,32 +0,0 @@
-module Hobostove
-  class RoomPicker
-    def initialize(stdin, stdout)
-      @stdin = stdin
-      @stdout = stdout
-    end
-
-    def run
-      @stdout.puts "Which room would you like to connect to?"
-
-      @config = YAML.load(File.read(Hobostove::Configuration.config_file))
-
-      if @config.count == 1
-        Hobostove::Configuration.current_room = 0
-      else
-        pick_room
-      end
-    end
-
-    private
-
-    def pick_room
-      @config.each_with_index do |account, index|
-        @stdout.puts "#{index + 1}. #{account["subdomain"]} - #{account["room"]}"
-      end
-
-      room_index = @stdin.gets.chomp
-
-      Hobostove::Configuration.current_room = room_index.to_i - 1
-    end
-  end
-end

data/lib/hobostove/setup.rb

@@ -1,29 +0,0 @@
-module Hobostove
-  class Setup
-    def self.run_setup?
-      !File.exists?(Hobostove::Configuration.config_file)
-    end
-
-    def initialize(stdin, stdout)
-      @stdin = stdin
-      @stdout = stdout
-      @settings = {}
-    end
-
-    def run
-      File.open(Hobostove::Configuration.config_file, "w") do |file|
-        @stdout.puts "~/.hobostove.yml not found. Running setup"
-        @stdout.puts "Subdomain?"
-        @settings["subdomain"] = @stdin.gets.chomp
-
-        @stdout.puts "Token?"
-        @settings["token"] = @stdin.gets.chomp
-
-        @stdout.puts "Room (full name)?"
-        @settings["room"] = @stdin.gets.chomp
-
-        file.write [@settings].to_yaml
-      end
-    end
-  end
-end

data/lib/hobostove/upgrade.rb

@@ -1,14 +0,0 @@
-module Hobostove
-  class Upgrade
-    def self.upgrade_config?
-      !YAML.load(File.read(Hobostove::Configuration.config_file)).is_a?(Array)
-    end
-
-    def self.perform
-      settings = YAML.load(File.read(Hobostove::Configuration.config_file))
-      File.open(Hobostove::Configuration.config_file, "w") do |file|
-        file.write [settings].to_yaml
-      end
-    end
-  end
-end