game_machine 0.0.11 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffff1acfb6c6991f5ec1bf5c1c6e4ad06ef0b588
-  data.tar.gz: 32e1d7c2016cd8fe2f1b348b1ef9a01595da26d3
+  metadata.gz: 83203a07ca4230b58694d08b0c2a9990a884eeef
+  data.tar.gz: 68a0cbf2c6fb8e6bc1aab6ac632ebfbc3b1f0116
 SHA512:
-  metadata.gz: e2fa98eec04da15ebd1c057675ca5032878d4959b6eef3b2d1f9dc60fc70d5e05df3b185805c695931d63ea963e982197c8a41983350f457344d18b699d4e5f2
-  data.tar.gz: ced35f7f4bc12fae21af3e2ef05dcca6d20692a44ae51133341a5196eb04fd6874e05d523659593df3480ea94e401ecbd9d2d1f56c94a504f5e0df79ba7afc61
+  metadata.gz: d25d5ef4fdf7f35987e9cde8ca76f9d03f0d8b606aa5df819280b19b1973730b471a5065b0af1bb15001d8bd184bd7760f2c91b7ce6bd139391abc1dea6bb8a5
+  data.tar.gz: 68b8384a54d54985bc0d9f1c6a339a2cad6dfb9ee77eb76172bf12af7d656252923d5026d086b60c8296dec911c014383154ff6842b2b635ffdbe4b08ecf9c29

data/Gemfile

@@ -1,4 +1,15 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gemspec
+gem 'i18n'
+gem 'json'
+gem 'ffi'
+gem 'sinatra'
+gem 'sinatra-contrib'
+gem 'rack-flash3'
+gem 'activesupport'
+gem 'wavefront'
+gem 'puma'
+gem 'faraday'
+gem 'bcrypt'
+gem 'bundler'

data/Gemfile.lock

@@ -1,55 +1,31 @@
-PATH
-  remote: .
-  specs:
-    game_machine (0.0.10)
-      consistent-hashing
-      ffi
-      haml
-      i18n
-      json
-      rjack-logback
-      settingslogic
-      sinatra
-      sinatra-contrib
-      webrick
-
 GEM
   remote: https://rubygems.org/
   specs:
-    avl_tree (1.1.3)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     backports (3.6.0)
-    consistent-hashing (1.0.0)
-      avl_tree (>= 1.1.3)
-    descriptive_statistics (1.1.2)
-    diff-lcs (1.2.5)
+    bcrypt (3.1.7-java)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3-java)
-    haml (4.0.5)
-      tilt
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1-java)
+    minitest (5.4.1)
     multi_json (1.10.1)
+    multipart-post (2.0.0)
+    puma (2.9.1-java)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
+    rack-flash3 (1.0.5)
+      rack
     rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
-    rjack-logback (1.7.0-java)
-      rjack-slf4j (>= 1.6.5, < 1.8)
-    rjack-slf4j (1.7.6.0-java)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    settingslogic (2.0.9)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -61,16 +37,25 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
-    webrick (1.3.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wavefront (0.1.2)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  descriptive_statistics
-  game_machine!
-  rake
-  rspec
-  rspec-expectations
-  rspec-mocks
+  activesupport
+  bcrypt
+  bundler
+  faraday
+  ffi
+  i18n
+  json
+  puma
+  rack-flash3
+  sinatra
+  sinatra-contrib
+  wavefront

data/Rakefile

@@ -9,30 +9,3 @@ RSpec::Core::RakeTask.new
 
 task :default => :spec
 
-namespace :game do
-  task :demo do
-    cp 'lib/demo/boot.rb', 'boot.rb'
-  end
-  
-  task :none do
-    rm 'boot.rb'
-  end
-end
-
-namespace :java do
-  gradlew = File.join(File.dirname(__FILE__), 'java','gradlew')
-
-  task :clean do
-    FileUtils.rm_f 'java/lib/*.jar'
-    FileUtils.rm_f 'java/src/main/java/com/game_machine/entity_system/generated/*.java'
-  end
-
-  task :all => [:clean] do
-    system "cd java && #{gradlew} clean && #{gradlew} codegen && #{gradlew} build && #{gradlew} install_libs"
-  end
-
-  task :build do
-    system "cd java && #{gradlew} build && #{gradlew} install_libs"
-  end
-end
-

data/bin/bundle_run.sh

@@ -0,0 +1 @@
+GEM_PATH=vendor/gem_home/jruby/1.9 ADMIN_UI=true java -jar jruby-complete-1.7.13.jar bin/game_machine s

data/bin/game_machine

@@ -1,5 +1,9 @@
 #!/usr/bin/env jruby
 
+ENV['APP_ROOT'] ||= File.expand_path(Dir.pwd)
+ENV['JAVA_ROOT'] = File.join(ENV['APP_ROOT'],'java','project')
+ENV['GAME_ENV'] = 'development'
+
 require 'rubygems'
 require 'fileutils'
 
@@ -11,36 +15,41 @@ def load_game_machine
   end
 end
 
+def load_config
+  require_relative '../lib/game_machine/app_config'
+  GameMachine::AppConfig.instance.load_config
+end
+
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
-  "n"  => "new",
   "b"  => "build",
-  "s"  => "server",
-  "sl" => "server_loop"
+  "s"  => "server"
 }
 
 command = ARGV.shift
 command = aliases[command] || command
 
