trifle-stats 0.4.1 → 1.0.0

data/.devops/docker/environment/.zshrc

@@ -0,0 +1,13 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+source /root/powerlevel10k/powerlevel10k.zsh-theme
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f /root/.p10k.zsh ]] || source /root/.p10k.zsh
+
+POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true

data/.devops/docker/environment/Dockerfile

@@ -0,0 +1,54 @@
+FROM debian:latest
+
+ENV TZ=Europe/Bratislava
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# install ubuntu packages
+RUN apt-get update -q \
+ && apt-get install -y \
+    build-essential \
+    apt-transport-https \
+    zsh \
+    libpq-dev \
+    git \
+    curl \
+    wget \
+    unzip \
+    gpg \
+    gnupg2 \
+    locales \
+    autoconf \
+    libssl-dev \
+    libreadline-dev \
+    zlib1g-dev \
+    tmux \
+    htop \
+    vim \
+ && apt-get clean
+
+#set the locale
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh || true
+RUN git clone --depth=1 https://github.com/romkatv/powerlevel10k.git /root/powerlevel10k
+COPY .zshrc /root/.zshrc
+COPY .p10k.zsh /root/p10k.zsh
+
+#install asdf
+ENV ASDF_ROOT /root/.asdf
+ENV PATH "${ASDF_ROOT}/bin:${ASDF_ROOT}/shims:$PATH"
+RUN git clone https://github.com/asdf-vm/asdf.git ${ASDF_ROOT} --branch v0.10.0
+
+RUN asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
+
+# install ruby
+ENV RUBY_VERSION 3.0.0
+RUN ASDF_RUBY_BUILD_VERSION=v20201225 asdf install ruby ${RUBY_VERSION} \
+  && asdf global ruby ${RUBY_VERSION}
+
+RUN gem install bundler
+
+CMD ["zsh"]

data/.gitpod.yml

@@ -1,5 +1,5 @@
 image:
-  file: .gitpod/Dockerfile
+  file: .devops/docker/gitpod/Dockerfile
 tasks:
   - init: bundle install
     command: ./bin/console

data/Gemfile.lock

@@ -1,10 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (0.4.1)
-      mongo (>= 2.14.0)
-      pg (>= 1.2)
-      redis (>= 4.2)
+    trifle-stats (1.0.0)
       tzinfo (~> 2.0)
 
 GEM
@@ -13,7 +10,7 @@ GEM
     ast (2.4.2)
     bson (4.12.1)
     byebug (11.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
     mongo (2.14.0)
@@ -64,7 +61,10 @@ DEPENDENCIES
   bundler (~> 2.1)
   byebug
   dotenv
+  mongo (>= 2.14.0)
+  pg (>= 1.2)
   rake (~> 12.0)
+  redis (>= 4.2)
   rspec (~> 3.0)
   rubocop (= 1.0.0)
   trifle-stats!

data/README.md

@@ -8,7 +8,7 @@ Simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment,
 
 `Trifle::Stats` is a _way too_ simple timeline analytics that helps you track custom metrics. Automatically increments counters for each enabled range. It supports timezones and different week beginning.
 
-[^1]: TBH only Redis for now 💔.
+[^1]: TBH only Redis, Postgres and MongoDB for now 💔.
 
 ## Documentation
 
@@ -24,11 +24,22 @@ gem 'trifle-stats'
 
 And then execute:
 
-    $ bundle install
+```sh
+$ bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install trifle-stats
+```sh
+$ gem install trifle-stats
+```
+
+Depending on driver you would like to use, make sure you add required gems into your `Gemfile`.
+```ruby
+gem 'mongo', '>= 2.14.0'
+gem 'pg', '>= 1.2'
+gem 'redis', '>= 4.2'
+```
 
 ## Usage
 
@@ -45,25 +56,72 @@ end
 
 ### Track values
 
-Available ranges are `:minute`, `:hour`, `:day`, `:week`, `:month`, `:quarter`, `:year`.
+Track your first metrics
 
-Now track your first metrics
 ```ruby
 Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 2, lines: 241})
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}]
-# or do it few more times
+```
+
+Then do it few more times
+
+```ruby
 Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 1, lines: 56})
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}]
 Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 5, lines: 361})
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}]
 ```
 
-### Get values
+You can also store nested counters like
+
+```ruby
+Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {
+  count: 1,
+  duration: {
+    parsing: 21,
+    compression: 8,
+    upload: 1
+  },
+  lines: 25432754
+})
+```
+
+#### Get values
+
+Retrieve your values for specific `range`. Adding increments above will return sum of all the values you've tracked.
+
+```ruby
+Trifle::Stats.values(key: 'event::logs', from: Time.now, to: Time.now, range: :day)
+=> {:at=>[2021-01-25 00:00:00 +0200], :values=>[{"count"=>3, "duration"=>8, "lines"=>658}]}
+```
+
+### Assert values
+
+Asserting values works same way like incrementing, but instead of increment, it sets the value. Duh.
+
+Set your first metrics
+
+```ruby
+Trifle::Stats.assert(key: 'event::logs', at: Time.now, values: {count: 1, duration: 2, lines: 241})
+=> [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}]
+```
+
+Then do it few more times
+
+```ruby
+Trifle::Stats.assert(key: 'event::logs', at: Time.now, values: {count: 1, duration: 1, lines: 56})
+=> [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}]
+Trifle::Stats.assert(key: 'event::logs', at: Time.now, values: {count: 1, duration: 5, lines: 361})
+=> [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}]
+```
+
+#### Get values
+
+Retrieve your values for specific `range`. As you just used `assert` above, it will return latest value you've asserted.
 
-Retrieve your values for specific `range`.
 ```ruby
 Trifle::Stats.values(key: 'event::logs', from: Time.now, to: Time.now, range: :day)
