move all deps into gemspec, remove Gemfile.lock

ajjahn · ajjahn · commit a00003b8a95e · 2015-12-10T19:30:52.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ node_modules
 .bundle
 
 spec/test_app
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,2 @@
 source 'https://rubygems.org'
-group :development, :test do
-  gem 'therubyracer', platforms: :ruby
-  gem 'rails'
-  gem 'react-rails'
-  gem 'opal-rails'
-end
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/generators/reactive_ruby/test_app/templates/application.rb.erb b/lib/generators/reactive_ruby/test_app/templates/application.rb.erb
@@ -1,15 +1,13 @@
-<% if defined? application_definition %>
+<% if defined? application_definition -%>
+require File.expand_path('../boot', __FILE__) 
+require 'rails/all'
 
-  require File.expand_path('../boot', __FILE__)
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
-  require 'rails/all'
+require 'opal-rails'
+require 'reactive-ruby'
 
-  # Require the gems listed in Gemfile, including any gems
-  # you've limited to :test, :development, or :production.
-  Bundler.require(*Rails.groups(assets: %w(development test)))
-
-  require 'reactive-ruby'
-
-  <%= application_definition %>
-
-<% end %>
+<%= application_definition %>
+<% end -%>
diff --git a/reactive-ruby.gemspec b/reactive-ruby.gemspec
@@ -20,20 +20,25 @@ Gem::Specification.new do |s|
 
 
 
-  s.add_dependency 'opal'
+  s.add_dependency 'opal', '0.8.0'
   s.add_dependency 'opal-activesupport', '>= 0.2.0'
-  s.add_dependency 'opal-browser'
+  s.add_dependency 'opal-browser', '0.2.0'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '3.3.3'
   s.add_development_dependency 'timecop'
-  s.add_development_dependency 'opal-rspec'
+  s.add_development_dependency 'opal-rspec', '0.4.3'
   s.add_development_dependency 'sinatra'
 
+  # For Test Rails App
+  s.add_development_dependency 'rails', '4.2.4'
+  s.add_development_dependency 'react-rails', '1.3.1'
+  s.add_development_dependency 'opal-rails', '0.8.0'
   if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'jdbc-sqlite3'  # For Test Rails App
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter' if RUBY_PLATFORM == 'java' # For Test Rails App
+    s.add_development_dependency 'jdbc-sqlite3'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
     s.add_development_dependency 'therubyrhino'
   else
-    s.add_development_dependency 'sqlite3' # For Test Rails App
+    s.add_development_dependency 'sqlite3', '1.3.10'
+    s.add_development_dependency 'therubyracer', '0.12.2'
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ node_modules`
`30`	`30`	`.bundle`
`31`	`31`
`32`	`32`	`spec/test_app`
	`33`	`+Gemfile.lock`