gitnesse 0.1.3 → 0.12.5

data/test/lib/gitnesse/commit_info_test.rb

@@ -1,28 +1,16 @@
 require_relative '../../test_helper'
 
 describe Gitnesse do
-  describe "#commit_info" do
-    let(:method) { lambda { Gitnesse.commit_info } }
+  describe "#generate_commit_info" do
+    let(:method) { lambda { Gitnesse.generate_commit_info } }
 
-    describe "with a defined git username and email" do
-      before do
-        Gitnesse.expects(:read_git_config).with("user.name").returns("Bob Smith")
-        Gitnesse.expects(:read_git_config).with("user.email").returns("bob@bobsmith.com")
-      end
-
-      it { method.call.must_equal({ :name => "Bob Smith",
-                                    :email => "bob@bobsmith.com",
-                                    :message => "Update features with Gitnesse" }) }
+    before do
+      Gitnesse::GitConfig.expects(:read).with("user.name").returns("Bob Martin")
+      Gitnesse::GitConfig.expects(:read).with("user.email").returns("bob@bobmartin.com")
     end
 
-    describe "without a defined git username and email" do
-      before do
-        Gitnesse.commit_info = nil
-        Gitnesse.expects(:read_git_config).with("user.name").returns('')
-        Gitnesse.expects(:read_git_config).with("user.email").returns('')
-      end
-
-      it { method.must_raise RuntimeError }
-    end
+    it { method.call.must_equal({ :name => "Bob Martin",
+                                  :email => "bob@bobmartin.com",
+                                  :message => "Update features with Gitnesse" }) }
   end
 end

data/test/lib/gitnesse/{config_to_hash_test.rb → configuration_to_hash_test.rb}

@@ -1,13 +1,14 @@
 require_relative '../../test_helper'
 
-describe Gitnesse do
-  describe ".config_to_hash" do
-    let(:method) { lambda { Gitnesse.config_to_hash } }
+describe Gitnesse::Configuration do
+  describe ".to_hash" do
+    let(:method) { lambda { Gitnesse.configuration.to_hash } }
+
     before do
-      Gitnesse.config do
-        repository_url   "git://github.com/hybridgroup/gitnesse-demo.wiki.git"
-        branch           "wiki"
-        target_directory "feature_files"
+      Gitnesse.configure do |config|
+        config.repository_url   = "git://github.com/hybridgroup/gitnesse-demo.wiki.git"
+        config.branch           = "wiki"
+        config.target_directory = "feature_files"
       end
     end
 

data/test/lib/gitnesse/custom_branch_test.rb

@@ -1,25 +1,24 @@
 require_relative '../../test_helper'
 
-describe Gitnesse do
+describe Gitnesse::Configuration do
   describe "#branch" do
     describe "defaults to 'master'" do
-      before { Gitnesse.branch nil }
-      it { Gitnesse.branch.must_equal "master" }
+      it { Gitnesse.configuration.branch.must_equal "master" }
     end
 
     describe "when changed" do
-      before { Gitnesse.branch "wiki" }
-      it { Gitnesse.branch.must_equal "wiki" }
+      before { Gitnesse.configuration.branch = "wiki" }
+      it { Gitnesse.configuration.branch.must_equal "wiki" }
     end
 
-    describe "when changed through #config" do
+    describe "when changed through #configure" do
       before do
-        Gitnesse.config do
-          branch "wiki"
+        Gitnesse.configure do |config|
+          config.branch = "wiki"
         end
       end
 
-      it { Gitnesse.branch.must_equal "wiki" }
+      it { Gitnesse.configuration.branch.must_equal "wiki" }
     end
   end
 end

data/test/lib/gitnesse/dependencies_check_test.rb

