sijka 0.0.3.5 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04f78e121417021ca540680a3472a9d9ef93df85
-  data.tar.gz: 7750a44b6ee255aa692969b085bbfa8b5d47062a
+SHA256:
+  metadata.gz: 652ec21dae9b00a0a020798053bc7689497375a4e0238ba72168e38bc372f832
+  data.tar.gz: b3557d3e0257328aa0bdb99476d625cb8c84e228730455e633c8d2546bbd4f20
 SHA512:
-  metadata.gz: f3e3d92a5553280d7fd2513661d39e23a4aa002960401a4ade31f4225ea7015aff86cf0c47348eb2e023f899253b2010e66cad1d1932c34d4088b4f9e87abe66
-  data.tar.gz: 835c8d980e38fe51e2fc09c5afdfc4c7a17d831a8b31b97ef74b4267782bc485cdf199dfd3ad58574237fd2439f2e667209200d2d242e42c0d931805a0a8345e
+  metadata.gz: 20ad9e8fe3e4301cf165554c575e91b6e7a35dd3cc6f6874ad612b5bb18c9c0dca56a82602ddaafe26a831048af9b9e8d7f144d5e9b04869ca7036d7c012895c
+  data.tar.gz: 629ebf20b628c8b2dba6112995d286330760bc3f03a7e253a30dbc8eb0c6fcee238211443304878caeae25ff0cbaf3e98463661378bad0dfd46fcf33fa853e48

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from: .rubocop_todo.yml
+

data/.rubocop_todo.yml

@@ -0,0 +1,35 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-05-12 16:32:19 +0300 using RuboCop version 0.52.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 100
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 50
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 5
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+
+# Offense count: 4
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+
+rvm:
+  - 2.4.1
+
+cache: bundler
+
+bundler_args: --jobs=3 --retry=3
+
+script:
+  - bundle exec rubocop -P
+  - bundle exec parallel_rspec spec/
+
+notifications:
+  email: false
+
+addons:
+  apt:
+    update: true

data/Gemfile

@@ -3,10 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sijka.gemspec
 gemspec
 
+gem 'curses'
 gem 'i18n', '~> 0.7.0'
-gem 'ruby-terminfo', '~> 0.1.1'
 
 group :development, :test do
+  gem 'parallel_tests'
   gem 'pry'
   gem 'rspec'
+  gem 'rubocop'
 end

data/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: .
+  specs:
+    sijka (0.1)
+      curses (~> 1.2, >= 1.2.5)
+      i18n (~> 0.7, >= 0.7.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    coderay (1.1.2)
+    curses (1.2.5)
+    diff-lcs (1.3)
+    i18n (0.7.0)
+    method_source (0.9.0)
+    parallel (1.12.1)
+    parallel_tests (2.21.3)
+      parallel
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.55.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    unicode-display_width (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16, >= 1.16.1)
+  curses
+  i18n (~> 0.7.0)
+  parallel_tests
+  pry
+  rake (~> 10.5)
+  rspec
+  rubocop
+  sijka!
+
+BUNDLED WITH
+   1.16.1

data/bin/sijka

@@ -2,4 +2,4 @@
 
 require_relative '../lib/sijka'
 
-Sijka::Sijka.new(ARGV, STDIN).smoke
+Sijka::Sijka.new(ARGV).smoke

data/bin/smoke

@@ -2,4 +2,4 @@
 
 require_relative '../lib/sijka'
 
-Sijka::Sijka.new(ARGV, STDIN).smoke
+Sijka::Sijka.new(ARGV).smoke

data/lib/sijka.rb

@@ -1,24 +1,26 @@
 require_relative 'sijka/smoke'
 require_relative 'sijka/parser'
 require_relative 'sijka/translator'
+require_relative 'sijka/curses_initializer'
 
-$LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)))
+$LOAD_PATH.unshift(__dir__)
 
 module Sijka
   class Sijka
     FILE_LIST = (Dir.entries("#{$LOAD_PATH.first}/characters") - %w[. ..]).freeze
+    attr_reader :options, :message
 
-    def initialize(argv, stdin)
-      sijka_parser = SijkaParser.new(argv, stdin)
+    def initialize(argv)
+      sijka_parser = SijkaParser.new(argv)
       @options = sijka_parser.parse_flags
       @message = sijka_parser.parse_message
     end
 
     def smoke
-      if @options['list']
+      if options['list']
         puts 'Sijka files:', "\n", FILE_LIST
       else
-        Smoke.new(@message, @options['sijkafile']).smoke
+        Smoke.new(message, options['sijkafile']).smoke
       end
     end
   end

data/lib/sijka/curses_initializer.rb

@@ -0,0 +1,31 @@
+require 'curses'
+
+module Sijka
+  class CursesInitializer
+    class << self
+      def call
+        init_curses
+      end
+
+      def init_curses
+        Curses.init_screen
+        Curses.nonl
+        Curses.noecho
+        Curses.curs_set 0
+
+        set_curses_trap
+      end
+
+      def set_curses_trap
+        %w[HUP INT QUIT TERM].each do |sig|
+          trap(sig) { |s| onsig(s) } if trap(sig, 'IGNORE') != 'IGNORE'
+        end
+      end
+
+      def onsig(signal)
+        Curses.close_screen
+        exit signal
+      end
+    end
+  end
+end

data/lib/sijka/parser.rb

@@ -2,9 +2,8 @@ require 'optparse'
 
 module Sijka
   class SijkaParser
-    def initialize(argv, stdin)
+    def initialize(argv)
       @argv = argv
-      @stdin = stdin
     end
 
     def parse_flags
@@ -25,11 +24,7 @@ module Sijka
     end
 
     def parse_message
