snapdragon 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97aadcc78ce94e09bf9863c15eab1d025770f72c
-  data.tar.gz: 5c005537c8cb301eedc865b49d4df0d49f24b705
+  metadata.gz: f1632da8263c3d4445832f76e9cc084c863946f2
+  data.tar.gz: 6abc0912510a43f966bdcd5a2092398f76255923
 SHA512:
-  metadata.gz: e82eccf5e685602a71fc77992c3c7b81455761643b876834cc68096efd8f0f8d5748bc710599704f2a5747bbf825a8d1d9cea560cf821438640479c032252f3a
-  data.tar.gz: 355df2ec500429b87cfb339b7eb5358bc46596ecc00a30efb0a12ec024d7543317bfe6999ff990238f3beba7a72758c6a07343721e4151b1f5ba32aee6102cf9
+  metadata.gz: 0245feb11ac0d4a2bc8b6e9ba1f04b45f24be9635c18bd12c7b27df683f5a9d0ff9d5824d8858cd93a49de00ecb989ab7e94c0b39ca9d9a98e5f601ecd5da8e8
+  data.tar.gz: a295d969bf7ff0f5e0f4bcd86c6bd9dd46deec98d3fecd09c6867031e6de83f4c4ba7a32727136f5184b01d32c7c89a512d63adabf0ec42449baac4a3c1f33d7

data/ChangeLog.markdown

