eotb 0.5.12 → 0.5.14

data/.gitignore

@@ -4,3 +4,5 @@ rdoc
 pkg
 *.swp
 .bundle
+*~
+*.class

data/README.rdoc

@@ -27,7 +27,7 @@ Install gem from GitHub repository
   $ git clone git://github.com/Quirke/eotb_rails_plugin.git
   $ cd eotb_rails_plugin
   $ rake build
-  $ gem install ./pkg/eotb-0.5.11.gem
+  $ gem install ./pkg/eotb-0.5.14.gem
 
 == Getting API Key
 
@@ -38,22 +38,31 @@ As a result you will get API Key of your application.
 
 === Rails 3
 
-To configure your rails 3 app just run the generator with your_api_key and optional number of events sent in one package to Beholder:
+To configure your rails 3 app just run the generator with your_api_key, app login and password:
 
-   rails generate eotb --api-key=your_api_key
+   rails generate eotb --api-key=your_api_key --login=app_login --password=app_password
 
 === Rails 2
 
-To configure your rails 2 app just run the generator with your_api_key and optional number of events sent in one package to Beholder:
+To configure your rails 2 app just run the generator with your_api_key, app login and password:
 
-  script/generate eotb --api-key=your_api_key
+  script/generate eotb --api-key=your_api_key --login=app_login --password=app_password
   
 === Configuration file
 
 If you didn't use rails generator you can manualy create a file <tt>eotb.rb</tt> in directory <tt>config/initializers</tt> in your rails application with content:
 
   require 'Eotb'
-  Eotb.configure("your_api_key") 
+  Eotb.configure("your_api_key", "app_login", "app_password")
+  
+=== Deprecated methods
+
+Please note that methods:
+    
+  Eotb.configure("your_api_key")
+  Eotb.configure("your_api_key", events, "host", "port")
+  
+are deprecated and will be removed in Eotb --version=0.5.17.
 
 == Using in your apps
 

data/VERSION

@@ -1 +1 @@
-0.5.12
+0.5.14

data/bin/eotb

@@ -13,8 +13,8 @@ class EotbConfigurator
       opts.on("-a", "--api-key=[ARG]", "Your API Key") do |opt|
         @app[:apikey] = opt
       end
-      opts.on("-e", "--events=[ARG]", "Number of events") do |opt|
-        @app[:events] = opt
+      opts.on("-d", "--dir=[ARG]", "Directory of app") do |opt|
+        @app[:dir] = opt
       end
     end
     options.parse!(ARGV)
@@ -37,8 +37,8 @@ class EotbConfigurator
     else
       command = "script/generate eotb --api-key=#{@app[:apikey]}"
     end
-    if @app[:events]
-      command = command + " --events=#{@app[:events]}"
+    if @app[:dir]
+      command = "cd "+@app[:dir]+";"+command
     end
     command
   end
@@ -49,8 +49,7 @@ class EotbConfigurator
     ensure_parameter_was_set
     recognize_rails_version
     command = prepare_command
-    # exec( command )
-    puts "Will execute: "+command
+    system( command )
   end
 end
 

data/eotb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.5.12"
+  s.version = "0.5.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-10-18}
   s.default_executable = %q{eotb}
   s.description = %q{Rails plugin which allow you easily track and observe your apps}
   s.email = %q{bartlomiej.kozal@ragnarson.com}

data/generators/eotb/eotb_generator.rb

@@ -2,12 +2,14 @@ class EotbGenerator < Rails::Generator::Base
  
   def add_options!(opt)
     opt.on('-k', '--api-key=key', String, "Your Beholder API key") {|v| options[:api_key] = v}
+    opt.on('-l', '--login=login', String, "Your Beholder app login") {|v| options[:email] = v}
+    opt.on('-d', '--password=password', String, "Your Beholder app password") {|v| options[:password] = v}
   end
   
   def manifest
     record do |m|
       ensure_parameter_was_set
-      m.template "initializer.rb", "config/initializers/eotb.rb", :assigns => {:api_key => api_key_exp}
+      m.template "initializer.rb", "config/initializers/eotb.rb", :assigns => {:api_key => api_key_exp, :login => login_exp, :password => password_exp}
     end
    
   end
@@ -15,14 +17,24 @@ class EotbGenerator < Rails::Generator::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
+  def login_exp
+    "#{options[:login]}"
+  end
+  def password_exp
+    "#{options[:password]}"
+  end
     
   def ensure_parameter_was_set
     if !options[:api_key]
