githug 0.2.5 → 0.2.6

data/levels/commit_ammend.rb

@@ -10,7 +10,11 @@ setup do
 end
 
 solution do
-		
+  # Reset config - see issue #74
+  file = File.open(".git/config", "w") do |file|
+    file.puts("[format]")
+    file.puts(" pretty = medium") 
+  end
   repo.commits.length == 1 && Grit::CommitStats.find_all(repo, repo.commits.first.sha).first[1].files.length == 2
 end
 

data/levels/restore.rb

@@ -1,5 +1,5 @@
 difficulty 4
-description "You decided to delete your latest commit by running `git checkout 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.)  You then change your mind, and want that commit back.  Restore the deleted commit."
 
 setup do
   repo.init
@@ -15,7 +15,7 @@ setup do
   repo.add        'file3'
   repo.commit_all 'Restore this commit'
 
-  repo.git.native :checkout, {}, 'HEAD^'
+  repo.git.native :reset, { "hard" => true }, 'HEAD^'
 end
 
 solution do

data/lib/githug/cli.rb

@@ -70,10 +70,6 @@ module Githug
           if UI.ask("No githug directory found, do you wish to create one?")
             Dir.mkdir("./git_hug")
             Dir.chdir("git_hug")
-            File.open(".gitignore", "w") do |file|
-              file.puts(".profile.yml")
-              file.puts(".gitignore")
-            end
           else
             UI.puts("Exiting")
             exit

data/lib/githug/level.rb

@@ -24,6 +24,7 @@ module Githug
         setup(path)
       end
 
+
       def setup(path)
         level_name = File.basename(path, File.extname(path))
         #Remove .rb extension, WTB a better way to do this

data/lib/githug/repository.rb

@@ -10,12 +10,21 @@ module Githug
     end
 
     def reset
-      dont_delete = ["..", ".", ".gitignore", ".profile.yml"]
+      dont_delete = ["..", ".", ".profile.yml"]
       if File.basename(Dir.pwd) == "git_hug"
         Dir.entries(Dir.pwd).each do |file|
           FileUtils.rm_rf(file) unless dont_delete.include?(file) 
         end
       end
+      create_gitignore
+    end
+
+    def create_gitignore
+      Dir.chdir("git_hug") if File.exists?("./git_hug")
+      File.open(".gitignore", "w") do |file|
+        file.puts(".profile.yml")
+        file.puts(".gitignore")
+      end
     end
 
     def valid?

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/githug/cli_spec.rb

@@ -19,7 +19,6 @@ describe Githug::CLI do
     Githug::UI.stub(:ask).and_return(true) 
     Dir.should_receive(:mkdir).with("./git_hug")
     Dir.should_receive(:chdir).with("git_hug")
-    File.should_receive(:open).with(".gitignore", "w").and_return(true)
     @cli.make_directory
   end
 

data/spec/githug/repository_spec.rb

@@ -6,6 +6,7 @@ describe Githug::Repository do
     @grit = mock
     Grit::Repo.stub(:new).and_return(@grit) 
     @repository = Githug::Repository.new
+    @repository.stub(:create_gitignore)
   end
 
   describe "initialize" do
@@ -50,6 +51,17 @@ describe Githug::Repository do
     end
   end
 
+
+  describe "create_gitignore" do
+    it "should create a gitignore" do
+      @repository.unstub(:create_gitignore)
+      File.stub(:exists?).and_return(true) 
+      Dir.should_receive(:chdir).with("git_hug")
+      File.should_receive(:open).with(".gitignore", "w")
+      @repository.create_gitignore
+    end
+  end
+
   describe "valid?" do
     it "should be valid if grit exists" do
       @repository.should be_valid  

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec