shoutbox-client 0.1.0 → 0.1.1

data/lib/shoutbox/configuration.rb

@@ -1,6 +1,6 @@
 module Shoutbox
   class Configuration
-    attr_accessor :host, :port, :proxy_host, :proxy_port, :default_group, :auth_token
+    attr_accessor :host, :proxy_host, :proxy_port, :default_group, :auth_token
 
     def initialize
       config_file_exists? ? read_config_file : default_config
@@ -22,9 +22,8 @@ module Shoutbox
       end
     
       def default_config
-        @host           = 'localhost'
-        @port           = 3000
-        @default_group  = 'default group'
+        @host           = 'http://shoutbox.io/'
+        @default_group  = 'Home'
         @auth_token     = 'invalid-auth-token'
         @proxy_host     = nil
         @proxy_port     = nil
@@ -33,8 +32,7 @@ module Shoutbox
       def read_config_file
         config_data     = YAML::load_file(config_file)
         @host           = config_data["host"]
-        @port           = config_data["port"]
-        @default_group  = config_data["default_group"] || 'default group'
+        @default_group  = config_data["default_group"] || 'Home'
         @auth_token     = config_data["auth_token"]
         @proxy_host     = config_data["proxy_host"]
         @proxy_port     = config_data["proxy_port"]

data/lib/shoutbox/shout.rb

@@ -12,13 +12,18 @@ module Shoutbox
     def parse_options
       @conf = Trollop::options do
         banner <<-EOS
-usage: shout <subcommand> <name>
+usage: shout <subcommand> <name> [message]
 
-<subcommand> must be one of red, green, remove
+<subcommand> must be one of green, yellow, red, remove
 <name> is any given string you can think of
+[message] is optional for green and required for red and yellow
 
-If you want to delete a status, you must provide
-a message.
+examples
+
+shout green db-export
+shout yellow db-export "export took too long"
+shout red db-export "failed saving file"
+shout remove db-export
 
 shout allows the folling options:
 EOS
@@ -40,7 +45,7 @@ EOS
         when "green"
           # noop
         when "yellow"
-          Trollop::die "provide <name> and <message> when shouting red" if @conf[:message].to_s.empty?
+          Trollop::die "provide <name> and <message> when shouting yellow" if @conf[:message].to_s.empty?
         when "remove"
           # noop
         else
@@ -57,4 +62,4 @@ EOS
       ShoutboxClient.shout :name => @conf[:name], :status => @conf[:status], :group => @conf[:group], :message => @conf[:message], :expires_in => @conf[:expires_in]
     end
   end
-end
+end

data/lib/shoutbox_client.rb

@@ -28,7 +28,7 @@ class ShoutboxClient
   end
   
   def self.update_status( options )
-    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(configuration.host, configuration.port) do |http|
+    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(self.host, self.port) do |http|
       req = Net::HTTP::Put.new( request_url(options) )
       default_headers(req)
       body_data = { :name => options[:name], :group => (options[:group] || configuration.default_group), :status => options[:status].to_s }
@@ -42,7 +42,7 @@ class ShoutboxClient
   end
   
   def self.delete_status( options )
-    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(configuration.host, configuration.port) do |http|
+    response = Net::HTTP.Proxy(configuration.proxy_host, configuration.proxy_port).start(self.host, self.port) do |http|
       req = Net::HTTP::Delete.new( request_url(options) )
       req.body = { :name => options[:name], :group => (options[:group] || configuration.default_group) }.to_json
       default_headers(req)
@@ -62,6 +62,14 @@ class ShoutboxClient
     '/status'
   end
   
+  def self.host
+    URI.parse(configuration.host).host
+  end
+  
+  def self.port
+    URI.parse(configuration.host).port
+  end
+  
   def self.valid_status?( status )
     VALID_STATUS.keys.include?( status.to_s )
   end

data/spec/shoutbox_client_spec.rb

@@ -10,27 +10,25 @@ describe "ShoutboxClient" do
   context 'configuration' do
     it 'should use the default configuration' do
       ShoutboxClient.configuration.config_file = '/i/dont/exist'
