githug 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d79d4ffee6020278723a688b4a55dc3dfba4ac
-  data.tar.gz: ee2e0f4be70b93e83e5f77d8160960e27ec36c6d
+  metadata.gz: 9ef20410caf64b37405990b315bcb0a6c0534d77
+  data.tar.gz: da283777c0e13586c8ba42ac8c93461ec4274bbc
 SHA512:
-  metadata.gz: ab986424a092306825c2c11962ee68b643c5bc3384e3571839e220a354df25112c4f22bf8665c7b6ad8cb029e5b66d0aba3390f96156b487b6801fe75ea1d552
-  data.tar.gz: b44c21dec92e90bbb5241778b9455cad34ffa4894ab846fe3c0ecc4325c19c43329f13b4498b05f499f152385a1ee0b90f71843c9632b38f6d8877503a3d1dd8
+  metadata.gz: 9b32b0a9ddf2f78aeaa865b6f26b01a25e926476dc965b770f39d80ac5bf75cf740fbb4e700ca2dbcaa3c883df8a6a4740ccae7f0a0e63f4dd34eeede7217f96
+  data.tar.gz: 06ee6264ed7517a8d14de09acd95ab31b4b418d712f9eb7c1b258d70a6ce4e77855df6ce3be055f266392553313623c478a57cf42e7b7ebf23fb4e5189a3a541

data/levels/remote.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "This projects has a remote repository.  Identify it."
+description "This project has a remote repository.  Identify it."
 
 setup do
   repo.init

data/lib/githug/cli.rb

@@ -61,10 +61,16 @@ module Githug
 
       def load_level(path = nil)
         return load_level_from_profile unless path
-        return Level.load(path) if Level.list.include?(path)
+        return load_level_from_name(path) if Level.list.include?(path)
         Level.load_from_file(path)
       end
 
+      def load_level_from_name(name)
+        profile = Profile.load
+        profile.set_level(name)
+        Level.load(name)
+      end
+
       def load_level_from_profile
         profile = Profile.load
         Level.load(profile.level)

data/lib/githug/level.rb

@@ -100,7 +100,7 @@ module Githug
     end
 
     def test
-      @solution.call
+      _solution
     end
 
     def show_hint

data/lib/githug/profile.rb

@@ -41,25 +41,31 @@ module Githug
       end
     end
 
+    def set_level(name)
+      settings[:level] = name
+      reset!
+      save
+    end
+
     def level_bump
       levels = Level::LEVELS
       level_no = levels.index(settings[:level])
 
       settings[:completed_levels] << level
-
       settings[:current_levels] = levels
-
-      settings[:current_attempts] = 0
-
-      settings[:current_hint_index] = 0
-
       next_level = (levels - settings[:completed_levels]).first || levels.last
 
-      settings[:level] = next_level
-      save
+      set_level(next_level)
       next_level
     end
 
+    private
+
+    def reset!
+      settings[:current_attempts] = 0
+      settings[:current_hint_index] = 0
+    end
+
 
   end
 end

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/githug/cli_spec.rb

@@ -88,6 +88,9 @@ describe Githug::CLI do
       it "should reset the level with a level name" 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("add")
         Githug::Level.should_receive(:load).with("add").and_return(@level)
         Githug::UI.should_receive(:word_box).with("Githug")
         Githug::UI.should_receive(:puts).with("resetting level")

data/spec/githug/level_spec.rb

@@ -100,7 +100,7 @@ end
 
   describe "test" do
     it "should call solve" do
-      @level.instance_variable_get("@solution").should_receive(:call)
+      @level.should_receive(:_solution)
       @level.test
     end
   end

data/spec/githug/profile_spec.rb

@@ -31,35 +31,53 @@ describe Githug::Profile do
     profile.save
   end
 
-  describe "level_bump" do
+  describe "level methods" do
+
+    let(:profile) { Githug::Profile.load }
+
     before(:each) do
-      @profile = Githug::Profile.load
+      profile.stub(:save)
       @levels = Githug::Level::LEVELS
       Githug::Level::LEVELS = ["init", "add", "rm", "rm_cached", "diff"]
-      @profile.level = "init"
-      @profile.should_receive(:save)
+      profile.level = "init"
     end
 
     after(:each) do
       Githug::Level::LEVELS = @levels
     end
 
-    it "should bump the level" do
-      @profile.level_bump.should eql("add")
-    end
+    describe "level_bump" do
+
+
+      it "should bump the level" do
+        profile.should_receive(:set_level).with("add")
+        profile.level_bump
+      end
 
-    it "should reset the current_attempts" do
-      @profile.current_attempts = 1
-      @profile.level_bump
-      @profile.current_attempts.should eql(0)
+      it "should reset the current_attempts" do
+        profile.current_attempts = 1
+        profile.level_bump
+        profile.current_attempts.should eql(0)
+      end
+
+      it "should set the level to the first incomplete level" do
+        profile.settings.stub(:[]).with(:level).and_return("rm_cached")
+        profile.settings.stub(:[]).with(:completed_levels).and_return(["init", "add"])
+        profile.level_bump.should eql("rm")
+      end
     end
 
-    it "should set the level to the first incomplete level" do
-      @profile.settings.stub(:[]).with(:level).and_return("rm_cached")
-      @profile.settings.stub(:[]).with(:completed_levels).and_return(["init", "add"])
-      @profile.level_bump.should eql("rm")
+    describe "set_level" do
+
+      it "should set the level" do
+        profile.should_receive(:save)
+        profile.should_receive(:reset!)
+        profile.set_level("rm")
+        profile.settings[:level].should eql("rm")
+      end
+
     end
-  end
 
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec