shoutbox-client 0.0.11 → 0.0.12

data/lib/shoutbox/configuration.rb

@@ -1,6 +1,6 @@
 module Shoutbox
   class Configuration
-    attr_accessor :host, :port
+    attr_accessor :host, :port, :proxy_host, :proxy_port, :default_group
 
     def initialize
       config_file_exists? ? read_config_file : default_config
@@ -22,15 +22,20 @@ module Shoutbox
       end
     
       def default_config
-        @host = 'localhost'
-        @port = 3000
+        @host           = 'localhost'
+        @port           = 3000
+        @default_group  = 'default group'
+        @proxy_host     = nil
+        @proxy_port     = nil
       end
 
       def read_config_file
-        config_data = YAML::load_file(config_file)
-        @host = config_data["host"]
-        @port = config_data["port"]
+        config_data     = YAML::load_file(config_file)
+        @host           = config_data["host"]
+        @port           = config_data["port"]
+        @default_group  = config_data["default_group"] || 'default group'
+        @proxy_host     = config_data["proxy_host"]
+        @proxy_port     = config_data["proxy_port"]
       end
-
   end
 end

data/lib/shoutbox/shout.rb

@@ -22,9 +22,11 @@ a message.
 
 shout allows the folling options:
 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 => "Shoutbox Default Group"
+        opt :host,        "The hostname of the Shoutbox",       :type => String
+        opt :port,        "The port of the Shoutbox",           :type => Integer
+        opt :proxy_host,  "The proxy host to use",              :type => String
+        opt :proxy_port,  "The proxy port to use",              :type => Integer
+        opt :group,       "The group to use",                   :type => String, :default => "Shoutbox Default Group"
       end
 
       @conf[:status]   = ARGV.shift

data/lib/shoutbox_client.rb

@@ -24,10 +24,10 @@ class ShoutboxClient
   end
   
   def self.update_status( options )
-    response = Net::HTTP.start(configuration.host, configuration.port) do |http|
+    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(configuration.host, configuration.port) do |http|
       req = Net::HTTP::Put.new( request_url(options) )
       default_headers(req)
-      body_data = { :statusId => options[:statusId], :group => (options[:group] || 'default'), :status => options[:status].to_s }
+      body_data = { :statusId => options[:statusId], :group => (options[:group] || configuration.default_group), :status => options[:status].to_s }
       body_data[:message] = options[:message] if options[:status].to_s == 'red' or (options[:status].to_s == 'yellow' and options[:message])
       raise ArgumentError if (options[:status] == :red) and body_data[:message].to_s.empty?
       req.body = body_data.to_json
@@ -37,9 +37,9 @@ class ShoutboxClient
   end
   
   def self.delete_status( options )
-    response = Net::HTTP.start(configuration.host, configuration.port) do |http|
+    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(configuration.host, configuration.port) do |http|
       req = Net::HTTP::Delete.new( request_url(options) )
-      req.body = { :statusId => options[:statusId], :group => (options[:group] || 'default') }.to_json
+      req.body = { :statusId => options[:statusId], :group => (options[:group] || configuration.default_group) }.to_json
       default_headers(req)
       http.request(req)
     end

data/spec/shoutbox_client_spec.rb

@@ -12,11 +12,23 @@ describe "ShoutboxClient" do
     
     it 'should use the values of the config file' do
       tempfile = Tempfile.new( '.shoutbox' )
-      tempfile << { "host" => "example.com", "port" => 89 }.to_yaml
+      tempfile << { "host" => "example.com", "port" => 89, "proxy_host" => "prx", "proxy_port" => 8080 }.to_yaml
       tempfile.close
       ShoutboxClient.configuration.config_file = tempfile.path
       ShoutboxClient.configuration.host.should == 'example.com'
       ShoutboxClient.configuration.port.should == 89
+      ShoutboxClient.configuration.proxy_host.should == "prx"
+      ShoutboxClient.configuration.proxy_port.should == 8080
+      ShoutboxClient.configuration.default_group.should == 'default group'
+      ShoutboxClient.configuration.config_file = nil
+    end
+    
+    it 'should use the configured default group' do
+      tempfile = Tempfile.new( '.shoutbox' )
+      tempfile << { "host" => "example.com", "port" => 89, "proxy_host" => "prx", "proxy_port" => 8080, "default_group" =>  "some group" }.to_yaml
+      tempfile.close
+      ShoutboxClient.configuration.config_file = tempfile.path
+      ShoutboxClient.configuration.default_group.should == 'some group'
       ShoutboxClient.configuration.config_file = nil
     end
   end
@@ -33,7 +45,7 @@ describe "ShoutboxClient" do
     
     it 'should create use group default if no group given' do
       stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\",\"status\":\"green\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"green\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -42,7 +54,7 @@ describe "ShoutboxClient" do
 
     it 'should not include a message when status is yellow and no message given' do
       stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\",\"status\":\"yellow\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"yellow\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -51,7 +63,7 @@ describe "ShoutboxClient" do
 
     it 'should include a message when status is yellow and message is given' do
       stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\",\"status\":\"yellow\",\"message\":\"This is what you should do now..\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"yellow\",\"message\":\"This is what you should do now..\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -60,7 +72,7 @@ describe "ShoutboxClient" do
     
     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..\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"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 => {})
 
@@ -69,7 +81,7 @@ describe "ShoutboxClient" do
     
     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\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"green\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -84,7 +96,7 @@ describe "ShoutboxClient" do
     
     it 'should delete a status' do
       stub_request(:delete, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default\"}",
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\"}",
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
       

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: shoutbox-client
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 11
-  version: 0.0.11
+  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors: 
 - Benjamin Krause
@@ -14,7 +10,7 @@ autorequire: shoutbox_client
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: shout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
         version: "1.16"
   type: :runtime
   prerelease: false
@@ -38,9 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
         version: "2.3"
   type: :development
   prerelease: false
@@ -52,9 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   prerelease: false
@@ -66,9 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
         version: "1.6"
   type: :development
   prerelease: false
@@ -80,9 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
         version: "1.5"
   type: :development
   prerelease: false
@@ -94,10 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
         version: 1.4.0
   type: :runtime
   prerelease: false
@@ -134,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4378634194582785805
+      hash: 591505643333229033
       segments: 
       - 0
       version: "0"
@@ -143,13 +120,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: ruby client to publish shoutbox status updates