gusto 1.0.0.beta5 → 1.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1808ada1efad77009fd9f1496f9a51f3a323f2
-  data.tar.gz: 43061acf4d0696732bf59e3fd430f9267d677764
+  metadata.gz: e0d60b26b8242dc202dc9449165409a42d237b9f
+  data.tar.gz: b02b6c3e680e45d7ddcc7694e7d28b3b1b98f7f4
 SHA512:
-  metadata.gz: bf24f5a1eb91e800657f89e16c4283243ec8a40f3046cf5e05d1571af4fb4cdb711d4f096838fcd122ef16e89744ac51d95252668e71859b10af45c3f5aee6a0
-  data.tar.gz: 340da76b5b3868259fc03f6e2bdc55c87c5ae3e8a1d01ed85a869ac5dabe8491182af6cd16f94fe1e6769cb527edf1f4a6e5db7c6c2fbaccbdd7657c5c917210
+  metadata.gz: 696d0053da6fcabc6aae8fd7705bdf20435db33bd3b1fb743f59187772213f67f469b4b42a381837b5011c6953a045641f5f43f86c5b789b1d1c305ba2420a2d
+  data.tar.gz: 1af4df4ed92749ac953d4ee16782c6750f148759d2a5f83280c31d2d4e47f234d06460722ea5230b021a4c562319514c02e68fe51c46722bfdc9773aa69a1dd0

data/lib/gusto/configuration.rb

@@ -0,0 +1,45 @@
+module Gusto
+  module Configuration
+    class << self
+      def paths
+        [
+          File.join(Gusto.project_root, 'gusto.json'),
+          File.join(Gusto.project_root, 'config', 'gusto.json')
+        ]
+      end
+
+      def load
+        # Set configuration defaults
+        @data = {
+          'port'        => 4567,
+          'lib_paths'   => %w(lib),
+          'spec_paths'  => %w(spec)
+        }
+
+        # Load custom configuration file
+        paths.each do |path|
+          if File.exists? path
+            @data.merge! JSON.parse(File.read(path))
+            puts "Loaded configuration from “#{path}”"
+          end
+        end
+      end
+
+      def port
+        @data['port']
+      end
+
+      def port= value
+        @data['port'] = value
+      end
+
+      def lib_paths
+        @data['lib_paths']
+      end
+
+      def spec_paths
+        @data['spec_paths']
+      end
+    end
+  end
+end

data/lib/gusto/runner.rb

@@ -5,8 +5,8 @@ module Gusto
   class Runner
     def load_gusto
       require File.join(File.dirname(__FILE__), '..', 'gusto')
-      Gusto.load_configuration
-      Gusto.port = @port
+      Gusto::Configuration.load
+      Gusto::Configuration.port = @port
     end
 
     def load_gusto_version

data/lib/gusto/server.rb

@@ -4,13 +4,27 @@ require 'sinatra'
 require 'sass'
 require 'slim'
 require 'coffee-script'
+require 'sprockets'
+require 'sprockets-helpers'
 require File.expand_path(File.dirname(__FILE__) + '/../gusto')
 
 module Gusto
   class Server < Sinatra::Application
+    def self.start
+      Rack::Handler.default.run rack_app, :Port => Configuration.port
+    end
+
+    def self.rack_app
+      Rack::Builder.app do
+        map('/assets') { run Sprockets.environment }
+        map('/')       { run Server }
+      end
+    end
+
     # Configure paths
-    set :public_folder,   ROOT + '/public'
-    set :views,           ROOT + '/views'
+    set :public_folder,   File.join(Gusto.root, 'public')
+    set :views,           File.join(Gusto.root, 'views')
+    set :assets_prefix,   '/assets'
 
     # Configure slim for prettier code formatting
     Slim::Engine.set_default_options :pretty => true
@@ -18,13 +32,24 @@ module Gusto
     # Hide redundant log messages
     disable :logging
 
+    ::Sprockets::Helpers.configure do |config|
+      config.environment = Sprockets.environment
+      config.public_path = public_folder
+      config.prefix      = assets_prefix
+      config.debug       = true
+    end
+
+    helpers do
+      include ::Sprockets::Helpers
+    end
+
     # Processes request for page index
     get "/" do
       # Fetch list of all specification files in specs path
       @scripts = []
-      Gusto.specs.each do |path|
-        Dir["#{Gusto::PROJECT_ROOT}/#{path}/**/*spec.coffee"].each do |file|
-          @scripts << $1 if file.match Regexp.new("^#{Regexp.escape Gusto::PROJECT_ROOT}\\/#{Regexp.escape path}\\/(.*).coffee$")
+      Gusto::Configuration.spec_paths.each do |path|
+        Dir["#{Gusto.project_root}/#{path}/**/*spec.coffee"].each do |file|
+          @scripts << $1 if file.match Regexp.new("^#{Regexp.escape Gusto.project_root}\\/#{Regexp.escape path}\\/(.*).coffee$")
         end
       end
 

data/lib/gusto/sprockets.rb

