t_chatter 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 444e14ae8b42aaa85766a23314158ed9d6fb0dd7
-  data.tar.gz: 7de15773339d2be2270099b466c733b543eaa056
+  metadata.gz: 20d112a39dc3f70adc1aba142d9e3ce0e13cb899
+  data.tar.gz: f5d6b2e9e9bd72337e48e9a57f2c291d9fcd217f
 SHA512:
-  metadata.gz: cb10d13a791e5e7d20e724a194d9ddb88734db0c7263075b178070b1a3bbe8f6f8db482745f5df3327757043ef835a028303929e7e26cb33d1cca506c5660047
-  data.tar.gz: 6af4107cc8e98fb12b2473e9d456e47dea2cfeee8fe283e578abac78eb3cc3509be5e06bf64950ff76292f6601860d05d60fd905a5fbd2075c0f2644a176c9b7
+  metadata.gz: 5291a053fa7f109fb8856ddba828d02c33787efea9d256e13e8b38671d56b3a59eb600e258125544623e61620b8888786d5283266a1228190740dfb3ce09507d
+  data.tar.gz: 39c87ee99bb7ad6dce34fcd6e4011d4a97bff1467b708fe9fd0cb639785497606f78ca3502056de31566faa702825b61557073ea64224e44a7319a9b768224ad

data/.gitignore

@@ -10,3 +10,4 @@
 .chatter.yml
 codesnip
 */codesnip
+*.gem

data/bin/setup_t_chatter

@@ -25,48 +25,64 @@ end
 
 config = Hash.new(nil)
 
+true_false_cmd = {
+  'true' => true,
+  'yes' => true,
+  'y' => true,
+  't' => true,
+  '' => true,
+  'false' => false,
+  'no' => false,
+  'n' => false,
+  'f' => false
+}
+
+tfc_short = true_false_cmd.keys.reject{ |k, v| k == '' }.join(', ')
+
 print "What is your name?(optional) : "
 config[:user] = gets.chomp.strip
 
 puts ""
 
-print "Would you like to just send message?(optional) : "
+print "Would you like to send messages?(optional) #enter (#{tfc_short}) : "
 config[:send] = gets.chomp.strip
 
 puts ""
 
-print "Would you like to receive messages?(optional) : "
+print "Would you like to receive messages?(optional) #enter (#{tfc_short}) : "
 config[:receive] = gets.chomp.strip
 
 print "Enter your URL for the Server?(optional) : "
 config[:host] = gets.chomp.strip
 
-true_cmd = {
-  'true' => true,
-  'yes' => true,
-  'y' => true,
-  '' => true,
-  'false' => false,
-  'no' => false,
-  'n' => false
-}
 
 real_config = Hash.new(nil)
 config.each{ |x, y|
   if [:send, :receive].include? x
-    real_config[x] = true_cmd[y]
-    real_config[x] = true unless true_cmd.keys.include? y
+    real_config[x] = true_false_cmd[y]
+    real_config[x] = true unless true_false_cmd.keys.include? y
   else
     real_config[x] = y if !y.blank?
   end
 }
 
 real_config[:host] = TChatter::DEFAULT_URL unless real_config[:host]
+real_config[:user_id] = TChatter::UNIQUE_ID
 
 File.open(file_location, 'w') do |f|
   ::YAML.dump real_config, f
 end
 
+applications_to_be_supported = %w[ Slack HipChat ].join(', ')
+
 puts <<-EOS
-  Congratulations you have completed the basic setup. The file can be found at: #{file_location}
+  Congratulations you have completed the basic setup. The file can be found at:
+  #{file_location}
+
+  To connect to TChatter
+  run `t_chatter` from your terminal and watch the messages stream in
+
+
+  Note: As part of the future plans, you would be able to connect TChatter to
+  your #{applications_to_be_supported} application so you never miss a chat
 EOS

data/bin/t_chatter

@@ -3,13 +3,5 @@
 require "bundler/setup"
 require "t_chatter"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-# require "irb"
-# IRB.start
-TChatter::Start.chat
+chat = TChatter::Entry.new
+chat.start_chat

data/lib/t_chatter/chat.rb

@@ -1,15 +1,22 @@
 module TChatter
   class Chat
-    attr_reader :connection, :messages, :response, :last_message_id, :user, :config
+    attr_reader :connection, :messages, :response, :last_message_id, :user, :user_id, :config, :url, :all_users
     # attr_accessor :url
 
     def initialize(username, config_class)
       @user = username
       @messages = []
       @last_message_id = 0
+      @all_users = []
       @config = config_class.configuration
+      @user_id = config[:user_id] || UNIQUE_ID
       set_url
       connect
