rsb-gol 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c5316450c6817252ff2069a664b6ca9c2d54e4
-  data.tar.gz: c7e8c01d370d89715c4d3421fdaef74c32aaf365
+  metadata.gz: bbbcc6ecbfbcea3087b5a19641a833c67af2ca2e
+  data.tar.gz: cbd7992ceb20e9ac07137110dbeaa5fc9d061623
 SHA512:
-  metadata.gz: 77ad4d9c53850749aa3bfd9d75a44ff41f49394bbd17fc8294f723ad7b081412490f74d3e08771c0804d6c78c5508a97369c7732f74087ce04731004c3ffc1fc
-  data.tar.gz: 281331232bf054a1b93b56c0c6bbfc80d23356e4055d9926c6425abe9580dd2a4532ac905f2981f0e08fb9db88ae79f9ee763ed35ae7994d7ebee3f9c947dc56
+  metadata.gz: 6ddb001d77f6448a6e4f01b3baae1246ea0288f622093af5a1f3ba318258062c7e852186a6dd4b6f2fffbc84aef21bf7d226b2c561a7bb337ae69a6aca812c06
+  data.tar.gz: 51ac8947c922921d69415f12a4e49852a14f3c58f9d8ef9d58088c715f129ca61cc912cb4287f52dad3b84e463b0cdb3d08f719e1588aa159d9bed7c33aff716

data/lib/rsb/gol/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'highline'
 
 module Rsb
   module Gol
@@ -11,10 +12,12 @@ module Rsb
 
       desc 'start', 'start the game of life'
       def start
-        rows, columns = screen_size
-        iterations    = options.iterations
-        alive         = options.alive_char
-        dead          = options.death_char
+        columns, rows = HighLine::SystemExtensions.terminal_size
+        rows      -= 10
+        columns   -= 10
+        iterations = options.iterations
+        alive      = options.alive_char
+        dead       = options.death_char
 
         columns = options.columns if options.columns?
         rows    = options.rows    if options.rows?
@@ -23,38 +26,6 @@ module Rsb
         game = Rsb::Gol::Game.new(cols: columns, rows: rows)
         game.start(iterations, alive, dead)
       end
-
-      no_commands do
-        # credit to: https://gist.github.com/nixpulvis/6025433
-        # From the tty_ioctl man page in Linux.
-        #
-        # TIOCGWINSZ     struct winsize *argp
-        #        Get window size.
-        #
-        # TIOCSWINSZ     const struct winsize *argp
-        #        Set window size.
-        #
-        # The struct used by these ioctls is defined as
-        #
-        #     struct winsize {
-        #         unsigned short ws_row;
-        #         unsigned short ws_col;
-        #         unsigned short ws_xpixel;   /* unused */
-        #         unsigned short ws_ypixel;   /* unused */
-        #     };
-        #         rows cols width height
-        def screen_size
-          window   = [0,  0,   0,    0].pack('SSSS')
-          fd       = IO.sysopen('/dev/tty', 'w')
-          terminal = IO.new(fd, "w")
-
-          # The in in this call is === TIOCGWINSZ. No idea where it is defined.
-          # I found it using ruby-termios with `Termios::TIOCGWINSZ`
-          terminal.ioctl(1074295912, window)
-          rows, cols, _, _ = window.unpack('SSSS')
-          [rows - 10, cols - 10]
-        end
-      end
     end
   end
 end

data/lib/rsb/gol/version.rb

@@ -1,5 +1,5 @@
 module Rsb
   module Gol
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/rsb-gol.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.19.1"
+  spec.add_dependency "thor",       ">= 0.19.1"
+  spec.add_dependency "highline",   ">= 1.7.2"
 
   spec.add_development_dependency "bundler",    "~> 1.10"
   spec.add_development_dependency "rake",       "~> 10.0"
   spec.add_development_dependency "pry",        "~> 0.10.1"
   spec.add_development_dependency "rspec",      "~> 3.2.0"
+  spec.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsb-gol
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
@@ -14,16 +14,30 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="