Skip to content

Commit

Permalink
remove duktape in favor of using nodejs for asset pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
alexskr committed Jul 7, 2015
1 parent ec942eb commit fc6c3bc
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ config/bioportal_config_localhost.rb
config/bioportal_config_stage.rb
config/bioportal_config_prod.rb
config/database.yml
config/deploy/*
config/locales/en.rb
**.DS_Store
/public/**/cache/**
Expand Down
31 changes: 26 additions & 5 deletions Capfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
load 'deploy'
# Uncomment if you are using Rails' asset pipeline
# load 'deploy/assets'
Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
load 'config/deploy' # remove this line to skip loading any of the default tasks
# Load DSL and Setup Up Stages
require 'capistrano/setup'

# Includes default deployment tasks
require 'capistrano/deploy'

# Includes tasks from other gems included in your Gemfile
#
# For documentation on these, see for example:
#
# https://github.com/capistrano/rvm
# https://github.com/capistrano/rbenv
# https://github.com/capistrano/chruby
# https://github.com/capistrano/bundler
# https://github.com/capistrano/rails
#
# require 'capistrano/rvm'
# require 'capistrano/rbenv'
# require 'capistrano/chruby'
require 'capistrano/bundler'
#require 'capistrano/rails/assets'
#require 'capistrano/rails/migrations'
require 'capistrano/rails'

# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
10 changes: 3 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '>= 1.0.3'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
gem 'duktape'
# gem 'duktape'

gem 'jquery-ui-rails'
gem 'jquery-rails'
Expand All @@ -19,10 +19,6 @@ gem 'jquery-rails'
# To use Jbuilder templates for JSON
# gem 'jbuilder'


# Deploy with Capistrano
# gem 'capistrano'

# To use debugger
# gem 'debugger'

Expand Down Expand Up @@ -55,7 +51,7 @@ gem 'logstash-logger'

gem 'ontologies_api_client', :git => "https://github.com/ncbo/ontologies_api_ruby_client.git", branch: "staging"

group :development do
#group :development do
#Capistrano
gem 'capistrano', '~> 3.4.0', require: false
# rails specific capistrano funcitons
Expand All @@ -64,4 +60,4 @@ group :development do
gem 'capistrano-bundler', require: false
# passenger reload
gem 'capistrano-passenger', require: false
end
#end
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ GEM
dalli (2.7.4)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
duktape (1.2.1.0)
erubis (2.7.0)
excon (0.45.3)
execjs (2.5.2)
Expand Down Expand Up @@ -226,7 +225,6 @@ DEPENDENCIES
coffee-rails (~> 4.1.0)
cube-ruby
dalli
duktape
flamegraph
haml (~> 4.0.0)
hpricot (~> 0.8.6)
Expand Down

0 comments on commit fc6c3bc

Please sign in to comment.