Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ PATH
specs:
web-console (1.0.0)
activemodel (~> 4.0.0)
rails (~> 4.0.0)
railties (~> 4.0.0)
sprockets-rails (~> 2.0.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -38,7 +39,6 @@ GEM
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.14)
atomic (1.1.14-java)
builder (3.1.4)
coderay (1.0.9)
daemons (1.1.9)
Expand Down Expand Up @@ -77,14 +77,6 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
Expand Down Expand Up @@ -115,8 +107,6 @@ GEM
thor (0.18.1)
thread_safe (0.1.3)
atomic
thread_safe (0.1.3-java)
atomic
tilt (1.4.1)
treetop (1.4.15)
polyglot
Expand All @@ -128,6 +118,8 @@ PLATFORMS
ruby

DEPENDENCIES
actionmailer (~> 4.0.0)
activerecord (~> 4.0.0)
activerecord-jdbcsqlite3-adapter
mocha
pry-rails
Expand Down
2 changes: 0 additions & 2 deletions app/models/web_console/console_session.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'active_model'

module WebConsole
# Manage and persist (in memory) WebConsole::Slave instances.
class ConsoleSession
Expand Down
3 changes: 3 additions & 0 deletions lib/web_console/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
require 'active_support/core_ext/numeric/time'
require 'rails/engine'

require 'active_model'
require 'sprockets/rails'

module WebConsole
class Engine < ::Rails::Engine
isolate_namespace WebConsole
Expand Down
11 changes: 9 additions & 2 deletions web-console.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.markdown"]
s.test_files = Dir["test/**/*"]

s.add_dependency "rails", "~> 4.0.0"
s.add_dependency "activemodel", "~> 4.0.0"
rails_version = "~> 4.0.0"

s.add_dependency "railties", rails_version
s.add_dependency "activemodel", rails_version
s.add_dependency "sprockets-rails", "~> 2.0.0"

# We need those for the testing application to run.
s.add_development_dependency "actionmailer", rails_version
s.add_development_dependency "activerecord", rails_version
end