@@ -0,0 +1,25 @@
+module Gusto
+  module Sprockets
+    class << self
+      # Prepares a Sprockets::Environment object to serve coffeescript assets
+      def environment
+        @environment ||= ::Sprockets::Environment.new.tap do |environment|
+          configure_environment(environment)
+        end
+      end
+
+      private
+
+      def configure_environment(environment)
+        environment.append_path File.join(Gusto.root, 'lib')
+        environment.append_path File.join(Gusto.root, 'assets')
+        puts "Using assets in #{all_paths.inspect}"
+        all_paths.each{ |path| environment.append_path(path) }
+      end
+
+      def all_paths
+        Configuration.lib_paths + Configuration.spec_paths
+      end
+    end
+  end
+end

data/lib/gusto/version.rb

@@ -1,3 +1,3 @@
 module Gusto
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0.beta6"
 end

data/lib/gusto.rb

@@ -8,55 +8,21 @@ require 'json'
 require File.join(File.dirname(__FILE__), 'gusto', 'version')
 
 module Gusto
-  ROOT            = File.expand_path File.join(File.dirname(__FILE__), '..')
-  PROJECT_ROOT    = File.expand_path "."
-
-  CONFIG_PATHS    = [
-    File.join(PROJECT_ROOT, 'gusto.json'),
-    File.join(PROJECT_ROOT, 'config', 'gusto.json')
-  ]
-
-  @configuration  = {}
+  autoload :Configuration,  File.join(File.dirname(__FILE__), 'gusto', 'configuration')
+  autoload :Server,         File.join(File.dirname(__FILE__), 'gusto', 'server')
+  autoload :Sprockets,      File.join(File.dirname(__FILE__), 'gusto', 'sprockets')
 
   class << self
-
-    def load_configuration
-      # Set configuration defaults
-      @configuration['port']  = 4567
-      @configuration['lib_paths']   = %w(lib)
-      @configuration['spec_paths']  = %w(spec)
-
-      # Load custom configuration file
-      CONFIG_PATHS.each do |path|
-        if File.exists? path
-          @configuration.merge! JSON.parse(File.read(path))
-          puts "Loaded configuration from “#{path}”"
-        end
-      end
-    end
-
-    def port
-      @configuration['port']
+    def root
+      File.expand_path File.join(File.dirname(__FILE__), '..')
     end
 
-    def port= value
-      @configuration['port'] = value
+    def project_root
+      File.expand_path "."
     end
 
     def root_url
-      "http://localhost:#{port}/"
-    end
-
-    def libs
-      @configuration['lib_paths']
-    end
-
-    def specs
-      @configuration['spec_paths']
-    end
-
-    def all_paths
-      libs + specs
+      "http://localhost:#{Configuration.port}/"
     end
 
     def server
@@ -80,32 +46,8 @@ module Gusto
       Process.waitall
     end
 
-    # Prepares a Sprockets::Environment object to serve coffeescript assets
-    def sprockets_environment
-      @environment ||= Sprockets::Environment.new.tap do |environment|
-        environment.append_path File.join(ROOT, 'lib')
-        environment.append_path File.join(ROOT, 'assets')
-        all_paths.each do |path|
-          environment.append_path path
-        end
-      end
-    end
-
-    def start_server
-      app = Rack::Builder.app do
-        map '/assets' do
-          run Gusto::sprockets_environment
-        end
-
-        map '/' do
-          run Gusto::Server
-        end
-      end
-      Rack::Handler.default.run app, :Port => port
-    end
-
     def spawn_server
-      @server = Process.fork{ $0 = 'gusto server'; start_server }
+      @server = Process.fork{ $0 = 'gusto server'; Server.start }
       wait_for_server_at(root_url)
     end
 
@@ -125,7 +67,7 @@ module Gusto
     def watch_for_changes
       require 'listen'
 
-      @listener = Listen.to(PROJECT_ROOT)
+      @listener = Listen.to(project_root)
 
       # Match .coffee files in any project paths
       @listener.filter Regexp.new('^(' + all_paths.map{ |s| Regexp.escape s}.join('|') + ')\/.*\.coffee$')
@@ -158,5 +100,3 @@ module Gusto
     end
   end
 end
-
-require File.expand_path(File.dirname(__FILE__) + '/gusto/server')

data/views/index.slim

@@ -4,14 +4,13 @@ head
   script type="text/javascript" src="jquery-1.5.2.js"
   script type="text/javascript" src="stacktrace.js"
   script type="text/javascript" src="jsdiff.js"
-  link rel="stylesheet" href="/assets/spec.css" type="text/css"
-  script type="text/javascript" src="/assets/Spec.js"
-  script type="text/javascript" src="/assets/HtmlReport.js"
+  == stylesheet_tag 'spec'
+  == javascript_tag('Spec') + "\n"
+  == javascript_tag('HtmlReport') + "\n"
+  - @scripts.each do |script|
+    == javascript_tag(script) + "\n"
 
 body
-  javascript:
-  - @scripts.each do |file_name|
-    script type="text/javascript" src="/assets/#{{file_name.sub /\.coffee$/, '.js'}}"
   javascript:
     $(function() {
       window.report = new HtmlReport(document.body);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gusto
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
 platform: ruby
 authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +149,10 @@ files:
 - assets/spec.css.sass
 - assets/test_results.sass
 - bin/gusto
+- lib/gusto/configuration.rb
 - lib/gusto/runner.rb
 - lib/gusto/server.rb
+- lib/gusto/sprockets.rb
 - lib/gusto/version.rb
 - lib/gusto.rb
 - lib/HtmlReport.coffee
@@ -177,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Coffeescript testing framework