ruby_loggly 0.0.1 → 0.0.2

data/Rakefile

@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description ="A simple Ruby interface to the Loggly API" 
   gem.email = "mitchellryanj@gmail.com"
   gem.authors = ["Ryan Mitchell"]
-	gem.version = "0.0.1"
+	gem.version = "0.0.2"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/lib/ruby_loggly.rb

@@ -2,19 +2,22 @@ require 'rest_client'
 
 class Loggly
 
-	def initialize(options)
-		@uri = options[:uri]
-		@user = options[:user]
-		@pass = options[:pass]
-		@key = options[:key]
-	end
+  def initialize(options)
+    @subdomain = options[:subdomain]
+    @user = options[:user]
+    @pass = options[:pass]
+    @key = options[:key]
+    @ec2 = options[:ec2] ||= false
+  end
 
-	def log(log_data)
-		RestClient.post("https://logs.loggly.com/inputs/#{@key}", log_data)
-	end
+  def log(log_data)
+    ec2flag = @ec2 ? 'ec2.' : ''
+    RestClient.post("https://#{ec2flag}logs.loggly.com/inputs/#{@key}", log_data)
+  end
 
-	def search(query)
-		RestClient.get("https://#{@uri}/api/search", {:params => {:q => query}})
-	end
+  def search(query)
+    response = RestClient.get("https://#{@user}:#{@pass}@#{@subdomain}.loggly.com/api/search", {:params => {:q => query}})
+    yield response.to_str if block_given?
+  end
 
 end

data/ruby_loggly.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby_loggly}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ryan Mitchell"]
+  s.date = %q{2011-08-10}
+  s.description = %q{A simple Ruby interface to the Loggly API}
+  s.email = %q{mitchellryanj@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "lib/ruby_loggly.rb",
+    "ruby_loggly.gemspec",
+    "spec/ruby_loggly_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/mitchel456/ruby_loggly}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Simple Ruby interface to Loggly}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.3"])
+      s.add_development_dependency(%q<rspec>, ["> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rest-client>, [">= 1.6.3"])
+      s.add_dependency(%q<rspec>, ["> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rest-client>, [">= 1.6.3"])
+    s.add_dependency(%q<rspec>, ["> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["> 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/spec/ruby_loggly_spec.rb

@@ -2,54 +2,92 @@ require 'spec_helper'
 
 describe Loggly do
 
-	before(:all) do
-		@test_uri = 'example.loggly.com'
-		@test_user = 'user'
-		@test_pass = 'pass'
-		@test_key = '123456'
-		@loggly = Loggly.new(
-			:uri => @test_uri, 
-			:user => @test_user, 
-			:pass => @test_pass, 
-			:key => @test_key
-		)
-	end
-
-	describe "#search" do
-
-		before(:each) do
-			RestClient.stub!(:get)
-		end
-
-		it "should generate an appropriate RestClient GET" do
-			search_string = "search string"
-			RestClient.should_receive(:get).with(@test_uri, {:params => {:q => search_string}})
-			@loggly.search("search string")
-		end
-	end
-
-	describe "#log" do
-		
-		before(:each) do
-			RestClient.stub!(:post)
-		end
-
-		it "should generate an appropriate RestClient POST with a raw payload" do
-			log_string = "this is a test log"
-			RestClient.should_receive(:post).with(
-				"https://logs.loggly.com/inputs/%s" % @test_key,
-				log_string
-			)
-			@loggly.log(log_string)
-		end
-
-		it "should generate an appropriate RestClient POST with parameters" do
-			log_parameters = { :time => 123456, :type => 'foo', :logger => 'bar' }
-			RestClient.should_receive(:post).with(
-				"https://logs.loggly.com/inputs/%s" % @test_key,
-				log_parameters
-			)
-			@loggly.log(log_parameters)
-		end
-	end
+  before(:all) do
+    @test_subdomain = 'example'
+    @test_user = 'user'
+    @test_pass = 'pass'
+    @test_key = '123456'
+    @loggly = Loggly.new(
+      :subdomain => @test_subdomain, 
+      :user => @test_user, 
+      :pass => @test_pass, 
+      :key => @test_key
+    )
+  end
+
+  describe "#search" do
+
+    before(:each) do
+      RestClient.stub!(:get)
+      Kernel.stub!(:print)
+    end
+
+    it "should generate an appropriate RestClient GET" do
+
+      search_string = "search string"
+      RestClient.should_receive(:get).with(
+        "https://#{@test_user}:#{@test_pass}@#{@test_subdomain}.loggly.com/api/search", 
+        {:params => {:q => search_string}}
+      )
+
+      @loggly.search(search_string)
+    end
+
+    it "should execute the callback if one is provided" do
+
+      Kernel.should_receive(:print).with('return data')
+      RestClient.should_receive(:get).and_return('return data')
+
+      @loggly.search('anything') do |data|
+        Kernel.print data
+      end
+    end
+  end
+
+  describe "#log" do
+    
+    before(:each) do
+      RestClient.stub!(:post)
+    end
+
+    it "should generate an appropriate RestClient POST with a raw payload" do
+
+      log_string = "this is a test log"
+      RestClient.should_receive(:post).with(
+        "https://logs.loggly.com/inputs/%s" % @test_key,
+        log_string
+      )
+
+      @loggly.log(log_string)
+    end
+
+    it "should generate an appropriate RestClient POST with parameters" do
+
+      log_parameters = { :time => 123456, :type => 'foo', :logger => 'bar' }
+      RestClient.should_receive(:post).with(
+        "https://logs.loggly.com/inputs/%s" % @test_key,
+        log_parameters
+      )
+
+      @loggly.log(log_parameters)
+    end
+
+    it "should use the EC2 host if the EC2 flag is set" do
+
+      log_string = "this is a test log"
+      ec2logger = Loggly.new(
+        :subdomain => @test_subdomain, 
+        :user => @test_user, 
+        :pass => @test_pass, 
+        :key => @test_key,
+        :ec2 => true
+      )
+      RestClient.should_receive(:post).with(
+        "https://ec2.logs.loggly.com/inputs/%s" % @test_key,
+        log_string
+      )
+
+      ec2logger.log(log_string)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_loggly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000Z
+date: 2011-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &27576864 !ruby/object:Gem::Requirement
+  requirement: &26754528 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *27576864
+  version_requirements: *26754528
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27576540 !ruby/object:Gem::Requirement
+  requirement: &26754168 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *27576540
+  version_requirements: *26754168
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27576252 !ruby/object:Gem::Requirement
+  requirement: &26753880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *27576252
+  version_requirements: *26753880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27575952 !ruby/object:Gem::Requirement
+  requirement: &26753520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *27575952
+  version_requirements: *26753520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27575664 !ruby/object:Gem::Requirement
+  requirement: &26753160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27575664
+  version_requirements: *26753160
 description: A simple Ruby interface to the Loggly API
 email: mitchellryanj@gmail.com
 executables: []
@@ -81,6 +81,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/ruby_loggly.rb
+- ruby_loggly.gemspec
 - spec/ruby_loggly_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mitchel456/ruby_loggly
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -721368077
+      hash: 273334035
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: