snapdragon 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1632da8263c3d4445832f76e9cc084c863946f2
-  data.tar.gz: 6abc0912510a43f966bdcd5a2092398f76255923
+  metadata.gz: 8c647d99a8ff9d5901d9f04c740dbcd44a69d2ed
+  data.tar.gz: 2dd56c5c44b89a6c095177f6d6c76e3ee8e42902
 SHA512:
-  metadata.gz: 0245feb11ac0d4a2bc8b6e9ba1f04b45f24be9635c18bd12c7b27df683f5a9d0ff9d5824d8858cd93a49de00ecb989ab7e94c0b39ca9d9a98e5f601ecd5da8e8
-  data.tar.gz: a295d969bf7ff0f5e0f4bcd86c6bd9dd46deec98d3fecd09c6867031e6de83f4c4ba7a32727136f5184b01d32c7c89a512d63adabf0ec42449baac4a3c1f33d7
+  metadata.gz: 8a5ed874e835d8eab0b2c7dafb93589fcb1fbeacd140422548b7e7b68e4d3e2c567d8ecc1cbd7179ef85f218c56c2dd82eaa4372bf10e55dea947c0e8487df1b
+  data.tar.gz: 5ea832633662226599029731286da72d534c48e21d4e637afff8b463af19509fc1bd6084dbab3442153364d96bafc615a5639b2fc2fa572c51c4dad03dddbcbd

data/ChangeLog.markdown

