From fc6c3bc6cd1cafbcf1f4582720177b3f790a8cfa Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Tue, 7 Jul 2015 14:41:44 -0700 Subject: [PATCH] remove duktape in favor of using nodejs for asset pipeline --- .gitignore | 1 + Capfile | 31 ++++++++++++++++++++++++++----- Gemfile | 10 +++------- Gemfile.lock | 2 -- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 7c5195f8d..6634b27e4 100644 --- a/.gitignore +++ b/.gitignore @@ -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/** diff --git a/Capfile b/Capfile index 98743d103..28845322d 100644 --- a/Capfile +++ b/Capfile @@ -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 \ No newline at end of file +# 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 } diff --git a/Gemfile b/Gemfile index d91d56786..a50097a8a 100644 --- a/Gemfile +++ b/Gemfile @@ -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' @@ -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' @@ -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 @@ -64,4 +60,4 @@ group :development do gem 'capistrano-bundler', require: false # passenger reload gem 'capistrano-passenger', require: false -end +#end diff --git a/Gemfile.lock b/Gemfile.lock index 48ebe059f..424584a45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -226,7 +225,6 @@ DEPENDENCIES coffee-rails (~> 4.1.0) cube-ruby dalli - duktape flamegraph haml (~> 4.0.0) hpricot (~> 0.8.6)