+      subscribe_user
+    end
+
+    def subscribe_user
+      connection.post('/new_user', {user_id: user_id , user: user})
     end
 
     def set_url
@@ -22,7 +29,7 @@ module TChatter
         used everytime you try to connect. However you are now being connected
         to the global chatter stream
         EOS
-        @url = URI.parse(TChatter::DEFAULT_URL)
+        @url = URI.parse(DEFAULT_URL)
       end
     end
 
@@ -37,8 +44,9 @@ module TChatter
 
     def send_message(message)
       response = connection.post('/send', {message: message, user: user})
-      response = JSON.parse(response.body)
-      @last_message_id = response["last_message_id"]
+      @response = JSON.parse(response.body)
+      @last_message_id = @response["last_message_id"]
+      @messages << message
       @last_message = message
     end
 
@@ -49,10 +57,35 @@ module TChatter
       last_id = @response["last_message_id"]
       unless last_id == last_message_id
         message = @response["message"]
-        @last_message_id = @response["last_message_id"]
-        @messages << message if message
         puts message
+        @last_message_id = last_id
+        update_messages(message) unless message.blank?
       end
+      get_subscribed_users if all_users.size < @response["total_users"].to_i
+    end
+
+    def update_messages(message)
+      message = message.split("\n")
+      @last_message = message.last
+      @messages += message
+    end
+
+    def get_subscribed_users
+      response = connection.get('/all_users')
+      response = JSON.parse(response.body)
+      @all_users = response["users"]
+    end
+
+    def each_user
+      @all_users.map{ |y| y['name'] }.join(', ')
+    end
+
+    def show_all_users
+      puts @all_users.map{ |y| "#{y['name']} joined at #{y['joined']}"}.join("\n")
+    end
+
+    def quit
+      connection.get('/quit', {user_id: user_id})
     end
   end
 end

data/lib/t_chatter/entry.rb

@@ -0,0 +1,111 @@
+module TChatter
+  class Entry
+    attr_reader :user, :config, :chat, :threads
+
+    def initialize
+      @config = ConfigSetup.instance
+      setup_user
+      @chat = Chat.new(@user, @config)
+      @threads = []
+    end
+
+    def start_chat
+      setup_threads
+      control_exit_strategy
+      start_threads
+    end
+
+    def want_to_send?
+      @config.configuration.blank? ? true : @config.configuration[:send]
+    end
+
+    def want_to_receive?
+      @config.configuration.blank? ? true : @config.configuration[:receive]
+    end
+
+    def setup_user
+      @user = config.configuration[:user]
+      unless @user
+        print 'Would you mind telling me your name? : '
+        @user = gets.chomp
+      end
+    end
+
+    def stream_messages
+      Thread.new do
+        loop do
+          chat.receive_message
+        end
+      end
+    end
+
+    def variables_subs
+      { '@my_name' => chat.user.to_s, '@last_message' => chat.messages.last.to_s, '@each_user' => chat.each_user }
+    end
+
+    def substitute_variables(message)
+      variables_subs.each do |var, val|
+        message = message.gsub(var, val)
+      end
+      message
+    end
+
+    def peep
+      chat.show_all_users
+    end
+
+    def help
+      var_help = variables_subs.keys.join(', ')
+      command_help = commands.keys.join(', ')
+      puts <<-EOS
+        Use the following variables in any message to refer to its inferred
+        meaning in any message: #{var_help}
+        You can use any of these commands to also call the inferred action
+        #{command_help}
+      EOS
+    end
+
+    def quit
+      puts "Gracefully shutting down the chat"
+      chat.quit
+      @threads.each(&:exit)
+    end
+
+    def commands
+      {
+        '#all_users' => :peep,
+        '#help' => :help,
+        '#quit' => :quit
+      }
+    end
+
+    def send_messages
+      Thread.new do
+        loop do
+          message = gets.chomp.strip
+          unless commands.keys.include? message
+            message = substitute_variables(message) if message.match(/@\w+/)
+            chat.send_message(message) unless message.blank?
+          else
+            send(commands[message])
+          end
+        end
+      end
+    end
+
+    def control_exit_strategy
+      trap('INT') do
+        quit
+      end
+    end
+
+    def setup_threads
+      @threads << stream_messages if want_to_receive?
+      @threads << send_messages if want_to_send?
+    end
+
+    def start_threads
+      @threads.each(&:join)
+    end
+  end
+end

data/lib/t_chatter/version.rb

@@ -1,3 +1,3 @@
 module TChatter
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/t_chatter.rb

@@ -5,9 +5,11 @@ require 'faraday'
 require 'yaml'
 require 'singleton'
 require 'uri'
+require 'securerandom'
 
 module TChatter
   DEFAULT_URL = "https://tchatter.herokuapp.com"
