trifle-stats 1.1.2 → 1.3.1

data/.devops/docker/gitpod/base/.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/gitpod/base/Dockerfile

@@ -1,41 +1,27 @@
-FROM ubuntu:20.04
+FROM debian:latest
 
 ENV TZ=Europe/Bratislava
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN useradd gitpod -u 33333
-RUN mkdir -p /home/gitpod && chown gitpod:gitpod /home/gitpod
-
 # install ubuntu packages
 RUN apt-get update -q \
  && apt-get install -y \
     build-essential \
     apt-transport-https \
-    bash \
-    xterm \
-    xvfb \
-    x11vnc \
+    zsh \
     libpq-dev \
     git \
     curl \
     wget \
     unzip \
-    dirmngr \
     gpg \
     gnupg2 \
     locales \
     autoconf \
-    libncurses5-dev \
-    libgl1-mesa-dev \
-    libglu1-mesa-dev \
-    libpng-dev \
-    unixodbc-dev \
     libssl-dev \
     libreadline-dev \
     zlib1g-dev \
-    ffmpeg \
     tmux \
-    runit-systemd \
     htop \
     vim \
  && apt-get clean
@@ -46,23 +32,15 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-RUN curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
-RUN echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list
-
-RUN apt-get update -q \
- && apt-get install -y \
-    postgresql postgresql-contrib \
-    # mongodb-org \
-    redis-server \
-    mariadb-server \
- && apt-get clean
-
-USER gitpod
+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 /home/gitpod/.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.8.0
+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
 
@@ -71,7 +49,6 @@ ENV RUBY_VERSION 3.0.0
 RUN ASDF_RUBY_BUILD_VERSION=v20201225 asdf install ruby ${RUBY_VERSION} \
   && asdf global ruby ${RUBY_VERSION}
 
-# throw errors if Gemfile has been modified since Gemfile.lock
 RUN gem install bundler
 
-CMD ["bash"]
+CMD ["zsh"]

data/.gitignore

@@ -10,3 +10,5 @@
 # rspec failure tracking
 .rspec_status
 /.byebug_history
+stats.db
+.DS_Store

data/Gemfile

@@ -5,3 +5,7 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+gem "mongo", require: false
+gem "pg", require: false
+gem "redis", require: false
+gem "sqlite", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (1.1.2)
+    trifle-stats (1.3.1)
       tzinfo (~> 2.0)
 
 GEM
@@ -49,6 +49,8 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
+    sqlite (1.0.2)
+    sqlite3 (1.4.4)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
@@ -61,12 +63,14 @@ DEPENDENCIES
   bundler (~> 2.1)
   byebug
   dotenv
-  mongo (>= 2.14.0)
-  pg (>= 1.2)
+  mongo
+  pg
   rake (~> 12.0)
-  redis (>= 4.2)
+  redis
   rspec (~> 3.0)
   rubocop (= 1.0.0)
+  sqlite
+  sqlite3 (>= 1.4.4)
   trifle-stats!
 
 BUNDLED WITH

data/README.md

@@ -12,7 +12,7 @@ Simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment,
 
 ## Documentation
 
-You can find guides and documentation at https://trifle.io/docs/stats
+You can find guides and documentation at https://trifle.io/trifle-stats
 
 ## Installation
 

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "trifle/stats"
+require "byebug"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'mongo'
 require_relative '../mixins/packer'
 
 module Trifle
@@ -16,6 +15,11 @@ module Trifle
           @separator = '::'
         end
 
+        def self.setup!(client, collection_name: 'trifle_stats')
+          client[collection_name].create
+          client[collection_name].indexes.create_one({ key: 1 }, unique: true)
+        end
+
         def inc(keys:, **values)
           data = self.class.pack(hash: { data: values })
 

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pg'
 require_relative '../mixins/packer'
 
 module Trifle
@@ -16,58 +15,68 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(keys:, **values)
-          keys.map do |key|
-            pkey = key.join(separator)
+        def self.setup!(client = PG::Connection.new, table_name: 'trifle_stats')
+          client.exec("CREATE TABLE #{table_name} (key VARCHAR(255) PRIMARY KEY, data JSONB NOT NULL DEFAULT '{}'::jsonb)") # rubocop:disable Layout/LineLength
+        end
 
