githug 0.2.11 → 0.2.12

data/spec/githug/repository_spec.rb

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
 describe Githug::Repository do
-    
+
   before(:each) do
     @grit = mock
-    Grit::Repo.stub(:new).and_return(@grit) 
+    Grit::Repo.stub(:new).and_return(@grit)
     @repository = Githug::Repository.new
     @repository.stub(:create_gitignore)
   end
 
   describe "initialize" do
-    
+
     it "should call grit on initialize" do
-      Grit::Repo.should_receive(:new).with(".").and_return(@grit) 
+      Grit::Repo.should_receive(:new).with(".").and_return(@grit)
       repo = Githug::Repository.new
       repo.grit.should equal(@grit)
     end
 
     it "should contain a nil grit if the repo is invalid" do
-      Grit::Repo.should_receive(:new).and_raise(Grit::InvalidGitRepositoryError) 
+      Grit::Repo.should_receive(:new).and_raise(Grit::InvalidGitRepositoryError)
       repo = Githug::Repository.new
       repo.grit.should equal(nil)
     end
 
     it "should initialize with a location" do
-      Grit::Repo.should_receive(:new).with("test").and_return(@grit) 
+      Grit::Repo.should_receive(:new).with("test").and_return(@grit)
       repo = Githug::Repository.new("test")
     end
 
@@ -33,7 +33,7 @@ describe Githug::Repository do
   describe "reset" do
 
     before(:each) do
-      FileUtils.stub(:rm_rf) 
+      FileUtils.stub(:rm_rf)
     end
 
     it "should do nothing if the current directory isn't git_hug" do
@@ -41,7 +41,7 @@ describe Githug::Repository do
       FileUtils.should_not_receive(:rm_rf)
       @repository.reset
     end
-    
+
     it "should remove all the files except .gitignore and .profile.yml" do
       Dir.stub(:pwd).and_return("/tmp/git_hug")
       Dir.stub(:entries).and_return([".profile.yml", ".gitignore", "..", ".", "README", ".git"])
@@ -55,7 +55,7 @@ describe Githug::Repository do
   describe "create_gitignore" do
     it "should create a gitignore" do
       @repository.unstub(:create_gitignore)
-      File.stub(:exists?).and_return(true) 
+      File.stub(:exists?).and_return(true)
       Dir.should_receive(:chdir).with("git_hug")
       File.should_receive(:open).with(".gitignore", "w")
       @repository.create_gitignore
@@ -64,18 +64,18 @@ describe Githug::Repository do
 
   describe "valid?" do
     it "should be valid if grit exists" do
-      @repository.should be_valid  
+      @repository.should be_valid
     end
 
     it "should not be valid if grit does not exist" do
-      @repository.instance_variable_set("@grit", nil) 
+      @repository.instance_variable_set("@grit", nil)
       @repository.should_not be_valid
     end
   end
 
   describe "init" do
     it "should not add and commit gitignore if prompted" do
-      @repo = mock 
+      @repo = mock
       Grit::Repo.should_receive(:init).with(".").and_return(@repo)
       @repository.init
     end
@@ -83,13 +83,13 @@ describe Githug::Repository do
 
   describe "method_missing" do
     it "should deletegate to grit if the method exists" do
-      @grit.should_receive(:respond_to?).with(:valid_method).and_return(true)      
+      @grit.should_receive(:respond_to?).with(:valid_method).and_return(true)
       @grit.should_receive(:valid_method)
       @repository.valid_method
     end
 
     it "should not deletegate to grit if the method does not exist" do
-      @grit.should_receive(:respond_to?).with(:invalid_method).and_return(false)      
+      @grit.should_receive(:respond_to?).with(:invalid_method).and_return(false)
       lambda { @repository.invalid_method }.should raise_error(NoMethodError)
     end
   end

data/spec/githug/ui_spec.rb

@@ -13,12 +13,12 @@ describe Githug::UI do
   end
 
   it "should put to the stream" do
-    @ui.puts("hello") 
+    @ui.puts("hello")
     @out.string.should eql("hello\n")
   end
 
   it "should print an empty line with no arguments" do
-    @ui.puts 
+    @ui.puts
     @out.string.should eql("\n")
   end
 
@@ -33,11 +33,6 @@ describe Githug::UI do
     @ui.gets.should == "bar\n"
   end
 
-  it "should make a line" do
-    @ui.line
-    @out.string.should eql("*"*80+"\n")
-  end
-
   it "should make a wordbox" do
     word_box = <<-eof
 ********************************************************************************
@@ -48,6 +43,13 @@ describe Githug::UI do
     @out.string.should eql(word_box)
   end
 
+  it "should print a correct wordbox for uneven msg length" do
+    @ui.word_box("odd",80)
+    printed = @out.string.lines
+    first_size = printed.first.chomp.length
+
+    printed.map{ |line| line.chomp.length.should eq(first_size) }
+  end
 
   it "should request text input" do
     @in.puts "bar"
@@ -60,12 +62,12 @@ describe Githug::UI do
     @ui.should_receive(:request).with('foo? [yn] ').and_return('y')
     @ui.ask("foo?").should be_true
   end
-  
+
   it "should ask for yes/no and return false when no" do
     @ui.stub(:request).and_return('n')
     @ui.ask("foo?").should be_false
   end
-  
+
   it "should ask for yes/no and return false for any input" do
     @ui.stub(:request).and_return('aklhasdf')
     @ui.ask("foo?").should be_false
@@ -89,7 +91,7 @@ describe Githug::UI do
   end
 
   describe "Non Windows Platform" do
-    
+
     before(:each) do
       ENV.stub(:[]).with("OS").and_return("Windows_NT")
     end
@@ -106,5 +108,5 @@ describe Githug::UI do
 
   end
 
-  
+
 end

data/spec/githug_spec.rb

@@ -0,0 +1,242 @@
+require 'spec_helper'
+
+RSpec::Matchers.define :be_solved do
+  match do |actual|
+    !actual.match("Congratulations, you have solved the level").nil?
+  end
+end
+
+def skip_level
+  Githug::Profile.load.level_bump
+  `githug reset`
+end
+
+
+describe "The Game" do
+
+  before(:all) do
+    @dir = Dir.pwd
+    `rake build`
+    `gem install pkg/githug-#{Githug::VERSION}.gem`
+    FileUtils.rm_rf("/tmp/git_hug")
+    Dir.chdir("/tmp")
+    `echo "y" | githug`
+    Dir.chdir("/tmp/git_hug")
+  end
+
+  after(:all) do
+    Dir.chdir(@dir)
+  end
+
+  it "should complete the init level" do
+    `git init`
+    `githug`.should be_solved
+  end
+
+  it "should complete the add level" do
+    `git add README`
+    `githug`.should be_solved
+  end
+
+  it "should complete the commit level" do
+    `git commit -m "test message"`
+    `githug`.should be_solved
+  end
+
+
+  it "should complete the config level" do
+    skip_level #The CI server does not have git config set
+    #full_name = `git config --get user.name`.chomp
+    #email = `git config --get user.email`.chomp
+    #f = IO::popen('githug', 'w')
+    #f.puts(full_name)
+    #f.puts(email)
+    #f.close
+  end
+
+  it "should complete the clone level" do
+    `git clone https://github.com/Gazler/cloneme`
+    `githug`.should be_solved
+  end
+
+  it "should complete the clone_to_folder level" do
+    `git clone https://github.com/Gazler/cloneme my_cloned_repo`
+    `githug`.should be_solved
+  end
+
+  it "should complete the ignore level" do
+    `echo "*.swp" >> .gitignore`
+    `githug`.should be_solved
+  end
+
+  it "should complete the status level" do
+    `git ls-files --other --exclude-standard | githug`.should be_solved
+  end
+
+  it "should complete the rm level" do
+    file_name = `git status | grep deleted | cut -d " " -f 5`
+    `git rm #{file_name}`
+    `githug`.should be_solved
+  end
+
+  it "should complete the rm cached level" do
+    file_name = `git status | grep "new file" | cut -d " " -f 5`
+    `git rm --cached #{file_name}`
+    `githug`.should be_solved
+  end
+
+  it "should complete the stash level" do
+    `git stash save`
+    `githug`.should be_solved
+  end
+
+  it "should complete the rename level" do
+    `git mv oldfile.txt newfile.txt`
+    `githug`.should be_solved
+  end
+
+  it "should complete the log level" do
+    `git log --pretty=short | grep commit | cut -c 8-14 | githug`.should be_solved
+  end
+
+  it "should complete the tag level" do
+    `git tag new_tag`
+    `githug`.should be_solved
+  end
+
+  it "should complete the commit_amend level" do
+    `git add forgotten_file.rb`
+    `git commit --amend -C HEAD`
+    `githug`.should be_solved
+  end
+
+  it "should complete the reset level" do
+    `git reset HEAD to_commit_second.rb`
+    `githug`.should be_solved
+  end
+
+  it "should complete the reset_soft level" do
+    `git reset --soft HEAD^`
+    `githug`.should be_solved
+  end
+
+  it "should complete the checkout_file level" do
+    `git checkout -- config.rb`
+    `githug`.should be_solved
+  end
+
+  it "should complete the remove level" do
+    `git remote | githug`.should be_solved
+  end
+
+  it "should complete the remote_url level" do
+    `git remote -v | tail -2 | head -1 | cut -c 17-52 | githug`.should be_solved
+  end
+
+  it "should complete the pull level" do
+    `git pull origin master`
+    `githug`.should be_solved
+  end
+
+  it "should complete the remote_add level" do
+    `git remote add origin https://github.com/githug/githug`
+    `githug`.should be_solved
+  end
+
+  it "should complete the push level" do
+    `git rebase origin/master`
+    `git push origin`
+    `githug`.should be_solved
+  end
+
+  it "should complete the diff level" do
+    `echo "26" | githug`.should be_solved
+  end
+
+  it "should complete the blame level" do
+    `echo "spider man" | githug`.should be_solved
+  end
+
+  it "should complete the branch level" do
+    `git branch test_code`
+    `githug`.should be_solved
+  end
+
+  it "should complete the checkout level" do
+    `git checkout -b my_branch`
+    `githug`.should be_solved
+  end
+
+  it "should complete the checkout_tag level" do
+    `git checkout 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}`
+    `githug`.should be_solved
+  end
+
+  it "should commit the merge level" do
+    `git merge feature`
+    `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}`
+    `githug`.should be_solved
+  end
+
+  it "should complete the rename_commit level" do
+    skip_level
+  end
+
+  it "should complete the squash level" do
+    skip_level
+  end
+
+  it "should complete the merge squash level" do
+    `git merge --squash long-feature-branch`
+    `git commit -m "Merged Long Feature Branch"`
+    `githug`.should be_solved
+  end
+
+  it "should complete the reorder level" do
+    skip_level
+  end
+
+  it "should complete the bisect level" do
+    `echo "18ed2ac" | githug`.should be_solved
+  end
+
+  it "should complete the stage_lines level" do
+    skip_level
+  end
+
+  it "should complete the find_old_branch level" do
+    `git checkout solve_world_hunger`
+    `githug`.should be_solved
+  end
+
+  it "should complete the revert level" do
+    sleep 1
+    `git revert HEAD~1 --no-edit`
+    `githug`.should be_solved
+  end
+
+  it "should complete the restore level" do
+    `git reflog | grep "Restore this commit" | awk '{print $1}' | xargs git checkout`
+    `githug`.should be_solved
+  end
+
+  it "should complete the conflict level" do
+    skip_level
+  end
+
+  it "should complete the contribute level" do
+    skip_level
+  end
+
+end