@@ -6,9 +6,24 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+#### v0.1.6
+
+* snapdragon_server when given `some/spec.js:344` now opens the browser to the
+  correctly filtered URL
+  ([\#3](http://github.com/reachlocal/snapdragon/issues/3))
+* snapdragon_server now finds new files/specs on browser refresh
+  ([\#1](http://github.com/reachlocal/snapdragon/issues/1))
+* Stack traces are now exclude jasmine.js lines
+  ([\#10](http://github.com/reachlocal/snapdragon/issues/10))
+* Added stack traces to the output of failed expectations
+  ([\#14](http://github.com/reachlocal/snapdragon/issues/14))
+* Moved from inline code loading to external script tag sources
+  ([\#13](http://github.com/reachlocal/snapdragon/issues/13))
+
 #### v0.1.5
 
-* Jasmine runner now hosts files in CWD under `/:path` ([\#12](http://github.com/reachlocal/snapdragon/issues/12))
+* Jasmine runner now hosts files in CWD under `/:path`
+  ([\#12](http://github.com/reachlocal/snapdragon/issues/12))
 
 #### v0.1.4
 

data/README.markdown

@@ -32,6 +32,13 @@ running the following command:
 
 ## Quick Start Guide
 
+If you are a visual learner Brian Miller and I have put together a Free
+[Snapdragon](http://github.com/reachlocal/snapdragon) Screencast at [The Code
+Breakdown](http://codebreakdown.com) ([direct
+download](http://codebreakdown.com/screencasts/7/download)).
+
+[![It in Action](http://media.codebreakdown.com/thumbnails/tcb-0007-thumbnail-400x225.png)](http://codebreakdown.com)
+
 For those of you that like to jump right in and start playing with new tools
 follow the steps below to get started.
 

data/example/spec/bar_spec.js

@@ -0,0 +1,6 @@
+
+describe("Bar", function() {
+  it(".foo", function() {
+    bar = new Bar();
+  });
+});

data/example/spec/hoopty_spec.js

@@ -18,7 +18,14 @@ describe("Hoopty", function() {
   describe(".hello", function() {
     it("says hello there", function() {
       var f = new Hoopty();
-      expect(f.hello()).toBe("Hello There");
+      expect(f.hello()).toBe("Hello There aeuaeuo");
+    });
+  });
+
+  describe(".goodbye", function() {
+    it("says goodbye", function() {
+      var f = new Hoopty();
+      expect(f.goodbye()).toBe("goodbye");
     });
   });
 });

data/lib/snapdragon/cli_application.rb

@@ -4,8 +4,6 @@ require 'launchy'
 
 require_relative './web_application'
 require_relative './suite'
-require_relative './spec_file'
-require_relative './spec_directory'
 
 # Set the default_wait_time to something reasonable for the entire length of
 # the test suite to run. This should probably eventually be something
@@ -17,77 +15,30 @@ module Snapdragon
   class CliApplication
     def initialize(arguements)
       @args = arguements
-      @suite = Snapdragon::Suite.new
+      @suite = Snapdragon::Suite.new(arguements)
     end
 
     def run
-      parse_arguements(@args)
-      run_suite
+      session = Capybara::Session.new(:poltergeist, Snapdragon::WebApplication.new(nil, @suite))
+      if @suite.filtered?
+        session.visit("/run?spec=#{@suite.spec_query_param}")
+      else
+        session.visit("/run")
+      end
+      session.find("#testscomplete")
       return 0
     end
 
     def serve
-      parse_arguements(@args)
       server = Capybara::Server.new(Snapdragon::WebApplication.new(nil, @suite), 9292)
       server.boot
-      Launchy.open('http://localhost:9292/run')
-      trap('SIGINT') { puts "Shutting down..."; exit 0 }
-      sleep
-    end
-
-    private
-
-    def parse_arguements(arguements)
-      arguements.each do |arguement|
-        parse_arguement(arguement)
-      end
-    end
-
-    def parse_arguement(arguement)
-      if is_a_file_path_and_line_number?(arguement)
-        path, line_num_str = arguement.split(':')
-        @suite.add_spec_file(SpecFile.new(path, line_num_str.to_i))
-      elsif is_a_file_path?(arguement)
-        @suite.add_spec_file(SpecFile.new(arguement))
-      elsif is_a_directory?(arguement)
-        spec_dir = Snapdragon::SpecDirectory.new(arguement)
-        @suite.add_spec_files(spec_dir.spec_files)
-      end
-    end
-
-    def is_a_file_path_and_line_number?(arguement)
-      if arguement =~ /^[\w\/\-\d\.]+[s|S]pec\.js:\d+$/
-        return true
-      else
-        return false
-      end
-    end
-
-    def is_a_file_path?(arguement)
-      if arguement =~ /^[\w\/\-\d\.]+[s|S]pec\.js$/
-        return true
-      else
-        return false
-      end
-    end
-
-    def is_a_directory?(arguement)
-      if arguement =~ /^[\w\/\-\d\.]+$/
-        return true
-      else
-        return false
-      end
-    end
-
-    def run_suite
-      session = Capybara::Session.new(:poltergeist, Snapdragon::WebApplication.new(nil, @suite))
       if @suite.filtered?
-        session.visit("/run?spec=#{@suite.spec_query_param}")
-        session.find("#testscomplete")
+        Launchy.open("http://localhost:9292/run?spec=#{@suite.spec_query_param}")
       else
-        session.visit("/run")
-        session.find("#testscomplete")
+        Launchy.open('http://localhost:9292/run')
       end
+      trap('SIGINT') { puts "Shutting down..."; exit 0 }
+      sleep
     end
   end
 end

data/lib/snapdragon/path.rb

@@ -0,0 +1,45 @@
+require_relative './spec_directory'
+require_relative './spec_file'
+
+module Snapdragon
+  class Path
+    attr_reader :path, :line_number
+
+    def initialize(raw_path)
+      @raw_path = raw_path
+      if has_line_number?
+        @path, @line_number = raw_path.split(':')
+        @line_number = @line_number.to_i
+      else
+        @path = raw_path
+      end
+    end
+
+    def spec_files
+      if exists?
+        if is_a_directory?
+          spec_dir = Snapdragon::SpecDirectory.new(self)
+          return spec_dir.spec_files
+        else
+          return [SpecFile.new(self)]
+        end
+      end
+      return []
+    end
+
+    def has_line_number?
+      return true if @raw_path =~ /^.*:\d+$/
+      return false
+    end
+
+    private
+
+    def is_a_directory?
+      return File.directory?(@path)
+    end
+
+    def exists?
+      return File.exists?(@path)
+    end
+  end
+end

data/lib/snapdragon/resources/SnapdragonConsoleReporter.js

@@ -0,0 +1,162 @@
+jasmine.SnapdragonConsoleReporter = function(options) {
+  var print = function(msg) { console.log(msg); },
+    showColors = options.showColors || true,
+    onComplete = options.onComplete || function() {},
+    specCount,
+    failureCount,
+    passedCount,
+    failedSpecs = [],
+    pendingSpecs = [],
+    pendingCount,
+    startTimestamp,
+    endTimestamp
+    ansi = {
+      green: '\033[32m',
+      red: '\033[31m',
+      yellow: '\033[33m',
+      none: '\033[0m'
+    };
+
+  function printNewline() {
+    print("");
+  }
+
+  function colored(color, str) {
+    return showColors ? (ansi[color] + str + ansi.none) : str;
+  }
+
+  function plural(str, count) {
+    return count == 1 ? str : str + "s";
+  }
+
+  function repeat(thing, times) {
+    var arr = [];
+    for (var i = 0; i < times; i++) {
+      arr.push(thing);
+    }
+    return arr;
+  }
+
+  function indent(str, spaces) {
+    var lines = (str || '').split("\n");
+    var newArr = [];
+    for (var i = 0; i < lines.length; i++) {
+      newArr.push(repeat(" ", spaces).join("") + lines[i]);
+    }
+    return newArr.join("\n");
+  }
+
+  function specFailureDetails(spec, failure_number) {
+    print(indent(failure_number + ") " + spec.getFullName(), 2));
+
+    var resultItems = spec.results().getItems();
+    for (var i = 0; i < resultItems.length; i++) {
+      var result = resultItems[i];
+      if (result.trace.stack) {
+        print(indent(colored("red", trimStackTrace(result.trace.stack)), 6));
+      } else {
+        print(indent(colored("red", result.message), 6));
+      }
+    }
+    printNewline();
+  }
+
+  function specPendingDetails(spec) {
+    print(indent(colored("yellow", spec.getFullName()), 2));
+    printNewline();
+  }
+
+  function signalCapybaraTestsFinishedRunning() {
+    var div = document.createElement('div');
+    div.id = 'testscomplete';
+    document.body.appendChild(div);
+  }
+
+  function trimStackTrace(stackTraceString) {
+    return stackTraceString.replace(/\s*at\s*http:\/\/127.0.0.1:\d+\/jasmine-core\/jasmine\.js:\d+\s*/g, "");
+  }
+
+  // Jasmine Hooks
+
+  this.log = function() {
+  };
+
+  this.reportRunnerStarting = function() {
+    startTimestamp = new Date().getTime();
+    specCount = 0;
+    failureCount = 0;
+    passedCount = 0;
+    pendingCount = 0;
+    print("Running examples...");
+    printNewline();
+  };
+
+  this.reportSuiteResults = function(suite) {
+  };
+
+  this.reportSpecStarting = function() {
+  };
+
+  this.reportSpecResults = function(spec) {
+    var results = spec.results();
+
+    if (!results.skipped) { // not pending
+      specCount++;
+    }
+
+    if (results.skipped) { // when you filter out tests with spec query param
+      pendingCount++;
+      pendingSpecs.push(spec);
+    } else if (results.passed()) { // passed
+      passedCount++;
+    } else { // failed
+      failureCount++;
+      failedSpecs.push(spec);
+    }
+  };
+
+  this.reportRunnerResults = function(options) {
+    endTimestamp = new Date().getTime();
+
+    // I have commented out the pending section below because v1.3.1 of
+    // jasmine doesn't have a concept of pending. It has a concept of
+    // skipped when you filter tests using the spec query param.
+
+    // if (pendingCount > 0) {
+    //   print("Pending:");
+    // }
+
+    // for (var i = 0; i < pendingSpecs.length; i++) {
+    //   specPendingDetails(pendingSpecs[i]);
+    // }
+
+    if (failureCount > 0) {
+      print("Failures:");
+      printNewline();
+    }
+
+    for (var i = 0; i < failedSpecs.length; i++) {
+      specFailureDetails(failedSpecs[i], i + 1);
+    }
+
+    var specCounts = specCount + " " + plural("example", specCount) + ", " + failureCount + " " + plural("failure", failureCount);
+
+    if (pendingCount) {
+      specCounts += ", " + pendingCount + " skipped";
+    }
+    
+    var seconds = (endTimestamp - startTimestamp) / 1000.0;
+    print("Finished in " + seconds + " " + plural("second", seconds));
+
+    if (failureCount > 0) { // have any failures
+      print(colored("red", specCounts));
+    // } else if (pendingCount > 0) {
+    //   print(colored("yellow", specCounts));
+    } else {
+      print(colored("green", specCounts));
+    }
+
+    onComplete();
+    signalCapybaraTestsFinishedRunning();
+  };
+};

data/lib/snapdragon/spec_directory.rb

@@ -7,13 +7,13 @@ module Snapdragon
     end
 
     def spec_files
-      spec_paths = []
-      Dir.glob("#{@path}/**/*").each do |path|
-        if path =~ /^[\w\/\-\d]+[s|S]pec\.js$/
-          spec_paths << Snapdragon::SpecFile.new(path)
+      spec_file_objs = []
+      Dir.glob("#{@path.path}/**/*").each do |raw_path|
+        if raw_path =~ /^[\w\/\-\d]+[s|S]pec\.js$/
+          spec_file_objs << Snapdragon::SpecFile.new(Snapdragon::Path.new(raw_path))
         end
       end
-      return spec_paths
+      return spec_file_objs
     end
   end
 end

data/lib/snapdragon/spec_file.rb

@@ -1,19 +1,15 @@
 module Snapdragon
   class SpecFile
-    def initialize(path, line_number = nil)
+    def initialize(path)
       @path = path
-      @line_number = line_number
     end
 
-    def read
-      f = File.open(File.expand_path(@path), 'r')
-      content = f.read
-      f.close
-      return content
+    def relative_url_path
+      File.join('/', @path.path)
     end
 
     def require_paths
-      f = File.open(File.expand_path(@path), 'r')
+      f = File.open(File.expand_path(@path.path), 'r')
       lines = f.readlines
       f.close
 
@@ -21,7 +17,7 @@ module Snapdragon
 
       lines.each do |line|
         if line =~ /\/\/+\s+require_relative\(['"](.+)['"]\)\s+$/
-          require_paths << File.expand_path(File.join(File.dirname(@path), $1))
+          require_paths << File.join('/', File.join(File.dirname(@path.path), $1))
         end
       end
 
@@ -29,8 +25,7 @@ module Snapdragon
     end
 
     def filtered?
-      return true if @line_number
-      return false
+      return @path.has_line_number?
     end
 
     def spec_query_param
@@ -38,10 +33,10 @@ module Snapdragon
 
       # Work our way from the line number up to build the spec query param
       # description
-      initial_line_number = @line_number
+      initial_line_number = @path.line_number
       initial_line_index = initial_line_number - 1
 
-      f = open(File.expand_path(@path), 'r')
+      f = open(File.expand_path(@path.path), 'r')
       lines = f.readlines
       f.close
 

data/lib/snapdragon/suite.rb

@@ -1,50 +1,44 @@
+require_relative './path'
+
 module Snapdragon
   class Suite
-    def initialize
-      @specs = []
-      @require_paths = Set.new
-      @filtered = false
-      @spec_query_param = ''
+    def initialize(paths)
+      @paths = paths
     end
 
-    def add_spec_file(spec_file)
-      if spec_file.filtered?
-        @filtered = true
-        @spec_query_param = spec_file.spec_query_param
+    def spec_files
+      spec_file_objs = []
+
+      @paths.each do |raw_path|
+        path = Snapdragon::Path.new(raw_path)
+        spec_file_objs.concat(path.spec_files)
       end
-      @specs << spec_file
-      @require_paths.merge(spec_file.require_paths)
+
+      return spec_file_objs
     end
 
-    def add_spec_files(spec_files)
-      spec_files.each do |spec|
-        add_spec_file(spec)
+    def require_paths
+      require_paths = Set.new
+
+      spec_files.each do |foo|
+        require_paths.merge(foo.require_paths)
       end
-    end
 
-    def spec_files
-      @specs
+      return require_paths
     end
 
-    def output_spec_dependencies
-      require_content = "// output spec dependencies begin here\n\n"
-      @require_paths.each do |require_path|
-        require_content << "\n\n// #{require_path} begins here\n"
-        f = File.open(require_path, 'r')
-        require_content << f.read
-        require_content << "\n// #{require_path} ends here\n\n"
-        f.close
+    def filtered?
+      spec_files.each do |spec_file|
+        return true if spec_file.filtered?
       end
-      require_content << "\n// output spec dependencies end here\n"
-      return require_content
+      return false
     end
 
     def spec_query_param
-      @spec_query_param
-    end
-
-    def filtered?
-      @filtered
+      spec_files.each do |spec_file|
+        return spec_file.spec_query_param if spec_file.filtered?
+      end
+      return ''
     end
   end
 end

data/lib/snapdragon/version.rb

@@ -1,3 +1,3 @@
 module Snapdragon
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/snapdragon/views/run.erb

@@ -2,19 +2,17 @@
 <script type="text/javascript" src="/jasmine-core/jasmine.js"></script>
 <script type="text/javascript" src="/jasmine-core/jasmine-html.js"></script>
 
-<script type="text/javascript" src="/resources/ConsoleReporter.js"></script>
+<script type="text/javascript" src="/resources/SnapdragonConsoleReporter.js"></script>
 
-<script type="text/javascript">
-// The implementation code the spec files being tested need
-<%= @suite.output_spec_dependencies %>
-</script>
+<!-- The implementation code the spec files being tested need -->
+<% @suite.require_paths.each do |path| %>
+<script type="text/javascript" src="<%= path %>"></script>
+<% end %>
 
-<script type="text/javascript">
-// The spec file contents
+<!-- The spec files -->
 <% @suite.spec_files.each do |spec| %>
-<%= spec.read %>
+<script type="text/javascript" src="<%= spec.relative_url_path %>"></script>
 <% end %>
-</script>
 
 <script type="text/javascript">
   (function() {
@@ -25,9 +23,8 @@
 
     jasmineEnv.addReporter(htmlReporter);
 
-    var consoleReporterFunc = jasmine.ConsoleReporter();
-    var consoleReporter = new consoleReporterFunc({});
-    jasmineEnv.addReporter(consoleReporter);
+    var snapdragonConsoleReporter = new jasmine.SnapdragonConsoleReporter({});
+    jasmineEnv.addReporter(snapdragonConsoleReporter);
 
     jasmineEnv.specFilter = function(spec) {
       return htmlReporter.specFilter(spec);

data/spec/lib/snapdragon/cli_application_spec.rb

@@ -22,174 +22,14 @@ describe Snapdragon::CliApplication do
   end
 
   describe "#run" do
-    it "parses the given command line arguements" do
-      arguements = stub
-      app = Snapdragon::CliApplication.new(arguements)
-      app.should_receive(:parse_arguements).with(arguements)
-      app.stub(:run_suite)
-      app.run
-    end
-
-    it "runs the Jasmine suite" do
-      app = Snapdragon::CliApplication.new(['/some/path/to_some_spec.js'])
-      app.stub(:parse_arguements)
-      app.should_receive(:run_suite)
-      app.run
-    end
-    
-    it "returns 0 representing success" do
-      app = Snapdragon::CliApplication.new(['/some/path/to_some_spec.js'])
-      app.stub(:parse_arguements)
-      app.stub(:run_suite)
-      app.run.should eq(0)
-    end
-  end
-
-  describe "#parse_arguements" do
-    let(:arguements) { ['some/path/to/some_spec.js:23', 'some/path/to/some_other_spec.js'] }
-    subject { Snapdragon::CliApplication.new(arguements) }
-
-    it "iterates over each of the arguments parsing each one" do
-      subject.should_receive(:parse_arguement).with('some/path/to/some_spec.js:23')
-      subject.should_receive(:parse_arguement).with('some/path/to/some_other_spec.js')
-      subject.send(:parse_arguements, arguements)
-    end
-  end
-
-  describe "#parse_arguement" do
-    subject { Snapdragon::CliApplication.new(stub) }
-
-    context "when the arg represents a file + line number" do
-      before do
-        subject.stub(:is_a_file_path_and_line_number?).and_return(true)
-      end
-
-      it "creates a SpecFile with the specified path and line number" do
-        Snapdragon::SpecFile.should_receive(:new).with('some/path/to/some_spec.js', 45).and_return(stub.as_null_object)
-        subject.send(:parse_arguement, 'some/path/to/some_spec.js:45')
-      end
-
-      it "appends the created SpecFile to the applications Suite" do
-        spec_file = stub('spec_file')
-        suite = mock('suite')
-        subject.instance_variable_set(:@suite, suite)
-        Snapdragon::SpecFile.stub(:new).and_return(spec_file)
-        suite.should_receive(:add_spec_file).with(spec_file)
-        subject.send(:parse_arguement, 'some/path/to/some_spec.js:45')
-      end
-    end
-
-    context "when the arg represents a file without a line number" do
-      before do
-        subject.stub(:is_a_file_path_and_line_number?).and_return(false)
-        subject.stub(:is_a_file_path?).and_return(true)
-      end
-
-      it "creates a SpecFile object with the specified path" do
-        Snapdragon::SpecFile.should_receive(:new).with('some/path/to/some_spec.js').and_return(stub.as_null_object)
-        subject.send(:parse_arguement, 'some/path/to/some_spec.js')
-      end
-
-      it "appends the created SpecFile to the application Suite" do
-        spec_file = stub('spec_file')
-        suite = mock('suite')
-        subject.instance_variable_set(:@suite, suite)
-        Snapdragon::SpecFile.stub(:new).and_return(spec_file)
-        suite.should_receive(:add_spec_file).with(spec_file)
-        subject.send(:parse_arguement, 'some/path/to/some_spec.js')
-      end
-    end
-
-    context "when the arg respesents a directory" do
-      before do
-        subject.stub(:is_a_file_path_and_line_number?).and_return(false)
-        subject.stub(:is_a_file_path?).and_return(false)
-        subject.stub(:is_a_directory?).and_return(true)
-      end
-
-      it "creates a SpecDirectory with the given directory path" do
-        Snapdragon::SpecDirectory.should_receive(:new).with('some/path/to/some_directory').and_return(stub(:spec_files => []))
-        subject.send(:parse_arguement, 'some/path/to/some_directory')
-      end
-
-      it "gets all of the SpecFiles recursively identified in the SpecDirectory path" do
-        spec_dir = mock
-        Snapdragon::SpecDirectory.stub(:new).and_return(spec_dir)
-        spec_dir.should_receive(:spec_files).and_return([])
-        subject.send(:parse_arguement, 'some/path/to/some_directory')
-      end
-
-      it "appends the SpecFiles to the application Suite" do
-        spec_dir = stub('spec_dir')
-        spec_files = stub('spec_files')
-        suite = mock('suite')
-        subject.instance_variable_set(:@suite, suite)
-        Snapdragon::SpecDirectory.stub(:new).and_return(spec_dir)
-        spec_dir.stub(:spec_files).and_return(spec_files)
-        suite.should_receive(:add_spec_files).with(spec_files)
-        subject.send(:parse_arguement, 'some/path/to/some_directory')
-      end
-    end
-  end
-
-  describe "#is_a_file_path_and_line_number?" do
-    let(:arguements) { stub('arguments') }
-    subject { Snapdragon::CliApplication.new(arguements) }
-
-    context "when it matches the pattern of a file path and line number" do
-      it "returns true" do
-        subject.send(:is_a_file_path_and_line_number?, 'some/path/to/some_spec.js:534').should be_true
-      end
-    end
-    
-    context "when it does NOT match the pattern of a file path and line number" do
-      it "returns false" do
-        subject.send(:is_a_file_path_and_line_number?, 'some/path/to/some_spec.js').should be_false
-      end
-    end
-  end
-
-  describe "#is_a_file_path?" do
-    let(:arguements) { stub('arguments') }
-    subject { Snapdragon::CliApplication.new(arguements) }
-
-    context "when it matches the pattern of a file path" do
-      it "returns true" do
-        subject.send(:is_a_file_path?, 'some/path/to/some_spec.js').should be_true
-      end
-    end
-
-    context "when it does NOT match the pattern of a file path" do
-      it "returns false" do
-        subject.send(:is_a_file_path?, 'some/path/to/some.js').should be_false
-      end
-    end
-  end
-
-  describe "#is_a_directory?" do
-    let(:arguements) { stub('arguments') }
-    subject { Snapdragon::CliApplication.new(arguements) }
-
-    context "when it matches the pattern of a directory path" do
-      it "returns true" do
-        subject.send(:is_a_directory?, 'some/path/to/some_directory').should be_true
-      end
-    end
-
-    context "when it does NOT match the pattern of a directory path" do
-      it "returns false" do
-        subject.send(:is_a_directory?, 'some/path/to/some_spec.js').should be_false
-      end
-    end
-  end
-
-  describe "#run_suite" do
     let(:arguements) { stub('arguments') }
     subject { Snapdragon::CliApplication.new(arguements) }
 
     it "creates a capybara session" do
+      suite = stub(filtered?: false)
+      Snapdragon::Suite.stub(:new).and_return(suite)
       Capybara::Session.should_receive(:new).and_return(stub.as_null_object)
-      subject.send(:run_suite)
+      subject.run
     end
 
     context "when suite is filtered" do
@@ -198,10 +38,10 @@ describe Snapdragon::CliApplication do
       end
 
       it "visits /run with the spec query param in the capybara session" do
-        session = mock
+        session = mock(find: nil)
         Capybara::Session.stub(:new).and_return(session)
         session.should_receive(:visit).with("/run?spec=some_query_param_spec_filter")
-        subject.send(:run_suite)
+        subject.run
       end
     end
 
@@ -211,10 +51,10 @@ describe Snapdragon::CliApplication do
       end
 
       it "visits /run in that capybara session" do
-        session = mock
+        session = mock(find: nil)
         Capybara::Session.stub(:new).and_return(session)
         session.should_receive(:visit).with('/run')
-        subject.send(:run_suite)
+        subject.run
       end
     end
   end

data/spec/lib/snapdragon/path_spec.rb

@@ -0,0 +1,100 @@
+require_relative '../../../lib/snapdragon/path'
+
+describe Snapdragon::Path do
+  describe "#initialize" do
+    it "stores the raw path in an instance variable" do
+      path = Snapdragon::Path.new('some/path:423')
+      path.instance_variable_get(:@raw_path).should eq('some/path:423')
+    end
+
+    context "when given a path and line number" do
+      it "stores the path in an instance variable" do
+        path = Snapdragon::Path.new('some/path:423')
+        path.instance_variable_get(:@path).should eq('some/path')
+      end
+
+      it "stores the line number in an instance variable" do
+        path = Snapdragon::Path.new('some/path:423')
+        path.instance_variable_get(:@line_number).should eq(423)
+      end
+    end
+
+    context "when given a path" do
+      it "stores teh path in an instance variable" do
+        path = Snapdragon::Path.new('some/path')
+        path.instance_variable_get(:@path).should eq('some/path')
+      end
+    end
+  end
+
+  describe "#spec_files" do
+    let(:path) { Snapdragon::Path.new('some/path') }
+
+    context "when does NOT exist" do
+      before do
+        path.stub(:exists?).and_return(false)
+      end
+
+      it "returns an empty array" do
+        path.spec_files.should eq([])
+      end
+    end
+
+    context "when does exist" do
+      before do
+        path.stub(:exists?).and_return(true)
+      end
+
+      context "when is a directory" do
+        before do
+          path.stub(:is_a_directory?).and_return(true)
+        end
+
+        it "constructs a spec directory" do
+          Snapdragon::SpecDirectory.should_receive(:new).and_return(stub.as_null_object)
+          path.spec_files
+        end
+
+        it "returns the spec files recursively found in the spec directory" do
+          spec_files = stub
+          spec_dir = stub(spec_files: spec_files)
+          Snapdragon::SpecDirectory.should_receive(:new).and_return(spec_dir)
+          path.spec_files.should eq(spec_files)
+        end
+      end
+
+      context "when is NOT a directory" do
+        before do
+          path.stub(:is_a_directory?).and_return(false)
+        end
+
+        it "constructs a spec file" do
+          Snapdragon::SpecFile.should_receive(:new)
+          path.spec_files
+        end
+
+        it "returns an array containing a newly constructed spec file" do
+          spec_file = stub
+          Snapdragon::SpecFile.stub(:new).and_return(spec_file)
+          path.spec_files.should eq([spec_file])
+        end
+      end
+    end
+  end
+
+  describe "#has_line_number?" do
+    context "when the given raw path has a line number" do
+      it "returns true" do
+        path = Snapdragon::Path.new('some/path:234')
+        path.has_line_number?.should be_true
+      end
+    end
+
+    context "when the given raw path does NOT have a line number" do
+      it "returns false" do
+        path = Snapdragon::Path.new('some/path')
+        path.has_line_number?.should be_false
+      end
+    end
+  end
+end

data/spec/lib/snapdragon/spec_file_spec.rb

@@ -6,16 +6,6 @@ describe Snapdragon::SpecFile do
       spec_file = Snapdragon::SpecFile.new('some/path/to_some_spec.js')
       spec_file.instance_variable_get(:@path).should eq('some/path/to_some_spec.js')
     end
-
-    it "assigns the given line number" do
-      spec_file = Snapdragon::SpecFile.new('some/path/to_some_spec.js', 54)
-      spec_file.instance_variable_get(:@line_number).should eq(54)
-    end
-
-    it "line number defaults to nil when not assigned" do
-      spec_file = Snapdragon::SpecFile.new('some/path/to_some_spec.js')
-      spec_file.instance_variable_get(:@line_number).should eq(nil)
-    end
   end
 
   describe "#read" do

data/spec/lib/snapdragon/suite_spec.rb

@@ -2,110 +2,40 @@ require_relative '../../../lib/snapdragon/suite'
 
 describe Snapdragon::Suite do
   describe "#initialize" do
-    it "assigns an empty array to hold all the spec files" do
-      suite = Snapdragon::Suite.new
-      suite.instance_variable_get(:@specs).should eq([])
+    it "constucts an instance of a Suite given an array of paths" do
+      paths = [stub, stub, stub]
+      Snapdragon::Suite.new(paths)
     end
 
-    it "assigns an empty set to hold all the require files" do
-      suite = Snapdragon::Suite.new
-      suite.instance_variable_get(:@require_paths).should be_kind_of(Set)
-    end
-
-    it "assigns @filtered to an initial state of false" do
-      suite = Snapdragon::Suite.new
-      suite.instance_variable_get(:@filtered).should be_false
-    end
-
-    it "assigns @spec_query_param to an initial state of empty string" do
-      suite = Snapdragon::Suite.new
-      suite.instance_variable_get(:@spec_query_param).should eq('')
-    end
-  end
-
-  describe "#spec_files" do
-    it "returns the array of specs which the suite contains" do
-      spec_file = stub(:require_paths => [])
-      subject.instance_variable_set(:@specs, [spec_file])
-      subject.spec_files.should eq([spec_file])
-    end
-  end
-
-  describe "#add_spec_file" do
-    it "appends the given SpecFile to the suite of specs" do
-      spec_file = stub(:require_paths => [], :filtered? => false)
-      specs = mock
-      subject.instance_variable_set(:@specs, specs)
-      specs.should_receive(:<<).with(spec_file)
-      subject.add_spec_file(spec_file)
-    end
-
-    it "gets the require paths outlined in the spec" do
-      spec_file = mock(:filtered? => false)
-      spec_file.should_receive(:require_paths).and_return([])
-      subject.add_spec_file(spec_file)
-    end
-
-    it "contactinates the specs require paths to the suites require paths collection" do
-      spec_file = stub(:filtered? => false)
-      require_paths = stub
-      suite_require_paths = mock
-      subject.instance_variable_set(:@require_paths, suite_require_paths)
-      spec_file.stub(:require_paths).and_return(require_paths)
-      suite_require_paths.should_receive(:merge).with(require_paths)
-      subject.add_spec_file(spec_file)
-    end
-
-    context "when spec is filtered" do
-      it "assigns @filtered to true" do
-        spec_file = stub(:require_paths => [], :filtered? => true, :spec_query_param => '')
-        subject.add_spec_file(spec_file)
-        subject.instance_variable_get(:@filtered).should be_true
-      end
-
-      it "assigns @spec_query_parm to the spec_files spec_query_parma" do
-        spec_file = stub(:require_paths => [], :filtered? => true, :spec_query_param => 'some_spec_query_param')
-        subject.add_spec_file(spec_file)
-        subject.instance_variable_get(:@spec_query_param).should eq('some_spec_query_param')
-      end
-    end
-  end
-
-  describe "#add_spec_files" do
-    it "adds each of the spec files" do
-      spec_file_one = stub('spec_file_one')
-      spec_file_two = stub('spec_file_two')
-      subject.should_receive(:add_spec_file).with(spec_file_one)
-      subject.should_receive(:add_spec_file).with(spec_file_two)
-      subject.add_spec_files([spec_file_one, spec_file_two])
+    it "stores the paths in an instance variable" do
+      paths = [stub, stub, stub]
+      suite = Snapdragon::Suite.new(paths)
+      suite.instance_variable_get(:@paths).should eq(paths)
     end
   end
 
   describe "#spec_files" do
-    it "returns the internal collection of spec files" do
-      specs = stub
-      subject.instance_variable_set(:@specs, specs)
-      subject.spec_files.should eq(specs)
+    it "creates a path object to represent the path" do
+      paths = ['path_a_str', 'path_b_str']
+      suite = Snapdragon::Suite.new(paths)
+      Snapdragon::Path.should_receive(:new).with('path_a_str').and_return(stub(spec_files: []))
+      Snapdragon::Path.should_receive(:new).with('path_b_str').and_return(stub(spec_files: []))
+      suite.spec_files
     end
-  end
-
-  describe "#output_spec_dependencies" do
-    it "needs to be tested"
-  end
 
-  describe "#spec_query_param" do
-    it "returns the suites spec_query_param" do
-      spec_query_param = stub
-      subject.instance_variable_set(:@spec_query_param, spec_query_param)
-      subject.spec_query_param.should eq(spec_query_param)
+    it "returns the collection of the spec files of all of the paths" do
+      paths = ['path_a_str', 'path_b_str']
+      suite = Snapdragon::Suite.new(paths)
+      spec_file_a = stub('spec_file_a'), spec_file_b = stub('spec_file_b')
+      Snapdragon::Path.stub(:new).with('path_a_str').and_return(stub(spec_files: [spec_file_a]))
+      Snapdragon::Path.stub(:new).with('path_b_str').and_return(stub(spec_files: [spec_file_b]))
+      suite.spec_files.should eq([spec_file_a, spec_file_b])
     end
   end
 
-  describe "#filtered?" do
-    it "returns the filtered state of the suite" do
-      filtered = stub
-      subject.instance_variable_set(:@filtered, filtered)
-      subject.filtered?.should eq(filtered)
+  describe "#require_paths" do
+    it "returns the merged set of the require paths of each spec file" do
+      pending
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapdragon
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew De Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -131,12 +131,14 @@ files:
 - bin/build_jspec_filter.rb
 - bin/snapdragon
 - bin/snapdragon_server
+- example/spec/bar_spec.js
 - example/spec/hoopty_spec.js
 - example/src/hoopty.js
 - lib/snapdragon.rb
 - lib/snapdragon/cli_application.rb
+- lib/snapdragon/path.rb
 - lib/snapdragon/resources/.gitkeep
-- lib/snapdragon/resources/ConsoleReporter.js
+- lib/snapdragon/resources/SnapdragonConsoleReporter.js
 - lib/snapdragon/spec_directory.rb
 - lib/snapdragon/spec_file.rb
 - lib/snapdragon/suite.rb
@@ -146,6 +148,7 @@ files:
 - lib/snapdragon/web_application.rb
 - snapdragon.gemspec
 - spec/lib/snapdragon/cli_application_spec.rb
+- spec/lib/snapdragon/path_spec.rb
 - spec/lib/snapdragon/spec_directory_spec.rb
 - spec/lib/snapdragon/spec_file_spec.rb
 - spec/lib/snapdragon/suite_spec.rb
@@ -186,6 +189,7 @@ specification_version: 4
 summary: A command-line Jasmine JavaScript test runner.
 test_files:
 - spec/lib/snapdragon/cli_application_spec.rb
+- spec/lib/snapdragon/path_spec.rb
 - spec/lib/snapdragon/spec_directory_spec.rb
 - spec/lib/snapdragon/spec_file_spec.rb
 - spec/lib/snapdragon/suite_spec.rb

data/lib/snapdragon/resources/ConsoleReporter.js

@@ -1,163 +0,0 @@
-jasmine.ConsoleReporter = function() {
-  function ConsoleReporter(options) {
-    var print = function(msg) { console.log(msg); },
-      showColors = options.showColors || true,
-      onComplete = options.onComplete || function() {},
-      specCount,
-      failureCount,
-      passedCount,
-      failedSpecs = [],
-      pendingSpecs = [],
-      pendingCount,
-      startTimestamp,
-      endTimestamp
-      ansi = {
-        green: '\033[32m',
-        red: '\033[31m',
-        yellow: '\033[33m',
-        none: '\033[0m'
-      };
-
-    this.log = function() {
-    };
-
-    // "reportRunnerStarting",
-    this.reportRunnerStarting = function() {
-      startTimestamp = new Date().getTime();
-      specCount = 0;
-      failureCount = 0;
-      passedCount = 0;
-      pendingCount = 0;
-      print("Running examples...");
-      printNewline();
-    };
-
-    // "reportSuiteResults",
-    this.reportSuitResults = function() {
-    };
-
-    // "reportSpecStarting",
-    this.reportSpecStarting = function() {
-    };
-
-    // "reportRunnerResults",
-    this.reportRunnerResults = function(options) {
-      endTimestamp = new Date().getTime();
-
-      // I have commented out the pending section below because v1.3.1 of
-      // jasmine doesn't have a concept of pending. It has a concept of
-      // skipped when you filter tests using the spec query param.
-
-      // if (pendingCount > 0) {
-      //   print("Pending:");
-      // }
-
-      // for (var i = 0; i < pendingSpecs.length; i++) {
-      //   specPendingDetails(pendingSpecs[i]);
-      // }
-
-      if (failureCount > 0) {
-        print("Failures:");
-        printNewline();
-      }
-
-      for (var i = 0; i < failedSpecs.length; i++) {
-        specFailureDetails(failedSpecs[i], i + 1);
-      }
-
-      var specCounts = specCount + " " + plural("example", specCount) + ", " + failureCount + " " + plural("failure", failureCount);
-
-      if (pendingCount) {
-        specCounts += ", " + pendingCount + " skipped";
-      }
-      
-      var seconds = (endTimestamp - startTimestamp) / 1000.0;
-      print("Finished in " + seconds + " " + plural("second", seconds));
-
-      if (failureCount > 0) { // have any failures
-        print(colored("red", specCounts));
-      // } else if (pendingCount > 0) {
-      //   print(colored("yellow", specCounts));
-      } else {
-        print(colored("green", specCounts));
-      }
-
-      onComplete();
-      signalCapybaraTestsFinishedRunning();
-    };
-
-    // "reportSpecResults",
-    this.reportSpecResults = function(spec) {
-      var results = spec.results();
-
-      if (!results.skipped) { // not pending
-        specCount++;
-      }
-
-      if (results.skipped) { // when you filter out tests with spec query param
-        pendingCount++;
-        pendingSpecs.push(spec);
-      } else if (results.passed()) { // passed
-        passedCount++;
-      } else { // failed
-        failureCount++;
-        failedSpecs.push(spec);
-      }
-    };
-
-    return this;
-
-    function printNewline() {
-      print("");
-    }
-
-    function colored(color, str) {
-      return showColors ? (ansi[color] + str + ansi.none) : str;
-    }
-
-    function plural(str, count) {
-      return count == 1 ? str : str + "s";
-    }
-
-    function repeat(thing, times) {
-      var arr = [];
-      for (var i = 0; i < times; i++) {
-        arr.push(thing);
-      }
-      return arr;
-    }
-
-    function indent(str, spaces) {
-      var lines = (str || '').split("\n");
-      var newArr = [];
-      for (var i = 0; i < lines.length; i++) {
-        newArr.push(repeat(" ", spaces).join("") + lines[i]);
-      }
-      return newArr.join("\n");
-    }
-
-    function specFailureDetails(spec, failure_number) {
-      var results = spec.results();
-      print(indent(failure_number + ") " + spec.getFullName(), 2));
-
-      for (var i = 0; i < results.items_.length; i++) {
-        var failedExpectation = results.items_[i];
-        print(indent(colored("red", failedExpectation.message), 6));
-      }
-      printNewline();
-    }
-
-    function specPendingDetails(spec) {
-      print(indent(colored("yellow", spec.getFullName()), 2));
-      printNewline();
-    }
-
-    function signalCapybaraTestsFinishedRunning() {
-      var div = document.createElement('div');
-      div.id = 'testscomplete';
-      document.body.appendChild(div);
-    }
-  }
-
-  return ConsoleReporter;
-};