oboe 1.4.1.2 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -2,9 +2,19 @@
2
2
  # All rights reserved.
3
3
 
4
4
  require 'mkmf'
5
+ require 'rbconfig'
6
+
5
7
  dir_config('oboe')
6
8
 
7
- if have_library('oboe')
9
+ # Check if we're running in JRuby
10
+ if RbConfig::CONFIG.has_key?('arch')
11
+ # nil meaning java string not found
12
+ jruby = (RbConfig::CONFIG['arch'] =~ /java/i) != nil
13
+ else
14
+ jruby = false
15
+ end
16
+
17
+ if not jruby and have_library('oboe')
8
18
  $libs = append_library($libs, "oboe")
9
19
  $libs = append_library($libs, "stdc++")
10
20
 
@@ -24,14 +24,14 @@ module Oboe
24
24
  unless options.empty?
25
25
  [:start_key, :finish_key, :key_count, :batch_size, :columns, :count, :start,
26
26
  :stop, :finish, :finished, :reversed, :consistency, :ttl].each do |k|
27
- report_kvs[k.capitalize] = options[k] if options.has_key?(k)
27
+ report_kvs[k.to_s.capitalize] = options[k] if options.has_key?(k)
28
28
  end
29
29
 
30
30
  if op == :get_indexed_slices
31
31
  index_clause = columns_and_options[:index_clause] || {}
32
32
  unless index_clause.empty?
33
33
  [:column_name, :value, :comparison].each do |k|
34
- report_kvs[k.capitalize] = index_clause[k] if index_clause.has_key?(k)
34
+ report_kvs[k.to_s.capitalize] = index_clause[k] if index_clause.has_key?(k)
35
35
  end
36
36
  end
37
37
  end
@@ -2,8 +2,8 @@ module Oboe
2
2
  module Version
3
3
  MAJOR = 1
4
4
  MINOR = 4
5
- PATCH = 1
6
- BUILD = 2
5
+ PATCH = 2
6
+ BUILD = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oboe
3
3
  version: !ruby/object:Gem::Version
4
- hash: 127
4
+ hash: 3
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 4
9
- - 1
10
9
  - 2
11
- version: 1.4.1.2
10
+ version: 1.4.2
12
11
  platform: ruby
13
12
  authors:
14
13
  - Tracelytics, Inc.
@@ -16,7 +15,7 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2013-04-19 00:00:00 Z
18
+ date: 2013-04-30 00:00:00 Z
20
19
  dependencies: []
21
20
 
22
21
  description: The oboe gem provides AppNeta instrumentation for Ruby and Ruby frameworks.