hobo_jquery_ui is now optional, so remove it as a dependency from hob…

…o_clean. Our generators now must explicitly add it to Gemfile.
sozolab · Nov 14, 2012 · a39b90f · a39b90f
1 parent ac78c07
commit a39b90f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/hobo/lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb b/hobo/lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb
@@ -18,7 +18,7 @@ def install_default_plugins
       say "Installing hobo_jquery plugin..."
       install_plugin_helper('hobo_jquery', nil, opts.merge(:skip_gem => true))
       say "Installing hobo_jquery_ui plugin..."
-      install_plugin_helper('hobo_jquery_ui', nil, opts.merge(:skip_gem => true))
+      install_plugin_helper('hobo_jquery_ui', nil, opts)
 
       say "Installing #{opts[:theme]} theme..."
       inject_css_require("jquery-ui/#{opts[:ui_theme]}", opts[:subsite], nil)

diff --git a/hobo_clean/hobo_clean.gemspec b/hobo_clean/hobo_clean.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = File.read(File.expand_path('../README', __FILE__))
 
   s.add_runtime_dependency('hobo', ["= #{version}"])
-  s.add_runtime_dependency('hobo_jquery_ui', ["= #{version}"])
+  s.add_runtime_dependency('hobo_jquery', ["= #{version}"])
 
   s.files = `git ls-files -x #{name}/* -z`.split("\0")
 

diff --git a/hobo_clean/lib/hobo_clean.rb b/hobo_clean/lib/hobo_clean.rb
@@ -1,6 +1,5 @@
 require 'hobo_rapid'
 require 'hobo_jquery'
-require 'hobo_jquery_ui'
 
 module HoboClean
 

diff --git a/integration_tests/agility_bootstrap/Gemfile b/integration_tests/agility_bootstrap/Gemfile
@@ -39,7 +39,7 @@ gem "hobo", :path => "../.."
 # gem "hobo_clean", :path => "../.."
 # gem "hobo_clean_sidemenu", :path => "../.."
 # gem "hobo_jquery", :path => "../.."
-# gem "hobo_jquery_ui", :path => "../.."
+gem "hobo_jquery_ui", :path => "../.."
 
 gem "jquery-ui-themes", "~> 0.0.4"
 

diff --git a/integration_tests/agility_bootstrap/Gemfile.lock b/integration_tests/agility_bootstrap/Gemfile.lock
@@ -77,8 +77,8 @@ PATH
   specs:
     hobo_bootstrap (2.0.0.pre6)
       bootstrap-sass (~> 2.1)
-      hobo (~> 2.0.0.pre1)
-      hobo_jquery_ui (~> 2.0.0.pre1)
+      hobo (~> 2.0.0.pre6)
+      hobo_jquery (~> 2.0.0.pre6)
       will_paginate-bootstrap (~> 0.2.1)
 
 PATH
@@ -262,6 +262,7 @@ DEPENDENCIES
   hobo!
   hobo_bootstrap!
   hobo_bootstrap_ui!
+  hobo_jquery_ui!
   hobo_paperclip!
   hobo_simple_color!
   hobo_tokeninput!