maxaf-fluke 0.0.1 → 0.0.3

data/History.txt

@@ -1,3 +1,17 @@
+=== 0.0.3 2009-09-08
+
+* Added Watcher#url_strftime to simplify time-based URL generation.
+* Even though httpclient aims to be similar to Perl's LWP, it's
+  missing support for file:// URLs. Implemented this locally.
+
+=== 0.0.2 2009-09-08
+
+* Added rudimentary result diffing.
+* Replaced net/http with httpclient.
+* Figured out synergy between watchers in the DB and their "code"
+  parts stored on the file system.
+* Implemented generated URLs.
+
 === 0.0.1 2009-09-05
 
 * Initial release: implemented minimum set of core features.

data/Manifest.txt

@@ -1,6 +1,12 @@
 bin/fluke
 db/migrate/0001_create_watchers.rb
 db/migrate/0002_create_results.rb
+db/migrate/0003_add_meth_to_watchers.rb
+db/migrate/0004_add_url_to_results.rb
+examples/dot-fluke.yml
+examples/gen_url.rb
+examples/strftime_url.rb
+fluke.gemspec
 History.txt
 lib/fluke/cli.rb
 lib/fluke/monkey_patch.rb

data/Rakefile

@@ -13,6 +13,7 @@ $hoe = Hoe.spec 'fluke' do
                      ['activerecord', '>=2.3'],
                      ['aws-s3', '>=0.6.2'],
 		     ['httpclient', '>=2.1.5.2'],
+		     ['pvande-differ', '>=0.1.1'],
                     ]
 end
 

data/lib/fluke/cli.rb

@@ -16,8 +16,9 @@ module Fluke
 
                  -OR-
 
-                 #{File.basename($0)} [options] watcher1..watcherN
-                 # run particular watchers
+                 #{File.basename($0)} [options] arg1..argN
+                 # args are either files, in which case watcher info is
+                 # inferred based on file content, or watcher names
           Options are:
         BANNER
         opts.separator ""
@@ -36,7 +37,12 @@ module Fluke
 
       if arguments.size > 0 then
         arguments.uniq.each do |name|
-          Fluke.watch name
+          if File.exists?(name) and !File.directory?(name) then
+            path = File.expand_path(name)
+            Fluke.class_eval(File.read(path), path)
+          else
+            Fluke.watch name
+          end
         end
       else
         Watcher.find(:all).each do |watcher|

data/lib/fluke/monkey_patch.rb

@@ -1,19 +1,27 @@
 module Fluke
   module Delays
     def seconds
-      return self*1000
+      self*1000
     end
 
     def minutes
-      return self.seconds*60
+      self.seconds*60
     end
 
     def hours
-      return self.minutes*60
+      self.minutes*60
     end
 
     def days
-      return self.hours*24
+      self.hours*24
+    end
+
+    def weeks
+      self.days*7
+    end
+
+    def months
+      self.weeks*4
     end
   end
 end

data/lib/fluke/result.rb

@@ -1,5 +1,6 @@
 require 'digest/sha1'
 require 'aws/s3'
+require 'differ'
 
 module Fluke
   class Result < ActiveRecord::Base
@@ -24,10 +25,13 @@ module Fluke
       Body.exists? self.body_key
     end
 
-    def self.from_response(watcher, content)
+    def self.from_response(watcher, content, generated_url = nil)
       checksum = Digest::SHA1.hexdigest(content)
       result = Result.new :checksum => checksum
       result.watcher = watcher
+      if generated_url and generated_url != watcher.url
+        result.url = generated_url
+      end
       result.save
 
       Thread.new do
@@ -41,5 +45,9 @@ module Fluke
 
       result
     end
+
+    def diff_against(right)
+      differ = Differ.diff_by_line(self.body.value, right.body.value)
+    end
   end
 end

data/lib/fluke/watcher.rb

@@ -9,14 +9,48 @@ module Fluke
     attr_accessor :thread
 
     def run
+      generated_url = self.generate_url
+      Fluke::log { "#{self}: generated URL: #{generated_url}" }
+
+      if generated_url =~ /^file\:\/\/(.+)$/
+        run_file File.expand_path($1)
+      else
+        run_http generated_url
+      end
+    end
+
+    def run_file(path)
+      result = Result.from_response(self, File.read(path), "file://#{path}")
+    end
+
+    def run_http(generated_url)
       hc = HTTPClient.new
       http_method = self.meth.downcase.to_sym
       unless hc.respond_to?(http_method)
         Fluke::log { "#{self}: invalid method '#{http_method}', converting to :get" }
         http_method = :get
       end
-      res = hc.send(http_method, self.url)
-      result = Result.from_response(self, res.body.dump.dup)
+      res = hc.send(http_method, generated_url, { 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache' })
+      result = Result.from_response(self, res.body.dump.dup, generated_url)
+    end
+
+    def url_generator(&block)
+      @generate_url = true
+      @url_generator = block
+    end
+
+    def url_strftime(offset = 0)
+      self.url_generator do |raw|
+        (Time.now + offset/1000.000).strftime(raw)
+      end
+    end
+
+    def generate_url
+      if @generate_url
+        return @url_generator.call(self.url)
+      else
+        return self.url
+      end
     end
 
     def wait
@@ -26,5 +60,10 @@ module Fluke
     def to_s
       "Watcher<#{name}>"
     end
+
+    def last_result(checksum = nil)
+      cond = [ "checksum = ?", checksum ] if checksum
+      results.find(:first, :conditions => cond, :order => "created_at desc")
+    end
   end
 end

data/lib/fluke.rb

@@ -9,7 +9,7 @@ require 'activerecord'
 require 'aws/s3'
 
 module Fluke
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
   ROOT = Dir.new(File.expand_path(File.dirname(__FILE__) + "/../"))
   DEFAULT_CONF_PATH = "~/.fluke.yml"
   @@verbose = false
@@ -61,7 +61,7 @@ module Fluke
       ActiveRecord::Base.logger = Logger.new(@@log_here) if verbose?
       ActiveRecord::Base.establish_connection(@@conf[:db])
       AWS::S3::Base.establish_connection!(@@conf[:s3][:auth])
-      Result::Body.set_current_bucket_to @@conf[:s3][:bucket]
+      Result::Body.set_current_bucket_to @@conf[:s3][:bucket][:result]
     rescue => e
       STDERR.puts e.inspect
       return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maxaf-fluke
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Max Afonov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: fluke
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/maxaf/fluke
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fluke
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple resource observer designed to detect change over time.