githug 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd01623048e26d6e08ad8dedad77025768f50170
-  data.tar.gz: 2eb13fc8cc825f045bceb74e3577de6d0b180549
+  metadata.gz: 0e9bf4cc4edb1340324308e6962db57c4f3d3d15
+  data.tar.gz: 88179cc894098286f09d5c0e9f4abedab122c7ac
 SHA512:
-  metadata.gz: 9771274cca2fa11c94e4fb68ab10359c8eae7057d34a8b650cda30ae3241b72337a97b26b33a2800b7787acef5423c53771d2ec4b17dfa8cecd874ae969cc22a
-  data.tar.gz: ce8b883542b3edac372f0648e0354cc2c98919d102a02347968c87d53a2c0f18bbbf7879cfc2441e27eb7638f4c0f203b5c156af307fcfa02e0f0f1db008d856
+  metadata.gz: 9b799abc8c24919db796761438a082c5c71698a5bce8e382795fd67a3864bcad2b1822f1f9b394d39b3655348cdf60a862b4f7679a63ec2b04df5ea73e80d561
+  data.tar.gz: eed02fe344c91defe7f5406733cd4ee6f4fb7930eb43d1d5dfde91af9e3fd981138a293236e860d13c82bcb67fde40f6962fa671851d7c94ca86d66fbf5f87dd

data/README.md

@@ -61,6 +61,7 @@ end
 solution do
   return false unless repo.status.files.keys.include?("README")
   return false if repo.status.files["README"].untracked
+
   true
 end
 
@@ -79,16 +80,6 @@ hints [
   "Check the man for `git add`"]
 ```
 
- **note** Because `solution` is a Proc, you cannot prematurely return out of it and as a result, must put an explicit return on the last line of the solution block.
-
-```ruby
-solution do
-  solved = false
-  solved = true if repo.valid?
-  solved
-end
-```
-
  By default, `setup` will remove all files from the game folder.  You do not need to include a setup method if you don't want an initial git repository (if you are testing `git init` or only checking an answer.)
 
  You can call `repo.init` to initialize an empty repository.
@@ -121,9 +112,9 @@ After doing this, your level should be able to copy the contents from that git r
 The easiest way to test a level is:
 
  * change into your git_hug repository
- * Run `githug reset PATH_TO_YOUR_LEVEL
+ * Run `githug reset PATH_TO_YOUR_LEVEL`
  * Solve the level
- * Run `githug test PATH_TO_YOUR_LEVEL
+ * Run `githug test PATH_TO_YOUR_LEVEL`
 
 Please note that the `githug test` command can be run as `githug test --errors` to get an error stacktrace from your solve method.
 

data/levels/bisect.rb

@@ -7,7 +7,7 @@ setup do
 end
 
 solution do
-  "18ed2ac" == request("What are the first 7 characters of the hash of the commit that introduced the bug?")
+  "18ed2ac" == request("What are the first 7 characters of the hash of the commit that introduced the bug?")[0..6]
 end
 
 hint do

data/levels/checkout_tag_over_branch.rb

@@ -0,0 +1,46 @@
+difficulty 2
+
+description "You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2 (Note: There is also a branch named v1.2)"
+
+setup do
+  repo.init
+  FileUtils.touch("app.rb")
+  repo.add("app.rb")
+  repo.commit_all("Initial commit")
+
+  `echo "Some code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Some changes")
+  repo.git.tag( { 'f' => true }, "v1.0" )
+
+  `echo "Buggy code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Some more changes")
+  repo.git.tag( { 'f' => true }, "v1.2" )
+
+  `echo "More code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Yet more changes")
+
+  `echo "Some more code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Changes galore")
+  repo.git.tag( { 'f' => true }, "v1.5" )
+
+  repo.git.native :checkout, {"b" => true}, 'v1.2'
+  File.open("file3", 'w') { |f| f << "some feature\n" }
+  repo.add "file3"
+  repo.commit_all "Developing new features"
+
+  repo.git.native :checkout, {}, 'master'
+end
+
+solution do
+  return false unless repo.commits.length == 5
+  return false unless `git show HEAD` =~ /Some more changes/
+  true
+end
+
+hint do
+  puts "You should think about specifying you're after the tag named v1.2 (think tags/)"
+end

data/levels/contribute.rb

@@ -5,7 +5,7 @@ solution do
   location = "/tmp/githug"
   FileUtils.rm_rf(location)
   puts "Cloning repository to #{location}"
-  `git clone git@github.com:Gazler/githug.git #{location}`
+  `git clone https://github.com/Gazler/githug #{location}`
 
   contributor = false
 

data/levels/log.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "You will be asked for the first 7 chars of the hash of most recent commit.  You will need to investigate the logs of the repository for this."
+description "You will be asked for the hash of most recent commit.  You will need to investigate the logs of the repository for this."
 
 setup do
   repo.init
@@ -10,7 +10,7 @@ setup do
 end
 
 solution do
