lumia-server 1.0.2.alpha → 1.0.3.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22162e5f148845c889253b7afb640b59c36d4de2163d6a4fc5f05392499ba690
-  data.tar.gz: db89e490d7991c37dd09f8c2b72f7cb712170dbcba7764f9438a041fcf6b2577
+  metadata.gz: ccd868250272bbd6a41a48ebe03cc60d5dcb72c8a4a7235cb4c1429073d2a91a
+  data.tar.gz: 68f8c1aa6543a003b9f8d3c842b34dcc2a24d77dcaf36a27888b445949009060
 SHA512:
-  metadata.gz: 9759df4c2f5bea86157efa48a821370b6ee953c647a3e7b5f7640cbc4f3a003065b41001d378b58bf00a697689c4996d6f0deb87b5df72c0de7f59e1284e25cb
-  data.tar.gz: c0552c83ffdfe398034ee9823446663e67f45e35a04dd43f6a572e8dd74fb55db75bf90fe2c6b57deac5229c556a2e67d3155675c02416ac80ef96b4e70caa1f
+  metadata.gz: 494623bde5973e41308cef2dfb540dc796b0d2de9bd9b3eb60f35559fd29dab9e439d8c178b0a3c0c7090351f550436b9f8cadfad6534a329161c9062e88e4da
+  data.tar.gz: f855610c3c48e1a5d8ce1f7a5996800d7fb2eafd97ae5a7b58611829f93d35b7438be8b80592f67cefa46f4d61d6912c70425f3ea2add9065d40ec87f26f2e27

data/lib/lumia-server/cli.rb

@@ -1,9 +1,13 @@
+require 'lumia-server/version'
+require 'lumia-server/command/command'
+
 module LumiaServer
   module CLI
 
     autoload :Exec, 'lumia-server/command/exec'
     autoload :Start, 'lumia-server/command/start'
     autoload :Build, 'lumia-server/command/build'
+    autoload :Clean, 'lumia-server/command/clean'
 
     extend self
 
@@ -16,7 +20,7 @@ module LumiaServer
     def command(arg)
       name = arg.to_s.downcase
       unless (name = constants.detect { |c| c.to_s.downcase == name })
-        $stderr.puts "Unknown command provided: #{arg}"
+        puts "Unknown command provided: #{arg}"
         exit 1
       end
       const_get(name)

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

@@ -1,30 +1,42 @@
-require 'lumia-server/command/command'
-require 'lumia-server/platform'
 require 'lumia-server/server'
 
 module LumiaServer
   module CLI
     class Build < Command
 
+      require 'erb'
+
       def run
         error('server.json was not found') unless File.exist?('server.json')
         @data = JSON.parse(File.read('server.json'))
 
-        server = Server.new(@data)
-        server.info
-        server.install_platform
-        server.install_mods
-        log('Server has been installed')
-      end
+        puts 'Initialising server..'
+        @server = Server.new(@data)
 
-      def install_mods(name)
-        count = 0
-        if @data.key?(name)
-          @data[name].each do |mod|
-            log('Installing ' + (mod.key?['name'] ? mod['name'] : 'Unknown') + '..')
+        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
-        count
+
+        puts 'Installing platform..'
+        @server.install_platform
+
+        puts 'Installing mods..'
+        @server.install_mods
+
+        @server.info
+
+        puts 'Done. Server has been installed.'
       end
     end
   end

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

@@ -0,0 +1,10 @@
+module LumiaServer
+  module CLI
+    class Clean < Command
+
+      def run
+        FileUtils.rm_rf('build')
+      end
+    end
+  end
+end

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

@@ -4,19 +4,19 @@ module LumiaServer
   module CLI
     class Command
 
+      require 'fileutils'
       require 'json'
 
+      attr_reader :args
+      attr_reader :options
+
       def initialize(args, options)
         @args = args
         @options = options
       end
 
-      def log(message)
-        $stdout.puts(message)
-      end
-
       def error(message)
-        $stderr.puts message
+        puts "Error: #{message}"
         exit 1
       end
 

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

@@ -1,5 +1,3 @@
-require 'lumia-server/command/command'
-
 module LumiaServer
   module CLI
     class Exec < Command

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

@@ -1,5 +1,3 @@
-require 'lumia-server/command/command'
-
 module LumiaServer
   module CLI
     class Start < Command

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

@@ -19,12 +19,12 @@ module LumiaServer
         if provider.nil?
           if VERSIONS.key?(version)
             file = 'paperclip.jar'
-            IO.copy_stream(open(VERSIONS[version]), file)
+            IO.copy_stream(open(VERSIONS[version]), File.join('build', file))
           else
             raise 'Invalid platform version provided'
           end
         else
-          provider.install(nil)
+          provider.install('build')
         end
       end
     end

data/lib/lumia-server/plugin.rb

@@ -14,7 +14,7 @@ module LumiaServer
 
     def install
       unless provider.nil?
-        provider.install('plugins')
+        provider.install('build/plugins')
       end
     end
   end

data/lib/lumia-server/server.rb

@@ -1,4 +1,5 @@
 require 'lumia-server/plugin'
+require 'lumia-server/platform'
 require 'lumia-server/provider'
 
 module LumiaServer
@@ -7,39 +8,38 @@ module LumiaServer
     require 'fileutils'
 
     attr_reader :platform
-    attr_reader :plugins
+    attr_reader :mods
 
     def initialize(data)
       @platform = Platform.new(data['platform'])
-      @plugins = []
+      @mods = []
       if data.key?('mods')
         data['mods'].each do |mod|
-          @plugins << Plugin.new(mod)
+          @mods << Plugin.new(mod)
         end
       end
     end
 
     def info
-      $stderr.puts " "
-      $stderr.puts "Server Information:"
-      $stderr.puts "-------------------"
-      $stderr.puts "Platform: #{print(platform.name, 'Unknown')} (#{print(platform.version, '0.0.0')})"
-      $stderr.puts "Plugins (#{plugins.length}):"
-      plugins.each do |mod|
-        $stderr.puts "  - #{print(mod.name, 'Unknown')} (#{print(mod.version, '0.0.0')})"
+      puts " "
+      puts "Server Information:"
+      puts "-------------------"
+      puts "Platform: #{print(platform.name, 'Unknown')} (#{print(platform.version, '0.0.0')})"
+      puts "Plugins (#{mods.length}):"
+      mods.each do |mod|
+        puts "  - #{print(mod.name, 'Unknown')} (#{print(mod.version, '0.0.0')})"
       end
-      $stderr.puts " "
+      puts " "
     end
 
     def install_platform
-      $stdout.puts "Installing platform.."
-      FileUtils.mkdir_p 'plugins'
+      FileUtils.mkdir_p 'build/plugins'
       platform.install
     end
 
     def install_mods
-      plugins.each do |mod|
-        $stdout.puts "Installing #{mod.name}.."
+      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.2.alpha".freeze
+  VERSION = "1.0.3.alpha".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumia-server
 version: !ruby/object:Gem::Version
-  version: 1.0.2.alpha
+  version: 1.0.3.alpha
 platform: ruby
 authors:
 - Conreptio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -49,6 +49,7 @@ files:
 - lib/lumia-server.rb
 - lib/lumia-server/cli.rb
 - lib/lumia-server/command/build.rb
+- lib/lumia-server/command/clean.rb
 - lib/lumia-server/command/command.rb
 - lib/lumia-server/command/exec.rb
 - lib/lumia-server/command/start.rb