-=> [{2021-01-25 00:00:00 +0100=>{"count"=>3, "duration"=>8, "lines"=>658}}]
+=> {:at=>[2021-01-25 00:00:00 +0200], :values=>[{"count"=>1, "duration"=>5, "lines"=>361}]}
 ```
 
 ## Contributing

data/lib/trifle/stats/driver/README.md

@@ -4,7 +4,7 @@ Driver is a wrapper class that persists and retrieves values from backend. It ne
 
 - `inc(key:, **values)` method increment values
 - `set(key:, **values)` method set values
-- `get(key:)` method to retrieve values
+- `get(keys:)` method to retrieve values
 
 ## Documentation
 

data/lib/trifle/stats/driver/mongo.rb

@@ -43,13 +43,12 @@ module Trifle
           }
         end
 
-        def get(key:)
-          pkey = key.join(separator)
-
-          data = collection.find(key: pkey).limit(1).first
-          return {} if data.nil? || data['data'].nil?
+        def get(keys:)
+          pkeys = keys.map { |key| key.join(separator) }
+          data = collection.find(key: { '$in' => pkeys })
+          map = data.inject({}) { |o, d| o.merge(d['key'] => d['data']) }
 
-          data['data']
+          pkeys.map { |pkey| map[pkey] || {} }
         end
 
         private

data/lib/trifle/stats/driver/postgres.rb

@@ -44,13 +44,15 @@ module Trifle
           client.exec(query)
         end
 
-        def get(key:)
-          pkey = key.join(separator)
+        def get(keys:)
+          keys.map do |key|
+            pkey = key.join(separator)
 
-          data = _get(key: pkey)
-          return {} if data.nil?
+            data = _get(key: pkey)
+            return {} if data.nil?
 
-          self.class.unpack(hash: data)
+            self.class.unpack(hash: data)
+          end
         end
 
         def _get(key:)

data/lib/trifle/stats/driver/process.rb

@@ -28,10 +28,12 @@ module Trifle
           end
         end
 
-        def get(key:)
-          self.class.unpack(
-            hash: @data.fetch(key.join(@separator), {})
-          )
+        def get(keys:)
+          keys.map do |key|
+            self.class.unpack(
+              hash: @data.fetch(key.join(@separator), {})
+            )
+          end
         end
       end
     end

data/lib/trifle/stats/driver/redis.rb

@@ -30,12 +30,14 @@ module Trifle
           client.hmset(pkey, *self.class.pack(hash: values))
         end
 
-        def get(key:)
-          pkey = ([prefix] + key).join(separator)
+        def get(keys:)
+          keys.map do |key|
+            pkey = ([prefix] + key).join(separator)
 
-          self.class.unpack(
-            hash: client.hgetall(pkey)
-          )
+            self.class.unpack(
+              hash: client.hgetall(pkey)
+            )
+          end
         end
       end
     end

data/lib/trifle/stats/operations/timeseries/values.rb

@@ -24,13 +24,14 @@ module Trifle
           end
 
           def perform
-            timeline.map do |at|
-              {
-                at => config.driver.get(
-                  key: [key, range, at.to_i]
-                )
-              }
-            end
+            {
+              at: timeline,
+              values: config.driver.get(
+                keys: timeline.map do |at|
+                  [key, range, at.to_i]
+                end
+              )
+            }
           end
         end
       end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '0.4.1'
+    VERSION = '1.0.0'
   end
 end

data/trifle-stats.gemspec

@@ -31,12 +31,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('bundler', '~> 2.1')
   spec.add_development_dependency('byebug', '>= 0')
   spec.add_development_dependency('dotenv')
+  spec.add_development_dependency('mongo', '>= 2.14.0')
+  spec.add_development_dependency('pg', '>= 1.2')
   spec.add_development_dependency('rake', '~> 13.0')
+  spec.add_development_dependency('redis', '>= 4.2')
   spec.add_development_dependency('rspec', '~> 3.2')
   spec.add_development_dependency('rubocop', '1.0.0')
 
-  spec.add_runtime_dependency('mongo', '>= 2.14.0')
-  spec.add_runtime_dependency('pg', '>= 1.2')
-  spec.add_runtime_dependency('redis', '>= 4.2')
   spec.add_runtime_dependency('tzinfo', '~> 2.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,89 +53,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :runtime
+        version: '4.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '3.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
+        version: 1.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -159,11 +159,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer.json"
+- ".devops/docker/codespaces/Dockerfile"
+- ".devops/docker/codespaces/docker-compose.yml"
+- ".devops/docker/environment/.p10k.zsh"
+- ".devops/docker/environment/.zshrc"
+- ".devops/docker/environment/Dockerfile"
+- ".devops/docker/gitpod/Dockerfile"
+- ".devops/docker/gitpod/base/Dockerfile"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitpod.yml"
-- ".gitpod/Dockerfile"
-- ".gitpod/base/Dockerfile"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"