kdaigle-roast 0.0.5 → 0.0.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 5
+:patch: 6

data/bin/roast

@@ -2,4 +2,4 @@
 
 require "roast"
 
-Roast::Main.run
+Roast::Main.run(:message => (ARGV[0] || STDIN.read) )

data/lib/roast/main.rb

@@ -1,16 +1,25 @@
 module Roast
 
   class Main
-
     include Tinder
 
-    def self.run(first_msg=nil, room=nil)
-  
-      config_file = YAML.load_file(ENV['HOME'] + '/roast.yml')
-
-      options = Hash.new
-      options[:room] = (room ? room.to_s : nil) || config_file["default"]
-
+    attr_accessor :message, :room, :config, :domain, :ssl, :username, :password, :verbose
+    
+    def initialize(options)
+      @message = options[:message]      
+      @config = YAML.load_file(ENV['HOME'] + '/roast.yml')
+      room_config = @config[(options[:room] ? options[:room].to_s : @config["default"])]
+      @room = room_config['room']
+      @domain = room_config['domain']
+      @ssl = room_config['ssl']
+      @username = room_config['username']
+      @password = room_config['password']
+      @verbose = options[:verbose]
+      self
+    end
+    
+    def self.run(options={})
+      
       opts = OptionParser.new do |opt|
         opt.banner = "Usage: roast [options] message"
         opt.separator ""
@@ -20,44 +29,52 @@ module Roast
                    "Room name from config") do |room|
           options[:room] = room
         end
+        opt.on("-v", "--verbose",
+                   "Be verbose during the posting of the message") do |verbose|
+          options[:verbose] = true
+        end
       end
 
       opts.parse!(ARGV)
 
-      puts options.inspect
-
-      conf = config_file[options[:room]]
-
-      msg = first_msg || ARGV[0] || STDIN.read
+      roast = Roast::Main.new(options)
 
-      puts "Using #{conf['room']} configuration ..."
+      roast.vocalize "Using #{roast.room} configuration ..."
 
-      campfire = Campfire.new(conf['domain'], :ssl => conf['ssl'])
+      campfire = Campfire.new(roast.domain, :ssl => roast.ssl)
 
-      puts "Logging in..."
-      campfire.login conf['username'], conf['password']
-      puts "Logged in!"
+      roast.vocalize "Logging in..."
+      campfire.login(roast.username, roast.password)
+      roast.vocalize "Logged in!"
 
-      room = campfire.find_room_by_name conf["room"]
+      room = campfire.find_room_by_name(roast.room)
 
-      puts "Joining #{room.name}..."
-      # room.join(true)
-      puts "Entered room #{room.name}"
+      roast.vocalize "Joining #{room.name}..."
+      roast.vocalize "Entered room #{room.name}"
 
-      puts "Saying message..."
+      roast.vocalize "Saying message..."
 
-      if msg.split("\n").size > 1
-        room.paste(msg)
+      if message_long?(options[:message])
+        room.paste(options[:message])
       else
-        room.speak(msg)
+        room.speak(options[:message])
       end
 
-      puts "Leaving room..."
+      roast.vocalize "Leaving room..."
 
-      # room.leave
+      roast.vocalize "Done."
+    end
+    
+    def vocalize(message)
+      STDOUT.puts message if self.verbose
+    end
+    
+  private  
 
-      puts "Done."
+    def self.message_long?(message)
+      (message.split("\n").size > 1) || (message.size >= 255)
     end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kdaigle-roast
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kyle Daigle
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: roast
 dependencies: 
 - !ruby/object:Gem::Dependency