@@ -0,0 +1,60 @@
+require_relative '../../test_helper'
+
+describe Gitnesse::Dependencies do
+  describe "#check_repository_url" do
+    let(:method) { lambda { Gitnesse::Dependencies.check_repository_url } }
+
+    describe "when repository was defined" do
+      before { Gitnesse.configuration.repository_url = "git://github.com/hybridgroup/gitnesse-demo.wiki" }
+      it { method.call.must_be_nil }
+    end
+
+    describe "when repository was not defined" do
+      before { Gitnesse.configuration.repository_url = nil }
+      it { method.must_raise(Gitnesse::Dependencies::NoRepositoryURLError) }
+    end
+  end
+
+  describe "#check_git" do
+    let(:method) { lambda { Gitnesse::Dependencies.check_git } }
+
+    describe "when git is not installed" do
+      before { Kernel.expects(:system).with("git --version").returns(false) }
+      it { method.must_raise(Gitnesse::Dependencies::NoGitError) }
+    end
+
+    describe "when git is installed" do
+      before { Kernel.expects(:system).with("git --version").returns(true) }
+      it { method.call.must_be_nil }
+    end
+  end
+
+  describe "#check_cucumber" do
+    let(:method) { lambda { Gitnesse::Dependencies.check_cucumber } }
+
+    describe "when cucumber is not installed" do
+      before { Kernel.expects(:system).with("cucumber --version").returns(false) }
+      it { method.must_raise(Gitnesse::Dependencies::NoCucumberError) }
+    end
+
+    describe "when cucumber is installed" do
+      before { Kernel.expects(:system).with("cucumber --version").returns(true) }
+      it { method.call.must_be_nil }
+    end
+  end
+
+  describe "#check_annotation_info" do
+    let(:method) { lambda { Gitnesse::Dependencies.check_annotation_info } }
+    before { Gitnesse.configuration.annotate_results = true }
+
+    describe "when info is defined" do
+      before { Gitnesse.configuration.info = "Bob Martin's workstation" }
+      it { method.call.must_be_nil }
+    end
+
+    describe "when info is not defined" do
+      before { Gitnesse.configuration.info = nil }
+      it { method.must_raise Gitnesse::Dependencies::NoAnnotationInfoError }
+    end
+  end
+end

data/test/lib/gitnesse/extract_features_test.rb

@@ -1,6 +1,6 @@
 require_relative '../../test_helper'
 
-describe Gitnesse do
+describe Gitnesse::Wiki do
   describe ".extract_features" do
     let(:data) do
       <<-EOS
@@ -33,7 +33,7 @@ Feature: Addition
 "}
     end
 
-    let(:method) { lambda { Gitnesse.extract_features(data) } }
+    let(:method) { lambda { Gitnesse::Wiki.extract_features(data) } }
 
     it { method.call.must_be_instance_of Hash }
 

data/test/lib/gitnesse/{gather_features_test.rb → gather_test.rb}

@@ -1,30 +1,30 @@
 require_relative '../../test_helper'
 
-describe Gitnesse do
-  describe ".gather_features" do
+describe Gitnesse::Features do
+  describe ".gather" do
 
     describe "when several features" do
       let(:page_features) { {"test-feature" => "feature content", "another-test-feature" => "another feature content"} }
 
-      it { Gitnesse.gather_features(page_features).must_equal "feature content" }
+      it { Gitnesse::Features.gather(page_features).must_equal "feature content" }
     end
 
     describe "when one single feature" do
       let(:page_features) { {"test-feature" => "feature content"} }
 
-      it { Gitnesse.gather_features(page_features).must_equal "feature content" }
+      it { Gitnesse::Features.gather(page_features).must_equal "feature content" }
     end
 
     describe "when no features" do
       let(:page_features) { Hash.new }
 
-      it { Gitnesse.gather_features(page_features).must_equal "" }
+      it { Gitnesse::Features.gather(page_features).must_equal "" }
     end
 
     describe "when nil" do
       let(:page_features) { nil }
 
-      it { Gitnesse.gather_features(page_features).must_equal "" }
+      it { Gitnesse::Features.gather(page_features).must_equal "" }
     end
   end
 end

data/test/lib/gitnesse/load_feature_files_into_wiki_test.rb

@@ -26,7 +26,7 @@ Feature: Addition
         file.write(feature)
       end
 
-      Dir.expects(:glob).with("#{Gitnesse.target_directory}/*.feature").returns(:feature_file_dir)
+      Dir.expects(:glob).with("#{Gitnesse.configuration.target_directory}/*.feature").returns(:feature_file_dir)
       wiki.expects(:page).with("testing").returns(wiki_page)
       Gitnesse.expects(:update_wiki_page).with(wiki_page, "testing", "blarg")
     end

data/test/lib/gitnesse/read_git_config_test.rb

@@ -1,23 +1,21 @@
 require_relative '../../test_helper'
 