metadata

@@ -1,75 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: githug
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.12
   prerelease: 
-  version: 0.2.11
 platform: ruby
-authors: 
+authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An interactive way to learn git.
-email: 
+email:
 - webmaster@gazler.com
-executables: 
+executables:
 - githug
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
+- LICENCE.txt
 - README.md
 - Rakefile
 - bin/githug
@@ -342,6 +360,29 @@ files:
 - levels/rm_cached.rb
 - levels/squash.rb
 - levels/stage_lines.rb
+- levels/stash.rb
+- levels/stash/.githug/COMMIT_EDITMSG
+- levels/stash/.githug/HEAD
+- levels/stash/.githug/config
+- levels/stash/.githug/description
+- levels/stash/.githug/hooks/applypatch-msg.sample
+- levels/stash/.githug/hooks/commit-msg.sample
+- levels/stash/.githug/hooks/post-update.sample
+- levels/stash/.githug/hooks/pre-applypatch.sample
+- levels/stash/.githug/hooks/pre-commit.sample
+- levels/stash/.githug/hooks/pre-rebase.sample
+- levels/stash/.githug/hooks/prepare-commit-msg.sample
+- levels/stash/.githug/hooks/update.sample
+- levels/stash/.githug/index
+- levels/stash/.githug/info/exclude
+- levels/stash/.githug/logs/HEAD
+- levels/stash/.githug/logs/refs/heads/master
+- levels/stash/.githug/objects/02/060592b31c9e12ffe1b282addf9537c5ef8e1f
+- levels/stash/.githug/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
+- levels/stash/.githug/objects/7f/82d7e4fba66980af16da540e18d8955518cdc2
+- levels/stash/.githug/objects/85/e560abcd7e3255dcd91982476e432f4d3d1b51
+- levels/stash/.githug/refs/heads/master
+- levels/stash/lyrics.txt
 - levels/status.rb
 - levels/tag.rb
 - lib/githug.rb
@@ -358,33 +399,30 @@ files:
 - spec/githug/profile_spec.rb
 - spec/githug/repository_spec.rb
 - spec/githug/ui_spec.rb
+- spec/githug_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: githug
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An interactive way to learn git.
 test_files: []
-