update some deps

features/sprockets_gems.feature

@@ -0,0 +1,7 @@
+@wip
+Feature: Sprockets Gems
+
+  Scenario: Sprockets can pull jQuery from gem
+    Given the Server is running at "test-app"
+    When I go to "/javascripts/jquery_base.js"
+    # Then I should see "sprockets_sub_function"

fixtures/test-app/source/javascripts/jquery_base.js

@@ -0,0 +1,5 @@
+//= require "jquery-ui"
+
+function then_do_stuff() {
+  
+}

lib/middleman/core_extensions/sprockets.rb

@@ -15,7 +15,7 @@ module Middleman::CoreExtensions::Sprockets
     alias :included :registered
   end
 
-  class MiddlemanEnvironment < Sprockets::Environment
+  class MiddlemanEnvironment < ::Sprockets::Environment
     def initialize(app)
       full_path = app.views
       full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
@@ -35,6 +35,13 @@ module Middleman::CoreExtensions::Sprockets
 
       # configure search paths
       append_path app.js_dir
+      
+      # jQuery for Sprockets
+      # begin
+      #   require "jquery-rails"
+      #   jquery-rails / vendor / assets / javascripts
+      # rescue LoadError
+      # end
     end
   end
   

middleman.gemspec

@@ -11,8 +11,6 @@ Gem::Specification.new do |s|
   s.homepage    = "http://middlemanapp.com"
   s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting."
 
-  s.rubyforge_project = "middleman"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -24,21 +22,22 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
-  s.add_runtime_dependency("padrino-core", ["~> 0.10.0"])
-  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0"])
+  s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
+  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
   s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
   s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
   s.add_runtime_dependency("slim", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
-  s.add_runtime_dependency("sass", ["~> 3.1.5"])
+  s.add_runtime_dependency("sass", ["~> 3.1.6"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_runtime_dependency("guard", ["~> 0.5.1"])
-  s.add_runtime_dependency("guard-livereload", ["~> 0.2.0"])
+  s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
-  s.add_development_dependency("cucumber", ["~> 0.10.0"])
+  # s.add_development_dependency("jquery-rails", ["~> 1.0.12"])
+  s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
 end