minecraft-server 0.0.1.pre.30 → 0.0.1.pre.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzBhMWRiNDdhMTU1YjQxNzFhZGYzZjkzMWQ1OGMxYmIxODVhNTgxMA==
+    NDM1MmU1MGE3ZWViMDJiNzM2MjNjYmNkNDIyYjFiZTNjYTcwYjQ0Zg==
   data.tar.gz: !binary |-
-    MjVhZGI1MTExYThiZGZmMzY0YjI2MWRkNWUzZGE1NjE5ZjVkNmQ0OQ==
+    M2QxZTE0YzA2MDA4NTE2YTQ0Y2ZiMGZjNTA0OThkNzhjMTE2YWVkMw==
 SHA512:
   metadata.gz: !binary |-
-    NGY0NTExYjExN2I0N2ZkN2EwM2VmNTU1ZGZjYTk5NDlmMzJhYzhkMzk1NTYy
-    NTM4NzUyZjY0MWU0ZWE0YWI3Nzk1ZThlZDA3ZTRlNDU4NWYzNjE5ZDRhNzVl
-    MDFmM2EwMjI2NGJjYWMwNjljNjI1ZjRjYjkyMzAyZGU2OTZjODk=
+    ODkyYjc4OWYzYWQ0MzFiOGExYzcwMjhmOTE3MTAxMTg4YjAyMTIwMmYzYmQ4
+    ZGIyMmMxNDc4ZTZjYWYwMjRmY2I4MjM5OGZkZGFkM2UxOGIzODI2M2M1ZjRh
+    YWE4ZGMzMGQ4ZDRlZTU4OThiNDQ3NzVjM2IwOGUwZjIzYjkwNzY=
   data.tar.gz: !binary |-
-    MjBiODM3OWE2YmZkYTA2Nzg4ZmM3MmRjZTg2YjE3ZTkzYWJlOTY2MDJiZDJm
-    MGNkY2M1NmUxMmRiYWQwMTI1OTc2ZDRiMGEzYjViNzhlOGM2M2E0OGFlNzlm
-    NmE4ZmFiZTMzMWFlYzJiMTU2OTY5MTBmNmRiYTk2NGExOTE0NmY=
+    YmQxZDYxYzZhN2VlZDg1YTc5ZDc2MGRkZmJjNDIwYmZjODIyM2MxMGU3MDRm
+    MGMyNDZiODFmMmI3NWQxNjk2OWQ5NjBhMjY5OTY3OTVjMTQ4OTVlMWM2Yzhk
+    NTA5ZGI5YTI5M2U1MDYyOTU5M2UwZGJhMjk4NWY5YzNlYWI2ODE=

data/bin/minecraft-server

@@ -0,0 +1,18 @@
+require 'thor'
+
+require 'minecraft/server/console'
+
+class ServerCLI < Thor
+
+  desc 'start', 'Starts this instance of Minecraft::Server'
+  def start
+    server_thread = Thread.new do
+      Minecraft::Server::Console.new
+    end
+    server_thread.join
+  end
+  default_command :start
+
+end
+
+ServerCLI.start

data/bin/minecraft-server-console

@@ -2,7 +2,6 @@ require 'cli-console'
 require 'highline'
 require 'thread'
 
-require 'minecraft/server/threads'
 require 'minecraft/server/console'
 
 cli_thread = Thread.new do
@@ -14,6 +13,7 @@ end
 
 server_thread = Thread.new do
   console = Minecraft::Server::Console.new
+  console.extend CLI::Task
 end
 
 threads = [cli_thread, server_thread]

data/lib/minecraft/server/console.rb

@@ -1,4 +1,3 @@
-require 'cli-console'
 require 'log4r'
 
 require 'minecraft/server'
@@ -8,7 +7,6 @@ require 'minecraft/server/config'
 module Minecraft
   class Server
     class Console
-      extend CLI::Task
 
       attr_reader :server
 

data/minecraft-server.gemspec

@@ -20,7 +20,7 @@ Minecraft Forge Server, Spigot Server, and a Sponge Server.'
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  #spec.add_dependency 'thor', '~> 0.19.1'
+  spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'cli-console', '~> 0.1.4'
   spec.add_dependency 'highline', '~> 1.6.2'
   spec.add_dependency 'log4r', '~> 1.1.10'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minecraft-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.30
+  version: 0.0.1.pre.31
 platform: ruby
 authors:
 - Kepler Sticka-Jones
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: cli-console
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,7 @@ description: ! 'Minecraft Server written purely in Ruby, capable of running as a
 email:
 - kbsj269@gmail.com
 executables:
+- minecraft-server
 - minecraft-server-console
 extensions: []
 extra_rdoc_files: []
@@ -139,6 +154,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/minecraft-server
 - bin/minecraft-server-console
 - lib/minecraft/server.rb
 - lib/minecraft/server/config.rb