githug 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90475cdbf217159f69447674586c43346ec23bca
-  data.tar.gz: 3f6ae08fcf6e630fe0ff4e15734481660b5c3de0
+  metadata.gz: e8d94eb08289627d4acc9a7af8b5fcfdd2994501
+  data.tar.gz: 4be2995f158cee6c89acbce3e9a6414a7df071d5
 SHA512:
-  metadata.gz: 921a1e7f8e9bec2f4b26ae4a7530fac8e0e3cce43ba4dec7aae6dbf7ed593835e2b2c48ada93c3ed3dfda806d5388e8280fef4b999acb4715e0fc053d8443f80
-  data.tar.gz: 17b1d9dc8d7f5c2c82dfabdf946fc7664048f36a1c5049eddc2484e5a0631273ec209f2c3edbd7541a9a394d9198c61ae8a20889bd22d07818fca67bc2e5810e
+  metadata.gz: 7891476804389f2a977ed64fab255f8623ae9aa7777e7f71ccb2111e5b9b111fb639c5c0d4ee72a110d2313f54a5acb49ec5536384f997f18269301b4e5c002b
+  data.tar.gz: 604b7ae4993d21505ae5851335103334d1a6d390ca035c65cca3322833853e649c87deb506385c83d6310937834e039dfb77ff8c63af86b4134436a31c779911

data/levels/fetch.rb

@@ -52,13 +52,13 @@ solution do
   # after a git fetch command, each branch will be stored in in the .git/FETCH_HEAD file. Each branch is on its own line
   # This command will count the number of lines, which will give the number of branches 
   if File.file?('.git/FETCH_HEAD') #checks for file existance
-  	num_remote = `wc -l < .git/FETCH_HEAD`
+  	num_remote = File.read(".git/FETCH_HEAD").split("\n").count
   else
-  	num_remote = '0'
+  	num_remote = 0
   end
 
   # there should be 1 local branch and 2 remote branches for a success condition
-  if local_branches == 1 and num_remote.to_i == 2
+  if local_branches == 1 and num_remote == 2
   	result = true
   else
   	result = false

data/levels/merge_squash.rb

@@ -39,6 +39,7 @@ solution do
   result = false unless file.readline =~ /some feature/
   result = false unless file.readline =~ /getting awesomer/
   result = false unless file.readline =~ /and awesomer!/
+  file.close
 
   result
 end

data/levels/push_branch.rb

@@ -60,7 +60,7 @@ solution do
 
   #each branch consits of one line, `wc -l counts the number of lines in order to get the number of remote branches`
   #At the moment Grit doesn't support remote branch references but is on the ToDo list.  This should be revisited when Grit implements the change
-  num_remote_branches = `git branch -r | wc -l`.to_i
+  num_remote_branches = `git branch -r`.split("\n").count
 
   # counts the number of commits in the remote master branch'
   remote_master_commits = repo.commits('origin/master').count

data/levels/rebase.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "We are using a git rebase workflow and the feature branch is ready to go into master. Let's rebase the master branch into our feature branch."
+description "We are using a git rebase workflow and the feature branch is ready to go into master. Let's rebase the feature branch onto our master branch."
 
 setup do
   init_from_level

data/levels/squash.rb

@@ -4,7 +4,7 @@ description "You have committed several times but would like all those changes t
 setup do
   repo.init
   FileUtils.touch(".hidden")
-  repo.add("hidden")
+  repo.add(".hidden")
   repo.commit_all("Initial Commit")
   FileUtils.touch("README")
   repo.add("README")

data/levels/submodule.rb

@@ -0,0 +1,20 @@
+difficulty 2
+description "You want to include the files from the following repo: `https://github.com/jackmaney/githug-include-me` into a the folder `./githug-include-me`. Do this without cloning the repo or copying the files from the repo into this repo."
+
+setup do
+    repo.init
+end
+
+solution do
+    return false if not File.directory?("./githug-include-me")
+    return false if not File.exist?("./githug-include-me/README.md")
+    return false if not File.exist?("./githug-include-me/.git")
+    return false if File.directory?("./githug-include-me/.git")
+    return false if not File.exist?(".gitmodules")
+
+    return true
+end
+
+hint do
+    puts "Take a look at `git submodule`."
+end

data/lib/githug/level.rb

@@ -11,7 +11,8 @@ module Githug
               "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at",
               "delete_branch", "push_branch", "merge", "fetch", "rebase", "repack", "cherry-pick",
               "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect",
-              "stage_lines", "find_old_branch", "revert", "restore", "conflict", "contribute"]
+              "stage_lines", "find_old_branch", "revert", "restore", "conflict",
+              "submodule","contribute"]
 
     attr_accessor :level_no, :level_path, :level_name
 

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/githug_spec.rb

@@ -298,6 +298,11 @@ describe "The Game" do
     skip_level
   end
 
+  it "solves the submodule level" do
+      `git submodule add https://github.com/jackmaney/githug-include-me`
+      `githug`.should be_solved
+  end
+
   it "solves the contribute level" do
     skip_level
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -465,6 +465,7 @@ files:
 - levels/stash/.githug/refs/heads/master
 - levels/stash/lyrics.txt
 - levels/status.rb
+- levels/submodule.rb
 - levels/tag.rb
 - lib/githug.rb
 - lib/githug/cli.rb