+  UNIQUE_ID = SecureRandom.uuid.gsub('-', '')
   # Your code goes here...
 end
 

data/t_chatter.gemspec

@@ -9,21 +9,36 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Oreoluwa Akinniranye"]
   spec.email         = ["oreoluwa.akinniranye@andela.com"]
 
-  spec.summary       = %q{Allows you to chat on your terminal}
-  spec.description   = %q{TChatter allows you to chat with your friends on your terminal. You can extend it further though to chat your friends on Slack and other applications.}
-  spec.homepage      = "http://github.com/andela-oakinniranye/t_chatter"
-  spec.license       = "MIT"
+  spec.summary       = %q{Allows you to chat on your terminal|command line}
+  spec.homepage      = "https://github.com/andela-oakinniranye/t_chatter"
+
+  spec.description   = <<-EOS
+  TChatter allows you to chat with your friends on your
+  terminal.
+  You can extend it further though to chat with your
+  friends on Slack and other applications."
+  Visit <a href='#{spec.homepage}'>TChatter's Homepage</a>
+  to read more on the application.
+  EOS
 
+  spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
   spec.executables   = ['t_chatter', 'setup_t_chatter']
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday"
-  spec.add_dependency "json"
+  spec.add_dependency "faraday", "~> 0.9"
+  spec.add_dependency "json", "~> 1.8"
+
+  spec.post_install_message = <<-EOS
 
-  spec.post_install_message = "Thanks for trying out my interesting gem.\nTo complete the installation, run `setup_t_chatter` to create a .chatter.yml configuration file.\nThis allows you to use your own url and set defaults for your version of TChatter"
+  Thanks for trying out my interesting gem.
+  To complete the installation, run `setup_t_chatter` to
+  create a .chatter.yml configuration file.
+  This allows you to use your own url and set defaults
+  for your version of TChatter
 
+  EOS
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: t_chatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Oreoluwa Akinniranye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +66,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: TChatter allows you to chat with your friends on your terminal. You can
-  extend it further though to chat your friends on Slack and other applications.
+description: |2
+    TChatter allows you to chat with your friends on your
+    terminal.
+    You can extend it further though to chat with your
+    friends on Slack and other applications."
+    Visit <a href='https://github.com/andela-oakinniranye/t_chatter'>TChatter's Homepage</a>
+    to read more on the application.
 email:
 - oreoluwa.akinniranye@andela.com
 executables:
@@ -90,17 +95,22 @@ files:
 - lib/t_chatter.rb
 - lib/t_chatter/chat.rb
 - lib/t_chatter/config_setup.rb
-- lib/t_chatter/start.rb
+- lib/t_chatter/entry.rb
 - lib/t_chatter/version.rb
+- t_chatter-0.1.0.gem
 - t_chatter.gemspec
-homepage: http://github.com/andela-oakinniranye/t_chatter
+homepage: https://github.com/andela-oakinniranye/t_chatter
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  Thanks for trying out my interesting gem.
-  To complete the installation, run `setup_t_chatter` to create a .chatter.yml configuration file.
-  This allows you to use your own url and set defaults for your version of TChatter
+post_install_message: |2+
+
+    Thanks for trying out my interesting gem.
+    To complete the installation, run `setup_t_chatter` to
+    create a .chatter.yml configuration file.
+    This allows you to use your own url and set defaults
+    for your version of TChatter
+
 rdoc_options: []
 require_paths:
 - lib
@@ -119,5 +129,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Allows you to chat on your terminal
+summary: Allows you to chat on your terminal|command line
 test_files: []

data/lib/t_chatter/start.rb

@@ -1,53 +0,0 @@
-module TChatter
-  class Start
-
-    def self.chat
-      config = ConfigSetup.instance
-      user = config.configuration[:user]
-
-      # host = config[:host]
-      unless user
-        print "Would you mind telling me your name? > "
-        user = gets.chomp
-      end
-
-      chat = Chat.new(user, config)
-
-      want_to_receive = config.configuration.blank? ? true : config.configuration[:receive]
-      want_to_send = config.configuration.blank? ? true : config.configuration[:send]
-
-      threads = []
-
-
-      if want_to_receive
-        #response object
-        threads << Thread.new do
-          loop{
-            chat.receive_message
-          }
-        end
-      end
-
-      if want_to_send
-        #request object
-        threads << Thread.new do
-          loop{
-            message = gets.chomp
-            chat.send_message(message) if message
-          }
-        end
-      end
-
-      trap("INT") {
-        puts "Exiting the chat"
-        threads.each{|t|
-          t.exit
-        }
-      }
-
-      threads.each{ |thread|
-        thread.join
-      }
-  end
-  end
-end