@@ -6,6 +6,11 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+#### v0.1.7
+
+* made require_relative directives work inside of required files
+  ([\#15](http://github.com/reachlocal/snapdragon/issues/15))
+
 #### v0.1.6
 
 * snapdragon_server when given `some/spec.js:344` now opens the browser to the

data/README.markdown

@@ -6,15 +6,21 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'snapdragon'
+```
+gem 'snapdragon'
+```
 
 And then execute:
 
-    $ bundle
+```text
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install snapdragon
+```text
+$ gem install snapdragon
+```
 
 ## Install PhantomJS
 
@@ -28,7 +34,9 @@ I recommend installing [PhantomJS](http://phantomjs.org/) using
 [Homebrew](http://mxcl.github.io/homebrew/) it can be installed as easily as
 running the following command:
 
-    $ brew install phantomjs
+```text
+$ brew install phantomjs
+```
 
 ## Quick Start Guide
 
@@ -105,26 +113,30 @@ examples.
 The following runs the describe or it block that corresponds to line number
 *23* in the *spec/javascript/foo_spec.js* file.
 
-```
-snapdragon spec/javascript/foo_spec.js:23
+```text
+$ snapdragon spec/javascript/foo_spec.js:23
 ```
 
 #### Run an entire spec file(s)
 
-```
-snapdragon spec/javascript/foo_spec.js spec/javascript/bar_spec.js
+```text
+$ snapdragon spec/javascript/foo_spec.js spec/javascript/bar_spec.js
 ```
 
 #### Run an entire directory of spec files
 
-```
-snapdragon spec/javascripts
+The following recursively explores the given directories contents for
+files that end in `spec.js` or `Spec.js` and runs the tests in the identified
+spec files.
+
+```text
+$ snapdragon spec/javascripts
 ```
 
 #### Run combination of files and directories
 
-```
-snapdragon spec/javascript custom_js/tests/foo_spec.js custom_js/test/bar_spec.js
+```text
+$ snapdragon spec/javascript custom_js/tests/foo_spec.js custom_js/test/bar_spec.js
 ```
 
 ## Usage (snapdragon_server)
@@ -137,22 +149,35 @@ useful if you want to debug some JavaScript as your browser most likely has a
 JavaScript debugger built into it. A few examples of this commands usage
 follow.
 
-#### Run specific spec files
+#### Run a specific describe/it block
 
+The following runs the describe or it block that corresponds to line number
+*23* in the *spec/javascript/foo_spec.js* file.
+
+```text
+$ snapdragon_server spec/javascript/foo_spec.js:23
 ```
-snapdragon_server spec/javascript/foo_spec.js spec/javascript/bar_spec.js
+
+#### Run specific spec files
+
+```text
+$ snapdragon_server spec/javascript/foo_spec.js spec/javascript/bar_spec.js
 ```
 
 #### Run all the specs in directories
 
-```
-snapdragon_server spec/javascript custom_js/specs
+The following recursively explores the given directories contents for
+files that end in `spec.js` or `Spec.js` and runs the tests in the identified
+spec files.
+
+```text
+$ snapdragon_server spec/javascript custom_js/specs
 ```
 
 #### Combine files and directories
 
-```
-snapdragon_server spec/javascript custom_js/tests/foo_spec.js custom_js/test/bar_spec.js
+```text
+$ snapdragon_server spec/javascript custom_js/tests/foo_spec.js custom_js/test/bar_spec.js
 ```
 
 ## // require_relative() directive

data/bin/snapdragon

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'snapdragon/cli_application'

data/bin/snapdragon_server

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'snapdragon/cli_application'

data/example/spec/bar_spec.js

@@ -1,3 +1,4 @@
+// require_relative('../spec_helper.js')
 
 describe("Bar", function() {
   it(".foo", function() {

data/example/spec/hoopty_spec.js

@@ -1,4 +1,4 @@
-// require_relative('../src/hoopty.js')
+// require_relative('../spec_helper.js')
 
 // This is just some example Jasmine spec code to test that everything would
 // work assuming that I can find a way to get the spec code loaded in here

data/example/spec_helper.js

@@ -0,0 +1,2 @@
+// require_relative('src/hoopty.js')
+// require_relative('./src/hoopty.js')

data/lib/snapdragon/file_base.rb

@@ -0,0 +1,45 @@
+require_relative './path'
+
+module Snapdragon
+  class FileBase
+    def initialize(path)
+      @path = path
+    end
+
+    def relative_url_path
+      ::File.join('/', @path.path)
+    end
+
+    def require_paths
+      f = ::File.open(::File.expand_path(@path.path), 'r')
+      lines = f.readlines
+      f.close
+
+      require_paths = []
+
+      lines.each do |line|
+        if line =~ /\/\/+\s+require_relative\(['"](.+)['"]\)\s+$/
+          require_paths << ::File.join(::File.dirname(@path.path), $1)
+        end
+      end
+
+      return require_paths
+    end
+
+    def require_files
+      files = []
+      require_paths.each do |require_path|
+        files << Snapdragon::RequireFile.new(Snapdragon::Path.new(require_path))
+      end
+      return files
+    end
+  end
+end
+
+# I was getting some weirdness I think because of Cyclic Requires between
+# require_file.rb and file_base.rb so I simply moved require_file.rb content
+# into file_base.rb and it seemed to resolve it.
+module Snapdragon
+  class RequireFile < Snapdragon::FileBase
+  end
+end

data/lib/snapdragon/path.rb

@@ -21,7 +21,7 @@ module Snapdragon
           spec_dir = Snapdragon::SpecDirectory.new(self)
           return spec_dir.spec_files
         else
-          return [SpecFile.new(self)]
+          return [Snapdragon::SpecFile.new(self)]
         end
       end
       return []
@@ -35,11 +35,11 @@ module Snapdragon
     private
 
     def is_a_directory?
-      return File.directory?(@path)
+      return ::File.directory?(@path)
     end
 
     def exists?
-      return File.exists?(@path)
+      return ::File.exists?(@path)
     end
   end
 end

data/lib/snapdragon/spec_file.rb

@@ -1,29 +1,8 @@
-module Snapdragon
-  class SpecFile
-    def initialize(path)
-      @path = path
-    end
-
-    def relative_url_path
-      File.join('/', @path.path)
-    end
-
-    def require_paths
-      f = File.open(File.expand_path(@path.path), 'r')
-      lines = f.readlines
-      f.close
-
-      require_paths = []
-
-      lines.each do |line|
-        if line =~ /\/\/+\s+require_relative\(['"](.+)['"]\)\s+$/
-          require_paths << File.join('/', File.join(File.dirname(@path.path), $1))
-        end
-      end
-
-      return require_paths
-    end
+require_relative './file_base'
+require_relative './path'
 
+module Snapdragon
+  class SpecFile < Snapdragon::FileBase
     def filtered?
       return @path.has_line_number?
     end

data/lib/snapdragon/suite.rb

@@ -17,14 +17,17 @@ module Snapdragon
       return spec_file_objs
     end
 
-    def require_paths
-      require_paths = Set.new
+    def require_files
+      return get_require_files_from_files(spec_files)
+    end
 
-      spec_files.each do |foo|
-        require_paths.merge(foo.require_paths)
+    def require_file_relative_url_paths
+      paths = Set.new
+      require_files.each do |file|
+        paths << file.relative_url_path
       end
-
-      return require_paths
+      puts "DREW: paths = #{paths.inspect}"
+      return paths
     end
 
     def filtered?
@@ -40,5 +43,16 @@ module Snapdragon
       end
       return ''
     end
+
+    private
+
+    def get_require_files_from_files(files)
+      req_files = []
+      files.each do |file|
+        req_files.concat(get_require_files_from_files(file.require_files))
+        req_files.concat(file.require_files)
+      end
+      return req_files
+    end
   end
 end

data/lib/snapdragon/version.rb

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

data/lib/snapdragon/views/run.erb

@@ -5,7 +5,7 @@
 <script type="text/javascript" src="/resources/SnapdragonConsoleReporter.js"></script>
 
 <!-- The implementation code the spec files being tested need -->
-<% @suite.require_paths.each do |path| %>
+<% @suite.require_file_relative_url_paths.each do |path| %>
 <script type="text/javascript" src="<%= path %>"></script>
 <% end %>
 

data/lib/snapdragon/web_application.rb

@@ -4,7 +4,7 @@ require 'erb'
 module Snapdragon
   class WebApplication < Sinatra::Base
     set :static, false
-    set :root, File.expand_path('.', File.dirname(__FILE__))
+    set :root, ::File.expand_path('.', ::File.dirname(__FILE__))
 
     def initialize(app = nil, suite)
       super()
@@ -16,15 +16,15 @@ module Snapdragon
     end
 
     get "/jasmine-core/*" do |path|
-      send_file File.expand_path(File.join('../jasmine/lib/jasmine-core', path), File.dirname(__FILE__))
+      send_file ::File.expand_path(::File.join('../jasmine/lib/jasmine-core', path), ::File.dirname(__FILE__))
     end
 
     get "/resources/*" do |path|
-      send_file File.expand_path(File.join('resources', path), File.dirname(__FILE__))
+      send_file ::File.expand_path(::File.join('resources', path), ::File.dirname(__FILE__))
     end
 
     get "/*" do |path|
-      send_file File.expand_path(File.join('.', path))
+      send_file ::File.expand_path(::File.join('.', path))
     end
   end
 end

data/spec/lib/snapdragon/suite_spec.rb

@@ -38,4 +38,8 @@ describe Snapdragon::Suite do
       pending
     end
   end
+
+  describe "#require_files" do
+    it "needs to be tested"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapdragon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Andrew De Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -133,9 +133,11 @@ files:
 - bin/snapdragon_server
 - example/spec/bar_spec.js
 - example/spec/hoopty_spec.js
+- example/spec_helper.js
 - example/src/hoopty.js
 - lib/snapdragon.rb
 - lib/snapdragon/cli_application.rb
+- lib/snapdragon/file_base.rb
 - lib/snapdragon/path.rb
 - lib/snapdragon/resources/.gitkeep
 - lib/snapdragon/resources/SnapdragonConsoleReporter.js