redistimeseries 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3de654187c79b461ca14b8d8ea7fe7be7262ab68c76999aaae7ca5d114aa067
-  data.tar.gz: ea43a4257fcc410def290bfd33cc18be0851f3b95dc9fe3da5289060701027de
+  metadata.gz: a72e1a9e50a89524c4e4b7678b629d120fd41d918cd7c7e6d19fe90ad3d8f41e
+  data.tar.gz: 75fa47de22b1351321ddbb93b46ee7d51804fea64479c31ff84ad5f1b35b45b6
 SHA512:
-  metadata.gz: 1d38aa78c9952bec3249dac3491d509fb2727ae85e0b9b7643f16b1fa43e302920bca6bdd0887e9c1a4830f2bafdee95d44ad570aa48026b79709596a3137b23
-  data.tar.gz: 102afdfbc45b7ebfedf306023d89a062f50418b18743263f0cc4c72c5e1b57181c905c9608caae904e5930b8116ae665f67f85af46ce9470e571d6be13df7a22
+  metadata.gz: 9ad9e23e76fd204a3231c650faf74faee510f12809e705106919c85f970cb627181a98be94d018566d337c5e18f99069de03636c5117cead6156db4486b1024e
+  data.tar.gz: f660b37032c113a8dabfd1f9730c2390483dfe56828b6644fc1168ead9ad8d7bf9803f49d5359012e45e1b53b376d8cc81bc1c719694177f5e6c0d7580a3b88f

data/.github/workflows/build.yml

@@ -0,0 +1,48 @@
+name: Publish Gem
+
+on:
+  push:
+    branches: [ gem ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    services:
+      redistimeseries:
+        image: redislabs/redistimeseries:latest
+        ports:
+          - 6379/tcp
+        # options: --entrypoint redis-server
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.6.x
+    - name: Debug Info
+      env:
+        REDIS_PORT: ${{ job.services.redistimeseries.ports[6379] }}
+      run: |
+        sudo apt-get install redis-tools
+        redis-cli -p ${REDIS_PORT} info
+        redis-cli -p ${REDIS_PORT} TS.CREATE mytestkey
+    - name: Bundle install
+      run: |
+        gem install bundler:2.1.2
+        bundle install
+    - name: Run specs
+      env:
+        REDIS_URL: redis://localhost:${{ job.services.redistimeseries.ports[6379] }}
+      run: |
+        ./bin/rspec
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.github/workflows/gempush.yml

@@ -1,10 +1,12 @@
-name: Ruby Gem
+name: CI Build
 
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  schedule:
+    - cron: '0 0 * * *' # Nightly to cover cases where the server might breaks the client
 
 jobs:
   build:
@@ -38,13 +40,13 @@ jobs:
         REDIS_URL: redis://localhost:${{ job.services.redistimeseries.ports[6379] }}
       run: |
         ./bin/rspec
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
+    # - name: Publish to RubyGems
+    #   run: |
+    #     mkdir -p $HOME/.gem
+    #     touch $HOME/.gem/credentials
+    #     chmod 0600 $HOME/.gem/credentials
+    #     printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+    #     gem build *.gemspec
+    #     gem push *.gem
+    #   env:
+    #     GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    redistimeseries (0.1.1)
+    redistimeseries (0.1.2)
       redis (~> 4)
 
 GEM

data/README.md

@@ -31,6 +31,7 @@ using Redistimeseries::RedisRefinement
 client = Redis.new
 client.ts_create(key: "mytimeseries")
 client.ts_add(key: "mytimeseries", value: 141)
+client.ts_get("mytimeseries")
 ```
 
 # Methods - see redis_refinement.rb

data/lib/redistimeseries/redis_refinement.rb

@@ -20,8 +20,11 @@ module Redistimeseries
         _ts_call(cmd)
       end
 
-      def ts_madd(key:, timestamp: "*", value:) # TODO make multi
-        cmd = ['TS.MADD', key, timestamp, value]
+      # Usage:
+      # ts_madd([key, timestamp, value, key, timestamp, value])
+      # or ts_madd([[key, timestamp, value], [key, timestamp, value]])
+      def ts_madd(key_timestamp_values)
+        cmd = ['TS.MADD', *key_timestamp_values.flatten]
         _ts_call(cmd)
       end
 
@@ -29,40 +32,68 @@ module Redistimeseries
 
       def ts_decrby; end
 
-      def ts_createrule; end
+      def ts_createrule(source_key:, dest_key:, aggregation_type:, timebucket:)
+        cmd = ["TS.CREATERULE", source_key, dest_key]
+        cmd += ["AGGREGATION", aggregation_type, timebucket]
+        _ts_call(cmd)
+      end
 
       def ts_deleterule; end
 
-      def ts_range(key:, from: 0, to: nil, count: nil, aggtype: nil, timebucket: nil)
-        to_time = to || (Time.now.to_f * 1000.0).to_i
-        cmd = ['TS.RANGE', key, from, to_time]
-        if count
-          cmd += ['COUNT', count]
-        else
-          cmd += ['AGGREGATION', aggtype, timebucket]
-        end
+      def ts_range(key:, from: '-', to: '+', count: nil, aggtype: nil, timebucket: nil)
+        cmd = ['TS.RANGE', key, from, to]
+        cmd += ['COUNT', count] if count
+        cmd += ['AGGREGATION', aggtype, timebucket] if aggtype && timebucket
         _ts_call(cmd)
       end
 
-      def ts_mrange; end
+      def ts_mrange(from_timestamp:, to_timestamp:,
+                    aggregation_type: nil, time_bucket: nil,
+                    count: nil, with_labels: false, filters: [])
+
+        cmd = ["TS.MRANGE", from_timestamp, to_timestamp]
+        cmd += ["COUNT", count] if count
+
+        if aggregation_type && time_bucket
+          cmd += ["AGGREGATION", aggregation_type, time_bucket]
+        end
+
+        cmd += ["WITHLABELS"] if with_labels
+        cmd += ["FILTER", *filters] if filters.length.positive?
+
+        _ts_call(cmd)
+      end
 
-      def ts_get; end
+      def ts_get(key)
+        cmd = ["TS.GET", key]
+        _ts_call(cmd)
+      end
 
-      def ts_mget; end
+      def ts_mget(filters:, withlabels: false)
+        cmd = []
+        cmd += ["WITHLABELS"] if withlabels
+        cmd += ["FILTER", *filters]
+        _ts_call(cmd)
+      end
 
       def ts_info(key:)
         cmd = ["TS.INFO", key]
         _ts_call(cmd)
       end
 
-      def ts_queryindex(filter:)
-        cmd = ["TS.QUERYINDEX", filter]
+      def ts_queryindex(filters:)
+        cmd = ["TS.QUERYINDEX", *filters]
         _ts_call(cmd)
       end
 
-      def _ts_call(cmd)
+      def _ts_call(args)
         # puts "CMD #{cmd.join(' ')}"
-        call cmd
+        synchronize do |client|
+          res = client.call(args)
+          raise res.first if res.is_a?(Array) && res.first.is_a?(Redis::CommandError)
+
+          res
+        end
       end
     end
   end

data/lib/redistimeseries/version.rb

@@ -1,3 +1,3 @@
 module Redistimeseries
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redistimeseries
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eaden McKee (eadz)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rspec"