githug 0.2.9 → 0.2.10

data/levels/reset_soft.rb

@@ -0,0 +1,22 @@
+difficulty 2
+description "You committed too soon. Now you want to undo the last commit, while keeping the index."
+
+setup do
+  repo.init
+  FileUtils.touch("README")
+  repo.add("README")
+  repo.commit_all("Initial commit")
+  FileUtils.touch("newfile.rb")
+  repo.add("newfile.rb")
+  repo.commit_all("Premature commit")
+end
+
+solution do
+  return false unless File.exists?("newfile.rb") && repo.status.files.keys.include?("newfile.rb")
+  return false if repo.status.files["newfile.rb"].untracked || repo.commit_count > 1
+  true
+end
+
+hint do
+  puts "What are some options you can use with 'git reset'?"
+end

data/lib/githug/level.rb

@@ -4,7 +4,7 @@ module Githug
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
               "clone_to_folder", "ignore", "status", "rm", "rm_cached",
-              "rename", "log", "tag",  "commit_amend", "reset",
+              "rename", "log", "tag",  "commit_amend", "reset", "reset_soft",
               "checkout_file", "remote", "remote_url", "pull", "remote_add",
               "push", "diff", "blame", "branch", "checkout", "branch_at", "merge",
               "cherry-pick", "rename_commit", "squash", "merge_squash", "reorder",

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-06 00:00:00 Z
+date: 2012-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -301,6 +301,7 @@ files:
 - levels/rename_commit.rb
 - levels/reorder.rb
 - levels/reset.rb
+- levels/reset_soft.rb
 - levels/restore.rb
 - levels/revert.rb
 - levels/rm.rb