diff --git a/guess.py b/guess.py old mode 100644 new mode 100755 index 3a28086..8fb3b11 --- a/guess.py +++ b/guess.py @@ -1,3 +1,5 @@ +#!/usr/bin/python3 + import random @@ -7,11 +9,10 @@ print('Hello! What is your name?') name = input() -print("Hi, {}. I'm thinking of a number from 1 and 20.".format(name)) +print(f"Hi, {name}. I'm thinking of a number from 1 and 20.") while guesses < 6: - - print('What is your guess. You have {} more guesses.'.format(6-guesses)) + print(f'What is your guess? You have {6 - guesses} more guesses.') guess = input() guess = int(guess) @@ -22,8 +23,8 @@ elif guess > number: print('Too high.') elif guess == number: - print('Good job, {}! You guessed my number in {} guesses!'.format(name,guesses)) + print(f'Good job, {name}! You guessed my number in {guesses} guesses!') break if guess != number: - print('Nope. The number I was thinking of was {}.'.format(number)) + print(f'Nope. The number I was thinking of was {number}.') diff --git a/guess.rb b/guess.rb old mode 100644 new mode 100755 index 18a7c52..f15c2dc --- a/guess.rb +++ b/guess.rb @@ -1,30 +1,22 @@ +#!/usr/bin/env ruby + number = rand(1..20) -guesses = 0 puts 'Hello! What is your name?' -name = gets.chomp.to_s - -puts "Hi, #{name}. I'm thinking of a number between 1 and 20." +name = gets&.chomp -while guesses < 6 +puts "Hi, #{name}. I'm thinking of a number between 1 and 20." - puts "What is your guess? You have #{6-guesses} more guesses." - guess = gets.chomp.to_i - guesses += 1 +1.upto 6 do |guesses| + puts "What is your guess? You have #{7 - guesses} more guesses." + guess = gets&.chomp.to_i - unless guess == number - message = if guess > number - "Too high" - else - "Too low" - end - puts message - else + if guess == number puts "Good job, #{name}! You guessed my number in #{guesses} guesses." exit + else + puts(guess > number ? 'Too high' : 'Too low') end - end puts "Nope. The number I was thinking of was #{number}." - diff --git a/readme.md b/readme.md index fd086db..f281cd9 100644 --- a/readme.md +++ b/readme.md @@ -152,7 +152,7 @@ The difference is that there is one right way of doing this given the situation. ### More differences -As you can imagine, there are many more differences that just the syntax and philosophies of the two languages. Let's quickly look at some examples. +As you can imagine, there are many more differences than just the syntax and philosophies of the two languages. Let's quickly look at some examples. #### Learning Curve @@ -208,6 +208,11 @@ The Python community is active, vibrant, and truly helpful. Although you can say #### Popularity/Jobs +![popularity](https://static1.squarespace.com/static/51361f2fe4b0f24e710af7ae/t/56b1187d4c2f85efc5598bb1/1454446752995/?format=750w) + +Source: http://blog.codeeval.com/codeevalblog/2016/2/2/most-popular-coding-languages-of-2016 + + ![popularity](https://raw.github.com/mjhea0/python-ruby/master/images/codeeval2015.jpg) For the fourth year in a row, Python is the most popular language. Also, notice how Ruby decreased in popularity: @@ -250,11 +255,10 @@ guesses = 0 print('Hello! What is your name?') name = input() -print("Hi, {}. I'm thinking of a number from 1 and 20.".format(name)) +print(f"Hi, {name}. I'm thinking of a number from 1 and 20.") while guesses < 6: - - print('What is your guess. You have {} more guesses.'.format(6-guesses)) + print(f'What is your guess? You have {6 - guesses} more guesses.') guess = input() guess = int(guess) @@ -265,42 +269,33 @@ while guesses < 6: elif guess > number: print('Too high.') elif guess == number: - print('Good job, {}! You guessed my number in {} guesses!'.format(name,guesses)) + print(f'Good job, {name}! You guessed my number in {guesses} guesses!') break if guess != number: - print('Nope. The number I was thinking of was {}.'.format(number)) + print(f'Nope. The number I was thinking of was {number}.') ``` #### Ruby ```ruby number = rand(1..20) -guesses = 0 puts 'Hello! What is your name?' -name = gets.chomp.to_s +name = gets&.chomp puts "Hi, #{name}. I'm thinking of a number between 1 and 20." -while guesses < 6 +1.upto 6 do |guesses| + puts "What is your guess? You have #{7 - guesses} more guesses." + guess = gets&.chomp.to_i - puts "What is your guess? You have #{6-guesses} more guesses." - guess = gets.chomp.to_i - guesses += 1 - - unless guess == number - message = if guess > number - "Too high" - else - "Too low" - end - puts message - else + if guess == number puts "Good job, #{name}! You guessed my number in #{guesses} guesses." exit + else + puts(guess > number ? 'Too high' : 'Too low') end - end puts "Nope. The number I was thinking of was #{number}."