githug 0.5.0 → 0.5.1

data/levels/number_of_files_committed.rb

@@ -1,37 +1,38 @@
 difficulty 1
-description "There are some files in this repository, how many of the files will be committed?"
+description "There are some files in this repository; how many of them are staged for a commit?"
 
 setup do
   repo.init
 
-  #Modified files
+  # Modified files
   %w{rubyfile4.rb rubyfile5.rb}.each do |file|
     FileUtils.touch(file)
     repo.add(file)
+    system "git branch -m master"
   end
   repo.commit_all "Commit"
 
-  #Staged file
+  # Staged file
   File.open("rubyfile4.rb", 'w') { |f| f << "#Changes" }
   repo.add("rubyfile4.rb")
 
-  #Not staged file
+  # Not staged file
   File.open("rubyfile5.rb", 'w') { |f| f << "#Changes" }
 
-  #Changes to be committed
+  # Changes to be committed
   %w{rubyfile1.rb}.each do |file|
     FileUtils.touch(file)
     repo.add(file)
-  end  
+  end
 
-  #Untrached files
+  # Untracked files
   %w{rubyfile6.rb rubyfile7.rb}.each do |file|
     FileUtils.touch(file)
   end
 end
 
 solution do
-  numberOfFilesThereWillBeCommit = request("How many changes are going to be committed?")
+  numberOfFilesThereWillBeCommit = request("How many files are going to be committed?")
 
   isInteger = !!(numberOfFilesThereWillBeCommit =~ /^[-+]?[0-9]+$/)
 
@@ -47,5 +48,5 @@ solution do
 end
 
 hint do
-  puts "You are looking for a command to identify the status of the repository."
+  puts "You are looking for a command to identify the status of the repository (resembles a Linux command)."
 end

data/levels/pull.rb

@@ -5,6 +5,7 @@ description "You need to pull changes from your origin repository."
 setup do
   repo.init
   repo.remote_add("origin", "https://github.com/pull-this/thing-to-pull")
+  system "git branch -m master"
 end
 
 solution do

data/levels/push.rb

@@ -1,6 +1,6 @@
 difficulty 3
 description "Your local master branch has diverged from " +
-  "the remote origin/master branch. Rebase your commit onto " +
+  "the remote origin/master branch. Rebase your branch onto " +
   "origin/master and push it to remote."
 
 setup do
@@ -28,6 +28,7 @@ setup do
   FileUtils.touch "file3"
   repo.add        "file3"
   repo.commit_all "Third commit"
+  system "git branch -m master"
 
   # remote repo
   Dir.chdir tmpdir
@@ -39,6 +40,7 @@ setup do
   FileUtils.touch "file4"
   repo.add        "file4"
   repo.commit_all "Fourth commit"
+  system "git branch -m master"  # tentative addition
 
   # change back to original repo to set up a remote
   Dir.chdir cwd

data/levels/push_branch.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "You've made some changes to a local branch and want to share it, but aren't yet ready to merge it with the 'master' branch.  Push only 'test_branch' to the remote repository"
+description "You've made some changes to a local branch and want to share it, but aren't yet ready to merge it with the 'master' branch. Push only 'test_branch' to the remote repository"
 
 setup do
 
@@ -14,16 +14,17 @@ setup do
   FileUtils.touch "file1"
   repo.add        "file1"
   repo.commit_all "committed changes on master"
+  system "git branch -m master"
 
   # copy the repo to remote
   FileUtils.cp_r ".", tmpdir
 
-  # add another file.  If successful this file won't be pushed to the remote repository
+  # add another file. If successful this file won't be pushed to the remote repository
   FileUtils.touch "file2"
   repo.add        "file2"
   repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
 
-  #This branch should not be pushed to to the remote repository
+  # This branch should not be pushed to to the remote repository
   `git checkout -b other_branch --quiet`
   # add another file
   FileUtils.touch "file3"
@@ -32,7 +33,7 @@ setup do
 
   `git checkout -b test_branch --quiet`
 
-  #This file should get pushed if the level is successful
+  # This file should get pushed if the level is successful
   FileUtils.touch "file4"
   repo.add        "file4"
   repo.commit_all "committed change on test_branch"
@@ -51,30 +52,30 @@ setup do
   `git fetch --quiet origin`
   `git branch -u origin/master master 2> /dev/null`
 
-  `git checkout master --quiet` #return to master branch
+  `git checkout master --quiet` # return to master branch
 end
 
 solution do
   repo.init
   result = false
 
-  #each branch consits of one line, `wc -l counts the number of lines in order to get the number of remote branches`
-  #At the moment Grit doesn't support remote branch references but is on the ToDo list.  This should be revisited when Grit implements the change
+  # each branch consists of one line, `wc -l` counts the number of lines in order to get the number of remote branches
+  # At the moment Grit doesn't support remote branch references but is on the ToDo list. This should be revisited when Grit implements the change
   num_remote_branches = `git branch -r`.split("\n").count
 
   # counts the number of commits in the remote master branch'
   remote_master_commits = repo.commits('origin/master').count
-  remote_test_branch_commits = repo.commits('origin/test_branch').count #if returns 0 indicates that the remote test_branch doesn't exist
+  remote_test_branch_commits = repo.commits('origin/test_branch').count # if returns 0 indicates that the remote test_branch doesn't exist
 
-  #Level will be successful if the remote master branch remains at 1 commit, the remote test_branch exits and the number of remote branches
+  # Level will be successful if the remote master branch remains at 1 commit, the remote test_branch and only 2 remote branches exists
   if remote_master_commits == 1 and remote_test_branch_commits > 0 and num_remote_branches == 2
     result = true
 
-  #User pushed up too many branches, level failed
+  # User pushed up too many branches, level failed
   elsif num_remote_branches > 2
     puts "*** It looks like you pushed up too many branches. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
 
-  #User pushed up the master banch, level failed
+  # User pushed up the master branch, level failed
   elsif remote_master_commits > 1
     puts "*** It looks like you pushed up new master branch changes. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
   end

data/levels/push_tags.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "There are tags in the repository that aren't pushed into remote repository. Push them now."
+description "A tag in the local repository isn't pushed into remote repository. Push it now."
 
 setup do
   # remember the working directory so we can come back to it later
@@ -14,6 +14,7 @@ setup do
   repo.add        "file1"
   repo.commit_all "First commit"
   repo.git.tag({'f' => true}, "tag_to_be_pushed")
+  system "git branch -m master"
 
   FileUtils.touch "file2"
   repo.add        "file2"

data/levels/rebase.rb

@@ -4,6 +4,7 @@ description "We are using a git rebase workflow and the feature branch is ready
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

data/levels/rebase_onto.rb

@@ -13,6 +13,7 @@ setup do
   File.open(authors_file, "w") { |f| f << "https://github.com/janis-vitols\n" }
   repo.add(authors_file)
   repo.commit_all("Create authors file")
+  system "git branch -m master"
 
   repo.git.native :checkout, { "b" => true }, "wrong_branch"
   File.open(authors_file, "w") { |f| f << "None\n" }

data/levels/remote.rb

@@ -1,10 +1,11 @@
 difficulty 2
 
-description "This project has a remote repository.  Identify it."
+description "This project has a remote repository. Identify it."
 
 setup do
   repo.init
   repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
+  system "git branch -m master"
 end
 
 solution do
@@ -12,5 +13,5 @@ solution do
 end
 
 hint do
-  puts "You are looking for a remote.  You can run `git` for a list of commands."
+  puts "You are looking for a remote. You can run `git` for a list of commands."
 end

data/levels/remote_add.rb

@@ -4,6 +4,7 @@ description "Add a remote repository called `origin` with the url https://github
 
 setup do
   repo.init
+  system "git branch -m master"
 end
 
 solution do

data/levels/remote_url.rb

@@ -1,11 +1,12 @@
 difficulty 2
 
-description "The remote repositories have a url associated to them.  Please enter the url of remote_location."
+description "The remote repositories have a url associated to them. Please enter the url of remote_location."
 
 setup do
   repo.init
   repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
   repo.remote_add("remote_location", "https://github.com/githug/not_a_repo")
+  system "git branch -m master"
 end
 
 solution do

data/levels/rename.rb

@@ -7,6 +7,7 @@ setup do
   FileUtils.touch("oldfile.txt")
   repo.add("oldfile.txt")
   repo.commit_all("Commited oldfile.txt")
+  system "git branch -m master"
 end
 
 solution do

data/levels/rename_commit.rb

@@ -6,6 +6,7 @@ setup do
   FileUtils.touch "README"
   repo.add        "README"
   repo.commit_all "Initial commit"
+  system "git branch -m master"
 
   FileUtils.touch "file1"
   repo.add        "file1"
@@ -17,7 +18,7 @@ setup do
 end
 
 solution do
-  repo.commits[1].message == "First commit"
+  repo.commits.first.parents[0].message == "First commit"
 end
 
 hint do

data/levels/reorder.rb

@@ -7,6 +7,7 @@ setup do
   FileUtils.touch "README"
   repo.add        "README"
   repo.commit_all "Initial Setup"
+  system "git branch -m master"
 
   FileUtils.touch "file1"
   repo.add        "file1"

data/levels/repack.rb

@@ -6,6 +6,7 @@ setup do
   FileUtils.touch("foo")
   repo.add("foo")
   repo.commit_all("Added foo")
+  system "git branch -m master"
 end
 
 solution do

