logworm_client 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.1
+    lw-tail and lw-compute now receive an optional app parameter, for the cases where you want to call command-line tools from a directory other than the app's directory... or when you have more than one Heroku remote/app from the same directory
+
 v0.7.0
     Eliminated long logs. Instead, there's now a parameter (log_request_headers in Rack, lw_log_request_headers in Rails) to add
        request and response headers to the web_log. 

data/Rakefile

@@ -1,10 +1,10 @@
 require 'echoe'
-Echoe.new('logworm_client', '0.7.0') do |p|
+Echoe.new('logworm_client', '0.7.1') do |p|
   p.description = "logworm client utilities"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"
   p.email  = "schapira@pomelollc.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["logworm >=0.7.5", "json"]
-  p.runtime_dependencies = ["logworm >=0.7.5", "json"]
+  p.development_dependencies = ["logworm >=0.7.7", "json"]
+  p.runtime_dependencies = ["logworm >=0.7.7", "json"]
 end

data/bin/lw-compute

@@ -15,6 +15,10 @@ options = {
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] <log table> <function> <field>"
 
+  opts.on("--app app", String, "Specify the Heroku app") do |app|
+    options[:app] = app.strip 
+  end
+
   opts.on("-g group", String, "Specify an aggregation group (e.g, hour(_ts_utc), or response.code)") do |k|
     options[:aggregate_group] = k
   end

data/bin/lw-tail

@@ -4,10 +4,10 @@ require 'rubygems'
 require 'logworm_utils'
 require 'optparse'
 
-def help(option_parser)
+def help(option_parser, options)
   puts option_parser.help
   puts
-  LogwormTail.list
+  LogwormTail.list(options)
 end
 
 options = {
@@ -25,6 +25,10 @@ options = {
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] <log table>"
 
+  opts.on("--app app", String, "Specify the Heroku app") do |app|
+    options[:app] = app.strip 
+  end
+
   opts.on("-f [secs]", Integer, 
           "Continuously check for more data, every [secs] seconds.", "Default: #{options[:frequency]}") do |s| 
     options[:loop] = true
@@ -60,8 +64,7 @@ option_parser = OptionParser.new do |opts|
   end
   
   opts.on( '-h', '--help', 'Display this screen' ) do
-    help option_parser
-    exit(1)
+    options[:help] = true
   end
   
 end
@@ -69,8 +72,8 @@ end
 # Parse, and get the required <table>
 option_parser.parse!
 table = ARGV.pop
-if !table
-  help option_parser
+if !table or options[:help]
+  help option_parser, options
   exit(1)
 end
 table.strip!

data/lib/logworm_utils/compute.rb

@@ -8,7 +8,7 @@ class LogwormCompute
       @valuefield = @field ? "#{@function}(#{@field})" : @function
 
       begin
-        @db    = Logworm::DB.from_config_or_die
+        @db    = Logworm::DB.from_config_or_die(@options[:app])
         spec   = {:aggregate_function => @function, :aggregate_argument => @field}.merge(@options)
         @query = Logworm::QueryBuilder.new(spec)
       rescue Exception => e

data/lib/logworm_utils/tail.rb

@@ -4,7 +4,7 @@ class LogwormTail
       @options = options
 
       begin
-        @db    = Logworm::DB.from_config_or_die
+        @db    = Logworm::DB.from_config_or_die(@options[:app])
         @query = Logworm::QueryBuilder.new(@options.merge(:force_ts => true))
       rescue Exception => e
         $stderr.puts "Error: #{e}"
@@ -12,9 +12,9 @@ class LogwormTail
       end
     end
 
-    def self.list
+    def self.list(options = {})
       begin
-        @db    = Logworm::DB.from_config_or_die
+        @db    = Logworm::DB.from_config_or_die(options[:app])
         @tables = @db.tables
         if @tables and @tables.size > 0
           puts "The following are the tables that you've created thus far:"

data/logworm_client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_client}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-06-24}
   s.description = %q{logworm client utilities}
   s.email = %q{schapira@pomelollc.com}
   s.executables = ["lw-compute", "lw-tail"]
@@ -24,20 +24,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<logworm>, [">= 0.7.5"])
+      s.add_runtime_dependency(%q<logworm>, [">= 0.7.7"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<logworm>, [">= 0.7.5"])
+      s.add_development_dependency(%q<logworm>, [">= 0.7.7"])
       s.add_development_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<logworm>, [">= 0.7.5"])
+      s.add_dependency(%q<logworm>, [">= 0.7.7"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<logworm>, [">= 0.7.5"])
+      s.add_dependency(%q<logworm>, [">= 0.7.7"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<logworm>, [">= 0.7.5"])
+    s.add_dependency(%q<logworm>, [">= 0.7.7"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<logworm>, [">= 0.7.5"])
+    s.add_dependency(%q<logworm>, [">= 0.7.7"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/spec/rails_spec.rb

@@ -16,8 +16,3 @@ describe Logworm, " init" do
   end
 end
 
-describe Logworm, " logging" do
-  it "should honor the filter_parameter_logging directive" do
-  end
-  
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 5
-        version: 0.7.5
+        - 7
+        version: 0.7.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -53,8 +53,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 5
-        version: 0.7.5
+        - 7
+        version: 0.7.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency