imsg 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc7fd076a7c56ab0d450077012b0aa36f9cccc8
-  data.tar.gz: bd23220b3346f311046c51e078b5b32c5420e621
+  metadata.gz: 764296b4df5fa36643856287659a63fde3af17d9
+  data.tar.gz: 00e11b5b9dffca41e12ce1e230aeea630d41653e
 SHA512:
-  metadata.gz: 68d1ec0492b62487b8d105569d877c211a15306bb3a6147ffcd12e465c0b59f3a00bd717f71ef087d4ac39b0be7aceb3c1fedec58334869045215c7568cf6ee6
-  data.tar.gz: 68409ec4ef8c10663ebf8c1bfdbbfaf6d952e72149fb6adab6f1080b9d07252d62febbe8048dd2c0991d5371699a9f0efb44b78cfb41601a1277b46ac22438b7
+  metadata.gz: 923bde834dc20f9f44bbee55fca2d2ebec66b1d94d3b14ace5fc3e3bbc09259df6df5f85b4daf997d3e8f8cabce45214d52f2b0de65e228aec57358e975a57d7
+  data.tar.gz: e31ac22f208906b84376133a72641dc860c1893682ec61cd7f844ed8d94163a9f9ddd9cfe9728b4d5c62e76ac4784225e0da062e61f9e718ec496610c36e776e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imsg (1.0.0)
+    imsg (0.0.5)
       rb-appscript
 
 GEM

data/bin/imsg

@@ -11,21 +11,16 @@ def interactWithUser
 	ARGV.clear
 	STDOUT.flush
 
-	# Show the chat list with the buddies names
-	ImsgHandler.showChatList
+	# handles user message
+	ImsgHandler.ask_for_buddy_with_msg str
+end
 
-	# Gets the buddy name or number
-	response = gets.chomp
 
-	# Send the message captured on the beggining to the selected buddy
-	ImsgHandler.sendMessage str, response
+# Control+C trick in order to get out of exit() signal gracefully
+trap("SIGINT") { throw :ctrl_c }
+catch :ctrl_c do
+	begin
+		interactWithUser
+	rescue Exception
+	end
 end
-
-# Control+C trick in order to get out of command gracefully
- trap("SIGINT") { throw :ctrl_c }
- catch :ctrl_c do
- begin
-    interactWithUser
- rescue Exception
- end
- end

data/lib/imsg.rb

@@ -1,56 +1,12 @@
 #!/usr/bin/env ruby
-require "imsg/version"
-require 'appscript'
+require 'imsg/version'
+require 'model/chat'
 
 module ImsgHandler
-	CHAT_DISPLAY_LIMIT = 12
-
-	class Chat
-		attr_accessor :chat_number, :updated, :participants
-
-		def initialize(chat_number, updated, participants)
-			self.chat_number = chat_number
-			self.updated = updated
-			self.participants = participants
-		end
-
-		def to_s
-			"#{chat_number} - #{participants.map(&:name).join(", ")}"
-		end
-
-		def self.fetch_all
-			ascript_chats.map.with_index(1){ |chat, i| from_ascript_chat(chat, i) }
-		end
-
-		def self.ascript_chats
-			Appscript.app("Messages").chats.get()
-		end
-
-		def self.from_ascript_chat(chat, chat_number)
-			new(chat_number, chat.updated.get(), participants_from_ascript_chat(chat))
-		end
-
-		def self.participants_from_ascript_chat(chat)
-			chat.participants.get().map do |participant|
-				Participant.from_ascript_participant(participant)
-			end
-		end
-	end
-
-	class Participant
-		attr_accessor :name
-
-		def initialize(name)
-			self.name = name
-		end
-
-		def self.from_ascript_participant(ascript_participant)
-			self.new(ascript_participant.name.get())
-		end
-	end
+	CHAT_DISPLAY_LIMIT = 15
 
 	def self.display_chats(chats)
-		sort_by_updated(chats).first(CHAT_DISPLAY_LIMIT).map(&:to_s).join("\n")
+		chats.first(CHAT_DISPLAY_LIMIT).map.with_index{ |x, i| "#{i + 1} - #{x.to_s}"}.join("\n")
 	end
 
 	def self.sort_by_updated(chats)
@@ -58,15 +14,15 @@ module ImsgHandler
 	end
 
 	# Check if a String is a integer number
-	def self.is_i str
-   		!!(str =~ /^[-+]?[0-9]+$/)
+	def self.is_i?(str)
+		str =~ /\A\d+\z/
 	end
 
 	# Calls Applescript in order to trigger an iMessage message to a buddy
 	# The buddy parameter accepts a String with either a chat number or a Buddy name
-	def self.sendMessage message, buddy
-		if is_i buddy
-			puts "Sending \'#{message}\'  to chat number #{buddy}"
+	def self.send_message message, buddy, chat
+		if (chat)
+			puts "Sending \'#{message}\'  to chat with #{chat.to_s}"
 			`osascript -e 'tell application "Messages" to send \"#{message}\" to item #{buddy.to_i} of text chats'`
 		else
 			puts "Sending \'#{message}\' to buddy \'#{buddy}\'"
@@ -75,11 +31,15 @@ module ImsgHandler
 	end
 
 	# Shows the chat list along with their participants
-	def self.showChatList
-		chats = Chat.fetch_all
-		puts "\nWho would you like to send your message to?"
+def self.ask_for_buddy_with_msg msg
+		chats = sort_by_updated(Chat.fetch_all)
+		puts "\nTo whom would you like to send your message?"
 		puts "(You can choose a number or type a buddy name/email)\n\n"
 		puts display_chats(chats)
+		response = gets.chomp
+		chat = is_i?(response) ? chats[response.to_i - 1] : nil
+		response = chat ? chat.chat_number.to_s : response
+		
+		send_message(msg, response, chat)
 	end
-
 end

data/lib/imsg/version.rb

@@ -1,3 +1,3 @@
 module Imsg
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/model/chat.rb

@@ -0,0 +1,34 @@
+require 'appscript'
+require 'model/participant'
+
+class Chat
+	attr_accessor :chat_number, :updated, :participants
+
+	def initialize(chat_number, updated, participants)
+		self.chat_number = chat_number
+		self.updated = updated
+		self.participants = participants
+	end
+
+	def to_s
+		participants.map(&:name).join(", ")
+	end
+
+	def self.fetch_all
+		ascript_chats.map.with_index(1){ |chat, i| from_ascript_chat(chat, i) }
+	end
+
+	def self.ascript_chats
+		Appscript.app("Messages").chats.get()
+	end
+
+	def self.from_ascript_chat(chat, chat_number)
+		new(chat_number, chat.updated.get(), participants_from_ascript_chat(chat))
+	end
+
+	def self.participants_from_ascript_chat(chat)
+		chat.participants.get().map do |participant|
+			Participant.from_ascript_participant(participant)
+		end
+	end
+end

data/lib/model/participant.rb

@@ -0,0 +1,11 @@
+class Participant
+	attr_accessor :name
+
+	def initialize(name)
+		self.name = name
+	end
+
+	def self.from_ascript_participant(ascript_participant)
+		self.new(ascript_participant.name.get())
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imsg
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christian Sampaio
@@ -71,6 +71,8 @@ files:
 - imsg.gemspec
 - lib/imsg.rb
 - lib/imsg/version.rb
+- lib/model/chat.rb
+- lib/model/participant.rb
 homepage: https://github.com/chrisfsampaio/imsg
 licenses:
 - MIT