data/levels/reset.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "There are two files to be committed.  The goal was to add each file as a separate commit, however both were added by accident.  Unstage the file `to_commit_second.rb` using the reset command (don't commit anything)."
+description "There are two files to be committed. The goal was to add each file as a separate commit, however both were added by accident. Unstage the file `to_commit_second.rb` using the reset command (don't commit anything)."
 
 setup do
   repo.init
@@ -9,6 +9,7 @@ setup do
   FileUtils.touch("to_commit_first.rb")
   FileUtils.touch("to_commit_second.rb")
   repo.add(".")
+  system "git branch -m master"
 end
 
 solution do

data/levels/reset_soft.rb

@@ -9,6 +9,7 @@ setup do
   FileUtils.touch("newfile.rb")
   repo.add("newfile.rb")
   repo.commit_all("Premature commit")
+  system "git branch -m master"
 end
 
 solution do

data/levels/restore.rb

@@ -1,11 +1,12 @@
 difficulty 4
-description "You decided to delete your latest commit by running `git reset --hard HEAD^`.  (Not a smart thing to do.)  You then change your mind, and want that commit back.  Restore the deleted commit."
+description "You decided to delete your latest commit by running `git reset --hard HEAD^` (not a smart thing to do). Now you changed your mind and want that commit back. Restore the deleted commit."
 
 setup do
   repo.init
   FileUtils.touch 'file1'
   repo.add        'file1'
   repo.commit_all 'Initial commit'
+  system "git branch -m master"
 
   FileUtils.touch 'file2'
   repo.add        'file2'
@@ -24,5 +25,5 @@ solution do
 end
 
 hint do
-  puts "The commit is still floating around somewhere.  Have you checked out `git reflog`?"
+  puts "The commit is still floating around somewhere. Have you checked out `git reflog`?"
 end

data/levels/restructure.rb

@@ -1,6 +1,6 @@
 difficulty 3
 
-description "You added some files to your repository, but now realize that your project needs to be restructured.  Make a new folder named `src` and using Git move all of the .html files into this folder."
+description "You added some files to your repository, but now realize that your project needs to be restructured. Make a new folder named `src` and use Git move all of the .html files into this folder."
 
 setup do
   repo.init
@@ -13,6 +13,8 @@ setup do
   repo.add("contact.html")
   repo.add("index.html")
 
+  system "git branch -m master"
+
   repo.commit_all("adding web content.")
 end
 

data/levels/revert.rb

@@ -1,6 +1,5 @@
 difficulty 4
-description "You have committed several times but want to undo the middle commit.
-All commits have been pushed, so you can't change existing history."
+description "You have committed several times but want to undo the middle commit. All commits have been pushed, so you can't change existing history."
 
 setup do
   repo.init
@@ -8,6 +7,7 @@ setup do
   FileUtils.touch "file1"
   repo.add        "file1"
   repo.commit_all "First commit"
+  system "git branch -m master"
 
   FileUtils.touch "file3"
   repo.add        "file3"

data/levels/rm.rb

@@ -1,11 +1,12 @@
 difficulty 2
 
-description "A file has been removed from the working tree, however the file was not removed from the repository.  Find out what this file was and remove it."
+description "A file has been removed from the working tree, but not from the repository. Identify this file and remove it."
 
 setup do
   repo.init
   file = File.new("deleteme.rb", "w")
-	file.close
+  file.close
+  system "git branch -m master"
   repo.add("deleteme.rb")
   repo.commit_all("Added a temp file")
   File.delete("deleteme.rb")
@@ -16,5 +17,7 @@ solution do
 end
 
 hint do
-  puts "You may need to use more than one command to complete this.  You have checked your staging area in a previous level.  Don't forget to run `git` for a list of commands."
+  puts ["You may need to use more than one command to complete this.",
+    "You have checked your staging area in a previous level.",
+    "Don't forget to run `git` for a list of commands."]
 end

data/levels/rm_cached.rb

@@ -1,10 +1,11 @@
 difficulty 2
 
-description "A file has accidentally been added to your staging area, find out which file and remove it from the staging area.  *NOTE* Do not remove the file from the file system, only from git."
+description "A file has accidentally been added to your staging area. Identify and remove it from the staging area. *NOTE* Do not remove the file from the file system, only from git."
 
 setup do
   repo.init
   FileUtils.touch("deleteme.rb")
+  system "git branch -m master"
   repo.add(".gitignore")
   repo.add("deleteme.rb")
 end
@@ -14,5 +15,5 @@ solution do
 end
 
 hint do
-  puts "You may need to use more than one command to complete this.  You have checked your staging area in a previous level.  Don't forget to run `git` for a list of commands."
+  puts "You may need to use more than one command to complete this. You have checked your staging area in a previous level. Don't forget to run `git` for a list of commands."
 end

