timequiz 0.1.7 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d96fc671de6bc8d4705bbffde863c537303c9ba52dcc47b89c21505b1a26bb6
-  data.tar.gz: 042ec7bd85e389e743ca1adf8349afd094ccece0cb38343f65f272a17c66f8e2
+  metadata.gz: 161df9cb4463fb4472eccf28b3a6eeb622d53565657f1a7f49e5ac427ffa785d
+  data.tar.gz: aaeb2fac8f159d546e7287cbd58373495e205c7a8a7de667ded43e4a1243cc95
 SHA512:
-  metadata.gz: ac0569c7708a7cf829b85fbc3d521a66fa73961ca3c5895e2f23ee066d03e34b3bbcb4d8e77f85f13efc6ab5161ee0c67fb5128b758d27f3ac3b3e3c1c116738
-  data.tar.gz: 1dd17386a7ad9978ee4006a31438544d31fc5589d6ca3b4d93ff145aa5b0913be76ded413c0ae74f657f866644f739c4a55307264d39e255ec3140a0d60240a9
+  metadata.gz: 0270c77e8884705fb75d1ecd598d71798fc674961babc9567c8ebdc5682e0f1c572e6f5ad51b63ed559457441ecb487fe47dbfc5d9c0a9843c26c42a47659b78
+  data.tar.gz: 7f823869746b8eb95a0dbbd182dec42397b864d793225a2954daca3a56c0b0f987f0415957580bcd7ec8843313334fd5e1ad42d12c0043b7194847d4c4adbc32

data/lib/console.rb

@@ -21,6 +21,18 @@ require_relative 'constants'
 module Console
   # Some definitions which may change one day, become configurable one day,
   # need to be accessed (one day) from somewhere else or not.
+
+@@won_text = %q"__  __               _       __               __
+\ \/ /___  __  __   | |     / /___  ____     / /
+ \  / __ \/ / / /   | | /| / / __ \/ __ \   / / 
+ / / /_/ / /_/ /    | |/ |/ / /_/ / / / /  /_/  
+/_/\____/\__,_/     |__/|__/\____/_/ /_/  (_)"
+@@fail_text = %q"                                   __ 
+ __ __            _               |  |
+|  |  |___ _ _   | |___ ___ ___   |  |
+|_   _| . | | |  | | . |_ -| -_|  |__|
+  |_| |___|___|  |_|___|___|___|  |__|"
+                   
   @@win_sequence = %w"won.. won.. Won.. WOn.. wON.. wON!. woN!! won!! won.!  won.. _on.. __n.. ___.. ___.. w__.. wo_.. " 
   @@wait_sequence = %w"U\  V\  Y\  T\  |\  ¦\  :\  .\  _\  .\  o\  O\ "
   @@fail_sequence = %w":-|\  :-|\  :-[\  :-[\  :-(\  :-(\  8-(\  8-(\  8-(\  8-(\  8-(\  8-(\  8-(\  8-(\  .... |... lo.. Los. LOso LOSe LOSE lOSE loSE lose"
@@ -29,7 +41,7 @@ module Console
   def start_game
     available = $events
     clear
-    puts "Put the following events into the right chronological order (e.g.: 2 3 1)."
+    puts bold("\nPut the following events into the right chronological order (e.g.: 2 3 1).")
     @m_events = Array.new
     out = ''
     $num_events.times do |i|
@@ -45,7 +57,7 @@ module Console
 
     response = int_array_input($num_events, (1..$num_events) ) 
     if response == :quit_game
-      score @@points
+      score @@points, true
       exit true
     end
 
@@ -54,23 +66,22 @@ module Console
     if good_order(response)
       @@points += $num_events 
       win
-      score(@@points)
     else
       lose
-      score(@@points)
     end
+    score(@@points)
 
     # Start the loop. Add events as requested.
     until @m_events.length == $MAX_NUM_EVENTS do
       ui = ask_new_event
       if ui == :quit_game
-        score @@points
+        score @@points, true
         exit true
       end
       if('a' == ui)
         ev = new_event
         if ev == :all_events_done
-          score(@@points)
+          score(@@points, true) 
           exit true
         end
 
@@ -78,7 +89,7 @@ module Console
         # 1) exclude new event from the choices (hence -1), allow 0 as 'earlier than any'.
         r = int_input(0..(@m_events.length - 1) )
         if r == :quit_game
-          score @@points
+          score @@points, true
           exit true
         end
         # User-input can be 0, which complicates the comparison with the
@@ -98,11 +109,10 @@ module Console
         if ok
           @@points += 1
           win
-          score(@@points)
         else
           lose
-          score(@@points)
         end
+        score(@@points)
       else
         detail( a2i(ui) )
       end
@@ -154,18 +164,17 @@ module Console
     UserInput::input()
   end
 
-  def score(pts)
-    puts ' (Current score: %i %s)' %[pts, (pts == 1 ? 'point' : 'points')]
+  def score(pts, all_done = false)
+    intro = (all_done ? 'Final score' : 'Current score')
+    puts ' (' << intro << ': %i %s)' %[pts, (pts == 1 ? 'point' : 'points')]
   end
 
   def lose
-    cmt = 'You ' << red('lose.') 
-    wait @@fail_sequence, 1, cmt 
+    wait @@fail_sequence, 1, red(@@fail_text )
   end
 
   def win
-    cmt = 'You ' << cyan(' W O N !!') 
-    wait(@@win_sequence, 1, cmt)
+    wait(@@win_sequence, 1, green(@@won_text) )
   end
 
   def show_correct_order

data/lib/events.rb

