lumia-server 1.0.4.alpha → 1.0.5.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 962a0ccef4e61eb0a933249f828c528da90444a00c3f885a652ab1167789f96c
-  data.tar.gz: 40bbf8835d19b139ae02197ab13b6e2e5f361c9583b3f084356220cc14c861f4
+  metadata.gz: 03e8ad8c87bc37b94d443304ec4273f84b85890290a8f46cd828d7f7688f1c26
+  data.tar.gz: fb1dfa3bd744e88de8057e3c05378b600fa1fce130bd346bc1ae00dab77d83c8
 SHA512:
-  metadata.gz: 9eb531810c643aac59ec5304a7596883bcc0495367389488df528907496ac84eda90e5e9d868b24295339ea6ac1ce8ec57425b9e003450cb637e96e706d3e32a
-  data.tar.gz: 0514ca9ad735797496592184d90f5c934c72be3dfdccf7dae78534aeff997d2c13d0eb21aa9a9b005844faf3787029c2c1cc098bb8ef9d15fd725ccc2c48bdfe
+  metadata.gz: ad4532457c6d7e84b6e91d4c91939e11b905cf1da369c3f5fce718235e9bf5c41ce9eeb08a79c17747f59f6c942351949bc3e05a88710986032a0ee87ab2e78a
+  data.tar.gz: 0590c5fbbdf5c191cba84561cf3e5d32d4472f63a3786ccf4d793ed8aa9d1db1128ebd4732208bfa71464f48598222fc2b3b8985372653ffe27b02dae6980a66

data/lib/lumia-server/cli.rb

@@ -25,5 +25,10 @@ module LumiaServer
       end
       const_get(name)
     end
+
+    def error(message)
+      puts "Error: #{message}"
+      exit 1
+    end
   end
 end

data/lib/lumia-server/command/build.rb

@@ -5,38 +5,48 @@ module LumiaServer
     class Build < Command
 
       require 'erb'
+      require 'yaml'
 
       def run
-        error('server.json was not found') unless File.exist?('server.json')
+        LumiaServer::CLI.error('server.json was not found') unless File.exist?('server.json')
         @data = JSON.parse(File.read('server.json'))
 
-        puts 'Initialising server..'
-        @server = Server.new(@data)
-
-        puts 'Copying files..'
-        Dir.glob("src/**/*").each do |file|
-          unless File.directory?(file)
-            out = file.sub('src', 'build')
-            out = File.join(File.dirname(out), File.basename(out, '.erb'))
-            FileUtils.mkdir_p File.dirname(out)
-            File.open(file) do |fh|
-              erb = ERB.new(fh.read)
-              File.open(out, 'w') do |f|
-                f.write erb.result(binding)
+        time = Benchmark.realtime {
+          puts 'Initialising server..'
+          yaml_file = File.join('build', '.lumia', 'server.yml')
+          yaml = File.exist?(yaml_file) ? YAML.load(File.open(yaml_file)) : nil
+
+          @server = Server.new(@data, yaml)
+
+          puts 'Copying files..'
+          Dir.glob("src/**/*").each do |file|
+            unless File.directory?(file)
+              out = file.sub('src', 'build')
+              out = File.join(File.dirname(out), File.basename(out, '.erb'))
+              FileUtils.mkdir_p File.dirname(out)
+              File.open(file) do |fh|
+                erb = ERB.new(fh.read)
+                File.open(out, 'w') do |f|
+                  f.write erb.result(binding)
+                end
               end
             end
           end
-        end
 
-        puts 'Installing platform..'
-        @server.install_platform
+          @server.install_platform
+          @server.install_mods
 
-        puts 'Installing mods..'
-        @server.install_mods
-
-        @server.info
-
-        puts 'Done. Server has been installed.'
+          update_yaml = {}
+          update_yaml[@server.platform.name] = @server.platform.id
+          @server.mods.each { |m|
+            unless m.provider.nil?
+              update_yaml[m.name] = m.id
+            end
+          }
+          FileUtils.mkdir_p File.dirname(yaml_file)
+          File.open(yaml_file, 'w') { |f| f.write update_yaml.to_yaml }
+        }
+        puts "Done. Server has been installed (#{time.round(3)}s)."
       end
     end
   end

data/lib/lumia-server/command/command.rb

@@ -6,6 +6,7 @@ module LumiaServer
 
       require 'fileutils'
       require 'json'
+      require 'benchmark'
 
       attr_reader :args
       attr_reader :options
@@ -15,11 +16,6 @@ module LumiaServer
         @options = options
       end
 
-      def error(message)
-        puts "Error: #{message}"
-        exit 1
-      end
-
       def run; end
     end
   end

data/lib/lumia-server/command/exec.rb

@@ -3,7 +3,7 @@ module LumiaServer
     class Exec < Command
 
       def run
-        error('No script name provided') unless @args[0]
+        LumiaServer::CLI.error('No script name provided') unless @args[0]
 
         file = File.join(Dir.pwd, 'scripts', @args[0])
         server = File.join(Dir.pwd, 'server.json')
@@ -12,11 +12,11 @@ module LumiaServer
           if File.exist?(file)
             exec "bash #{file}"
           else
-            error('No script name provided') unless @args[0]
-            error('server.json was not found') unless File.exist?(server)
+            LumiaServer::CLI.error('No script name provided') unless @args[0]
+            LumiaServer::CLI.error('server.json was not found') unless File.exist?(server)
             @data = JSON.parse(File.read(server))
             line = @data['scripts'][@args[0]]
-            error("Invalid script name: #{@args[0]}") unless line
+            LumiaServer::CLI.error("Invalid script name: #{@args[0]}") unless line
             exec line
           end
         end

data/lib/lumia-server/platform.rb

@@ -3,27 +3,50 @@ module LumiaServer
 
     require 'open-uri'
 
+    attr_reader :data
+    attr_reader :server_yaml
+
     attr_reader :name
     attr_reader :version
     attr_reader :provider
+    attr_reader :id
 
     autoload :Custom, 'lumia-server/platform/custom'
     autoload :Paper, 'lumia-server/platform/paper'
+    autoload :BungeeCord, 'lumia-server/platform/bungeecord'
+    autoload :Waterfall, 'lumia-server/platform/waterfall'
 
-    def self.new(data)
+    def self.new(data, server_yaml)
       return super if self < Platform
       const = data['id'].to_s.downcase
       raise format('Unknown platform %p', data['id']) unless (const = constants.detect { |c| c.to_s.downcase == const })
-      platform = const_get(const).new(data)
+      platform = const_get(const).new(data, server_yaml)
       platform
     end
 
-    def initialize(data)
+    def initialize(data, server_yaml)
       @data = data
+      @server_yaml = server_yaml
+
       @version = data['version']
       @provider = data.key?('provider') ? Provider.new(@data['provider']) : nil
+      @id = provider.nil? ? version : provider.id
+    end
+
+    def install
+      if needs_update
+        puts "#{name}: updating.."
+        install_platform
+      else
+        puts "#{name}: up-to-date"
+      end
     end
 
-    def install; end
+    def needs_update
+      server_yaml.nil? || server_yaml[name] != id
+    end
+
+    def install_platform;
+    end
   end
 end

data/lib/lumia-server/platform/bungeecord.rb

@@ -0,0 +1,22 @@
+module LumiaServer
+  class Platform
+    class BungeeCord < Platform
+
+      URL = 'https://ci.md-5.net/job/BungeeCord/lastStableBuild/artifact/bootstrap/target/BungeeCord.jar'
+
+      def initialize(data, server_yaml)
+        super
+        @name = 'BungeeCord'
+      end
+
+      def install_platform
+        file = 'BungeeCord.jar'
+        if provider.nil?
+          IO.copy_stream(open(URL), File.join('build', file))
+        else
+          provider.install('build', file)
+        end
+      end
+    end
+  end
+end

data/lib/lumia-server/platform/paper.rb

@@ -3,19 +3,19 @@ module LumiaServer
     class Paper < Platform
 
       VERSIONS = {
-          '1.12.2' => 'https://ci.destroystokyo.com/job/PaperSpigot/1288/artifact/paperclip.jar',
+          '1.12.2' => 'https://ci.destroystokyo.com/job/PaperSpigot/1294/artifact/paperclip.jar',
           '1.11.2' => 'https://ci.destroystokyo.com/job/PaperSpigot/1104/artifact/paperclip.jar',
           '1.10.2' => 'https://ci.destroystokyo.com/job/PaperSpigot/916/artifact/paperclip.jar',
           '1.9.4' => 'https://ci.destroystokyo.com/job/PaperSpigot/773/artifact/paperclip.jar',
           '1.8.8' => 'https://ci.destroystokyo.com/job/PaperSpigot/443/artifact/paperclip.jar'
       }.freeze
 
-      def initialize(data)
+      def initialize(data, server_yaml)
         super
         @name = 'Paper'
       end
 
-      def install
+      def install_platform
         if provider.nil?
           if VERSIONS.key?(version)
             file = 'paperclip.jar'