-describe Gitnesse do
-  describe "#read_git_config" do
-    let(:method) { lambda { Gitnesse.read_git_config("user.email") } }
+describe Gitnesse::GitConfig do
+  describe "#read" do
+    let(:method) { lambda { Gitnesse::GitConfig.read("user.email") } }
 
     describe "when a gitconfig value is not set" do
       before do
-        $?.stubs(:success?).returns(false)
-        Gitnesse.stubs(:`).with("git config --get user.email").returns("")
-        Gitnesse.stubs(:`).with("git config --get --global user.email").returns("")
+        Gitnesse::GitConfig.stubs(:`).with("git config --get user.email").returns("")
+        Gitnesse::GitConfig.stubs(:`).with("git config --get --global user.email").returns("")
       end
 
-      it { method.call.must_equal "" }
+      it { method.must_raise(Gitnesse::GitConfig::NoValueSetError) }
     end
 
     describe "when a gitconfig value is set" do
       before do
-        $?.stubs(:success?).returns(true)
-        Gitnesse.stubs(:`).with("git config --get user.email").returns("bob@bobsmith.com\n")
+        Gitnesse::GitConfig.stubs(:`).with("git config --get user.email").returns("bob@bobsmith.com\n")
       end
 
       it { method.call.must_equal "bob@bobsmith.com" }
@@ -25,8 +23,8 @@ describe Gitnesse do
 
     describe "when a gitconfig value is set globally" do
       before do
-        Gitnesse.stubs(:`).with("git config --get user.email").returns("")
-        Gitnesse.stubs(:`).with("git config --get --global user.email").returns("bob@bobsmith.com\n")
+        Gitnesse::GitConfig.stubs(:`).with('git config --get user.email').returns('')
+        Gitnesse::GitConfig.stubs(:`).with('git config --get --global user.email').returns("bob@bobsmith.com\n")
       end
 
       it { method.call.must_equal "bob@bobsmith.com" }

data/test/lib/gitnesse/strip_results_test.rb

