kukushka 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1868389f90b7966de784b7c01ef008fb3112a851dbc90a8f09acf57df8120bd8
-  data.tar.gz: 4ffa3548b1f651dc8dbb459718dd2fdc2f4f0dc1844c198cc38b49cc6cb139a3
+  metadata.gz: 87f7d2da9cffcb01bf3b7dba61f237ab4f75f5e47451657832371a1222cdd754
+  data.tar.gz: 7363f9843f96e990b3ec29ac31e13cfe74339ca402ce2e2a9672f3d57bcd440b
 SHA512:
-  metadata.gz: 772d155cd2e503dd1e0e365e1c1d2a9a216c28111d2661fd222b1f33f3146dee452ed0fbf8e543b9b1d6a230bb7f69bfb79b9ba1f23ec4f8325c895b1b9f8fcb
-  data.tar.gz: a3ac0c16a33245cc6afa1beba585ff4a0ada8982d44f2b908881e16a65e3f52344d4106395901dea9fa7465b06a882dd5e56f5680056ba9d3e769ee7ac1dce3a
+  metadata.gz: c4e589c8f6d58c55700e9d080d01d8903f130c44b17ff3b70072fdf8a1342fa2cf2e11a7c5922f90785e6aeaded821986b3c5f9eb56b00ec142a69057d608154
+  data.tar.gz: bca9109ddb4d06224e25e27dc2cdd3a972c260e9242a4c520accfaa1e6228b7590955d9c10de299ffd193abe92e41fc384b2ec8f6e8234b5a4f556858e740f96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kukushka (0.1.11)
+    kukushka (0.1.12)
       commander (~> 4.4)
       rainbow (~> 3.0)
       redis (~> 5.3)

data/exe/kuku

@@ -39,6 +39,7 @@ Commander.configure do
     c.syntax = 'kuku init'
     c.description = 'Default initiation'
     c.action do |args, options|
+      Kukushka.reset(redis)
       # res = Kukushka.kuku(ARGV)
       # puts res if res
     end
@@ -48,18 +49,17 @@ Commander.configure do
     c.syntax = 'kuku annoying [int]'
     c.description = 'Sets annoying factor'
     c.action do |args, options|
-      redis.set(:annoying, args.first)
-      Kukushka.store(redis)
-      # puts res if res
+      Kukushka.store({ annoying: args.first })
+      Kukushka.restore(redis)
     end
   end
 
   command :format do |c|
     c.syntax = 'kuku format simple'
-    c.description = 'Output format'
+    c.description = 'format output'
     c.action do |args, options|
-      redis.set(:format, args.first)
-      Kukushka.store(redis)
+      Kukushka.store({ format: args.first })
+      Kukushka.restore(redis)
     end
   end
 
@@ -67,10 +67,10 @@ Commander.configure do
     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(:source, args.first)
-      redis.set(:lines, lines.to_json)
-      Kukushka.store(redis)
+      # lines = File.readlines(args.first, chomp: true)
+      # redis.set(:lines, lines.to_json)
+      Kukushka.store({source: args.first})
+      Kukushka.restore(redis)
     end
   end
 
@@ -78,7 +78,8 @@ Commander.configure do
     c.syntax = 'kuku on'
     # c.description = 'enable'
     c.action do |args, options|
-      redis.set('enabled', true)
+      Kukushka.store({enabled: true})
+      Kukushka.restore(redis)
     end
   end
 
@@ -86,7 +87,8 @@ Commander.configure do
     c.syntax = 'kuku off'
     # c.description = 'disable'
     c.action do |args, options|
-      redis.set('enabled', false)
+      Kukushka.store({enabled: false})
+      Kukushka.restore(redis)
     end
   end
 
@@ -94,7 +96,7 @@ Commander.configure do
     c.syntax = 'kuku status'
     c.description = 'disable'
     c.action do |args, options|
-      %i(source enabled annoying output counter from circle).each do |key|
+      %i(source enabled format counter from circle annoying).each do |key|
         puts "#{key}: #{redis.get(key.to_s)}"
       end
     end

data/lib/kukushka/version.rb

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

data/lib/kukushka.rb

@@ -7,13 +7,14 @@ require 'yaml'
 module Kukushka
   EXAMPLE_SOURCE ||= File.dirname(__FILE__) + '/../fixtures/pl_001.txt'
   DEFULAT_LINES = File.readlines(EXAMPLE_SOURCE, chomp: true)
+  CONFIG_ENTRIES = %i(source enabled annoying format counter from circle)
 
   def self.kuku(redis)
     Kukushka.kuku(redis)
   end
 
-  def self.store(redis)
-    Config.store(redis)
+  def self.store(config_entry)
+    Config.store(config_entry)
   end
 
   def self.restore(redis)
@@ -32,8 +33,8 @@ module Kukushka
     dir = File.dirname(CONFIG_FILE)
     FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
-    def self.store(redis)
-      new.store(redis)
+    def self.store(config_entry)
+      new.store(config_entry)
     end
 
     def self.restore(redis)
@@ -54,18 +55,17 @@ module Kukushka
         from: 0,
         circle: 0,
         annoying: 0,
-        output: nil,
+        format: nil,
       }
 
       File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
     end
 
-    def store(redis)
-      config = {}
-      %i(source enabled annoying output counter from circle).each do |key|
-        config[key] = redis.get(key)
-      end
+    def store(config_entry)
+      raise 'unknown config' if (config_entry.keys - CONFIG_ENTRIES).any?
 
+      config = YAML::load_file(CONFIG_FILE)
+      config.merge!(config_entry)
       File.open(CONFIG_FILE, 'w') {|f| f.write config.to_yaml }
     end
 
@@ -125,7 +125,7 @@ module Kukushka
         end
 
 
-        return lines[counter] if redis.get(:output) == 'simple'
+        return lines[counter] if redis.get(:format) == 'simple'
         return "#{lines[counter]} #{counter} [#{from}-#{to}/#{lines.size - 1}]"
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kukushka
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Serge Kislak