data/lib/lumia-server/platform/waterfall.rb

@@ -0,0 +1,22 @@
+module LumiaServer
+  class Platform
+    class Waterfall < Platform
+
+      URL = 'https://ci.destroystokyo.com/job/Waterfall/lastStableBuild/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar'
+
+      def initialize(data, server_yaml)
+        super
+        @name = 'Waterfall'
+      end
+
+      def install_platform
+        file = 'Waterfall.jar'
+        if provider.nil?
+          IO.copy_stream(open(URL), File.join('build', file))
+        else
+          provider.install('build', file)
+        end
+      end
+    end
+  end
+end

data/lib/lumia-server/plugin.rb

@@ -1,21 +1,41 @@
 module LumiaServer
   class Plugin
 
+    attr_reader :data
+    attr_reader :server_yaml
+
     attr_reader :name
     attr_reader :version
     attr_reader :provider
+    attr_reader :id
 
-    def initialize(data)
+    def initialize(data, server_yaml)
       @data = data
+      @server_yaml = server_yaml
+
       @name = data['name']
       @version = data['version']
       @provider = data.key?('provider') ? Provider.new(@data['provider']) : nil
+      @id = provider.nil? ? version : provider.id
     end
 
     def install
       unless provider.nil?
-        provider.install(File.join('build', 'plugins'))
+        if needs_update
+          puts "#{name}: updating.."
+          install_mod
+        else
+          puts "#{name}: up-to-date"
+        end
       end
     end
+
+    def needs_update
+      server_yaml.nil? || server_yaml[name] != id
+    end
+
+    def install_mod
+      provider.install(File.join('build', 'plugins'))
+    end
   end
 end

data/lib/lumia-server/provider.rb

@@ -5,6 +5,9 @@ module LumiaServer
 
     autoload :Direct, 'lumia-server/provider/direct'
 
+    attr_reader :data
+    attr_reader :id
+
     def self.new(data)
       return super if self < Provider
       const = data['id'].to_s.downcase
@@ -17,6 +20,6 @@ module LumiaServer
       @data = data
     end
 
-    def install(dir, force = true); end
+    def install(dir, file = nil, force = true); end
   end
 end

data/lib/lumia-server/provider/direct.rb

@@ -2,10 +2,18 @@ module LumiaServer
   class Provider
     class Direct < Provider
 
-      def install(dir, force = false)
-        file = dir.nil? ? @data['file'] : File.join(dir, @data['file'])
+      def initialize(data)
+        super
+        @id = data['url']
+      end
+
+      def install(dir, file = nil, force = true)
+        name = data['file'].nil? ? file : data['file']
+        LumiaServer::CLI.error('No file name provided for provider \'direct\'') if name.nil?
+
+        file = dir.nil? ? name : File.join(dir, name)
         if !File.exist?(file) || force
-          IO.copy_stream(open(@data['url']), file)
+          IO.copy_stream(open(data['url']), file)
         end
       end
     end

data/lib/lumia-server/server.rb

@@ -10,12 +10,12 @@ module LumiaServer
     attr_reader :platform
     attr_reader :mods
 
-    def initialize(data)
-      @platform = Platform.new(data['platform'])
+    def initialize(data, server_yaml)
+      @platform = Platform.new(data['platform'], server_yaml)
       @mods = []
       if data.key?('mods')
         data['mods'].each do |mod|
-          @mods << Plugin.new(mod)
+          @mods << Plugin.new(mod, server_yaml)
         end
       end
     end
@@ -39,7 +39,6 @@ module LumiaServer
 
     def install_mods
       mods.each do |mod|
-        puts "Installing #{mod.name}.."
         mod.install
       end
     end

data/lib/lumia-server/version.rb

@@ -1,3 +1,3 @@
 module LumiaServer
-  VERSION = "1.0.4.alpha".freeze
+  VERSION = "1.0.5.alpha".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumia-server
 version: !ruby/object:Gem::Version
-  version: 1.0.4.alpha
+  version: 1.0.5.alpha
 platform: ruby
 authors:
 - Conreptio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,8 +54,10 @@ files:
 - lib/lumia-server/command/exec.rb
 - lib/lumia-server/command/start.rb
 - lib/lumia-server/platform.rb
+- lib/lumia-server/platform/bungeecord.rb
 - lib/lumia-server/platform/custom.rb
 - lib/lumia-server/platform/paper.rb
+- lib/lumia-server/platform/waterfall.rb
 - lib/lumia-server/plugin.rb
 - lib/lumia-server/provider.rb
 - lib/lumia-server/provider/direct.rb