-      puts "Must pass --api-key or create config/initializers/eotb.rb"
+      puts "Must pass --api-key='your_api_key' or -k 'your_api_key'"
+      exit
+    elsif !options[:login]
+      puts "Must pass --login='app_login' or -l 'app_login'"
+      exit
+    elsif !options[:password]
+      puts "Must pass --password='app_password' or -d 'app_password'"
       exit
     end
   end
 
-
-  
 end

data/generators/eotb/templates/initializer.rb

@@ -1,3 +1,3 @@
 require 'eotb'
 
-Eotb.configure("<%= api_key_exp %>")
+Eotb.configure("<%= api_key_exp %>", "<%= login_exp %>", "<%= password_exp %>")

data/lib/eotb.rb

@@ -10,15 +10,32 @@ class Eotb
   @@api_key = nil
   METHODS = [:to_actor, :to_subject, :to_json, :to_hash, :inspect]
     
-  def self.configure(api_key)
+  def self.configure(*params) #(api_key, email, password)
     @@host = "beta.beholder.ragnarson.com"
     @@port = '80'
-    @@api_key = api_key
-    @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + api_key)
-    @@post = Net::HTTP::Post.new(@@uri.path)
+    @@api_key = params[0] if params.size > 0
+    @@reset = 100
+    if params.size == 1  # DEPRECATED - remove on Eotb 0.5.17
+      puts 'DEPRECATION WARNING'
+      puts 'Eotb.configure(api_key) -- method will be removed in eotb 0.5.17'
+    elsif params.size == 4 # DEPRECATED - remove on Eotb 0.5.17
+      puts 'DEPRECATION WARNING'
+      puts 'Eotb.configure(api_key, events, host, port) -- method will be removed in eotb 0.5.17'
+      @@host = params[2]
+      @@port = params[3]
+      params[1].to_i >= 1 ? @@reset = params[1].to_i : @@reset = 1
+      @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + @@api_key)
+      @@post = Net::HTTP::Post.new(@@uri.path)
+    elsif params.size == 3 
+      @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + @@api_key)
+      @@post = Net::HTTP::Post.new(@@uri.path)
+      @@post.basic_auth params[1], params[2]
+    else
+      raise ArgumentError, 'Wrong number of arguments. Check Eotb.configure parameters!'
+    end
+    
     @@events = {}
     @@counter = 1
-    @@reset = 100
     
     Thread.new do
       Timer.every(600.0) { |elapsed| 
@@ -111,5 +128,4 @@ class Eotb
     end
     eval "{#{h.to_s}}"
   end
-  
 end

data/lib/generators/eotb/eotb_generator.rb

@@ -7,6 +7,8 @@ class EotbGenerator < Rails::Generators::Base
   source_root File.expand_path('../../../../generators/eotb/templates', __FILE__)
   
   class_option :api_key, :aliases => "-k", :type => :string, :desc => "Your Beholder API key"
+  class_option :login, :aliases => "-l", :type => :string, :desc => "Your Beholder app login"
+  class_option :password, :aliases => "-d", :type => :string, :desc => "Your Beholder app password"
   
   def generator
     ensure_parameters_was_set
@@ -28,6 +30,12 @@ class EotbGenerator < Rails::Generators::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
+  def login_exp
+    "#{options[:login]}"
+  end
+  def password_exp
+    "#{options[:password]}"
+  end
   
   def generate_initializer
     template 'initializer.rb', 'config/initializers/eotb.rb'
@@ -35,10 +43,16 @@ class EotbGenerator < Rails::Generators::Base
   
   def api_key_configured?
     if !options[:api_key]
-      puts "Must pass --api-key='your_api_key'"
+      puts "Must pass --api-key='your_api_key' or -k 'your_api_key'"
+      exit
+    elsif !options[:email]
+      puts "Must pass --email='app_email' or -l 'app_email'"
+      exit
+    elsif !options[:password]
+      puts "Must pass --password='app_password' or -d 'app_password'"
       exit
     end
-    File.exists?('config/initializers/eotb.rb') && options[:api_key].empty?
+    File.exists?('config/initializers/eotb.rb') && options[:api_key].empty? && options[:login].empty? && options[:password].empty?
   end
   
 end

data/spec/eotb_spec.rb

@@ -25,8 +25,7 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      
-      Eotb.configure("0"*40)
+      Eotb.configure("test_api_key", 'email', 'passwords')
       @@counter = 100
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
@@ -71,7 +70,7 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("0"*40)
+      Eotb.configure("0"*40, 'email', 'passwords')
       @@counter = 96
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 5
-  - 12
-  version: 0.5.12
+  - 14
+  version: 0.5.14
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +02:00
+date: 2010-10-18 00:00:00 +02:00
 default_executable: eotb
 dependencies: 
 - !ruby/object:Gem::Dependency