logworm 0.7.6 → 0.7.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.7
+    DB.config now receives 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.6
     QueryBuilder now allows Time objects as arguments for timeframe
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm', '0.7.6') do |p|
+Echoe.new('logworm', '0.7.7') do |p|
   p.description = "logworm logging tool"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/base/config.rb

@@ -10,12 +10,15 @@ module Logworm
     FILENAME = ".logworm"
     
     def initialize
-      read
+      reset
     end
-
-    def read
+    
+    def reset
       @file_found = false
       @url = nil
+    end
+    
+    def read
       begin
         f = File.new("./" + FILENAME, 'r')
         @url = f.readline.strip
@@ -30,7 +33,7 @@ module Logworm
     end
     
     def file_found?
-      @file_found and @url
+      @file_found and (!@url.nil? and @url != "")
     end
     
     def save(url)

data/lib/base/db.rb

@@ -27,24 +27,31 @@ module Logworm
       DB.new(DB.make_url(host, consumer_key, consumer_secret, token, token_secret))
     end
     
-    def self.from_config
-      # Try with URL from the environment
+    def self.from_config(app = nil)
+      # Try with URL from the environment. This will certainly be the case when running on Heroku, in production.
       return DB.new(ENV['LOGWORM_URL']) if ENV['LOGWORM_URL'] and DB.parse_url(ENV['LOGWORM_URL'])
       
-      # Try with configuration file
+      # If no env. found, try with configuration file, unless app specified
       config = Logworm::Config.instance
-      return DB.new(config.url) if config.file_found? and DB.parse_url(config.url)
+      config.read
+      unless app
+        return DB.new(config.url) if config.file_found? and DB.parse_url(config.url)
+      end
 
       # Try with Heroku configuration otherwise
-      config_vars = %x[heroku config --long] || ""
+      cmd = "heroku config --long #{app ? " --app #{app}" : ""}"
+      config_vars = %x[#{cmd}] || ""
       m = config_vars.match(Regexp.new("LOGWORM_URL\\s+=>\\s+([^\\n]+)"))
-      config.save(m[1]) and return DB.new(m[1]) if m and DB.parse_url(m[1])
+      if m and DB.parse_url(m[1])
+        config.save(m[1]) unless (config.file_found? and app) # Do not overwrite if --app is provided
+        return DB.new(m[1])
+      end
       
       nil
     end
     
-    def self.from_config_or_die
-      db = self.from_config
+    def self.from_config_or_die(app = nil)
+      db = self.from_config(app)
       raise "The application is not properly configured. Either use 'heroku addon:add' to add logworm to your app, or save your project's credentials into the .logworm file" unless db
       db
     end

data/logworm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-06-24}
   s.description = %q{logworm logging tool}
   s.email = %q{schapira@pomelollc.com}
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/base/config.rb", "lib/base/db.rb", "lib/base/query_builder.rb", "lib/logworm.rb"]

data/spec/base_spec.rb

@@ -7,6 +7,11 @@ $: << File.dirname(__FILE__) + '/../lib'
 require 'logworm.rb'
 
 describe Logworm::DB, " initialization" do
+  before do
+    File.delete(".logworm") if File.exist?(".logworm")
+    Logworm::Config.instance.reset
+  end
+  
   it "should only accept proper URLs" do
     lambda {Logworm::DB.new('')}.should raise_exception(Logworm::ForbiddenAccessException)
     lambda {Logworm::DB.new('http://www.test.com')}.should   raise_exception(Logworm::ForbiddenAccessException)
@@ -26,8 +31,50 @@ describe Logworm::DB, " initialization" do
     db.token_secret.should == "d"
   end
 
-  it "should be able to read its configuration from a file"
-  it "should be able to read its configuration from the current Heroku application"
+  it "should be able to read its configuration from a file" do
+    File.open(".logworm", "w") do |f|
+      f.puts 'logworm://a:b@localhost:9401/c/d/'
+    end
+    db = Logworm::DB.from_config
+    db.host.should == "localhost:9401"
+    db.consumer_key.should == "a"
+    db.consumer_secret.should == "b"
+    db.token.should == "c"
+    db.token_secret.should == "d"
+  end
+  
+  it "should fail if no logworm file (and no current Heroku application)" do
+    db = Logworm::DB.from_config
+    db.should == nil
+  end
+  
+  # Note that this will fail unless it's run from the command line!
+  it "should not be nil if we pass a proper app parameter" do
+    db = Logworm::DB.from_config("lw-client")
+    db.should_not == nil
+    db.host.should == "db.logworm.com"
+  end
+  
+  # Note that this will fail unless it's run from the command line!
+  it "should not use a config file if app is passed" do 
+    File.open(".logworm", "w") do |f|
+      f.puts 'logworm://a:b@xxx:9401/c/d/'
+    end
+    db = Logworm::DB.from_config("lw-client")
+    db.host.should == "db.logworm.com"  # The one from the app, not the config file
+  end
+  
+  # Note that this will fail unless it's run from the command line!
+  it "should not overwrite a config file if app is passed" do 
+    File.open(".logworm", "w") do |f|
+      f.puts 'logworm://a:b@xxx:9401/c/d/'
+    end
+
+    db = Logworm::DB.from_config("lw-client")
+    Logworm::Config.instance.reset
+    Logworm::Config.instance.read
+    Logworm::Config.instance.url.should == 'logworm://a:b@xxx:9401/c/d/'
+  end
 
 end
 
@@ -59,7 +106,7 @@ describe Logworm::DB, " functioning" do
   
   it "should just parse and return the results of the call to query" do
     return_body =  {"id" => 10, "query" => "q", "self_uri" => "/queries/10", "results_uri" => "/queries/10/results"}
-    stub_request(:post, "#{host}/queries").with(:body => "table=table1&query=q").to_return(:body => return_body.to_json)
+    stub_request(:post, "#{host}/queries").with(:body => "query=q&table=table1").to_return(:body => return_body.to_json)
     @db.query("table1", "q").should == return_body
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency