whirly 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 676e277e0721c5b27b89f72b91d218c6132ecea9
-  data.tar.gz: c84ff19c62bc2dd2f178d266c06446465bbc2571
+  metadata.gz: f69b668e3ed248d4353ae4d0d45a0b1556435d18
+  data.tar.gz: b57f46e4c21d95ad19a29be45bf99abefc1e80fe
 SHA512:
-  metadata.gz: 8cda16355b8fc8f217c05796bd6b9f524da98b4d9574e8b9a2827fefc05c336e706f3a2de5f5641965b9e95e88bbdfa7b89b3473b1a675c6d65d064ad6f5e205
-  data.tar.gz: ff67f700686adcdad1dd2b2d6c661aab1ec7a0a85f0ebdf6d0a03fbef97fe157daec8970b890020aa559356577ba33344cf50643c823c74fc6456b8b3e83549c
+  metadata.gz: 5f25ab43a137b933d7daf44ff0ce4beedf57eaa8afa8b0d2b70ac42e94ec2a6a5b85c491d6248cf414082a3d4a080bcd573ecb50a2570a707bf93164c982971c
+  data.tar.gz: 7053d6533a53af42794609d0859495f70b8aaa6bee21635089dfb7f2d20f25cea155a34bf8f60c5c84ec2ef29d0b34facdfafda3827cfeff2d74f19ff5d56469

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+### 0.2.4
+
+- Fix bug that the Whirly thread will also stop when main thread throws error
+  (patch by @monkbroc)
+- New spinner: xberg
+
 ### 0.2.3
 
 - Fix bug that in some cases whirly output would be shown on non-ttys

data/README.md

@@ -1,6 +1,6 @@
-# Whirly 😀 [![[version]](https://badge.fury.io/rb/whirly.svg)](http://badge.fury.io/rb/whirly)  [![[travis]](https://travis-ci.org/janlelis/whirly.png)](https://travis-ci.org/janlelis/whirly)
+# Whirly 😀 [![[version]](https://badge.fury.io/rb/whirly.svg)](http://badge.fury.io/rb/whirly)  [![[travis]](https://travis-ci.org/janlelis/whirly.svg)](https://travis-ci.org/janlelis/whirly)
 
-A simple, colorful and customizable terminal spinner library for Ruby. It comes with 23 custom spinners and also includes those from the [cli-spinners](https://github.com/sindresorhus/cli-spinners) project.
+A simple, colorful and customizable terminal spinner library for Ruby. It comes with 24 custom spinners and also includes those from the [cli-spinners](https://github.com/sindresorhus/cli-spinners) project.
 
 ## Demonstration
 
@@ -60,7 +60,7 @@ Whirly.stop
 The `start` method takes a lot of options, like which spinner to use or an initial status. See further below for the full description of available options.
 
 ```ruby
-Whirly.start spinner: "pong", use_color: false, status: "The Game of Pong" do
+Whirly.start spinner: "pong", color: false, status: "The Game of Pong" do
   sleep 10
 end
 ```

data/data/whirly-static-spinners.json

@@ -221,5 +221,54 @@
       "🞎",
       "🞔"
     ]
+  },
+  "xberg": {
+    "interval": 150,
+    "mode": "random",
+    "frames": [
+      "⨯",
+      "⛰",
+      "⛰",
+      "⛰",
+      "⛰",
+      "⛰",
+      "⛰"
+    ]
+  },
+  "circled_letter": {
+    "interval": 120,
+    "mode": "random",
+    "frames": [
+      "Ⓐ", "Ⓑ", "Ⓒ", "Ⓓ", "Ⓔ", "Ⓕ", "Ⓖ", "Ⓗ", "Ⓘ",
+      "Ⓙ", "Ⓚ", "Ⓛ", "Ⓜ", "Ⓝ", "Ⓞ", "Ⓟ", "Ⓠ", "Ⓡ",
+      "Ⓢ", "Ⓣ", "Ⓤ", "Ⓥ", "Ⓦ", "Ⓧ", "Ⓨ", "Ⓩ"
+    ]
+  },
+  "circled_number": {
+    "interval": 120,
+    "mode": "random",
+    "frames": [
+      "①", "②", "③", "④", "⑤", "⑥", "⑦", "⑧", "⑨"
+    ]
+  },
+  "letter_with_parens": {
+    "interval": 150,
+    "mode": "random",
+    "frames": [
+      "🄐", "🄑", "🄒", "🄓", "🄔", "🄕", "🄖", "🄗", "🄘",
+      "🄙", "🄚", "🄛", "🄜", "🄝", "🄞", "🄟", "🄠", "🄡",
+      "🄢", "🄣", "🄤", "🄥", "🄦", "🄧", "🄨", "🄩"
+    ]
+  },
+  "starlike": {
+    "interval": 120,
+    "mode": "random",
+    "frames": [
+      "✩", "✪", "✫", "✬", "✭", "✮", "✯", "✰",
+      "✱", "✲", "✳", "✴", "✵", "✶", "✷", "✸",
+      "✹", "✺", "✻", "✼", "✽", "✾", "✿", "❀",
+      "❁", "❂", "❃", "❄", "❅", "❆", "❇", "❈",
+      "❉", "❊"
+    ]
   }
 }