-            self.class.pack(hash: values).each do |k, c|
-              _inc_one(key: pkey, name: k, value: c)
+        def inc(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.map do |key|
+              pkey = key.join(separator)
+              c.exec(inc_query(key: pkey, data: data))
             end
           end
         end
 
-        def _inc_one(key:, name:, value:)
-          data = { name => value }
-          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = jsonb_set(to_jsonb(trifle_stats.data), '{#{name}}', (COALESCE(trifle_stats.data->>'#{name}','0')::int + #{value})::text::jsonb)" # rubocop:disable Metric/LineLength
-
-          client.exec(query)
+        def inc_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) VALUES ('#{key}', '#{data.to_json}')
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject("to_jsonb(#{table_name}.data)") { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (COALESCE(trifle_stats.data->>'#{k}', '0')::int + #{v})::text::jsonb)" }};
+          SQL
         end
 
         def set(keys:, **values)
-          keys.map do |key|
-            pkey = key.join(separator)
-
-            _set_all(key: pkey, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.map do |key|
+              pkey = key.join(separator)
+              c.exec(set_query(key: pkey, data: data))
+            end
           end
         end
 
-        def _set_all(key:, **values)
-          data = self.class.pack(hash: values)
-          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = '#{data.to_json}'" # rubocop:disable Metric/LineLength
-
-          client.exec(query)
+        def set_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) VALUES ('#{key}', '#{data.to_json}')
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject("to_jsonb(#{table_name}.data)") { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (#{v})::text::jsonb)" }}
+          SQL
         end
 
         def get(keys:)
-          keys.map do |key|
-            pkey = key.join(separator)
+          pkeys = keys.map { |key| key.join(separator) }
+          data = get_all(keys: pkeys)
+          map = data.inject({}) { |o, d| o.merge(d[:key] => d[:data]) }
 
-            data = _get(key: pkey)
-            return {} if data.nil?
+          pkeys.map { |pkey| self.class.unpack(hash: map.fetch(pkey, {})) }
+        end
+
+        def get_all(keys:)
+          results = client.exec_params(get_query(keys: keys)).to_a
 
-            self.class.unpack(hash: data)
+          results.map do |r|
+            { key: r['key'], data: JSON.parse(r['data']) }
+          rescue JSON::ParserError
+            { key: r['key'], data: {} }
           end
         end
 
-        def _get(key:)
-          result = client.exec_params(
-            "SELECT * FROM #{table_name} WHERE key = $1 LIMIT 1;", [key]
-          ).to_a.first
-          return nil if result.nil?
-
-          JSON.parse(result['data'])
-        rescue JSON::ParserError
-          nil
+        def get_query(keys:)
+          <<-SQL
+            SELECT * FROM #{table_name} WHERE key IN ('#{keys.join("', '")}');
+          SQL
         end
       end
     end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'redis'
 require_relative '../mixins/packer'
 
 module Trifle

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative '../mixins/packer'
+
+module Trifle
+  module Stats
+    module Driver
+      class Sqlite
+        include Mixins::Packer
+        attr_accessor :client, :table_name, :separator
+
+        def initialize(client = SQLite3::Database.new('stats.db'), table_name: 'trifle_stats')
+          @client = client
+          @table_name = table_name
+          @separator = '::'
+        end
+
+        def self.setup!(client = SQLite3::Database.new('stats.db'), table_name: 'trifle_stats')
+          client.execute("CREATE TABLE #{table_name} (key varchar(255), data json);")
+          client.execute("CREATE UNIQUE INDEX idx_#{table_name}_key ON #{table_name} (key);")
+        end
+
+        def inc(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.each do |key|
+              pkey = key.join(separator)
+              c.execute(inc_query(key: pkey, data: data))
+            end
+          end
+        end
+
+        def inc_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) values('#{key}', json('#{data.to_json}'))
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject('data') { |o, (k, v)| "json_set(#{o}, '$.#{k}', IFNULL(json_extract(data, '$.#{k}'), 0) + #{v})" }};
+          SQL
+        end
+
+        def set(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.each do |key|
+              pkey = key.join(separator)
+              c.execute(set_query(key: pkey, data: data))
+            end
+          end
+        end
+
+        def set_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) values('#{key}', json('#{data.to_json}'))
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject('data') { |o, (k, v)| "json_set(#{o}, '$.#{k}', #{v})" }};
+          SQL
+        end
+
+        def get(keys:)
+          pkeys = keys.map { |key| key.join(separator) }
+          data = get_all(keys: pkeys)
+          map = data.inject({}) { |o, d| o.merge(d[:key] => d[:data]) }
+
+          pkeys.map { |pkey| map.fetch(pkey, {}) }
+        end
+
+        def get_all(keys:)
+          results = client.execute(get_query(keys: keys)).to_a
+
+          results.map do |key, data|
+            { key: key, data: JSON.parse(data) }
+          rescue JSON::ParserError
+            { key: key, data: {} }
+          end
+        end
+
+        def get_query(keys:)
+          <<-SQL
+            SELECT key, data FROM #{table_name} WHERE key IN ('#{keys.join("', '")}');
+          SQL
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '1.1.2'
+    VERSION = '1.3.1'
   end
 end

data/lib/trifle/stats.rb

@@ -7,6 +7,7 @@ require 'trifle/stats/driver/mongo'
 require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
 require 'trifle/stats/driver/redis'
+require 'trifle/stats/driver/sqlite'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'
 require 'trifle/stats/configuration'

data/trifle-stats.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('byebug', '>= 0')
   spec.add_development_dependency('dotenv')
   spec.add_development_dependency('mongo', '>= 2.14.0')
+  spec.add_development_dependency('sqlite3', '>= 1.4.4')
   spec.add_development_dependency('pg', '>= 1.2')
   spec.add_development_dependency('rake', '~> 13.0')
   spec.add_development_dependency('redis', '>= 4.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-30 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,8 @@ files:
 - ".devops/docker/environment/.zshrc"
 - ".devops/docker/environment/Dockerfile"
 - ".devops/docker/gitpod/Dockerfile"
+- ".devops/docker/gitpod/base/.p10k.zsh"
+- ".devops/docker/gitpod/base/.zshrc"
 - ".devops/docker/gitpod/base/Dockerfile"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -191,6 +207,7 @@ files:
 - lib/trifle/stats/driver/postgres.rb
 - lib/trifle/stats/driver/process.rb
 - lib/trifle/stats/driver/redis.rb
+- lib/trifle/stats/driver/sqlite.rb
 - lib/trifle/stats/mixins/packer.rb
 - lib/trifle/stats/nocturnal.rb
 - lib/trifle/stats/operations/timeseries/classify.rb