githug 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0669db6aa142549b3fc2ef14253d22be30dd8a26
-  data.tar.gz: a72898cba48c26849715f2ae2a8774fe7760757b
+  metadata.gz: 902c5775d724ae3be89e0c52eb01907288680b00
+  data.tar.gz: 9f6a93e66437b2fc9c2ba49bd1bd32bb504b2900
 SHA512:
-  metadata.gz: 221cd4042f23132f2dc79126a5f555f97664560314e83f1374d450840104fc7de7072c7b641c16dc54771236073e6772a6abbbe3dbe770158d5f3262bd666144
-  data.tar.gz: eb7c00c6ceab4ee18609153d84234b7876e9fc3302f57ede7877561eec0eb346223847884080146a96d52cd19327e299369e64610929a336ebb5b77820324a3a
+  metadata.gz: e0f50cad99ed1fd09263a1c7e54d711c4d98d0adfc5d166c27050d743f1203974384d67b2a45b7be8cfbc0600467503f239dc56ebafddaa2e45962610d8460b3
+  data.tar.gz: 3a931fcdfc57acdd9500917f554c9dd3c134b31755378cc50d278bb09332706a5e4407f1399a532b9788ca90754d1e0afe873d04be2b9ecb0c0e90a4871fc6af

data/githug.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "grit", "~>2.3.0"
   s.add_dependency "thor", "~>0.14.6"
-  s.add_dependency "rake"
+  s.add_dependency "rake", "<11"
   # s.add_runtime_dependency "rest-client"
 end

data/levels/ignore.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "The text editor 'vim' creates files ending in `.swp` (swap files) for all files that are currently open.  We don't want them creeping into the repository.  Make this repository ignore `.swp` files."
+description "The text editor 'vim' creates files ending in `.swp` (swap files) for all files that are currently open.  We don't want them creeping into the repository.  Make this repository ignore those swap files which are ending in `.swp`."
 
 setup do
   repo.init

data/levels/rebase_onto.rb

@@ -0,0 +1,45 @@
+difficulty 2
+
+description "You have created your branch from `wrong_branch` and already made some commits, \
+and you realise that you needed to create your branch from `master`. \
+Rebase your commits onto `master` branch so that you don't have `wrong_branch` commits."
+
+setup do
+  readme_file  = "README.md"
+  authors_file = "authors.md"
+
+  repo.init
+  FileUtils.touch(authors_file)
+  File.open(authors_file, "w") { |f| f << "https://github.com/janis-vitols\n" }
+  repo.add(authors_file)
+  repo.commit_all("Create authors file")
+
+  repo.git.native :checkout, { "b" => true }, "wrong_branch"
+  File.open(authors_file, "w") { |f| f << "None\n" }
+  repo.add(authors_file)
+  repo.commit_all("Wrong changes")
+
+  repo.git.native :checkout, { "b" => true }, "readme-update"
+  FileUtils.touch(readme_file)
+  File.open(readme_file, "a") { |f| f << "# SuperApp\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add app name in readme")
+  File.open(readme_file, "a") { |f| f << "## About\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add `About` header in readme")
+  File.open(readme_file, "a") { |f| f << "## Install\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add `Install` header in readme")
+end
+
+solution do
+  repo.commits("readme-update").each { |commit| return false if commit.message ==  "Wrong changes" }
+  return false unless repo.commits("readme-update").length == 4
+  return false unless File.readlines("authors.md").include?("https://github.com/janis-vitols\n")
+
+  true
+end
+
+hint do
+  puts "You want to research the `git rebase` commands `--onto` argument"
+end

data/levels/submodule.rb

@@ -1,5 +1,5 @@
 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."
+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 manually cloning the repo or copying the files from the repo into this repo."
 
 setup do
     repo.init

data/lib/githug/cli.rb

@@ -38,7 +38,7 @@ module Githug
       LEVEL parameter which will reset the game to a specific level. For
       example:
 
-      > $ githug reset merge_squash
+      > $ githug reset merge_squash   # or $ githug reset 45
 
       Will reset githug to level '#45: merge_squash'
     LONGDESC
@@ -67,10 +67,16 @@ module Githug
 
       def load_level(path = nil)
         return load_level_from_profile unless path
+        return load_level_from_number(path.to_i) if path.to_i.to_s == path
         return load_level_from_name(path) if Level.list.include?(path)
         Level.load_from_file(path)
       end
 
+      def load_level_from_number(number)
+        level_name = number >= 1 ? Level.list[number - 1] : nil
+        return load_level_from_name(level_name)
+      end
+
       def load_level_from_name(name)
         profile = Profile.load
         profile.set_level(name)

data/lib/githug/level.rb

@@ -9,7 +9,7 @@ module Githug
               "commit_in_future", "reset", "reset_soft", "checkout_file", "remote",
               "remote_url", "pull", "remote_add", "push", "diff", "blame", "branch",
               "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at",
-              "delete_branch", "push_branch", "merge", "fetch", "rebase", "repack", "cherry-pick",
+              "delete_branch", "push_branch", "merge", "fetch", "rebase", "rebase_onto", "repack", "cherry-pick",
               "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect",
               "stage_lines", "find_old_branch", "revert", "restore", "conflict",
               "submodule","contribute"]

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.4.8"
+  VERSION = "0.5.0"
 end

data/spec/githug/cli_spec.rb

@@ -98,6 +98,18 @@ describe Githug::CLI do
         subject.reset("add")
       end
 
+      it "resets the level with a level number" do
+        level.should_receive(:setup_level)
+        level.should_receive(:full_description)
+        profile = mock
+        Githug::Profile.stub(:load).and_return(profile)
+        profile.should_receive(:set_level).with("rename_commit")
+        Githug::Level.should_receive(:load).with("rename_commit").and_return(level)
+        Githug::UI.should_receive(:word_box).with("Githug")
+        Githug::UI.should_receive(:puts).with("resetting level")
+        subject.reset("45")
+      end
+
       it "resets the level with a path" do
         level.should_receive(:setup_level)
         level.should_receive(:full_description)

data/spec/githug/profile_spec.rb

@@ -20,7 +20,7 @@ describe Githug::Profile do
     end
   end
 
-  it "allows method acces to getters and setters" do
+  it "allows method access to getters and setters" do
     profile = Githug::Profile.load
     profile.level.should eql(nil)
     profile.level = 1

data/spec/githug_spec.rb

@@ -237,6 +237,12 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "solves the rebase_onto level" do
+    `git checkout readme-update`
+    `git rebase --onto master wrong_branch readme-update`
+    `githug`.should be_solved
+  end
+
   it "solves the repack level" do
     `git repack -d`
     `githug`.should be_solved

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 description: An interactive way to learn git.
 email:
 - webmaster@gazler.com
@@ -74,9 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENCE.txt
 - README.md
@@ -425,6 +425,7 @@ files:
 - levels/rebase/.githug/refs/heads/feature
 - levels/rebase/.githug/refs/heads/master
 - levels/rebase/README
+- levels/rebase_onto.rb
 - levels/remote.rb
 - levels/remote_add.rb
 - levels/remote_url.rb
@@ -494,17 +495,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.