kukushka 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d030697e9f1111877140f181beeeea09d6167a2a4bd4aeab2d17cf6d4c355c2c
-  data.tar.gz: a12340d1ec1a48292e0b3e22b2ffac82fa7e5273f7b286f1fc3da940a378e79d
+  metadata.gz: 92ab7d9dc8513ea956f2e2f4a0351fc568deeee3f372cc0d888b56e1eb8fb0f6
+  data.tar.gz: b2cae314f91fdbd8af055b6377632188e7591ceb7f8c5941c7d7201b7687c4bb
 SHA512:
-  metadata.gz: f25df4940db25abd1a34b886adf32dd34d412cdffb8082b48da325d75b8dd1265f4358f3cc7b23c012347040e0c975146d4be8ba5cc4557106ccf221248c27b9
-  data.tar.gz: c98bd1748f07f2fb26e7336a31b5f939ea48f3d3efc5d7aa55a75141f5b697f4fd01261fa026e9eebe55988173744351f9684f3ed8ce7d6e6a1384a1b8bd5fa6
+  metadata.gz: ab7efa3e67b77a343a702d0adcfab9449bfc4ed8823f0e1f9883b22ea11e78266bfb15e0a683e8ce2873ba72a78328ee4ff5efe1f3fc2a0b61889376cdb94877
+  data.tar.gz: 6a2fd3c7fce07d40a054ad89b0e9a9ed17390d028110ecb2f85cf0224d6206d362de8acf05822aa206eff0556123ce84a77bfe6601283b2fe3179cf40342fb59

data/.ruby-gemset

@@ -0,0 +1 @@
+kukushka

data/.ruby-version

@@ -0,0 +1 @@
+3.3.4

data/Gemfile.lock

@@ -1,26 +1,79 @@
 PATH
   remote: .
   specs:
-    kukushka (0.1.2)
+    kukushka (0.1.8)
+      commander (~> 4.4)
       rainbow (~> 3.0)