data/levels/squash.rb

@@ -6,6 +6,7 @@ setup do
   FileUtils.touch(".hidden")
   repo.add(".hidden")
   repo.commit_all("Initial Commit")
+  system "git branch -m master"
   FileUtils.touch("README")
   repo.add("README")
   repo.commit_all("Adding README")
@@ -25,5 +26,5 @@ solution do
 end
 
 hint do
-  puts "Take a look the `-i` flag of the rebase command."
+  puts "Take a look at the `-i` flag of the rebase command."
 end

data/levels/stage_lines.rb

@@ -7,6 +7,7 @@ setup do
   File.open("feature.rb", "w") do |file|
     file.puts("this is the class of my feature")
   end
+  system "git branch -m master"
 
   repo.add("feature.rb")
   repo.commit_all("Added initial feature file")
@@ -25,5 +26,5 @@ solution do
 end
 
 hint do
-  puts "You might want to try to manipulate the hunks of the diff to choose which lines of the diff get staged. Read about the flags which can be passed to the `add` command; `man git-add`."
+  puts "You might want to try to manipulate the hunks of the diff to choose which lines of the diff get staged. Read about the flags which can be passed to the `add` command; `git --help add`."
 end

data/levels/stash.rb

@@ -3,6 +3,7 @@ description "You've made some changes and want to work on them later. You should
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do
@@ -12,5 +13,5 @@ solution do
 end
 
 hint do
-  puts "It's like stashing. Try finding appropriate git command."
+  puts "It's like stashing. Try finding an appropriate git command."
 end

data/levels/status.rb

@@ -1,10 +1,11 @@
 difficulty 1
-description "There are some files in this repository, one of the files is untracked, which file is it?"
+description "Among the files in this repository, which of them is untracked?"
 
 setup do
   repo.init
   %w{config.rb README setup.rb deploy.rb Guardfile}.each do |file|
     FileUtils.touch(file)
+    system "git branch -m master"
     repo.add(file)
   end
   FileUtils.touch("database.yml")

data/levels/submodule.rb

@@ -1,20 +1,21 @@
 difficulty 2
-description "You want to include the files from the following repo: `https://github.com/jackmaney/githug-include-me` into a the folder `./githug-include-me`. Do this without manually cloning the repo or copying the files from the repo into this repo."
+description "You want to include the files from the following repo: `https://github.com/jackmaney/githug-include-me` into the folder `./githug-include-me`. Do this without manually cloning the repo or copying the files from the repo into this repo."
 
 setup do
-    repo.init
+  repo.init
+  system "git branch -m master"
 end
 
 solution do
-    return false if not File.directory?("./githug-include-me")
-    return false if not File.exist?("./githug-include-me/README.md")
-    return false if not File.exist?("./githug-include-me/.git")
-    return false if File.directory?("./githug-include-me/.git")
-    return false if not File.exist?(".gitmodules")
+  return false if not File.directory?("./githug-include-me")
+  return false if not File.exist?("./githug-include-me/README.md")
+  return false if not File.exist?("./githug-include-me/.git")
+  return false if File.directory?("./githug-include-me/.git")
+  return false if not File.exist?(".gitmodules")
 
-    return true
+  return true
 end
 
 hint do
-    puts "Take a look at `git submodule`."
+  puts "Take a look at `git submodule`."
 end

data/levels/tag.rb

@@ -7,6 +7,7 @@ setup do
     FileUtils.touch("somefile.txt")
     repo.add("somefile.txt")
     repo.commit_all("Added some file to the repo")
+    system "git branch -m master"
 end
 
 solution do

data/lib/githug/cli.rb

@@ -32,15 +32,15 @@ module Githug
       end
     end
 
-    desc :reset, "Reset the current level"
+    desc :reset, "Reset the current level or select specific level"
     long_desc <<-LONGDESC
       `githug reset` will reset the current level. You can optionally specify a
       LEVEL parameter which will reset the game to a specific level. For
       example:
 
-      > $ githug reset merge_squash   # or $ githug reset 45
+      > $ githug reset merge_squash   # or $ githug reset 47
 
-      Will reset githug to level '#45: merge_squash'
+      Will reset githug to level '#47: merge_squash'
     LONGDESC
     def reset(path = nil)
       level = load_level(path)

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/githug.rb

@@ -13,3 +13,4 @@ require 'githug/repository'
 
 Githug::UI.in_stream = STDIN
 Githug::UI.out_stream = STDOUT
+STDIN.sync = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -68,7 +68,7 @@ dependencies:
         version: '11'
 description: An interactive way to learn git.
 email:
-- webmaster@gazler.com
+- gazler@gmail.com
 executables:
 - githug
 extensions: []
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENCE.txt
 - README.md
@@ -505,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.1.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.