-ENV['APP_ROOT'] ||= File.expand_path(Dir.pwd)
-ENV['JAVA_ROOT'] = File.join(ENV['APP_ROOT'],'java')
-ENV['GAME_ENV'] = 'development'
-
 require_relative '../lib/game_machine/console'
 
-if command == 'new'
+
+if command == 'install' || command == 'upgrade'
   bin_path = File.dirname(__FILE__)
   install_source_path = File.expand_path(
     File.join(bin_path,'../')
   )
-  GameMachine::Console::Install.new(ARGV,install_source_path).run!
+  GameMachine::Console::Install.new(command,ARGV,install_source_path).run!
 
-elsif command == 'build'
-  require_relative  '../java/local_lib/protostuff-compiler-1.0.7-jarjar.jar'
+elsif command == 'build' || command == 'bundle'
+  require_relative  '../java/project/local_lib/protostuff-compiler-1.0.8-jarjar.jar'
   require_relative '../lib/game_machine/protobuf/game_messages.rb'
   require_relative '../lib/game_machine/protobuf/generate.rb'
-  GameMachine::Console::Build.new(ARGV).run!
+  if command == 'bundle'
+    GameMachine::Console::Build.new(ARGV,true).run!
+  else
+    GameMachine::Console::Build.new(ARGV).run!
+  end
+  
 
 elsif command == 'server'
   # Need to set environment vars before loading everything.
@@ -51,29 +60,22 @@ elsif command == 'server'
   # Run the server
   server.run!
 
-elsif command == 'server_loop'
-  GameMachine::Console::Server.run_in_loop
 else
 
 puts <<EOF
   Usage:
   
-  game_machine server [options]      Start the server
-    -r, --restartable                If tmp/gm_restart.txt should trigger a restart
-    -s, --server=name                Server name
-    -c, --config=name                Configuration file
-    -e, --environment=name           Specifies the environment to run under (development/production).
-                                     Default: development
+  game_machine server               Start the server
+
+  game_machine build  [clean]       Build java and protobuf messages
 
-  game_machine server_loop           Runs server in loop that restarts when tmp/gm_restart.txt
-                                     is present. On restart it will run build then server -r.
+  game_machine bundle               Build and bundle gems for deployment
 
-  game_machine build                 Generate and compile protobuf messages
+  game_machine install [path]       Install Game Machine to [path]
 
-  game_machine new [path]            Create a new Game Machine application at the
-                                     specified path
+  game_machine upgrade [path]       Upgrade the Game Machine installation at [path]
     
 EOF
-end
-
 
+exit 1
+end

data/config/cluster.conf

@@ -1,5 +1,4 @@
 