-  repo.commits.last.id_abbrev == request("What are the first 7 characters of the hash of the most recent commit?")
+  repo.commits.last.id_abbrev == request("What is the hash of the most recent commit?")[0..6]
 end
 
 hint do

data/levels/push_tags.rb

@@ -0,0 +1,63 @@
+difficulty 2
+description "There are tags in the repository that aren't pushed into remote repository. Push them now."
+
+setup do
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  # initialize another git repo to be used as a "remote"
+  tmpdir = Dir.mktmpdir
+
+  # local repo
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+  repo.git.tag({'f' => true}, "tag_to_be_pushed")
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+
+  # copy the repo to remote
+  FileUtils.cp_r ".", tmpdir
+
+  # remote repo
+  Dir.chdir tmpdir
+  repo.init
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch origin`
+
+  # delete tags from remote
+  Dir.chdir tmpdir
+  repo.git.tag({'d' => true}, "tag_to_be_pushed")
+
+  # change back to local repo
+  Dir.chdir cwd
+end
+
+solution do
+  solved = false
+
+  # a bit hacky solution to get tags from remote
+  remote_tags=
+    repo.git.raw_git_call("git ls-remote --tags -q", repo.git.git_file_index).
+      first.
+      split("\n")
+
+  # see if we have the correct tag in the remote
+  remote_tags.each do |t|
+    solved=true if t.include?("refs/tags/tag_to_be_pushed")
+  end
+
+  solved
+end
+
+hint do
+  puts "Take a look at '--tags' flag of 'git push'"
+end

data/levels/rename_commit.rb

@@ -1,5 +1,5 @@
 difficulty 3
-description "Correct the typo in the message of your first commit."
+description "Correct the typo in the message of your first (non-root) commit."
 
 setup do
   repo.init

data/levels/repack.rb

@@ -0,0 +1,19 @@
+difficulty 2
+description "Optimise how your repository is packaged ensuring that redundant packs are removed"
+
+setup do
+  repo.init
+  FileUtils.touch("foo")
+  repo.add("foo")
+  repo.commit_all("Added foo")
+end
+
+solution do
+  result = `git count-objects -v`
+  required = ["count: 0", "prune-packable: 0"];
+  required.all? { |r| result.include?(r) }
+end
+
+hint do
+  puts "You want to research the `git repack` command"
+end

data/levels/rm_cached.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "A file (deleteme.rb) 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 system, only from git."
+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."
 
 setup do
   repo.init

data/lib/githug/level.rb

@@ -4,10 +4,10 @@ module Githug
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
               "clone_to_folder", "ignore", "status", "rm", "rm_cached",
-              "stash", "rename", "log", "tag",  "commit_amend", "reset",
+              "stash", "rename", "log", "tag", "push_tags", "commit_amend", "reset",
               "reset_soft", "checkout_file", "remote", "remote_url", "pull",
               "remote_add", "push", "diff", "blame", "branch", "checkout",
-              "checkout_tag", "branch_at", "merge", "cherry-pick",
+              "checkout_tag", "checkout_tag_over_branch", "branch_at", "merge", "repack", "cherry-pick",
               "rename_commit", "squash", "merge_squash", "reorder", "bisect",
               "stage_lines", "find_old_branch", "revert", "restore",
               "conflict", "contribute"]
@@ -55,7 +55,8 @@ module Githug
     end
 
     def solution(&block)
-      @solution = block
+      singleton = class << self; self end
+      singleton.send :define_method, :_solution, &block
     end
 
     def setup(&block)
@@ -89,7 +90,7 @@ module Githug
     end
 
     def solve
-      @solution.call
+      _solution
     rescue
       false
     end

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/githug/game_spec.rb

@@ -2,61 +2,61 @@ require 'spec_helper'
 
 describe Githug::Game do
 
+  let(:profile) { mock(:level => 1, 
+                       :current_attempts => 0).as_null_object }
+  let(:game) { Githug::Game.new }
+  let(:level) { mock(:full_description => nil, :setup_level => nil) }
+
   before(:each) do
-    @profile = mock.as_null_object
-    Githug::Profile.stub(:new).and_return(@profile)
-    @game = Githug::Game.new
-    @profile.stub(:level).and_return(1)
-    @profile.stub(:save)
-    @profile.stub(:level_bump)
-    @profile.stub(:current_attempts).and_return(0)
-    @level = mock
-    @level.stub(:full_description)
-    @level.stub(:setup_level)
+    Githug::Profile.stub(:new).and_return(profile)
+    profile.stub(:save)
+    profile.stub(:level_bump)
+
     Githug::UI.stub(:puts)
-    Githug::Level.stub(:load).and_return(@level)
+
+    Githug::Level.stub(:load).and_return(level)
   end
 
   it "should have a profile" do
-    @game.profile.should eql(@profile)
+    game.profile.should eql(profile)
   end
 
   it "should show a description if the level is 0" do
-    @level.should_not_receive(:solve)
-    @profile.stub(:level).and_return(nil)
-    @profile.should_receive(:level_bump)
+    level.should_not_receive(:solve)
+    profile.stub(:level).and_return(nil)
+    profile.should_receive(:level_bump)
     Githug::UI.should_receive(:puts).with("Welcome to Githug")
-    @game.play_level
+    game.play_level
   end
 
   describe "play_level" do
 
     it "should echo congratulations if the level is solved" do
-      @level.stub(:solve).and_return(true)
-      @profile.should_receive(:level_bump)
+      level.stub(:solve).and_return(true)
+      profile.should_receive(:level_bump)
       Githug::UI.should_receive(:success).with("Congratulations, you have solved the level")
-      @game.play_level
+      game.play_level
     end
 
     it "should echo the solution is not right" do
-      @level.stub(:solve).and_return(false)
+      level.stub(:solve).and_return(false)
       Githug::UI.should_receive(:error).with("Sorry, this solution is not quite right!")
-      @game.play_level
+      game.play_level
     end
 
     it "should increment the number of failed attempts" do
-      @level.stub(:solve).and_return(false)
-      @profile.should_receive(:current_attempts=).with(1)
-      @profile.should_receive(:save)
-      @game.play_level
+      level.stub(:solve).and_return(false)
+      profile.should_receive(:current_attempts=).with(1)
+      profile.should_receive(:save)
+      game.play_level
     end
 
     it "should prompt for a hint if the user has failed 3 times." do
-      @profile.stub(:current_attempts).and_return(3)
-      @level.stub(:solve).and_return(false)
+      profile.stub(:current_attempts).and_return(3)
+      level.stub(:solve).and_return(false)
       Githug::UI.should_receive(:error).with("Sorry, this solution is not quite right!")
       Githug::UI.should_receive(:error).with("Don't forget you can type `githug hint` for a hint and `githug reset` to reset the current level")
-      @game.play_level
+      game.play_level
     end
 
   end
@@ -64,33 +64,33 @@ describe Githug::Game do
 
   describe "test_level" do
     it "Should output Valid solution if the solution is valid" do
-      @level.stub(:solve).and_return(true)
+      level.stub(:solve).and_return(true)
       Githug::UI.should_receive(:success).with("Valid solution")
-      @game.test_level(@level)
+      game.test_level(level)
     end
 
     it "Should output Invalid solution if the solution is invalid" do
-      @level.stub(:solve).and_return(false)
+      level.stub(:solve).and_return(false)
       Githug::UI.should_receive(:error).with("Invalid solution")
-      @game.test_level(@level)
+      game.test_level(level)
     end
 
     it "should call test when errors is true" do
-      @level.should_receive(:test)
-      @game.test_level(@level, true)
+      level.should_receive(:test)
+      game.test_level(level, true)
     end
   end
 
   it "should output the description of the next level" do
-    @level.should_receive(:full_description)
-    @profile.stub(:level=)
-    @game.level_bump
+    level.should_receive(:full_description)
+    profile.stub(:level=)
+    game.level_bump
   end
 
   it "should call setup_level for the next level" do
-    @level.should_receive(:setup_level)
-    @profile.stub(:level=)
-    @game.level_bump
+    level.should_receive(:setup_level)
+    profile.stub(:level=)
+    game.level_bump
   end
 
 end

data/spec/githug_spec.rb

@@ -104,6 +104,11 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the push_tags level" do
+    `git push origin master --tags`
+    `githug`.should be_solved
+  end
+
   it "should complete the commit_amend level" do
     `git add forgotten_file.rb`
     `git commit --amend -C HEAD`
@@ -172,6 +177,11 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the checkout_tag_over_branch level" do
+    `git checkout tags/v1.2`
+    `githug`.should be_solved
+  end
+
   it "should complete the branch_at level" do
     commit = `git log HEAD~1 --pretty=short | head -1 | cut -d " " -f 2`
     `git branch test_branch #{commit}`
@@ -183,6 +193,11 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the repack level" do
+    `git repack -d`
+    `githug`.should be_solved
+  end
+
   it "should complete the cherry-pick level" do
     commit = `git log new-feature --oneline  -n 3 | tail -1 | cut -d " " -f 1`
     `git cherry-pick #{commit}`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -154,6 +154,7 @@ files:
 - levels/checkout.rb
 - levels/checkout_file.rb
 - levels/checkout_tag.rb
+- levels/checkout_tag_over_branch.rb
 - levels/cherry-pick.rb
 - levels/cherry-pick/.githug/COMMIT_EDITMSG
 - levels/cherry-pick/.githug/HEAD
@@ -337,12 +338,14 @@ files:
 - levels/merge_squash.rb
 - levels/pull.rb
 - levels/push.rb
+- levels/push_tags.rb
 - levels/remote.rb
 - levels/remote_add.rb
 - levels/remote_url.rb
 - levels/rename.rb
 - levels/rename_commit.rb
 - levels/reorder.rb
+- levels/repack.rb
 - levels/reset.rb
 - levels/reset_soft.rb
 - levels/restore.rb
@@ -412,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.