+      redis (~> 5.3)
+      redis-namespace (~> 1.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    diff-lcs (1.2.5)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    dry-configurable (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.2)
+      concurrent-ruby (~> 1.0)
+      logger
+      zeitwerk (~> 2.6)
+    dry-inflector (1.1.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.4)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    highline (2.0.3)
+    json (2.9.0)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.3)
     method_source (1.1.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
     pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    reek (1.3.7)
-      rainbow
-      ruby2ruby (~> 2.0.8)
-      ruby_parser (~> 3.3)
-      sexp_processor
+    redis (5.3.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.23.0)
+      connection_pool
+    redis-namespace (1.11.0)
+      redis (>= 4)
+    reek (6.3.0)
+      dry-schema (~> 1.13.0)
+      parser (~> 3.3.0)
+      rainbow (>= 2.0, < 4.0)
+      rexml (~> 3.1)
+    regexp_parser (2.9.3)
+    rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -34,15 +87,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (0.7.2)
-      rainbow (>= 1.1.4)
-    ruby2ruby (2.0.8)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.21.1)
-      racc (~> 1.5)
-      sexp_processor (~> 4.16)
-    sexp_processor (4.17.3)
+    rubocop (1.69.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22

data/README.md

@@ -45,4 +45,13 @@ bundle init
 
 gem 'pry'
 gem 'kukushka', path: '/Users/Siarhei/laboratory/kukushka'
-```
+```
+
+```bash
+gem build kukushka.gemspec
+gem push kukushka-0.x.y.gem
+```
+
+dependencies
+https://github.com/redis/redis-rb
+https://github.com/commander-rb/commander

data/exe/kuku

@@ -2,12 +2,63 @@
 require 'yaml'
 require 'kukushka'
 require 'pry'
+require 'commander'
+require 'redis'
+require 'redis-namespace'
+require 'json'
 
-if ARGV.join('') == 'on'
-  Kukushka.on!
-end
 
-return unless Kukushka.on?
+redis_connection = Redis.new
+redis = Redis::Namespace.new(:kukushka, redis: redis_connection)
+
+Commander.configure do
+  program :name, 'kuku'
+  program :version, '1.0.0'
+  program :description, 'learn list'
+  default_command :sample
+
+  command :sample do |c|
+    c.syntax = 'kuku sample'
+    c.description = 'Show next sample'
+    c.action do |args, options|
+      next unless redis.get('enabled') == 'true'
+
+      res = Kukushka.kuku(redis)
+      puts res if res
+    end
+  end
 
-res = Kukushka.kuku(ARGV)
-puts res if res
+  command :init do |c|
+    c.syntax = 'kuku init'
+    c.description = 'Default initiation'
+    c.action do |args, options|
+      # res = Kukushka.kuku(ARGV)
+      # puts res if res
+    end
+  end
+
+  command :source do |c|
+    c.syntax = 'kuku source file_path'
+    c.description = 'Add new source'
+    c.action do |args, options|
+      lines = File.readlines(args.first, chomp: true)
+      redis.set(:lines, lines.to_json)
+    end
+  end
+
+  command :on do |c|
+    c.syntax = 'kuku on'
+    c.description = 'Disable'
+    c.action do |args, options|
+      redis.set('enabled', true)
+    end
+  end
+
+  command :off do |c|
+    c.syntax = 'kuku off'
+    c.description = 'disable'
+    c.action do |args, options|
+      redis.set('enabled', false)
+    end
+  end
+end

data/lib/kukushka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kukushka
-  VERSION = "0.1.5"
+  VERSION = "0.1.8"
 end

data/lib/kukushka.rb

@@ -5,147 +5,26 @@ require 'rainbow'
 require 'yaml'
 
 module Kukushka
-  INIT_CTA = "TODO: kuku init source_file"
-  PROVIDE_SOURCE_CTA = "TODO: provide valid source_file path"
-  DEFAULT_CIRCLE = 5
+  EXAMPLE_SOURCE ||= File.dirname(__FILE__) + '/../spec/fixtures/pl_001.txt'
+  DEFULAT_LINES = File.readlines(EXAMPLE_SOURCE, chomp: true)
 
-  def self.kuku(args)
-    Kukushka.kuku(args)
-  end
-
-  def self.on?
-    Config.new.on?
-  end
-
-  def self.on!
-    Config.new.enable
-  end
-
-  class Config
-    CONFIG_FILE = File.dirname(__FILE__) + '/../tmp/config/kuku.yaml'
-    CONFIG_DIR = File.dirname(CONFIG_FILE)
-
-    def on?
-      return true unless exists?
-      exists? && config[:enabled]
-    end
-
-    def exists?
-      File.exists?(CONFIG_DIR)
-    end
-
-    def init(source_file)
-      source_file ||= File.dirname(__FILE__) + '/../spec/fixtures/pl_001.txt'
-      return INIT_CTA if source_file.nil?
-      return PROVIDE_SOURCE_CTA unless File.exist?(source_file)
-
-      dir = File.dirname(CONFIG_FILE)
-      FileUtils.mkdir_p(dir) unless File.exists?(dir)
-      config = {
-        source: source_file,
-        enabled: true,
-        counter: 0,
-        from: 0,
-        circle: DEFAULT_CIRCLE,
-      }
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-    end
-
-    def enable
-      config.merge!(enabled: true)
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-      'enabled'
-    end
-
-    def disable
-      config.merge!(enabled: false)
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-      'disabled'
-    end
-
-    def cleanup
-      FileUtils.rm_rf(CONFIG_DIR) if config_exists?
-    end
-
-    def source
-      @source ||= config[:source]
-    end
-
-    def counter
-      @counter ||= config[:counter]
-    end
-
-    def from
-      @from ||= config[:from]
-    end
-
-    def circle
-      @circle ||= config[:circle]
-    end
-
-    def set_counter(new_counter)
-      config.merge!(counter: new_counter)
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-    end
-
-    def set_circle(new_circle)
-      config.merge!(circle: new_circle)
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-    end
-
-    def set_from(new_from)
-      config.merge!(from: new_from)
-      File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
-    end
-
-    def config
-      @config ||= YAML::load_file(CONFIG_FILE)
-    end
+  def self.kuku(redis)
+    Kukushka.kuku(redis)
   end
 
   class Kukushka
-    def self.kuku(args)
-      new(args).kuku
+    def self.kuku(redis)
+      new(redis).kuku
     end
 
-    def initialize(args)
-      @command = args[0]
-      @param1 = args[1]
-      @config = Config.new
+    def initialize(redis)
+      @redis = redis
     end
 
-    attr_reader :command, :param1, :config
+    attr_reader :redis
 
     def kuku
-      config.init(param1) if command == 'init'
-
-      return INIT_CTA unless config.exists?
-
-      return config.enable if command == 'on'
-      return config.disable if command == 'off'
-
-      if command == 'counter'
-        return config.set_counter(0) if param1.nil?
-        return config.set_counter(nil) if param1 == 'no' || param1 == 'off' || param1 == 'nil'
-        return config.set_counter(param1.to_i)
-      end
-
-      if command == 'from'
-        config.set_from(0) if param1.nil?
-        config.set_from(param1.to_i)
-        config.set_counter(config.from)
-      end
-
-      if command == 'circle'
-        config.set_circle(DEFAULT_CIRCLE) if param1.nil?
-        config.set_circle(param1.to_i)
-        config.set_counter(config.from)
-      end
-
-      return config.cleanup if command == 'cleanup'
-      # return show if command == 'show'
-      return sample if command == 'sample'
-      return punchline
+      Rainbow(sample).color(color).bright
     end
 
     private
@@ -163,30 +42,54 @@ module Kukushka
     # end
 
     def sample
-      if config.counter
-        config.set_counter(config.counter + 1)
-        config.set_counter(0) if config.counter > lines.size
+      if counter
+        set_counter(counter + 1)
+        set_counter(0) if counter > lines.size
 
-        if config.counter < config.from
-          config.set_counter(config.from)
+        if counter < from
+          set_counter(from)
         end
 
-        if config.counter >= config.from + config.circle - 1
-          config.set_counter(config.from)
+        if counter > to
+          set_counter(from)
         end
 
-        return "#{config.counter}. #{lines[config.counter]}"
+        return "#{lines[counter]} #{counter} [#{from}-#{to}/#{lines.size - 1}]"
       end
 
       lines.sample
     end
 
+    def counter
+      @counter ||= redis.get(:counter).to_i
+    end
+
+    def to
+      @to ||= from + circle - 1
+    end
+
+    def set_counter(new_counter)
+      redis.set(:counter, new_counter)
+      @counter = new_counter
+    end
+
     def lines
-      @lines ||= File.readlines(config.source, chomp: true)
+      # binding.pry
+      redis_lines = redis.get(:lines)
+      if redis_lines
+        @lines = JSON.parse(redis.get(:lines))
+      end
+      @lines ||= DEFULAT_LINES
     end
 
-    def punchline
-      @punchline ||= Rainbow(sample).color(color).bright
+    def from
+      @from ||= redis.get(:from).to_i
+    end
+
+    def circle
+      @circle ||= redis.get(:circle).to_i
+      @circle = lines.size if @circle == 0
+      @circle
     end
 
     def color

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kukushka
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Serge Kislak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 description: Learning tool for interval repetition
 email:
 - kislak7@gmail.com
@@ -34,13 +76,14 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - exe/kuku
-- kukushka-0.1.4.gem
 - lib/kukushka.rb
 - lib/kukushka/version.rb
 - sig/kukushka.rbs
@@ -63,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: interval repetition