kennethkalmer-smsinabox 0.0.3 → 0.1.0

data/bin/sms-credit

@@ -12,6 +12,10 @@ end
 require 'smsinabox'
 require 'optparse'
 
+OPTIONS = {
+  :config => nil
+}
+
 parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
 Retrieve the number of credits in the account
@@ -21,12 +25,14 @@ Usage: #{File.basename($0)} [options]
 Options are:
 BANNER
   opts.separator ""
+  opts.on("-c", "--config=path/to/config", String,
+          "Path to alternate config file (defaults to ~/.smsinabox)") { |m| OPTIONS[:config] = m }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
 
 end
 
-Smsinabox.configure!
+Smsinabox.configure!( OPTIONS[:config] )
 
 puts "Credits left: #{Smsinabox.credits}"

data/bin/sms-send

@@ -14,9 +14,11 @@ require 'optparse'
 
 OPTIONS = {
   :recipient => nil,
-  :message => nil
+  :message => nil,
+  :pipe => false,
+  :config => nil
 }
-MANDATORY_OPTIONS = %w( recipient message)
+MANDATORY_OPTIONS = %w( recipient )
 
 parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -31,6 +33,10 @@ BANNER
           "The recipient of the SMS") { |r| OPTIONS[:recipient] = r }
   opts.on("-m", "--message=MESSAGE", String,
           "The body of the message (wrap in quotes)") { |m| OPTIONS[:message] = m }
+  opts.on("-c", "--config=path/to/config", String,
+          "Path to alternate config file (defaults to ~/.smsinabox)") { |m| OPTIONS[:config] = m }
+  opts.on("-p", "--pipe",
+          "Read message text from STDIN") { OPTIONS[:pipe] = true }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -38,16 +44,33 @@ BANNER
   if MANDATORY_OPTIONS && MANDATORY_OPTIONS.find { |option| OPTIONS[option.to_sym].nil? }
     puts opts; exit
   end
+  
+  if OPTIONS[:message].nil? && !OPTIONS[:pipe]
+    puts opts; exit
+  end
+end
+
+# Figure out our message
+message = if !OPTIONS[:message].nil?
+  OPTIONS[:message]
+else
+  require 'fcntl'
+  if STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
+    STDIN.read
+  else
+    puts "Nothing to read from STDIN!"
+    exit 1
+  end
 end
 
-Smsinabox.configure!
-id = Smsinabox.send( 
+Smsinabox.configure!( OPTIONS[:config] )
+id = Smsinabox.send(
   Smsinabox::Message.new( 
-    :recipient => OPTIONS[:recipient], :body => OPTIONS[:message]
+    :recipient => OPTIONS[:recipient], :body => message
   ) 
 )
 
 puts "Message sent"
 puts "Reference: #{id}"
 puts "Recipient: #{OPTIONS[:recipient]}"
-puts "Message:   #{OPTIONS[:message]}"
+puts "Message:   #{message}"

data/bin/sms-setup

@@ -14,7 +14,8 @@ require 'optparse'
 
 OPTIONS = {
   :username     => nil,
-  :password     => nil
+  :password     => nil,
+  :config       => nil
 }
 MANDATORY_OPTIONS = %w( username password )
 
@@ -34,6 +35,8 @@ BANNER
           "Username to use") { |u| OPTIONS[:username] = u }
   opts.on("-p", "--password=PASSWORD", String,
           "Password to use") { |p| OPTIONS[:password] = p }
+  opts.on("-c", "--config=path/to/config", String,
+          "Path to alternate config file (defaults to ~/.smsinabox)") { |m| OPTIONS[:config] = m }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -43,7 +46,7 @@ BANNER
   end
 end
 
-config = Smsinabox::Configuration.new
+config = Smsinabox::Configuration.new( OPTIONS[:config] )
 config[:username] = OPTIONS[:username]
 config[:password] = OPTIONS[:password]
 config.save

data/lib/smsinabox.rb

@@ -34,9 +34,9 @@ module Smsinabox
       )
     end
     
-    # Set our username and password from ~/.smsinabox
-    def configure!
-      c = Configuration.new
+    # Set our username and password from #Smsinabox::Configuration
+    def configure!( config_file = nil )
+      c = Configuration.new( config_file )
       @username = c["username"]
       @password = c["password"]
       nil

data/lib/smsinabox/configuration.rb

@@ -1,9 +1,14 @@
 require 'yaml'
 
 module Smsinabox
+  
+  # Wrapper around our YAML configuration file, which lives in ~/.smsinabox by
+  # default
   class Configuration
     
-    def initialize
+    def initialize( config_file = nil )
+      @config_file = config_file
+      
       check_file!
       load_config
     end
@@ -44,7 +49,7 @@ module Smsinabox
     end
     
     def config_name
-      File.expand_path( File.join('~', '.smsinabox') )
+      @config_file || File.expand_path( File.join('~', '.smsinabox') )
     end
   end
 end

data/lib/smsinabox/version.rb

@@ -1,8 +1,8 @@
 module Smsinabox
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 3
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     self

data/smsinabox.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{smsinabox}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenneth Kalmer"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kennethkalmer-smsinabox
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kenneth Kalmer