@@ -26,8 +26,8 @@ $events << ['Foundation of the Royal Society in London', 1660, 'From its first m
 $events << ['Galileo Galilée observes the first known satellites of Jupiter', 1610,  'A few weeks after his observations, Galileo determined that he was observing not stars, but objects in orbit around Jupiter. Today, Jupiter’s four largest satellites—Io, Europa, Ganymede, and Callisto—are named the Galilean moons in honor of their discoverer.']
 $events << ['The Persian astronomer Al Soufi is born', 903, 'Abd-al-Rahman Al Sufi published his famous "Book of Fixed Stars" in 964 describing much of his work, both in textual descriptions and pictures. In his descriptions and pictures of Andromeda, he included "A Little Cloud" which is actually the Andromeda Galaxy M31.']
 $events << ["Failed British Macartney Embassy in China",1793, 'The British mission traveled to China in 1792–93 in an attempt to secure more favourable trade and diplomatic relations for the United Kingdom. Macartney was expected by his hosts to kneel three times and to touch his head several times on the ground in acknowledgment of the emperor as the “son of heaven” (tianzi) and of China as the Central Kingdom (Zhongguo). He refused to kowtow, however, and instead went down on only one knee, as he would before a British monarch. The whole mission was marked by misunderstandings, and the Embassy failed to achieve its goals.']
-$events << ['Copernicus publishes “De revolutionibus orbium coelestium”', 1543,'Copernicus major work, first edition 1543 in Nuremberg, was a compendium of six books published during the year of his death, though he had arrived at his theory several decades earlier: Copernicus held that the Earth is another planet revolving around the fixed Sun once a year and turning on its axis once a day.']
-$events << ['Permière heure universelle, “Greenich Meen Time”', 1884, 'People had been trying to standardise time for years, but nobody could agree. And so, to settle the subject once and for all, in 1884 a conference was called by the president of the USA, Chester Arthur. On 13 October 1884, the International Meridian Conference resolved by 22 votes to one, and two abstentions (one of which was France, obviously), that Greenwich would be the prime meridian of longitude.']
+$events << ['Copernicus publishes “De revolutionibus orbium coelestium”', 1543,"Copernicus' major work, first edition 1543 in Nuremberg, was a compendium of six books published during the year of his death, though he had arrived at his theory several decades earlier: Copernicus held that the Earth is another planet revolving around the fixed Sun once a year and turning on its axis once a day."]
+$events << ['First universal time, “Greenich Meen Time”', 1884, 'People had been trying to standardise time for years, but nobody could agree. And so, to settle the subject once and for all, in 1884 a conference was called by the president of the USA, Chester Arthur. On 13 October 1884, the International Meridian Conference resolved by 22 votes to one, and two abstentions (one of which was France, obviously), that Greenwich would be the prime meridian of longitude.']
 $events << ['Begining of the Islamic Calendar', 622, 'The Islamic Calendar, also known as the Hijri or lunar calendar, began on July 16, 622 CE, marking the first day of the first year of the Hegira (Hijra). This significant event commemorates the migration of the Prophet Muhammad from Mecca to Medina, a pivotal moment in Islamic history that not only shaped the early Muslim community but also established a new chronological framework for Muslims.']
 $events << ['Introduction of the Gregorian Calendar', 1582, 'After centuries, the Julian Calendar had added ten days too many to the calendar, so Pope Gregory decreed that the day after the 4th of October 1582 should be the 15th of October 1582, thus correcting the error.']
 $events << ['The Tunguska event', 1908, 'On June 30, 1908, an asteroid plunged into Earth’s atmosphere and exploded in the skies over Siberia. Local eyewitnesses in the sparsely populated region reported seeing a fireball and hearing a large explosion. They also reported massive forest fires, and trees blown over for miles (NASA).']

data/lib/timequiz.rb

@@ -175,7 +175,6 @@ class Timequiz
       # response.each_with_index {|r, i| response_years[r-1] = @m_events[i].year}
       response.each_with_index {|r, i| response_years[i] = @m_events[r-1].year}
       debug('response is ' << response.join(', ') << "\nresponse_years is : " << response_years.join(', ') )
-      puts 'response is ' << response.join(', ') << "\nresponse_years is : " << response_years.join(', ') 
 
       # do not change the displayed index
       sort_years(false)

data/lib/user_input.rb

@@ -17,6 +17,7 @@
 
 require 'io/wait'
 require 'io/console'
+require_relative 'color_output'
 
 # Provides functions to convert terminal input to desired data-types and does
 # some verifications.
@@ -141,15 +142,16 @@ class UserInput
     ar = []
     until ar.length == len
       if(range)
-        print ' (Available: '
+        print bold(' (Available: ')
         disp = range.to_a - ar
         if disp.length > 2
-          puts disp.join(', ') << ')' 
+          print disp.join(', ')
         elsif disp.length == 2
-          puts disp.first.to_s << ' or ' << disp.last.to_s << ')'
+          print disp.first.to_s << ' or ' << disp.last.to_s
         else
-          puts disp.first.to_s << ')'
+          print disp.first.to_s
         end
+        puts bold(')')
       end
 
       begin

data/lib/version.rb

@@ -15,8 +15,8 @@
  ***************************************************************************/
 =end
 
-VERSION = '0.1.7'
-SUMMARY = 'Some new events added, mostly related to astronomy.'
+VERSION = '0.2'
+SUMMARY = 'Nicer console output.'
 AUTHOR = 'Michael Uplawski'
 AUTHOR_MAIL = '<michael.uplawski@uplawski.eu>'
 YEARS = 2017 - 2025

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timequiz
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: '0.2'
 platform: ruby
 authors:
 - Michael Uplawski
@@ -58,5 +58,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
-summary: Some new events added, mostly related to astronomy.
+summary: Nicer console output.
 test_files: []