flumify 0.0.1 → 0.0.2

data/.rvmrc

@@ -1,2 +1,2 @@
-rvm use  ruby-1.8.7-p302@flumify
+rvm use  ruby-1.8.7@flumify
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flumify (0.0.1)
+    flumify (0.0.2)
       net-ssh (~> 2.1.4)
 
 GEM

data/lib/flumify.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "ssh_connection")
 require File.join(File.dirname(__FILE__), "flume_master")
 
-class Flumify 
+class Flumify
   
   attr_accessor :the_internal_collector, :the_external_collector, :logical_nodes, :node_configurations
   
@@ -21,15 +21,15 @@ class Flumify
   end
   
   def logical_node(name, opts)
+    opts = {:startFromEnd => true}.merge(opts)
+    
     @logical_nodes << "flume shell -c localhost -e 'exec spawn #{@server} #{name}.#{@server}'"
-
     if opts[:tail].include? "*"
-      split = opts[:tail].split("*")
-      directory = split[0]
-      glob_pattern = ".*" + split[1]
-      @node_configurations << "#{name}.#{@server} : tailDir( \"#{directory}\", \"#{glob_pattern}\" ) | { value(\"bucket\", \"#{opts[:bucket]}\") => agentBEChain(\"#{@the_internal_collector[:host]}:#{@the_internal_collector[:port]}\",\"#{@the_external_collector[:host]}:#{@the_external_collector[:port]}\") };"   
+      directory = File.dirname(opts[:tail])
+      glob_pattern = File.basename(opts[:tail])
+      @node_configurations << "#{name}.#{@server} : tailDir( \"#{directory}\", \"#{glob_pattern}\", #{opts[:startFromEnd]} ) | { value(\"bucket\", \"#{opts[:bucket]}\") => agentBEChain(\"#{@the_internal_collector[:host]}:#{@the_internal_collector[:port]}\",\"#{@the_external_collector[:host]}:#{@the_external_collector[:port]}\") };"   
     else
-      @node_configurations << "#{name}.#{@server} : tail( \"#{opts[:tail]}\", true ) | { value(\"bucket\", \"#{opts[:bucket]}\") => agentBEChain(\"#{@the_internal_collector[:host]}:#{@the_internal_collector[:port]}\",\"#{@the_external_collector[:host]}:#{@the_external_collector[:port]}\") };"
+      @node_configurations << "#{name}.#{@server} : tail( \"#{opts[:tail]}\", #{opts[:startFromEnd]} ) | { value(\"bucket\", \"#{opts[:bucket]}\") => agentBEChain(\"#{@the_internal_collector[:host]}:#{@the_internal_collector[:port]}\",\"#{@the_external_collector[:host]}:#{@the_external_collector[:port]}\") };"
     end
   end
 end

data/lib/flumify/version.rb

@@ -1,3 +1,3 @@
 module Flumify
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/flumify_spec.rb

@@ -45,12 +45,12 @@ describe "Flumify" do
       internal_collector :host => "ec2-foo", :port => 35853
       external_collector :host => "ec2-bar", :port => 35853
 
-      logical_node "query", {:tail => "/path/to/query.log", :bucket => "ask-query"}
-      logical_node "click", {:tail => "/path/to/click.log", :bucket => "ask-click"}
+      logical_node "query", {:tail => "/path/to/query.log", :bucket => "ask-query", :startFromEnd => true}
+      logical_node "click", {:tail => "/path/to/click.log", :bucket => "ask-click", :startFromEnd => false}
     end
 
     config.node_configurations.should include "query.ec2.us-west-1a : tail( \"/path/to/query.log\", true ) | { value(\"bucket\", \"ask-query\") => agentBEChain(\"ec2-foo:35853\",\"ec2-bar:35853\") };"
-    config.node_configurations.should include "click.ec2.us-west-1a : tail( \"/path/to/click.log\", true ) | { value(\"bucket\", \"ask-click\") => agentBEChain(\"ec2-foo:35853\",\"ec2-bar:35853\") };"
+    config.node_configurations.should include "click.ec2.us-west-1a : tail( \"/path/to/click.log\", false ) | { value(\"bucket\", \"ask-click\") => agentBEChain(\"ec2-foo:35853\",\"ec2-bar:35853\") };"
     config.node_configurations.length.should == 2
   end
   
@@ -59,10 +59,10 @@ describe "Flumify" do
       internal_collector :host => "ec2-foo", :port => 35853
       external_collector :host => "ec2-bar", :port => 35853
 
-      logical_node "query", {:tail => "/path/to/*.log", :bucket => "ask-query"}
+      logical_node "query", {:tail => "/path/to/.*.log", :bucket => "ask-query", :startFromEnd => false}
     end
 
-     config.node_configurations.should include "query.ec2.us-west-1a : tailDir( \"/path/to/\", \".*.log\" ) | { value(\"bucket\", \"ask-query\") => agentBEChain(\"ec2-foo:35853\",\"ec2-bar:35853\") };"
+     config.node_configurations.should include "query.ec2.us-west-1a : tailDir( \"/path/to\", \".*.log\", false ) | { value(\"bucket\", \"ask-query\") => agentBEChain(\"ec2-foo:35853\",\"ec2-bar:35853\") };"
      config.node_configurations.length.should == 1
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flumify
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Greenhall
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +01:00
+date: 2011-06-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: flumify
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple flume configuration