-      if @argv.any?
-        @argv.join(' ')
-      else
-        @stdin.tty? ? '' : @argv.read.chomp
-      end
+      @argv.any? ? @argv.join(' ') : ''
     end
   end
 end

data/lib/sijka/smoke.rb

@@ -1,59 +1,83 @@
-require 'terminfo'
-
 module Sijka
   class Smoke
-    SLEEP_TIME = 0.02
+    MOVE_SLEEP_TIME = 0.025
+    SLEEP_TIME_IN_THE_END = 1.5
+    DEFAULT_IMG_FILE = 'sijka'.freeze
 
-    def initialize(name, file_name)
-      set_standarted_img file_name
-      @movement_range = TermInfo.screen_size[1] - @img_length
+    attr_reader :img_file_name, :smoker_name
 
-      message = Translator.new.smoken_with_locale(file_name)
-      @message_with_name = name.to_s.empty? ? "#{message}!" : "#{message}, #{name}!"
+    def initialize(smoker_name, file_name)
+      @smoker_name = smoker_name
+      @img_file_name = validated_img_file_name(file_name&.downcase)
+      load_standarted_img
+      CursesInitializer.call
+      @movement_range = Curses.cols - @img_length
     end
 
     def smoke
       right_move
       reverse_img
       left_move
-      puts @message_with_name
-      sleep(1.3)
-      system 'clear'
+      write_end_message
     end
 
     private
 
-    def right_move
-      @movement_range.times do
-        system 'clear'
-        puts @img
-        sleep(SLEEP_TIME)
-        @img.map! { |line| line.insert(0, ' ') }
-      end
+    def clear_terminal
+      Curses.refresh
+      Curses.clear
     end
 
-    def set_standarted_img(file_name)
-      file_name = !file_name.to_s.empty? && Sijka::FILE_LIST.include?(file_name) ? file_name : 'sijka'
-      file_path = "#{$LOAD_PATH.first}/characters/#{file_name.downcase}"
-      @img = File.open(file_path) { |file| file.read.split("\n") }
+    def place_string(y_pos:, x_pos:, line:)
+      Curses.setpos(y_pos, x_pos)
+      Curses.addstr(line)
+    end
 
-      @img_length = @img.max_by(&:length).length
-      @img.map { |line| line << ' ' * (@img_length - line.length) }
+    def draw_image(start_position:)
+      @img.each_with_index { |line, y_position| place_string(y_pos: y_position, x_pos: start_position, line: line) }
     end
 
-    def reverse_img
-      @img.map! do |line|
-        line[0..@movement_range - 1] + line[@movement_range..-1].reverse
+    def right_move
+      @movement_range.times do |i|
+        draw_image(start_position: i)
+        sleep(MOVE_SLEEP_TIME)
+        clear_terminal
       end
     end
 
     def left_move
-      @movement_range.times do
-        system 'clear'
-        puts @img
-        sleep(SLEEP_TIME)
-        @img.map! { |line| line[1..-1] }
+      @movement_range.times do |i|
+        draw_image(start_position: @movement_range - i)
+        sleep(MOVE_SLEEP_TIME)
+        clear_terminal
       end
     end
+
+    def reverse_img
+      @img.map!(&:reverse)
+    end
+
+    def message_with_name
+      message = Translator.new.smoken_with_locale(img_file_name)
+      smoker_name.to_s.empty? ? "#{message}!" : "#{message}, #{smoker_name}!"
+    end
+
+    def write_end_message
+      place_string(y_pos: 0, x_pos: 0, line: message_with_name)
+      clear_terminal
+      sleep(SLEEP_TIME_IN_THE_END)
+    end
+
+    def load_standarted_img
+      file_path = "#{$LOAD_PATH.first}/characters/#{img_file_name}"
+      @img = File.open(file_path) { |file| file.read.split("\n") }
+
+      @img_length = @img.max_by(&:length).length
+      @img.map { |line| line << ' ' * (@img_length - line.length) }
+    end
+
+    def validated_img_file_name(file_name)
+      file_name && Sijka::FILE_LIST.include?(file_name) ? file_name : DEFAULT_IMG_FILE
+    end
   end
 end

data/lib/sijka/version.rb

@@ -1,3 +1,3 @@
 module Sijka
-  VERSION = '0.0.3.5'.freeze
+  VERSION = '0.1'.freeze
 end

data/sijka.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sijka/version'
 
@@ -20,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.version       = Sijka::VERSION
-  spec.add_runtime_dependency     'ruby-terminfo', '~> 0.1.1'
-  spec.add_runtime_dependency     'i18n', '>= 0.7.0'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'curses', '~> 1.2', '>= 1.2.5'
+  spec.add_runtime_dependency 'i18n', '~> 0.7', '>= 0.7.0'
+  spec.add_development_dependency 'bundler', '~> 1.16', '>= 1.16.1'
+  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'rspec', '~> 3.7'
 end

metadata

@@ -1,33 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: sijka
 version: !ruby/object:Gem::Version
-  version: 0.0.3.5
+  version: '0.1'
 platform: ruby
 authors:
 - Mario_Sparta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-terminfo
+  name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -44,28 +56,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.7'
 description: Smoke without harm to health
 email:
 - megosparta@mail.ru
@@ -77,8 +109,14 @@ extra_rdoc_files: []
 files:
 - ".DS_Store"
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -90,6 +128,7 @@ files:
 - lib/characters/nyan_cat
 - lib/characters/sijka
 - lib/sijka.rb
+- lib/sijka/curses_initializer.rb
 - lib/sijka/parser.rb
 - lib/sijka/smoke.rb
 - lib/sijka/translator.rb
@@ -120,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: To smoke a cigarette.