logworm 0.6.1 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.7.0 Changes to run as a Heroku add-on
+       Configuration now stored as a URL
+       Now requires Heroku gem
+       
 v0.6.1 fixed query builder
 
 v0.6.0 added query builder

data/Rakefile

@@ -1,10 +1,10 @@
 require 'echoe'
-Echoe.new('logworm', '0.6.1') do |p|
+Echoe.new('logworm', '0.7.0') do |p|
   p.description = "logworm logging tool"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"
   p.email  = "schapira@pomelollc.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["memcache-client", "hpricot", "oauth"]
-  p.runtime_dependencies = ["memcache-client", "hpricot", "oauth"]
+  p.development_dependencies = ["memcache-client", "hpricot", "oauth", "heroku"]
+  p.runtime_dependencies = ["memcache-client", "hpricot", "oauth", "heroku"]
 end

data/lib/base/config.rb

@@ -11,21 +11,28 @@ module Logworm
     
     def initialize
       @file_found = false
-      @consumer_key = @consumer_secret = @token_key = @token_secret = nil
+      @url = nil
       begin
         f = File.new(FILENAME, 'r')
-        @consumer_key, @consumer_secret, @token_key, @token_secret = f.readlines.map {|l| l.strip }
+        @url = f.readline.strip
         @file_found = true
       rescue Errno::ENOENT => e
       end
     end
     
-    def keys
-      [@consumer_key, @consumer_secret, @token_key, @token_secret]
+    def url
+      @url
     end
     
     def file_found?
-      @file_found and @consumer_key and @consumer_secret and @token_key and @token_secret
+      @file_found and @url
+    end
+    
+    def save(url)
+      File.open(FILENAME, 'w') do |f|
+        f.puts url
+      end rescue Exception
+      %x[echo '.logworm' >> .gitignore]
     end
     
   end

data/lib/base/db.rb

@@ -8,36 +8,53 @@ module Logworm
   
   class DB
     
-    DB_HOST            = "http://db.logworm.com"
-  
-    def initialize(keys = nil)
-      if keys.is_a? Array and keys.size == 4
-        @consumer_key, @consumer_secret, @token, @token_secret = keys
-      elsif keys.is_a? Array and keys.size == 2
-        @consumer_key    = ENV["#{ENV['APP_ID']}_APPS_KEY"]
-        @consumer_secret = ENV["#{ENV['APP_ID']}_APPS_SECRET"]
-        @token, @token_secret = keys
-      else
-        config = Logworm::Config.instance
-        if config.file_found?
-          @consumer_key, @consumer_secret, @token, @token_secret = config.keys
-        else
-          raise "Could not find .logworm file in current directory." if keys.is_a? FalseClass
-          @consumer_key, @consumer_secret = [ENV['LW_CONSUMER_KEY'], ENV['LW_CONSUMER_SECRET']]
-          @token, @token_secret           = [ENV['LW_PROJECT_KEY'], ENV['LW_PROJECT_SECRET']]
-        end
-      end
-      raise ForbiddenAccessException.new("Missing keys") if @consumer_key.nil? or @consumer_secret.nil? 
-      raise ForbiddenAccessException.new("Missing keys") if @token.nil? or @token_secret.nil?
+    DEFAULT_HOST  = "db.logworm.com"
+    URL_FORMAT    = /lw:\/\/([^:]+):([^!]+)!([^:]+):([^@]+)@([^\/]+)\//
+    # URI: lw://<consumer_key>:<consumer_secret>!<access_token>:<access_token_secret>@db.logworm.com/
+
+
+    def initialize(url)
+      match = DB.parse_url(url)
+      raise ForbiddenAccessException.new("Incorrect URL Format #{url}") unless match and match.size == 6
+      
+      keys = match[1..4]
+      raise ForbiddenAccessException.new("Incorrect Keys") unless keys.is_a? Array and keys.size == 4
+      @consumer_key, @consumer_secret, @token, @token_secret = keys
+      raise ForbiddenAccessException.new("Missing consumer keys") if @consumer_key.nil? or @consumer_secret.nil? 
+      raise ForbiddenAccessException.new("Missing tokens") if @token.nil? or @token_secret.nil?
       @connection = OAuth::AccessToken.new(OAuth::Consumer.new(@consumer_key, @consumer_secret), @token, @token_secret)
+      
+      @host       = "http://" + match[5]
     end
   
+    def self.with_tokens(token, token_secret)
+      consumer_key    = ENV["#{ENV['APP_ID']}_APPS_KEY"]
+      consumer_secret = ENV["#{ENV['APP_ID']}_APPS_SECRET"]
+      DB.new("lw://#{consumer_key}:#{consumer_secret}!#{token}:#{token_secret}@#{DEFAULT_HOST}/")
+    end
+    
+    def self.from_config
+      # Try with URL from the environment
+      return DB.new(ENV['LOGWORM_URL']) if ENV['LOGWORM_URL'] and DB.parse_url(ENV['LOGWORM_URL'])
+      
+      # Try with configuration file
+      config = Logworm::Config.instance
+      return DB.new(config.url) if config.file_found? and DB.parse_url(config.url)
+
+      # Try with Heroku configuration otherwise
+      config_vars = %x[heroku config --long] || ""
+      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])
+      
+      nil
+    end
+      
     def tables()
-      res = db_call(:get, "#{DB_HOST}/")
+      res = db_call(:get, "#{@host}/")
     end
   
     def query(table, cond)
-      res = db_call(:post, "#{DB_HOST}/queries", {:table => table, :query => cond})
+      res = db_call(:post, "#{@host}/queries", {:table => table, :query => cond})
     end
   
     def results(uri)
@@ -48,7 +65,7 @@ module Logworm
     end
     
     def batch_log(entries)
-      db_call(:post, "#{DB_HOST}/log", {:entries => $lr_queue.to_json})
+      db_call(:post, "#{@host}/log", {:entries => $lr_queue.to_json})
     end
 
   private
@@ -68,6 +85,11 @@ module Logworm
         raise DatabaseException.new("Database reponse cannot be parsed: #{e}")
       end
     end
+    
+    def self.parse_url(url)
+       url.match(URL_FORMAT)
+    end
+    
   end
 
 end

data/logworm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-31}
   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"]
@@ -26,23 +26,29 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<memcache-client>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
+      s.add_runtime_dependency(%q<heroku>, [">= 0"])
       s.add_development_dependency(%q<memcache-client>, [">= 0"])
       s.add_development_dependency(%q<hpricot>, [">= 0"])
       s.add_development_dependency(%q<oauth>, [">= 0"])
+      s.add_development_dependency(%q<heroku>, [">= 0"])
     else
       s.add_dependency(%q<memcache-client>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<heroku>, [">= 0"])
       s.add_dependency(%q<memcache-client>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<heroku>, [">= 0"])
     end
   else
     s.add_dependency(%q<memcache-client>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<heroku>, [">= 0"])
     s.add_dependency(%q<memcache-client>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<heroku>, [">= 0"])
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: memcache-client
+  name: heroku
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,10 +63,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: memcache-client
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -78,7 +78,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: hpricot
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -89,6 +89,30 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: heroku
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: logworm logging tool
 email: schapira@pomelollc.com
 executables: []