chagol 0.0.3 → 0.0.4

data/bin/chagol

@@ -9,7 +9,16 @@ if !Dir.exists?(Dir.home + "/.chagol")
   Chagol.install_chagol
   puts "Please enter your contacts in ~/.chagol/contacts.json\n
   Modify the one that already exists and add as many more as \n
-  you want in the same format"
+  you want in the same format.\n
+  Before using chagol you need to edit your configuration file ~/.chagol/config.rb"
+  exit
+end
+
+require File.expand_path("~/.chagol/config")
+# Check if the user has configured chagol exit if not done
+if $user[:phone_no] == "" || $user[:password] == ""
+  puts "Please enter your phone no and your password in ~/.chagol/config.rb"
+  exit
 end
 
 # Parse the command line options with the awesome optionparser
@@ -39,26 +48,20 @@ end.parse!
 # A message is necessary for all actions except quering 
 # for the version of the gem
 if options[:message] && (options[:users] || options[:lists])
-  # Load the contacts in from the json also TODO load lists too
+  # Load the contacts in from the json
   contacts = Array.new
   File.open(File.expand_path("~/.chagol/contacts.json","r")).each_line do |line|
     contacts << JSON.parse(line)
   end
-  # Load the username, password and provider from the config file
-  require File.expand_path("~/.chagol/config")
+  # Instantiate the messenger with the users configuration
   messenger = Chagol::SmsSender.new($user[:phone_no], $user[:password], $user[:provider])
   # Send messages to individual users
   if options[:users] && options[:users].length > 0
-    #TODO : Replace these stubs with the actual code to send messages
-    puts "Your Message will be sent to the following users"
-    options[:users].each do |target|
-      contacts.each do |contact|
-        if target.casecmp(contact.name) == 0
-          puts "#{target}, #{contact.phone} => #{options[:message]}"
-          messenger.send(contact.phone,options[:message])
-        end
-      end
-    end 
+    phone_nos = Chagol.get_phone_nos_from_name(contacts, options[:users])
+    phone_nos.each do |no|
+      messenger.send(no,options[:message])
+      puts no
+    end
   end
   # Send messages to user created lists
   if options[:lists] && options[:lists].length > 0
@@ -69,5 +72,6 @@ if options[:message] && (options[:users] || options[:lists])
 else
   puts "The great chagol isn't a mind reader!
 Please specify a recipient or a list of recipients 
-to whom you want the message delivered."
+to whom you want the message delivered.
+Run chagol -h to learn what it can do."
 end

data/lib/chagol/cli.rb

@@ -8,8 +8,43 @@ module Chagol
     Dir.mkdir(chagol_path)
     # Create the sample json files for the contacts
     File.open(chagol_path + "/contacts.json", "w") do |f|
-      f.write('{"json_class":"Contact","data":{"id":1,"name":"Nikhil","phone":"9900000018"}}')
+      f.write('{"json_class":"Chagol::Contact","data":{"id":1,"name":"Nikhil","phone":"9900000018"}}')
     end
     # Create the json for the lists
+    #
+    # Create the user configuration
+    File.open(chagol_path + "/config.rb", "w") do |f|
+      f.write('# Please change this file to replace your phone no, password and provider
+# The password is your way2sms/160by2/provider password
+
+$user = { phone_no: "",
+         password: "",
+         provider: "way2sms" }')
+    end
+  end
+
+  # More helper methods
+
+  # This finds the phone nos for the users whose names have been passed as
+  # command line arguments also it returns phones no's that were passed
+  # directly. The messages are to be sent to each no returned from here.
+  def self.get_phone_nos_from_name(contacts, names)
+    phone_nos = Array.new
+    # Parse out phone no's first and remove them from the names first
+    names.delete_if do |ph_no|
+      if /[7-9][0-9]{9}/.match(ph_no)
+        phone_nos << ph_no
+      end
+    end
+    # And find the phone no's from the contacts next
+    names.each do |target|
+      contacts.each do |contact|
+        if target.casecmp(contact.name) == 0
+          # puts "#{target}, #{contact.phone}" # debug mode info
+          phone_nos << contact.phone
+        end
+      end
+    end
+    return phone_nos.uniq
   end
 end

data/lib/chagol/version.rb

@@ -1,3 +1,3 @@
 module Chagol
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chagol
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Chagol can send messages to any Indian mobile no
 email: