githug 0.2.11 → 0.2.12

data/levels/stash/.githug/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/levels/stash/.githug/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/levels/stash/.githug/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 02060592b31c9e12ffe1b282addf9537c5ef8e1f Anton Vasin <magnumsmail@gmail.com> 1354518787 +0400	commit (initial): Add some lyrics

data/levels/stash/.githug/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 02060592b31c9e12ffe1b282addf9537c5ef8e1f Anton Vasin <magnumsmail@gmail.com> 1354518787 +0400	commit (initial): Add some lyrics

data/levels/stash/.githug/refs/heads/master

@@ -0,0 +1 @@
+02060592b31c9e12ffe1b282addf9537c5ef8e1f

data/levels/stash/lyrics.txt

@@ -0,0 +1,13 @@
+Down in Louisiana in that sunny clime,
+They play a class of music that is super fine,
+And it makes no difference if its rain or shine,
+You can hear that that jazz band music playing all the time.
+It sounds so peculiar cause the music's queer.
+How its sweet vibration seem to fill the air.
+Then to you the whole world seems to be in rhyme.
+You want nothing else but blues-band music all the time.
+
+Ev'ry one that's nigh
+Never seems to sigh,
+Hear them loudly cry:
+Hey!

data/levels/stash.rb

@@ -0,0 +1,16 @@
+difficulty 2
+description "You've made some changes and want to work on them later. You should save them, but don't commit them"
+
+setup do
+  init_from_level
+end
+
+solution do
+  return false if `git stash list` !~ /stash@\{0\}/
+  return false if repo.status.changed.to_a.flatten.include? "lyrics.txt"
+  true
+end
+
+hint do
+  puts "It's like stashing. Try finding appropriate git command"
+end

data/levels/status.rb

@@ -12,7 +12,7 @@ end
 
 solution do
 
-  name = request("What is the full file name of the untracked file?")  
+  name = request("What is the full file name of the untracked file?")
 
   if name != "database.yml"
     return false

data/lib/githug/cli.rb

@@ -21,7 +21,7 @@ module Githug
     def test(path)
       UI.word_box("Githug")
       make_directory
-      level = Level.load_from_file(path)  
+      level = Level.load_from_file(path)
       game = Game.new
       game.test_level(level, options[:errors])
     end
@@ -61,7 +61,7 @@ module Githug
 
 
       def make_directory
-        if File.exists?("./git_hug") 
+        if File.exists?("./git_hug")
           UI.puts "Please change into the git_hug directory"
           exit
         end

data/lib/githug/game.rb

@@ -16,7 +16,7 @@ module Githug
       else
         level = Level.load(profile.level)
         if solve && level
-          if level.solve  
+          if level.solve
             UI.success "Congratulations, you have solved the level"
             level_bump
           else

data/lib/githug/level.rb

@@ -4,17 +4,18 @@ module Githug
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
               "clone_to_folder", "ignore", "status", "rm", "rm_cached",
-              "rename", "log", "tag",  "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", "rename_commit", "squash",
-              "merge_squash", "reorder", "bisect", "stage_lines",
-              "find_old_branch", "revert", "restore", "conflict", "contribute"]
+              "stash", "rename", "log", "tag",  "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",
+              "rename_commit", "squash", "merge_squash", "reorder", "bisect",
+              "stage_lines", "find_old_branch", "revert", "restore",
+              "conflict", "contribute"]
 
     attr_accessor :level_no, :level_path
-    
+
     class << self
-      
+
       def load(level_name)
         path = "#{File.dirname(__FILE__)}/../../levels/#{level_name}.rb"
         setup(path)
@@ -27,10 +28,11 @@ module Githug
 
       def setup(path)
         level_name = File.basename(path, File.extname(path))
-        #Remove .rb extension, WTB a better way to do this
-        level_path = path[0..-4]
-        level = new
+        level_path = path.chomp(File.extname(path))
+        level = self.new
+
         return false unless File.exists?(path)
+
         level.instance_eval(File.read(path))
         level.level_no = LEVELS.index(level_name) || 1
         level.level_path = level_path
@@ -57,7 +59,7 @@ module Githug
     end
 
     def setup(&block)
-      @setup = block 
+      @setup = block
     end
 
     def hint(&hint)

data/lib/githug/profile.rb

@@ -12,7 +12,7 @@ module Githug
           :current_attempts => 0,
           :current_hint_index => 0,
           :current_levels => [],
-          :completed_levels => [] 
+          :completed_levels => []
         }
 
         settings.merge! YAML::load(File.open(PROFILE_FILE)) if File.exists?(PROFILE_FILE)

