cosm 0.0.2 → 0.0.3

data/lib/cosm/command/help.rb

@@ -31,7 +31,7 @@ class Cosm::Command::Help < Cosm::Command::Base
 
   def self.usage_for_command(command)
     command = new.send(:commands)[command]
-    "Usage: cosm #{command[:banner]}" if command
+    "Usage: cosm #{command[:help]}" if command
   end
 
 private

data/lib/cosm/command/subscribe.rb

@@ -1,21 +1,22 @@
 require 'cosm/command/base'
 require 'socket'
 
-# Subscribe to a datastream via the Cosm PAWS (Socket Server)
+# Subscribe to a feed or datastream via the Cosm PAWS (Socket Server)
 #
 class Cosm::Command::Subscribe < Cosm::Command::Base
 
   # subscribe
   #
-  # connect to a tcp socket for a datastream
+  # connect to a tcp socket for a feed or datastream
   #
   # -k, --key API_KEY        # your api key
   # -f, --feed FEED          # the feed id
-  # -d, --datastream DATASTREAM  # the datastream id
+  # -d, --datastream DATASTREAM  # the datastream id (optional)
   #
   #Example:
   #
-  # $ cosm subscribe -k ABCD1234 -f 504 -d 0
+  # $ cosm subscribe -k ABCD1234 -f 504 -d 0 # subscribe to datastream
+  # $ cosm subscribe -k ABCD1234 -f 504 # subscribe to feed
   #
   def index
     api_key = options[:key]
@@ -24,12 +25,17 @@ class Cosm::Command::Subscribe < Cosm::Command::Base
 
     validate_arguments!
 
-    unless api_key && feed_id && datastream_id
+    unless api_key && feed_id
       puts Cosm::Command::Help.usage_for_command("subscribe")
       exit(1)
     end
 
-    subscribe = "{\"method\":\"subscribe\", \"resource\":\"/feeds/#{feed_id}/datastreams/#{datastream_id}\", \"headers\":{\"X-ApiKey\":\"#{api_key}\"}}"
+    resource = "/feeds/#{feed_id}"
+    resource += "/datastreams/#{datastream_id}" if datastream_id
+
+    puts "Subscribing to updates for #{resource}"
+
+    subscribe = "{\"method\":\"subscribe\", \"resource\":\"#{resource}\", \"headers\":{\"X-ApiKey\":\"#{api_key}\"}}"
     s = TCPSocket.new 'api.cosm.com', 8081
     s.puts subscribe
     while line = s.gets

data/lib/cosm/version.rb

@@ -1,3 +1,3 @@
 module Cosm
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -153491597975561020
+      hash: 2287985111779659553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -153491597975561020
+      hash: 2287985111779659553
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23