@@ -0,0 +1,52 @@
+require_relative "../../test_helper"
+
+describe Gitnesse::Wiki do
+  describe "#strip_results" do
+    let(:wiki_page) do
+      <<-EOS
+```gherkin
+Feature: Division
+  In order to avoid silly mistakes
+  As a math idiot
+  I want to be told the quotient of 2 numbers
+
+  Scenario: Divide two numbers
+    Given I have entered 6 into the calculator
+    And I have entered 2 into the calculator
+    When I divide
+    Then the result should be 3
+```
+`Last result was UNDEFINED: Divide two numbers`
+
+`Last result was PENDING: Divide two numbers`
+
+`Last result was FAILED: Divide two numbers`
+
+`Last result was PASSED: Divide two numbers`
+EOS
+    end
+
+    let(:expected_result) do
+      "```gherkin
+Feature: Division
+  In order to avoid silly mistakes
+  As a math idiot
+  I want to be told the quotient of 2 numbers
+
+  Scenario: Divide two numbers
+    Given I have entered 6 into the calculator
+    And I have entered 2 into the calculator
+    When I divide
+    Then the result should be 3
+```"
+    end
+
+    before do
+      Gollum::Wiki.expects(:new).returns(mock)
+    end
+
+    it "strips old results from the page" do
+      Gitnesse::Wiki.new(Dir.mktmpdir).strip_results(wiki_page).must_equal expected_result
+    end
+  end
+end

data/test/lib/gitnesse/write_file_test.rb

@@ -0,0 +1,18 @@
+require_relative '../../test_helper'
+
+describe Gitnesse::Features do
+  describe ".write_file" do
+    let(:file) { StringIO.new }
+    let(:file_path) { "#{Gitnesse.configuration.target_directory}/test.feature" }
+
+    before do
+      File.expects(:open).with(file_path, "w").yields(file)
+      Gitnesse::Features.expects(:gather).with({ "test-feature" => "feature content" }).returns("feature content")
+    end
+
+    it "writes to the file" do
+      Gitnesse::Features.write_file(file_path, { "test-feature" => "feature content" })
+      file.string.must_equal "feature content"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitnesse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.12.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,21 +123,29 @@ files:
 - bin/gitnesse
 - gitnesse.gemspec
 - lib/gitnesse.rb
+- lib/gitnesse/configuration.rb
+- lib/gitnesse/dependencies.rb
+- lib/gitnesse/features.rb
+- lib/gitnesse/git_config.rb
+- lib/gitnesse/hooks.rb
 - lib/gitnesse/railtie.rb
+- lib/gitnesse/support/hook.rb
 - lib/gitnesse/tasks.rake
 - lib/gitnesse/tasks.rb
 - lib/gitnesse/version.rb
+- lib/gitnesse/wiki.rb
 - test/lib/gitnesse/build_page_content_test.rb
-- test/lib/gitnesse/check_dependencies_test.rb
 - test/lib/gitnesse/commit_info_test.rb
-- test/lib/gitnesse/config_to_hash_test.rb
+- test/lib/gitnesse/configuration_to_hash_test.rb
 - test/lib/gitnesse/custom_branch_test.rb
+- test/lib/gitnesse/dependencies_check_test.rb
 - test/lib/gitnesse/extract_features_test.rb
-- test/lib/gitnesse/gather_features_test.rb
+- test/lib/gitnesse/gather_test.rb
 - test/lib/gitnesse/load_feature_files_into_wiki_test.rb
 - test/lib/gitnesse/read_git_config_test.rb
+- test/lib/gitnesse/strip_results_test.rb
 - test/lib/gitnesse/version_test.rb
-- test/lib/gitnesse/write_feature_file_test.rb
+- test/lib/gitnesse/write_file_test.rb
 - test/test_helper.rb
 - test/wiki_test_helper.rb
 homepage: https://github.com/hybridgroup/gitnesse
@@ -154,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842557645323661909
+      hash: 3810986427098166554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842557645323661909
+      hash: 3810986427098166554
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -172,15 +180,16 @@ specification_version: 3
 summary: Features on git-based Wiki!
 test_files:
 - test/lib/gitnesse/build_page_content_test.rb
-- test/lib/gitnesse/check_dependencies_test.rb
 - test/lib/gitnesse/commit_info_test.rb
-- test/lib/gitnesse/config_to_hash_test.rb
+- test/lib/gitnesse/configuration_to_hash_test.rb
 - test/lib/gitnesse/custom_branch_test.rb
+- test/lib/gitnesse/dependencies_check_test.rb
 - test/lib/gitnesse/extract_features_test.rb
-- test/lib/gitnesse/gather_features_test.rb
+- test/lib/gitnesse/gather_test.rb
 - test/lib/gitnesse/load_feature_files_into_wiki_test.rb
 - test/lib/gitnesse/read_git_config_test.rb
+- test/lib/gitnesse/strip_results_test.rb
 - test/lib/gitnesse/version_test.rb
-- test/lib/gitnesse/write_feature_file_test.rb
+- test/lib/gitnesse/write_file_test.rb
 - test/test_helper.rb
 - test/wiki_test_helper.rb

data/test/lib/gitnesse/check_dependencies_test.rb

@@ -1,45 +0,0 @@
-require_relative '../../test_helper'
-
-describe Gitnesse do
-  describe "#ensure_repository" do
-    let(:method) { lambda { Gitnesse.ensure_repository } }
-
-    describe "when repository was defined" do
-      before { Gitnesse.repository_url("git://github.com/hybridgroup/gitnesse-demo.wiki") }
-      it { method.call.must_be_nil }
-    end
-
-    describe "when repository was not defined" do
-      before { Gitnesse.repository_url(nil) }
-      it { method.must_raise(RuntimeError) }
-    end
-  end
-
-  describe "#ensure_git_available" do
-    let(:method) { lambda { Gitnesse.ensure_git_available } }
-
-    describe "when git is not installed" do
-      before { Kernel.expects(:system).with("git --version").returns(false) }
-      it { method.must_raise(RuntimeError) }
-    end
-
-    describe "when git is installed" do
-      before { Kernel.expects(:system).with("git --version").returns(true) }
-      it { method.call.must_be_nil }
-    end
-  end
-
-  describe "#ensure_cucumber_available" do
-    let(:method) { lambda { Gitnesse.ensure_cucumber_available } }
-
-    describe "when cucumber is not installed" do
-      before { Kernel.expects(:system).with("cucumber --version").returns(false) }
-      it { method.must_raise(RuntimeError) }
-    end
-
-    describe "when cucumber is installed" do
-      before { Kernel.expects(:system).with("cucumber --version").returns(true) }
-      it { method.call.must_be_nil }
-    end
-  end
-end