prometheus-client-mmap 0.7.0.beta37 → 0.7.0.beta38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28aac67101802350b1dfd976a1feb6e52e8cc58e
-  data.tar.gz: 7e9d1453fd4f1a85cdb31cf90224acd14426076a
+  metadata.gz: 529b3bc7c66b300e5d76ef2c26ce847bc0675f01
+  data.tar.gz: 061cc23d4fa253208860e648eed1d9123c1cca12
 SHA512:
-  metadata.gz: 11e665a5263a6aad3621d9f99331134d70a170259b1ed5275175cbf57bc28b63d39ce4ac1713c0d2a57403bbcbc79dac9e7326387516d59285e7132d9c4d0bad
-  data.tar.gz: fe0f20b47951cb8d227e41981724de6eda3363add39fad80fd292c0e4f4c9f0438400e53c0b788000ddb719d9357263902c173d36554b259f07d7ced8af64411
+  metadata.gz: 1573f6da16316623e8ced38ae7c2f67a25c8459e23765b2eec4199dc4f83eeaf1f4da5fb44a03360110e09c2f33e4a5d20650d3d7801eaf2846cd2a70a7f9064
+  data.tar.gz: dda3950d9c9cc3f7b0678141c51de68ccc46bdc92fbc6b5baaa8ff53357e2e6dd6b1374fb61c87463e64129c9381d5760a37f93a4255426026b272e917a4d54d

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -21,7 +21,7 @@ int open_and_extend_file(mm_ipc *i_mm, size_t len) {
 
     if (lseek(fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
         close(fd);
-        rb_raise(rb_eIOError, "Can't lseek %lu", len - i_mm->t->len - 1);
+        rb_raise(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
     }
 
     if (write(fd, "\000", 1) != 1) {
@@ -133,8 +133,8 @@ VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
         rb_error_frozen("mmap");
     }
 
-    if (RSTRING_LEN(key) > UINT32_MAX) {
-        rb_raise(rb_eArgError, "string length gt %u", UINT32_MAX);
+    if (RSTRING_LEN(key) > INT32_MAX) {
+        rb_raise(rb_eArgError, "string length gt %zd", INT32_MAX);
     }
 
     uint32_t key_length = (uint32_t)RSTRING_LEN(key);
@@ -159,7 +159,7 @@ VALUE method_get_double(VALUE self, VALUE index) {
     size_t idx = NUM2UINT(index);
 
     if ((i_mm->t->real + sizeof(double)) <= idx) {
-        rb_raise(rb_eIndexError, "index %ld out of string", idx);
+        rb_raise(rb_eIndexError, "index %zu out of string", idx);
     }
 
     double tmp;

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta37'.freeze
+    VERSION = '0.7.0.beta38'.freeze
   end
 end

data/lib/prometheus/client/version.rb.orig

@@ -0,0 +1,9 @@
+module Prometheus
+  module Client
+<<<<<<< HEAD
+    VERSION = '0.7.0.beta36'.freeze
+=======
+    VERSION = '0.7.0.beta32'.freeze
+>>>>>>> Fix compilation on GCC 4.9
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta37
+  version: 0.7.0.beta38
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2
@@ -134,6 +134,7 @@ files:
 - lib/prometheus/client/support/unicorn.rb
 - lib/prometheus/client/uses_value_type.rb
 - lib/prometheus/client/version.rb
+- lib/prometheus/client/version.rb.orig
 homepage: https://gitlab.com/gitlab-org/prometheus-client-mmap
 licenses:
 - Apache 2.0