right_support 2.6.4 → 2.6.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -48,7 +48,7 @@ module RightSupport::CI
48
48
  @test_failures[example] = failure
49
49
  end
50
50
 
51
- def example_pending(example)
51
+ def example_pending(example, message, deprecated_pending_location=nil)
52
52
  @test_times[example] = Time.now - @example_started_at
53
53
  @test_results[example] = 'pending'
54
54
  end
@@ -510,17 +510,13 @@ module RightSupport::DB
510
510
  attempt_time = now - started_at
511
511
 
512
512
  if METHODS_TO_LOG.include?(meth)
513
- if key.is_a?(Array)
514
- key_count = key.size
515
- else
516
- key_count = 1
517
- end
513
+ key_count = key.is_a?(Array) ? key.size : 1
518
514
 
519
- log_string = sprintf("CassandraModel %s, cf=%s, keys=%d, time=%.1fms", meth, cf, key_count, attempt_time)
515
+ log_string = sprintf("CassandraModel %s, cf=%s, keys=%d, time=%.1fms", meth, cf, key_count, attempt_time*1000)
520
516
 
521
517
  if retries && retries > 0
522
518
  total_time = now - first_started_at
523
- log_string += sprintf(", retries=%d, total_time=%.1fms", retries, total_time)
519
+ log_string += sprintf(", retries=%d, total_time=%.1fms", retries, total_time*1000)
524
520
  end
525
521
 
526
522
  logger.debug(log_string)
@@ -41,10 +41,11 @@ module RightSupport::Net
41
41
  # @raise BucketNotFound if bucket name specified in config["bucket_name"] does not exist
42
42
  #
43
43
  # @return [true] always returns true
44
- def self.init(config, s3, encryptor)
44
+ def self.init(config, s3, encryptor, options = {})
45
45
  @config = config
46
46
  @s3class = s3
47
47
  @encryptor = encryptor
48
+ @options = options
48
49
 
49
50
  # Reset any S3 objects we'd been caching, since config may have changed
50
51
  @s3 = @bucket = nil
@@ -70,7 +71,7 @@ module RightSupport::Net
70
71
  end
71
72
  # Create (if does not exist) and return S3 object
72
73
  def self.s3
73
- @s3 ||= @s3class.new config["creds"]["aws_access_key_id"], config["creds"]["aws_secret_access_key"]
74
+ @s3 ||= @s3class.new config["creds"]["aws_access_key_id"], config["creds"]["aws_secret_access_key"], @options
74
75
  end
75
76
  # Create Bucket object using S3 object
76
77
  # @raise BucketNotFound if bucket name specified in config["bucket_name"] does not exist
@@ -7,7 +7,7 @@ spec = Gem::Specification.new do |s|
7
7
  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
8
8
 
9
9
  s.name = 'right_support'
10
- s.version = '2.6.4'
10
+ s.version = '2.6.5'
11
11
  s.date = '2012-11-11'
12
12
 
13
13
  s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik']
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: right_support
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
4
+ hash: 29
5
5
  prerelease: false
6
6
  segments:
7
7
  - 2
8
8
  - 6
9
- - 4
10
- version: 2.6.4
9
+ - 5
10
+ version: 2.6.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Tony Spataro