gitnesse 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0e8d676922e813e166be577a0a5866452c9029
-  data.tar.gz: 40ca9a4ccfa71c4308a90d1f4d1f9c1dd0a4339e
+  metadata.gz: 5be94d888608f5e3f317832d868b72a51c028c85
+  data.tar.gz: c7539589e565d2331879b2b16b3810159fffe797
 SHA512:
-  metadata.gz: af6deb49255c922a75add6ce18912ba23e491b0cc7e24ee2bd4d852d1c4971b092ea08bf0e99c51d5f0c5f105e06055354137d4c0d6833bf313cc1d35d289758
-  data.tar.gz: ba274b9548f2f867dd64890e67e298d8b45d05451e227e49bddb0b1ca7a17861eb04aa236b210de3e7c17d23aec0f49803a65a4ada266fe52b9f417640c11ee9
+  metadata.gz: 281e86c029b1a61720002b5ae889a2f8f6764a276ee2819084907fa12c590e18f6b786953427ef1f087c9830fd53e76a688140b64ce85fe65a19cd65766413fd
+  data.tar.gz: e6de2276bb6dcb372aea80fc149ad89b31717c855f4dbee81d771e4746738a50ec4125a8884dbbf537bc8d8030b9e3b578227a2e4e0a8c1e682155c456adfdd4

data/lib/gitnesse/cli.rb

@@ -15,7 +15,8 @@ module Gitnesse
     end
 
     def parse(args = ARGV)
-      parser.parse! args
+      # gitnesse run will pass all arguments onto cucumber
+      parser.parse! args unless ARGV.first == "run"
 
       arg = args.shift.to_s
 

data/lib/gitnesse/cli/task/run.rb

@@ -11,12 +11,16 @@ Pulls changed features from remote git-based wiki, runs Cucumber, and pushes
 annotated results to the remote git-based wiki if the "annotate_results" setting
 is enabled.
 
+Unlike other commands, all arguments passed to gitnesse run will be passed
+through to Cucumber if you only want to run specific cukes.
+
 Examples:
   gitnesse run  # will pull changes, run cucumber, and annotate results
+  gitnesse run ./features/addition.feature
     EOS
   end
 
-  def perform
+  def perform(*args)
     load_and_check_config
     clone_wiki
     extract_features_from_wiki
@@ -27,7 +31,7 @@ Examples:
     remove_existing_results_from_wiki
 
     create_hooks
-    run_features
+    run_features(args)
     remove_hooks
 
     push_annotated_results_to_wiki
@@ -64,15 +68,19 @@ Examples:
 
   # Public: Runs Cucumber features
   #
+  # args - optional array of arguments to be passed to Cucumber
+  #
   # Returns nothing
-  def run_features
-    puts "  Running cucumber."
-    puts '  -------------------', ''
+  def run_features(args = [])
+    puts "  Running cucumber.", '  -------------------', ''
+    args = (args.empty? ? @config.features_dir : args.join(' '))
+
     if defined?(Bundler)
-      Bundler.with_clean_env { system "cucumber #{@config.features_dir}" }
+      Bundler.with_clean_env { system "bundle exec cucumber #{args}" }
     else
-      system "cucumber #{@config.features_dir}"
+      system "bundle exec cucumber #{args}"
     end
+
     puts '  -------------------', ''
   end
 

data/lib/gitnesse/hooks.rb

@@ -31,10 +31,17 @@ module Gitnesse
       Gitnesse::ConfigLoader.find_and_load
       dir = Gitnesse::DirManager.project_dir
 