data/lib/githug/repository.rb

@@ -2,7 +2,7 @@ module Githug
   class Repository
 
     attr_accessor :grit
-  
+
     def initialize(location = ".")
       @grit = Grit::Repo.new(location)
     rescue Grit::InvalidGitRepositoryError
@@ -13,7 +13,7 @@ module Githug
       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) 
+          FileUtils.rm_rf(file) unless dont_delete.include?(file)
         end
       end
       create_gitignore
@@ -37,7 +37,7 @@ module Githug
     end
 
     def method_missing(method, *args, &block)
-      if @grit && @grit.respond_to?(method) 
+      if @grit && @grit.respond_to?(method)
         return @grit.send(method, *args, &block)
       end
       super

data/lib/githug/ui.rb

@@ -5,7 +5,7 @@ module Githug
     @@in_stream = STDIN
 
     class << self
-      
+
       def out_stream=(out)
         @@out_stream = out
       end
@@ -26,26 +26,17 @@ module Githug
         @@in_stream.gets
       end
 
-      def line
-        puts("*"*80)
-      end
-
-      def word_box(string)
-        space_length = (80/2) - ((string.length/2)+1)
-        line
-        print "*"
-        print " "*space_length
-        print string
-        print " "*space_length
-        puts "*"
-        line
+      def word_box(string,width=80,char='*')
+        puts char*width
+        puts "#{char}#{string.center(width-2)}#{char}"
+        puts char*width
       end
 
       def request(msg)
         print("#{msg} ")
         gets.chomp
       end
-      
+
       def ask(msg)
         request("#{msg} [yn] ") == 'y'
       end

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/spec/githug/cli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'githug/cli'
 
 describe Githug::CLI do
-  
+
   before(:each) do
     game = mock.as_null_object
     @cli = Githug::CLI.new
@@ -11,12 +11,12 @@ describe Githug::CLI do
 
   it "should print the logo" do
     Githug::UI.should_receive(:word_box).with("Githug")
-    @cli.stub(:make_directory) 
+    @cli.stub(:make_directory)
     @cli.play
   end
 
   it "should create a directory if one does not exist" do
-    Githug::UI.stub(:ask).and_return(true) 
+    Githug::UI.stub(:ask).and_return(true)
     Dir.should_receive(:mkdir).with("./git_hug")
     Dir.should_receive(:chdir).with("git_hug")
     @cli.make_directory
@@ -25,16 +25,16 @@ describe Githug::CLI do
   it "should not make a directory if you are in the game directory" do
     Dir.stub(:pwd).and_return("/home/git_hug")
     Githug::UI.should_not_receive(:ask)
-    @cli.make_directory 
+    @cli.make_directory
   end
 
   it "should exit if the user selects no" do
-    Githug::UI.stub(:ask).and_return(false) 
+    Githug::UI.stub(:ask).and_return(false)
     lambda {@cli.make_directory}.should raise_error(SystemExit)
   end
 
   it "should prompt to change into the directory if it exists" do
-    File.stub(:exists?).and_return(true) 
+    File.stub(:exists?).and_return(true)
     Githug::UI.should_receive(:puts).with("Please change into the git_hug directory")
     lambda {@cli.make_directory}.should raise_error(SystemExit)
   end
@@ -44,7 +44,7 @@ describe Githug::CLI do
       level = mock
       game = mock
       @cli.stub(:make_directory)
-      Githug::Level.should_receive(:load_from_file).with("/foo/bar/test/level.rb").and_return(level)  
+      Githug::Level.should_receive(:load_from_file).with("/foo/bar/test/level.rb").and_return(level)
       Githug::Game.stub(:new).and_return(game)
       game.should_receive(:test_level).with(level, anything)
       @cli.test("/foo/bar/test/level.rb")
@@ -67,8 +67,8 @@ describe Githug::CLI do
     end
 
     describe "reset" do
-      
-      
+
+
       it "should reset the current level" do
         @level.should_receive(:setup_level)
         @level.should_receive(:full_description)
@@ -92,8 +92,8 @@ describe Githug::CLI do
         Githug::UI.should_receive(:puts).with("resetting level")
         @cli.reset("/foo/bar/level.rb")
       end
-    end  
+    end
 
   end
-  
+
 end

data/spec/githug/game_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Githug::Game do
-  
+
   before(:each) do
     @profile = mock.as_null_object
     Githug::Profile.stub(:new).and_return(@profile)
@@ -64,13 +64,13 @@ 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)
     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)
     end
@@ -88,9 +88,9 @@ describe Githug::Game do
   end
 
   it "should call setup_level for the next level" do
-    @level.should_receive(:setup_level)  
+    @level.should_receive(:setup_level)
     @profile.stub(:level=)
     @game.level_bump
   end
-  
+
 end

data/spec/githug/level_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'grit'
 
 describe Githug::Level do
-  
+
   before(:each) do
     @file = <<-eof
 difficulty 1
@@ -26,7 +26,7 @@ end
     File.stub(:read).and_return(@file)
     @level = Githug::Level.load("init")
     @repo = mock
-    @repo.stub(:reset) 
+    @repo.stub(:reset)
     Githug::Repository.stub(:new).and_return(@repo)
     Githug::UI.stub(:puts)
     Githug::UI.stub(:print)
@@ -38,7 +38,7 @@ end
 
 
   describe "load" do
-    
+
     it "should load the level" do
       File.stub(:dirname).and_return("")
       File.should_receive(:read).with('/../../levels/init.rb').and_return(@file)
@@ -80,13 +80,13 @@ end
 
 
   describe "solve" do
-    
+
     it "should solve the problem" do
       @level.solve.should eql(false)
     end
 
     it "should return true if the requirements have been met" do
-      Grit::Repo.stub(:new).and_return(true) 
+      Grit::Repo.stub(:new).and_return(true)
       @level.solve.should eql(true)
     end
 
@@ -94,9 +94,9 @@ end
 
   describe "test" do
     it "should call solve" do
-      @level.instance_variable_get("@solution").should_receive(:call) 
+      @level.instance_variable_get("@solution").should_receive(:call)
       @level.test
-    end  
+    end
   end
 
 
@@ -115,7 +115,7 @@ end
   describe "setup" do
 
     it "should call setup" do
-      @level.setup_level.should eql("test") 
+      @level.setup_level.should eql("test")
     end
 
     it "should not call the setup if none exists" do
@@ -124,10 +124,10 @@ end
     end
 
   end
-  
+
 
   describe "repo" do
-      
+
     it "should initialize a repository when repo is called" do
       @level.repo.should equal(@repo)
       Githug::Repository.should_not_receive(:new)
@@ -135,14 +135,14 @@ end
     end
 
     it "should call reset on setup_level" do
-      @repo.should_receive(:reset) 
+      @repo.should_receive(:reset)
       @level.setup_level
     end
 
   end
 
   describe "hint" do
-    
+
     before(:each) do
       @profile = mock.as_null_object
       Githug::Profile.stub(:load).and_return(@profile)
@@ -152,10 +152,10 @@ end
     it "should return sequential hint if there are multiple" do
       @level.should_receive(:puts).ordered.with("this is hint 1")
       @level.show_hint
-      
+
       @level.should_receive(:puts).ordered.with("this is hint 2")
       @level.show_hint
-      
+
       @level.should_receive(:puts).ordered.with("this is hint 1")
       @level.show_hint
     end
@@ -163,7 +163,7 @@ end
     it "should display a hint if there are not multiple" do
       @level.instance_variable_set("@hints", nil)
       @level.should_receive(:puts).with("this is a hint")
-      @level.show_hint 
+      @level.show_hint
     end
 
     it "should not call the hint if none exist" do
@@ -174,9 +174,9 @@ end
 
   describe "init_from_level" do
     it "should copy the files from the level folder" do
-      FileUtils.should_receive(:cp_r).with("#{@level.level_path}/.", ".") 
+      FileUtils.should_receive(:cp_r).with("#{@level.level_path}/.", ".")
       FileUtils.should_receive(:mv).with(".githug", ".git")
       @level.init_from_level
-    end  
+    end
   end
 end

data/spec/githug/profile_spec.rb

@@ -34,16 +34,16 @@ describe Githug::Profile do
   describe "level_bump" do
     before(:each) do
       @profile = Githug::Profile.load
-      @levels = Githug::Level::LEVELS 
+      @levels = Githug::Level::LEVELS
       Githug::Level::LEVELS = ["init", "add", "rm", "rm_cached", "diff"]
       @profile.level = "init"
       @profile.should_receive(:save)
     end
-      
+
     after(:each) do
       Githug::Level::LEVELS = @levels
     end
-      
+
     it "should bump the level" do
       @profile.level_bump.should eql("add")
     end
@@ -61,5 +61,5 @@ describe Githug::Profile do
     end
   end
 
-  
+
 end