data/examples/euruko.rb

@@ -45,7 +45,7 @@ sleep 5
 print "\033c"
 puts Paint["Pong", :underline]
 
-Whirly.start spinner: "pong", use_color: false, status: "Two computers in a game of Pong" do
+Whirly.start spinner: "pong", color: false, status: "Two computers in a game of Pong" do
   sleep 9
 end
 

data/examples/single.rb

@@ -3,4 +3,4 @@ require "paint"
 
 # Call a single spinner from the command-line
 
-Whirly.start(spinner: $*[0], status: $*[2] || $*[0], use_color: false){ sleep(($*[1] || 10).to_i) }
+Whirly.start(spinner: $*[0], status: $*[2] || $*[0], color: false){ sleep(($*[1] || 10).to_i) }

data/lib/whirly.rb

@@ -167,8 +167,11 @@ module Whirly
 
     # idiomatic block syntax support
     if block_given?
-      yield
-      Whirly.stop
+      begin
+        yield
+      ensure
+        Whirly.stop
+      end
     end
 
     true

data/lib/whirly/spinners/whirly.rb

@@ -4,13 +4,9 @@ module Whirly
   module Spinners
     WHIRLY = {
       "random_dots"         => { "proc" => ->(){ [ 0x2800 + rand(256)].pack("U") }, "interval" => 100 },
-      "circled_letter"      => { "proc" => ->(){ [ 0x24B6 + rand(26) ].pack("U") }, "interval" => 120 },
-      "circled_number"      => { "proc" => ->(){ [ 0x2460 + rand(9)  ].pack("U") }, "interval" => 120 },
-      "starlike"            => { "proc" => ->(){ [ 0x2729 + rand(34) ].pack("U") }, "interval" => 120 },
       "mahjong"             => { "proc" => ->(){ [0x1F000 + rand(44)].pack("U") }, "interval" => 200 },
       "domino"              => { "proc" => ->(){ [0x1F030 + rand(50)].pack("U") }, "interval" => 200 },
-      "vertical_domino"     => { "proc" => ->(){ [0x1F062 + rand(50)].pack("U") }, "interval" => 200 },
-      "letters_with_parens" => { "proc" => ->(){ [0x1F110 + rand(26)].pack("U") }, "interval" => 150 },
+      "vertical_domino"     => { "proc" => ->(){ [0x1F062 + rand(50)].pack("U") }, "interval" => 200 }
     }
     WHIRLY.merge! JSON.load(File.read(File.dirname(__FILE__) + "/../../../data/whirly-static-spinners.json"))
 

data/lib/whirly/version.rb

@@ -1,3 +1,3 @@
 module Whirly
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

data/spec/whirly_spec.rb

@@ -376,4 +376,18 @@ describe Whirly do
       refute_predicate Whirly, :enabled?
     end
   end
+
+  describe "Error Handling" do
+    it "stops the spinner, when the main thread threw an exception [gh#3]" do
+      begin
+        Whirly.start status: "working" do
+          short_sleep
+          raise 'error!'
+        end
+      rescue
+      end
+
+      refute_predicate Whirly, :enabled?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whirly
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
@@ -50,6 +50,7 @@ files:
 - examples/multi_lines.rb
 - examples/single.rb
 - examples/status.rb
+- lib/.whirly.rb.swp
 - lib/whirly.rb
 - lib/whirly/spinners.rb
 - lib/whirly/spinners/cli.rb