-      file = scenario.file.gsub(/^#{@config.features_dir}\//, '')
+      if scenario.respond_to?(:scenario_outline)
+        file = scenario.scenario_outline.file.gsub(/^#{@config.features_dir}\//, '')
+        name = "#{scenario.scenario_outline.name}"
+        subtitle = scenario.name.gsub(/(^\|\s+|\s+\|$)/, '').gsub(/\s+\|/, ',')
+      else
+        file = scenario.file.gsub(/^#{@config.features_dir}\//, '')
+        name = scenario.name
+        subtitle = nil
+      end
 
       page = file.gsub("/", " > ")
-      name = scenario.name
       status = scenario.status
 
       @wiki = Gitnesse::Wiki.new(@config.repository_url, dir, clone: false)
@@ -42,7 +49,7 @@ module Gitnesse
 
       return unless page
 
-      page.append_result name, status
+      page.append_result name, status, subtitle
       @wiki.repo.add(page.wiki_path)
     end
   end

data/lib/gitnesse/version.rb

@@ -1,3 +1,3 @@
 module Gitnesse
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/gitnesse/wiki/page.rb

@@ -41,7 +41,11 @@ module Gitnesse
       #
       # Returns nothing
       def remove_results
-        write(read.gsub(/(\s+\!\[\].*)/, ''))
+        content = read
+        # Remove old Cucumber results, if they exist
+        content.gsub!(/(\s+\!\[\].*)/, '') unless content =~ /\s+- !\[\].*---/m
+        content.gsub!(/\s+- !\[\].*---/m, '')
+        write content
       end
 
       # Public: Appends the result of a Cucumber scenario to the feature's wiki
@@ -50,16 +54,17 @@ module Gitnesse
       # scenario - feature scenario that was run
       # status - return status of the scenario, e.g. :passed, :undefined,
       # :failing
+      # subtitle - subtitle of scenario (used for scenario outlines)
       #
       # Returns nothing
-      def append_result(scenario, status)
-        status = status.to_s
-        image = "![](https://s3.amazonaws.com/gitnesse/github/#{status}.png)"
-        string = "\n\n#{image} \`"
-        string << "Last Result For Scenario '#{scenario}': "
-        string << status.upcase
-        string << " (#{Time.now.strftime("%b %d, %Y, %-l:%M %p")} - "
-        string << "#{Gitnesse::Config.instance.identifier})\`"
+      def append_result(scenario, status, subtitle = nil)
+        image = "![](//s3.amazonaws.com/gitnesse/github/#{status.to_s}.png)"
+        time = Time.now.strftime("%b %d, %Y, %-l:%M %p")
+        identifier = Gitnesse::Config.instance.identifier
+
+        string = "\n- #{image} **#{scenario}**".chomp
+        string << "\n- **(#{subtitle})**" if subtitle
+        string << "\n- #{identifier} - #{time}\n\n---"
 
         write(read + string)
       end

data/spec/lib/config_loader_spec.rb

@@ -7,8 +7,9 @@ module Gitnesse
     describe "#find_and_load" do
       context "when no config file exists" do
         before do
-          Dir.should_receive(:glob).and_return([])
-          ConfigLoader.should_receive(:raise_error).with("Can't find a gitnesse.rb file with Gitnesse configuration.")
+          expect(Dir).to receive(:glob).and_return []
+          message = "Can't find a gitnesse.rb file with Gitnesse configuration."
+          expect(ConfigLoader).to receive(:raise_error).with message
         end
 
         it "raises an error" do
@@ -18,10 +19,10 @@ module Gitnesse
 
       context "when one config file exists" do
         before do
-          files = [Support.example_config_file_path]
-          Dir.should_receive(:glob).and_return(files)
-          ConfigLoader.should_receive(:load).and_return(true)
-          ConfigLoader.should_receive(:reject_irrelevant_files).and_return(files)
+          files = [Support.example_config_file]
+          expect(Dir).to receive(:glob).and_return(files)
+          expect(ConfigLoader).to receive(:load).and_return(true)
+          expect(ConfigLoader).to receive(:reject_irrelevant_files).and_return(files)
         end
 
         it "loads the config file" do
@@ -31,10 +32,10 @@ module Gitnesse
 
       context "when multiple config files exist" do
         before do
-          files = [Support.example_config_file_path, Support.example_config_file_path]
-          Dir.should_receive(:glob).and_return(files)
-          ConfigLoader.should_receive(:reject_irrelevant_files).and_return(files)
-          ConfigLoader.should_receive(:raise_error).with("Multiple configuration files found:", files)
+          files = [Support.example_config_file, Support.example_config_file]
+          expect(Dir).to receive(:glob).and_return(files)
+          expect(ConfigLoader).to receive(:reject_irrelevant_files).and_return(files)
+          expect(ConfigLoader).to receive(:raise_error).with("Multiple configuration files found:", files)
         end
 
         it "raises an error" do

data/spec/lib/dependency_checker_spec.rb

@@ -10,7 +10,7 @@ module Gitnesse
         checks = %w(check_git check_cucumber check_repository_url
                     check_identifier check_features_dir_exists)
         checks.each do |check|
-          checker.should_receive(check.to_sym).and_return(true)
+          expect(checker).to receive(check.to_sym).and_return(true)
         end
 
         checker.check
@@ -21,11 +21,11 @@ module Gitnesse
                     check_features_dir_exists)
 
         checks.each do |check|
-          checker.should_receive(check.to_sym).and_return(true)
+          expect(checker).to receive(check.to_sym).and_return(true)
         end
 
-        checker.should_receive(:system).with('git --version &> /dev/null').and_return(nil)
-        checker.should_receive(:display_errors)
+        expect(checker).to receive(:system).with('git --version &> /dev/null').and_return(nil)
+        expect(checker).to receive(:display_errors)
 
         checker.check
       end
@@ -35,9 +35,9 @@ module Gitnesse
       before do
         checker.instance_variable_set(:@errors, ["this is an example error"])
 
-        checker.should_receive(:puts).with("Configuration errors were found!")
-        checker.should_receive(:puts).with("  - this is an example error")
-        checker.should_receive(:abort)
+        expect(checker).to receive(:puts).with("Configuration errors were found!")
+        expect(checker).to receive(:puts).with("  - this is an example error")
+        expect(checker).to receive(:abort)
       end
 
       it "prints a note saying errors were found" do
@@ -56,7 +56,7 @@ module Gitnesse
     describe '#check_git' do
       context 'when git is installed' do
         before do
-          checker.should_receive(:system).with('git --version &> /dev/null').and_return(true)
+          expect(checker).to receive(:system).with('git --version &> /dev/null').and_return(true)
         end
 
         it 'returns true' do
@@ -66,7 +66,7 @@ module Gitnesse
 
       context 'when git is not installed' do
         before do
-          checker.should_receive(:system).with('git --version &> /dev/null').and_return(nil)
+          expect(checker).to receive(:system).with('git --version &> /dev/null').and_return(nil)
         end
 
         it 'adds an error' do
@@ -80,7 +80,7 @@ module Gitnesse
     describe '#check_cucumber' do
       context 'when cucumber is installed' do
         before do
-          checker.should_receive(:system).with('cucumber --version &> /dev/null').and_return(true)
+          expect(checker).to receive(:system).with('cucumber --version &> /dev/null').and_return(true)
         end
 
         it 'returns true' do
@@ -90,7 +90,7 @@ module Gitnesse
 
       context 'when cucumber is not installed' do
         before do
-          checker.should_receive(:system).with('cucumber --version &> /dev/null').and_return(nil)
+          expect(checker).to receive(:system).with('cucumber --version &> /dev/null').and_return(nil)
         end
 
         it 'adds an error' do
@@ -169,7 +169,7 @@ module Gitnesse
     describe "#check_features_dir_exists" do
       context "when features_dir exists" do
         before do
-          File.should_receive(:directory?).and_return(true)
+          expect(File).to receive(:directory?).and_return(true)
         end
 
         it "returns true" do
@@ -179,7 +179,7 @@ module Gitnesse
 
       context "when features_dir does not exist or is a file" do
         before do
-          File.should_receive(:directory?).and_return(false)
+          expect(File).to receive(:directory?).and_return(false)
         end
 
         it "adds an error" do

data/spec/lib/dir_manager_spec.rb

@@ -6,7 +6,7 @@ module Gitnesse
 
     describe ".make_project_dir" do
       before do
-        FileUtils.should_receive(:mkdir_p).with(path).and_return(true)
+        expect(FileUtils).to receive(:mkdir_p).with(path).and_return(true)
       end
 
       it "creates a dir based on the current project name" do
@@ -16,7 +16,7 @@ module Gitnesse
 
     describe ".remove_project_dir" do
       it "removes the wiki dir for the current project" do
-        FileUtils.should_receive(:rm_rf).with(path).and_return(true)
+        expect(FileUtils).to receive(:rm_rf).with(path).and_return(true)
         DirManager.remove_project_dir
       end
     end
@@ -24,7 +24,7 @@ module Gitnesse
     describe ".project_dir_present?" do
       context "if project dir is a directory" do
         before do
-          File.should_receive(:directory?).with(path).and_return(true)
+          expect(File).to receive(:directory?).with(path).and_return(true)
         end
 
         it "returns true" do
@@ -34,7 +34,7 @@ module Gitnesse
 
       context "if project dir does not exists" do
         before do
-          File.should_receive(:directory?).with(path).and_return(false)
+          expect(File).to receive(:directory?).with(path).and_return(false)
         end
 
         it "returns false" do

data/spec/lib/wiki/page_spec.rb

@@ -19,7 +19,7 @@ module Gitnesse
 
     describe "#read" do
       it "reads and caches the page's contents" do
-        File.should_receive(:read).with(page.wiki_path).once.and_return("test")
+        expect(File).to receive(:read).with(page.wiki_path).once.and_return("test")
 
         expect(page.read).to be_a String
         expect(page.read).to eq "test"

data/spec/support_helper.rb

@@ -1,17 +1,30 @@
 SUPPORT_FILES_DIR = File.join(File.dirname(__FILE__), "/support")
 
-Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require(f) }
+require 'fileutils'
+require 'tempfile'
+require 'tmpdir'
+
+module CliSpecs
+  def gitnesse(args)
+    out = StringIO.new
+    Gitnesse::Cli.new(out).parse(args.split(/\s+/))
+
+    out.rewind
+    out.read
+  rescue SystemExit
+    out.rewind
+    out.read
+  end
+end
+
+RSpec.configure do |c|
+  c.include CliSpecs, type: :cli
+end
 
 class Support
   class << self
-    def example_config_file_path
-      "#{SUPPORT_FILES_DIR}/example_config/gitnesse.rb"
-    end
-
     def example_config_file
-      @example_config ||= begin
-        File.read(example_config_file_path)
-      end
+      "#{SUPPORT_FILES_DIR}/example_config/gitnesse.rb"
     end
 
     def addition_feature
@@ -57,8 +70,10 @@ class Support
 ```gherkin
 #{division_feature}
 ```
+- ![](//s3.amazonaws.com/gitnesse/github/passed.png) **Divide two numbers**
+-  - Sep 06, 2013, 10:10 AM
 
-![](https://s3.amazonaws.com/gitnesse/github/passed.png) `Last Result For Scenario 'Divide two numbers': PASSED (Sep 06, 2013, 10:10 AM - )`
+---
       EOS
     end
 
@@ -77,3 +92,4 @@ class Support
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitnesse
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - www.hybridgroup.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,7 +154,6 @@ files:
 - spec/lib/wiki/page_spec.rb
 - spec/lib/wiki_spec.rb
 - spec/spec_helper.rb
-- spec/support/cli.rb
 - spec/support/example_config/gitnesse.rb
 - spec/support/example_features/addition.feature
 - spec/support/example_features/division.feature
@@ -180,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sync your feature stories using a Git-based wiki!
@@ -209,7 +208,6 @@ test_files:
 - spec/lib/wiki/page_spec.rb
 - spec/lib/wiki_spec.rb
 - spec/spec_helper.rb
-- spec/support/cli.rb
 - spec/support/example_config/gitnesse.rb
 - spec/support/example_features/addition.feature
 - spec/support/example_features/division.feature

data/spec/support/cli.rb

@@ -1,20 +0,0 @@
-require 'fileutils'
-require 'tempfile'
-require 'tmpdir'
-
-module CliSpecs
-  def gitnesse(args)
-    out = StringIO.new
-    Gitnesse::Cli.new(out).parse(args.split(/\s+/))
-
-    out.rewind
-    out.read
-  rescue SystemExit
-    out.rewind
-    out.read
-  end
-end
-
-RSpec.configure do |c|
-  c.include CliSpecs, type: :cli
-end