adding 2.5 and latest 2.4 support.

railsmachine · Apr 2, 2018 · a12ccfa · a12ccfa
1 parent c2991d4
commit a12ccfa
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/generators/moonshine/moonshine_generator.rb b/generators/moonshine/moonshine_generator.rb
@@ -150,7 +150,7 @@ def add_options!(opt)
       opt.on('--multistage',
               "setup multistage deployment environment") { options[:multistage] = true }
       opt.on("--ruby RUBY",
-             "Ruby version to install. Currently supports: src193, src200, src21, src22, src23, brightbox21, brightbox22") { |ruby| options[:ruby] = ruby }
+             "Ruby version to install. Currently supports: src193, src200, src21, src22, src23, src24, src25, brightbox21, brightbox22") { |ruby| options[:ruby] = ruby }
 
     end
 

diff --git a/lib/generators/moonshine/moonshine_generator.rb b/lib/generators/moonshine/moonshine_generator.rb
@@ -21,7 +21,7 @@ def self.rails_root
 
   class_option :skip_manifest, :default => false, :desc => 'skip generating a manifest', :type => :boolean
 
-  class_option :ruby, :default => default_ruby, :desc => 'Ruby version to install. Currently supports: src193, src193falcon, src193railsexpress, src200, src200railsexpress, src21, src21railsexpress, src22, src23', :type => :string
+  class_option :ruby, :default => default_ruby, :desc => 'Ruby version to install. Currently supports: src193, src193falcon, src193railsexpress, src200, src200railsexpress, src21, src21railsexpress, src22, src23, src24, src25', :type => :string
   class_option :multistage, :default => false, :desc => 'setup multistage deployment environment', :type => :boolean
 
   def self.source_root

diff --git a/lib/generators/moonshine_helper.rb b/lib/generators/moonshine_helper.rb
@@ -37,6 +37,10 @@ def default_ruby
         'src22'
       when /^2.3/
         'src23'
+      when /^2.4/
+        'src24'
+      when /^2.5/
+        'src25'
       else
       end
     end

diff --git a/lib/moonshine/capistrano_integration.rb b/lib/moonshine/capistrano_integration.rb
@@ -850,7 +850,7 @@ def self.load_into(capistrano_config)
               'sudo rm -rf /usr/lib/ruby/gems/1.9.1 || true',
               'sudo rm -rf /usr/lib/ruby/gems/2.0.0 || true',
               'sudo rm -rf /usr/lib/ruby/gems/2.1.0 || true',
-              'sudo mkdir -p /usr/lib/ruby/gems/2.2.0/gems || true',
+              'sudo mkdir -p /usr/lib/ruby/gems/2.3.0/gems || true',
               "wget -q http://cache.ruby-lang.org/pub/ruby/2.3/#{p}.tar.gz",
               "tar xzf #{p}.tar.gz",
               "cd /tmp/#{p}",
@@ -864,7 +864,7 @@ def self.load_into(capistrano_config)
 
           task :src24 do
             remove_ruby_from_apt
-            pv = "2.4.1"
+            pv = "2.4.4"
             p = "ruby-#{pv}"
             run [
               'cd /tmp',
@@ -874,16 +874,45 @@ def self.load_into(capistrano_config)
               'sudo rm -rf /usr/lib/ruby/gems/1.9.1 || true',
               'sudo rm -rf /usr/lib/ruby/gems/2.0.0 || true',
               'sudo rm -rf /usr/lib/ruby/gems/2.1.0 || true',
-              'sudo mkdir -p /usr/lib/ruby/gems/2.2.0/gems || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.2.0 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.3.0 || true',
+              'sudo mkdir -p /usr/lib/ruby/gems/2.4.0/gems || true',
               "wget -q http://cache.ruby-lang.org/pub/ruby/2.4/#{p}.tar.gz",
               "tar xzf #{p}.tar.gz",
               "cd /tmp/#{p}",
               './configure --prefix=/usr',
               'make',
               'sudo make install'
             ].join(' && ')
-            set :rubygems_version, fetch(:rubygems_version, '2.6.11')
-            set :bundler_version, fetch(:bundler_version, '1.14.6')
+            set :rubygems_version, fetch(:rubygems_version, '2.7.6')
+            set :bundler_version, fetch(:bundler_version, '1.16.1')
+          end
+
+         task :src25 do
+            remove_ruby_from_apt
+            pv = "2.5.1"
+            p = "ruby-#{pv}"
+            run [
+              'cd /tmp',
+              "sudo rm -rf #{p}* || true",
+              'sudo rm /usr/bin/rake || true',
+              'sudo rm -rf /usr/lib/ruby/gems/1.8 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/1.9.1 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.0.0 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.1.0 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.2.0 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.3.0 || true',
+              'sudo rm -rf /usr/lib/ruby/gems/2.4.0 || true',
+              'sudo mkdir -p /usr/lib/ruby/gems/2.5.0/gems || true',
+              "wget -q http://cache.ruby-lang.org/pub/ruby/2.5/#{p}.tar.gz",
+              "tar xzf #{p}.tar.gz",
+              "cd /tmp/#{p}",
+              './configure --prefix=/usr',
+              'make',
+              'sudo make install'
+            ].join(' && ')
+            set :rubygems_version, fetch(:rubygems_version, '2.7.6')
+            set :bundler_version, fetch(:bundler_version, '1.16.1')
           end
 
          task :install_rubygems do