shoutbox-client 0.0.5 → 0.0.6

data/lib/shoutbox/shout.rb

@@ -7,30 +7,49 @@ module Shoutbox
       parse_options
       do_it
     end
-    
+
+
     def parse_options
+
+      sub_commands = %w(red green destroy)
+      
+      
       @conf = Trollop::options do
         banner <<-EOS
-usage: shout <status> <statusId> [options]
+usage: shout <subcommand> <statusId>
+
+<subcommand> must be one of red, green, remove
+<statusId> is any given string you can think of
+
+If you want to delete a status, you must provide
+a message.
 
-<status> must be one of red, green, remove
-<statusId> is any given id you can think of
-       
 shout allows the folling options:
-        EOS
-        
+EOS
         opt :host,    "The hostname of the Shoutbox",       :type => String
         opt :port,    "The port of the Shoutbox",           :type => Integer
         opt :group,   "The group to use",                   :type => String, :default => "default"
-        opt :name,    "The display name for the statusId",  :type => String
+
+        stop_on sub_commands
       end
-      
-      Trollop::die "provide <status> and <statusId>" if ARGV.size != 2
+
       @conf[:status]   = ARGV.shift
-      Trollop::die "<status> must be one of 'green', 'red', 'destroy'" unless ShoutboxClient.valid_status?( @conf[:status] )
-      
       @conf[:statusId] = ARGV.shift
-
+      
+      cmd_opts = case @conf[:status]
+        when "red"
+          @conf[:message] = ARGV.shift
+          Trollop::die "provide <statusId> and <message> when shouting red" if @conf[:message].to_s.empty?
+        when "green"
+          # noop
+        when "remove"
+          # noop
+        else
+          Trollop::die "unknown <subcommand> #{ @conf[:status] }"
+      end
+      
+      Trollop::die "provide <status> and <statusId>" unless @conf[:status] and @conf[:statusId]
+      
       ShoutboxClient.configuration.host = @conf[:host]  if     @conf[:host]
       ShoutboxClient.configuration.port = @conf[:port]  if     @conf[:port]
     end

data/lib/shoutbox_client.rb

@@ -26,7 +26,10 @@ class ShoutboxClient
     response = Net::HTTP.start(configuration.host, configuration.port) do |http|
       req = Net::HTTP::Put.new( request_url(options) )
       default_headers(req)
-      req.body = { :statusId => options[:statusId], :group => (options[:group] || 'default'), :status => options[:status].to_s }.to_json
+      body_data = { :statusId => options[:statusId], :group => (options[:group] || 'default'), :status => options[:status].to_s }
+      body_data[:message] = options[:message] if options[:status] == :red
+      raise ArgumentError if (options[:status] == :red) and body_data[:message].to_s.empty?
+      req.body = body_data.to_json
       http.request(req)
     end
     response.body == "OK"

data/spec/shoutbox_client_spec.rb

@@ -40,6 +40,30 @@ describe "ShoutboxClient" do
       ShoutboxClient.shout( :statusId => "test_status", :status => :green ).should == true
     end
     
+    it 'should include a message when status is red' do
+      stub_request(:put, "http://localhost:3000/status").
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\",\"status\":\"red\",\"message\":\"This is what you should do now..\"}", 
+             :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
+        to_return(:status => 200, :body => "OK", :headers => {})
+
+      ShoutboxClient.shout( :statusId => "test_status", :status => :red, :message => "This is what you should do now.." ).should == true
+    end
+    
+    it 'should not include a message when status is green' do
+      stub_request(:put, "http://localhost:3000/status").
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\",\"status\":\"green\"}", 
+             :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
+        to_return(:status => 200, :body => "OK", :headers => {})
+
+      ShoutboxClient.shout( :statusId => "test_status", :status => :green, :message => "This is what you should do now.." ).should == true
+    end
+    
+    it 'should deny red update if message is missin' do
+      lambda {
+        ShoutboxClient.shout( :statusId => "test_status", :status => :red )
+      }.should raise_error(ArgumentError)
+    end
+    
     it 'should delete a status' do
       stub_request(:delete, "http://localhost:3000/status").
         with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\"}",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Benjamin Krause
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1908286584344260910
+      hash: -1817083746782898519
       segments: 
       - 0
       version: "0"