-  
 cluster {
 
 default-pinned-dispatcher {
@@ -14,14 +13,16 @@ default-pinned-dispatcher {
   akka {
 
     cluster {
-      seed-nodes = [SEEDS]
+      #seed-nodes = [SEEDS]
       acceptable-heartbeat-pause = 10 s
       auto-down-unreachable-after = 10s
     }
 
+    #log-config-on-start = on
+    log-dead-letters = "off"
     actor.debug.unhandled = "on"   
     jvm-exit-on-fatal-error=false
-    loglevel = "WARNING"
+    loglevel = "INFO"
 
   actor {
     serializers {
@@ -32,13 +33,14 @@ default-pinned-dispatcher {
 
     serialization-bindings {
       "[B" = bytes
-      "java.io.Serializable" = java
       "com.dyuproject.protostuff.Message" = myown
       "GameMachine.Messages.ClientMessage" = myown
       "GameMachine.Messages.Entity" = myown
       "GameMachine.Messages.ObjectdbGet" = myown
       "GameMachine.Messages.ObjectdbPut" = myown
       "GameMachine.Messages.ObjectdbUpdate" = myown
+      "java.io.Serializable" = java
+      
     }
     provider = "akka.cluster.ClusterActorRefProvider"
     #serialize-messages = on
@@ -48,7 +50,6 @@ default-pinned-dispatcher {
     log-remote-lifecycle-events = off
 
 
-    #enabled-transports = ["akka.remote.netty.tcp"]
     netty.tcp {
       hostname = "HOST"
       port = PORT

data/config/default.conf

@@ -0,0 +1,164 @@
+
+gamemachine {
+
+  environment = development
+  use_regions = false
+  orm = false
+  mono_enabled = false
+
+
+  client {
+
+    # Sets the protocol and host/port used by the client. If set to TCP or UDP then those protocols are enforced.
+    # ANY lets the client use it's own values
+    protocol = ANY
+  }
+
+  handlers {
+
+    # Team handler
+    team = "GameMachine::DefaultHandlers::TeamHandler"
+
+    # Authentication handlers.  
+
+    #PublicAuthenticator allows any user/password combination to work
+    #auth = "com.game_machine.authentication.PublicAuthenticator"
+
+    # The default.  Uses salted password hash (bcrypt)
+    auth = "com.game_machine.authentication.DefaultAuthenticator"
+
+  }
+  
+  routers {
+
+    # IMPORTANT - You don't need that many routers to handle a lot of traffic.  5 is sufficient to handle several hundred
+    # messages per second.  We suggest starting with the defaults and only increasing these numbers as necessary.
+
+    # Size of the router for incoming message from all clients
+    game_handler = 5
+
+    # Also in the pipeline for all incoming requests, should be set the same as
+    # game_handler_routers
+    request_handler = 5
+
+    # router size for the udp actor that handles all incoming udp messages
+    udp = 5
+
+    # Router size for the data/object store.
+    objectdb =  5
+  }
+  
+  datastore {
+    # What data store the object database will use.  Valid options are gamecloud, couchbase, jdbc, mapdb,
+    # memory, or redis
+    store = gamecloud
+
+    # How protobuf messages will be serialized to the datastore.  Valid options are json or bytes.
+    # Json is easier to debug but slower and more cpu intensive under load.  bytes is the native protocol
+    # buffer binary format.
+    serialization = json
+
+    # minimum time in milliseconds between writes to the backing store for the same key.  When a message
+    # exceeds the limit it is either enqueued, or if already enqueued, it's value is updated.
+    # -1 disables caching.  1000 is a good starting value.
+    cache_write_interval = -1
+
+    # Total writes per second to the backing store that an actor will allow, across all keys.  Note this is on a per actor
+    # basis.  If you want to limit total writes per second to your database, this value should be a multiple of the number
+    # of write behind cache actors that are started.  -1 disables caching. 100 is a good starting number.
+    cache_writes_per_second = -1
+  }
+  
+
+  gamecloud {
+
+    # The gamecloud is a hosted data store with a REST api backed by couchbase.  It is offered as a service by
+    # Game Machine.
+    
+    user = me
+
+    host = "cloud.gamemachine.io:80"
+    api_key = myapikey
+
+  }
+
+  grids {
+    default = "4000, 50, 1"
+    aoe =  "4000, 5, 1"
+    local_chat =  "4000, 10, 10"
+  }
+
+  couchbase {
+    bucket = gamemachine
+    password = pass
+    servers = ["http://127.0.0.1:8091/pools"]
+  }
+
+  jdbc {
+    
+    // Postgres
+    hostname = 127.0.0.1
+    port = 5432
+    database = gamemachine
+    url = "jdbc:postgresql://127.0.0.1:5432/gamemachine"
+    ds = "org.postgresql.ds.PGSimpleDataSource"
+    driver = "org.postgresql.Driver"
+    username = gamemachine
+    password = gamemachine
+
+    // Mysql
+    #hostname = 127.0.0.1
+    #port = 3306
+    #database = gamemachine
+    #url = "mysql://127.0.0.1:3306/game_machine"
+    #ds = "com.mysql.jdbc.jdbc2.optional.MysqlDataSource"
+    #driver = "com.mysql.jdbc.Driver"
+    #username = gamemachine
+    #password = gamemachine
+
+  }
+
+  http {
+    enabled = true
+    host = 0.0.0.0
+    port = 3000
+  }
+
+  udp {
+    enabled = true
+    host = 127.0.0.1
+    port = 24130
+  }
+
+  tcp {
+    enabled = true
+    host = 127.0.0.1
+    port = 8910
+  }
+
+  akka {
+    host = 127.0.0.1
+    port = 2551
+  }
+
+ 
+
+  # Seeds are akka nodes that should already be in the cluster.  We use them as first points of contact to join against
+  # If the seeds list is empty, we start the cluster by joining to ourself.  The case of joining ourself should only happen
+  # if we are the only node, or if we are the first node.
+  #seeds = ["127.0.0.1:9991","127.0.0.1:9992"]
+  seeds = []
+  
+
+  admin {
+    user = admin
+    pass = pass
+  }
+  
+  regions = [
+    ["zone1","GameMachine::DefaultHandlers::ZoneManager"],
+    ["zone2", "GameMachine::DefaultHandlers::ZoneManager"]
+  ]
+}
+ 
+