diff --git a/.ruby-version b/.ruby-version index a603bb5..49cdd66 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +2.7.6 diff --git a/Capfile b/Capfile deleted file mode 100644 index ae93652..0000000 --- a/Capfile +++ /dev/null @@ -1,22 +0,0 @@ -# Load DSL and set up stages -require "capistrano/setup" - -# Include default deployment tasks -require "capistrano/deploy" - -require "capistrano/scm/git" -install_plugin Capistrano::SCM::Git - -# Load custom tasks from `lib/capistrano/tasks` if you have any defined -Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } - -require 'capistrano/rails' -require 'capistrano/passenger' - -Rake::Task["deploy:migrate"].clear_actions -namespace :deploy do - desc "Override Capistrano's default behavior, do not migrate on deploy" - task :migrate do - puts 'No migrate' - end -end diff --git a/Gemfile b/Gemfile index 891e8bf..102a7ff 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '2.7.5' +ruby '2.7.6' gem 'rails' , "> 5.2" -gem "passenger" , "6.0.13" + gem 'sass-rails' gem 'uglifier' @@ -23,9 +23,14 @@ gem "rx-file" , git: "https://github.com/ruby-x/rx-file" gem "haml-coderay" gem 'mini_racer' +group :production do + gem "passenger" , "6.0.15" +end + group :development, :test do gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] gem 'rspec-rails' + gem "puma" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 4854d34..ba0c64b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,10 +169,12 @@ GEM paggio (0.2.6) parser (2.3.3.1) ast (~> 2.2) - passenger (6.0.13) + passenger (6.0.15) rack rake (>= 0.8.1) public_suffix (4.0.6) + puma (6.0.0) + nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) rack-test (1.1.0) @@ -285,7 +287,8 @@ DEPENDENCIES opal-browser (= 0.2.0) opal-jquery opal-rails - passenger (= 6.0.13) + passenger (= 6.0.15) + puma rails (> 5.2) rspec-rails rubyx (= 0.6)! @@ -299,7 +302,7 @@ DEPENDENCIES web-console (>= 3.3.0) RUBY VERSION - ruby 2.7.5p203 + ruby 2.7.6p219 BUNDLED WITH - 2.2.23 + 2.3.25 diff --git a/config/deploy.rb b/config/deploy.rb index c9e94fd..5b6c997 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -9,7 +9,7 @@ require 'mina/rbenv' # for rbenv support. (https://rbenv.org) # branch - Branch name to deploy. (needed by mina/git) set :application_name, 'ruby-x' -set :domain, '192.168.128.100' +set :domain, '192.168.129.10' set :deploy_to, '/home/feenix/ruby-x' set :repository, "https://github.com/ruby-x/ruby-x.github.io.git" set :branch, 'master'