-      ShoutboxClient.configuration.host.should == 'localhost'
-      ShoutboxClient.configuration.port.should == 3000
+      ShoutboxClient.configuration.host.should == 'http://shoutbox.io/'
       ShoutboxClient.configuration.auth_token.should == 'invalid-auth-token'
     end
     
     it 'should use the values of the config file' do
       tempfile = Tempfile.new( '.shoutbox' )
-      tempfile << { "host" => "example.com", "port" => 89, "proxy_host" => "prx", "proxy_port" => 8080, "auth_token" => 'abc' }.to_yaml
+      tempfile << { "host" => "http://example.com", "proxy_host" => "prx", "proxy_port" => 8080, "auth_token" => 'abc' }.to_yaml
       tempfile.close
       ShoutboxClient.configuration.config_file = tempfile.path
-      ShoutboxClient.configuration.host.should == 'example.com'
-      ShoutboxClient.configuration.port.should == 89
+      ShoutboxClient.configuration.host.should == 'http://example.com'
       ShoutboxClient.configuration.proxy_host.should == "prx"
       ShoutboxClient.configuration.proxy_port.should == 8080
-      ShoutboxClient.configuration.default_group.should == 'default group'
+      ShoutboxClient.configuration.default_group.should == 'Home'
       ShoutboxClient.configuration.auth_token.should == 'abc'
     end
     
-    it 'should use the configured default group' do
+    it 'should use the configured Home' do
       tempfile = Tempfile.new( '.shoutbox' )
-      tempfile << { "host" => "example.com", "port" => 89, "proxy_host" => "prx", "proxy_port" => 8080, "default_group" =>  "some group" }.to_yaml
+      tempfile << { "host" => "http://example.com","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'
@@ -46,7 +44,7 @@ describe "ShoutboxClient" do
     
     
     it 'should create a valid PUT request to the shoutbox' do
-      stub_request(:put, "http://localhost:3000/status").
+      stub_request(:put, "http://shoutbox.io/status").
         with(:body    => "{\"name\":\"test_status\",\"group\":\"my_group\",\"status\":\"green\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
@@ -55,8 +53,8 @@ describe "ShoutboxClient" do
     end
     
     it 'should create use group default if no group given' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\",\"status\":\"green\"}", 
+      stub_request(:put, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\",\"status\":\"green\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -64,8 +62,8 @@ describe "ShoutboxClient" do
     end
 
     it 'should include a message when status is yellow and message is given' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\",\"status\":\"yellow\",\"message\":\"This is what you should do now..\"}", 
+      stub_request(:put, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\",\"status\":\"yellow\",\"message\":\"This is what you should do now..\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -73,8 +71,8 @@ describe "ShoutboxClient" do
     end
     
     it 'should include a message when status is red' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\",\"status\":\"red\",\"message\":\"This is what you should do now..\"}", 
+      stub_request(:put, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\",\"status\":\"red\",\"message\":\"This is what you should do now..\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -82,8 +80,8 @@ describe "ShoutboxClient" do
     end
 
     it 'should include an expiration time when given' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\",\"status\":\"green\",\"expires_in\":3600}", 
+      stub_request(:put, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\",\"status\":\"green\",\"expires_in\":3600}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
 
@@ -103,8 +101,8 @@ describe "ShoutboxClient" do
     end
 
     it 'should send optional status on green update' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\",\"status\":\"green\",\"message\":\"everything's ok!\"}", 
+      stub_request(:put, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\",\"status\":\"green\",\"message\":\"everything's ok!\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
       lambda {
@@ -113,8 +111,8 @@ describe "ShoutboxClient" do
     end
     
     it 'should delete a status' do
-      stub_request(:delete, "http://localhost:3000/status").
-        with(:body    => "{\"name\":\"test_status\",\"group\":\"default group\"}",
+      stub_request(:delete, "http://shoutbox.io/status").
+        with(:body    => "{\"name\":\"test_status\",\"group\":\"Home\"}",
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client', 'X-Shoutbox-Auth-Token' => 'invalid-auth-token'}).
         to_return(:status => 200, :body => "OK", :headers => {})
       

metadata

@@ -2,7 +2,7 @@
 name: shoutbox-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Benjamin Krause
@@ -10,7 +10,7 @@ autorequire: shoutbox_client
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: shout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 592437698402898647
+      hash: 4047158430543841235
       segments: 
       - 0
       version: "0"