game_machine 0.0.11 → 1.0.2

data/lib/game_machine/cloud_updater.rb

@@ -0,0 +1,51 @@
+module GameMachine
+  class CloudUpdater < Actor::Base
+
+    attr_reader :node_status, :stats, :windows
+    def post_init(*args)
+
+      @stats = {}
+      @windows = Config::CONFIG['target_os'].match(/mswin/)
+
+      if ENV['CONTAINER_ID'] && ENV['CLUSTER_NAME']
+        @node_status = MessageLib::NodeStatus.new.
+          set_container_id(ENV['CONTAINER_ID'].to_i).
+          set_hostname(AppConfig.instance.config.http.host).
+          set_port(AppConfig.instance.config.http.port).
+          set_cluster_name(ENV['CLUSTER_NAME']).
+          set_client_count(ClientManager.local_players.size)
+
+        schedule_message('update',5,:seconds)
+      end
+
+      cluster = JavaLib::Cluster.get(getContext.system)
+      cluster.subscribe(getSelf, JavaLib::ClusterEvent::ClusterMetricsChanged.java_class)
+      
+    end
+
+    def on_receive(message)
+      if message.is_a?(JavaLib::ClusterEvent::ClusterMetricsChanged)
+        message.get_node_metrics.each do |node_metric|
+          heap = JavaLib::StandardMetrics.extract_heap_memory(node_metric)
+          stats[:heap] = heap.used / 1024 / 1024
+          unless windows
+            cpu = JavaLib::StandardMetrics.extract_cpu(node_metric)
+            if cpu.respond_to?(:systemLoadAverage)
+              stats[:load_average] = cpu.systemLoadAverage.get
+              stats[:processor_count] = cpu.processors
+            end
+          end
+        end
+      end
+      if message.is_a?(String)
+        if message == 'update'
+          node_status.set_last_updated(Time.now.to_i)
+          node_status.set_client_count(ClientManager.local_players.size)
+          node_status.set_heap_used(stats[:heap])
+          node_status.set_load_average(stats[:load_average])
+          JavaLib::CloudClient.get_instance.update_node_status(node_status)
+        end
+      end
+    end
+  end
+end

data/lib/game_machine/cluster_monitor.rb

@@ -72,7 +72,7 @@ module GameMachine
 
       elsif message.is_a?(JavaLib::ClusterEvent::MemberRemoved)
         address = message.member.address.to_string
-        Akka.instance.hashring.remove_bucket(address)
+        Akka.instance.hashring.remove_node(address)
         self.class.remove_cluster_member(address)
         self.class.remove_remote_member(address)
 
@@ -83,7 +83,7 @@ module GameMachine
       elsif message.is_a?(JavaLib::ClusterEvent::MemberUp)
         address = message.member.address.to_string
         self.class.add_cluster_member(address,message.member)
-        Akka.instance.hashring.add_bucket(address)
+        Akka.instance.hashring.add_node(address)
 
         unless address == @cluster.self_address.to_string
           self.class.add_remote_member(address,message.member)
@@ -98,7 +98,7 @@ module GameMachine
         message.get_members.each do |member|
           address = member.address.to_string
           self.class.add_cluster_member(address,member)
-          Akka.instance.hashring.add_bucket(address)
+          Akka.instance.hashring.add_node(address)
           unless address == @cluster.self_address.to_string
             self.class.add_remote_member(address,member)
           end

data/lib/game_machine/commands.rb

@@ -7,7 +7,7 @@ require_relative 'commands/misc_commands'
 require_relative 'commands/proxy'
 require_relative 'commands/base'
 
-if Config::CONFIG['target_os'] == 'linux'
+if RbConfig::CONFIG['host_os'].match(/linux/i)
   require_relative 'commands/navigation_commands'
 end
 

data/lib/game_machine/commands/misc_commands.rb

@@ -2,18 +2,14 @@ module GameMachine
   module Commands
     class MiscCommands
 
-      attr_reader :player_manager
+      attr_reader :player_manager, :mono_proxy
       def initialize
+        @mono_proxy = JavaLib::MonoProxy.getInstance
         @player_manager = Application.config.player_manager
       end
 
-      def player_status_change(player_id,status)
-        if player_manager
-          update = Models::PlayerStatusUpdate.new(:player_id => player_id,:status => status)
-          Actor::Base.find(player_manager).tell(update)
-        else
-          GameMachine.logger.info "player manager not defined."
-        end
+      def call_mono(klass,message)
+        mono_proxy.call(klass,message)
       end
 
       def client_manager_register(name,events=[])

data/lib/game_machine/commands/player_commands.rb

@@ -3,6 +3,14 @@ module GameMachine
     class PlayerCommands
       include MessageHelper
 
+      def send_game_message(game_message,player_id)
+        entity = MessageLib::Entity.new.set_id('0')
+        game_messages = MessageLib::GameMessages.new
+        game_messages.add_game_message(game_message)
+        entity.set_game_messages(game_messages)
+        send_message(entity,player_id)
+      end
+
       def send_message(message,player_id)
         if player_id.nil?
           raise "player id cannot be nil"

data/lib/game_machine/console.rb

@@ -1,3 +1,4 @@
 require_relative 'console/install'
 require_relative 'console/build'
 require_relative 'console/server'
+require_relative 'console/bundle'

data/lib/game_machine/console/build.rb

@@ -1,11 +1,11 @@
 require 'fileutils'
-require_relative '../settings'
 module GameMachine
   module Console
     class Build
 
-      attr_reader :command
-      def initialize(argv)
+      attr_reader :command, :bundle
+      def initialize(argv,bundle=false)
+        @bundle = bundle
         @command = argv.shift || ''
       end
 
@@ -21,17 +21,21 @@ module GameMachine
         File.join(java_root,'gradlew')
       end
 
-      def build_code
-        system("cd #{java_root} && #{gradlew} build")
-      end
-
       def generate_csharp_code
         protogen_path = File.join(ENV['APP_ROOT'],'mono','bin','csharp','protogen_csharp.exe')
         proto_file = File.join(ENV['APP_ROOT'],'config','combined_messages.proto')
+        proto_path = File.join(ENV['APP_ROOT'],'config')
         messages_out_file =  File.join(ENV['APP_ROOT'],'messages.cs')
-        cmd = "#{protogen_path} -i:#{proto_file} -o:#{messages_out_file}"
-        puts "Running #{cmd}"
-        system(cmd)
+        
+        # Yet another .NET tool that assumes the whole world is windows.  In this case it embeds a 
+        # windows protoc.exe, so we have to compile differently on non windows platforms
+        if Config::CONFIG['target_os'].match(/mswin/)
+          cmd = "#{protogen_path} -i:#{proto_file} -o:#{messages_out_file}"
+        else
+          bin_out_file =  File.join(ENV['APP_ROOT'],'messages.bin')
+          cmd = "protoc -I#{proto_path} #{proto_file} -o#{bin_out_file}; mono #{protogen_path} -i:#{bin_out_file} -o:#{messages_out_file};rm -f #{bin_out_file}"
+        end
+        return cmd
       end
 
       def generate_java_code
@@ -41,31 +45,60 @@ module GameMachine
 
       def generate_code
         generate_java_code
-        if Config::CONFIG['target_os'].match(/mswin/)
-          generate_csharp_code
-        end
+        generate_csharp_code
       end
 
       def remove_libs
         FileUtils.rm Dir.glob(File.join(java_lib,'*.jar'))
       end
 
-      def install_libs
-        system("cd #{java_root} && #{gradlew} install_libs")
+      def build(clean=false)
+        if clean
+          cmd = "cd #{java_root} && #{gradlew} clean build install_libs"
+        else
+          cmd = "cd #{java_root} && #{gradlew} build install_libs"
+        end
+      end
+
+      def bundle_commands
+        gm_path = File.join(ENV['APP_ROOT'],'.game_machine')
+        FileUtils.mkdir_p(gm_path)
+        vendor_path = File.join(gm_path,'vendor','bundle')
+        cmd = "cd #{ENV['APP_ROOT']} && bundle install --path=#{vendor_path}"
+      end
+
+      def run_commands(commands)
+        commands.each do |command|
+          system(command)
+        end
       end
 
       def run!
-        if command == 'code'
-          build_code
+        commands = []
+
+        if bundle
+          commands << generate_code
           remove_libs
-          install_libs
-        elsif command == 'messages'
-          generate_code
+          commands << build(true)
+          commands << bundle_commands
+          run_commands(commands)
+          bundler_path = File.join(ENV['APP_ROOT'],'.bundle')
+          FileUtils.rm_rf(bundler_path)
         else
-          generate_code
-          build_code
-          remove_libs
-          install_libs
+          if command == 'messages'
+            commands << generate_code
+            commands << build(false)
+            run_commands(commands)
+          elsif command == 'clean'
+            commands << generate_code
+            remove_libs
+            commands << build(true)
+            run_commands(commands)
+          else
+            commands << generate_code
+            commands << build(false)
+            run_commands(commands)
+          end
         end
       end
 

data/lib/game_machine/console/bundle.rb

@@ -0,0 +1,95 @@
+
+require 'digest'
+require 'openssl'
+require 'faraday'
+require 'yaml'
+require 'json'
+require 'fileutils'
+require_relative '../ruby_extensions/string'
+
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end
+
+suppress_warnings {OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE}
+
+module GameMachine
+  module Console
+    class Bundle
+
+      attr_reader :command, :name, :bundle_dir, :bundle_file
+      def initialize(argv)
+        @command = argv.shift
+        @name = argv.shift
+        @bundle_dir = File.join(ENV['APP_ROOT'],'.game_machine')
+        @bundle_file = File.join(bundle_dir,'bundle.zip')
+      end
+
+      
+      def upload_bundle(name)
+        username = AppConfig.instance.config.gamecloud.user
+        api_key = AppConfig.instance.config.gamecloud.api_key
+        host = AppConfig.instance.config.gamecloud.host
+
+        url = "http://#{host}/bundle/#{username}/upload"
+        token = Digest::SHA256.hexdigest("#{username}#{name}#{api_key}")
+        file = Faraday::UploadIO.new(bundle_file, 'application/octet-stream')
+        body = { :file => file, :name => name }
+       
+
+        response = conn.post do |req|
+          req.options[:timeout] = 10
+          req.options[:open_timeout] = 2 
+          req.url url
+          req.headers['X-Auth'] = token
+          req.body = body
+        end
+      end
+
+
+      def conn
+        Faraday.new do |f|
+          f.request :multipart
+          f.request :url_encoded
+          #f.response :logger
+          f.adapter Faraday.default_adapter
+        end
+      end
+
+      def create_bundle
+        FileUtils.mkdir_p(bundle_dir)
+        FileUtils.rm_f(bundle_file)
+        system("cd #{ENV['APP_ROOT']} && bundle install --path=.game_machine/vendor/bundle >> /dev/null && rm -rf #{ENV['APP_ROOT']}/.bundle")
+        system("cd #{ENV['APP_ROOT']} && zip -r .game_machine/bundle.zip games config db lib java bin script web .game_machine/vendor mono >> /dev/null")
+      end
+
+      def run!
+        if name.nil? || name.blank?
+          puts "Must specify bundle name"
+          puts "Usage: game_machine service push [bundle name]"
+          exit
+        end
+
+        puts "Creating bundle"
+        create_bundle
+
+        puts "Uploading bundle to server"
+        response = upload_bundle(name)
+        
+        if response.status == 204
+          puts "Push Successful"
+        else
+          puts response.body
+          puts "Push failed, server returned #{response.status}"
+        end
+      end
+
+    end
+  end
+end

data/lib/game_machine/console/deploy.rb

@@ -0,0 +1,30 @@
+module GameMachine
+  module Console
+    class Deploy
+
+      attr_reader :options, :service
+      def initialize(service,argv)
+        @options = parse_arguments(argv)
+        @service = service
+      end
+
+      def parse_arguments(arguments)
+        options = {}
+
+        OptionParser.new do |opt|
+          opt.banner = "Usage: game_machine deploy [options]"
+          opt.on('-n', '--name=name', String, 'Give a name to the bundle') { |v| options[:server] = v.strip }
+          
+          opt.parse!(arguments)
+        end
+        
+        unless options.has_key?(:name)
+          options[:name] = 'default'
+        end
+
+        options
+      end
+
+    end
+  end
+end

data/lib/game_machine/console/install.rb

@@ -2,13 +2,12 @@ module GameMachine
   module Console
     class Install
 
-      attr_reader :install_path, :help, :install_source_path
-      def initialize(argv,install_source_path)
-        @install_source_path = install_source_path
+      attr_reader :install_path, :help, :install_source_path, :command
+      def initialize(command,argv,install_source_path)
+        @command = command
         @install_path = argv.shift
-        if argv.find {|v| /--help/ =~ v}
-          @help = true
-        end
+        @install_source_path = install_source_path
+        
         puts "Installing from #{install_source_path}"
       end
 
@@ -16,39 +15,24 @@ module GameMachine
         puts "Invalid install path #{install_path} (#{reason})"
       end
 
-      def valid_input?
-      end
-
       def run!
-        if help
-          show_help
-          return
-        end
-
         if install_path.nil? || install_path.empty?
           error("Invalid input")
           return
         end
 
-        if File.exists?(install_path)
+        if command == 'install' && File.exists?(install_path)
           error("Directory exists")
           return
         end
 
-        @install_path = File.expand_path(install_path)
-        install
-      end
-
-      def show_help
-        puts "new [install directory]"
-      end
-
-      def valid_install_path?
-        if File.exists?(install_path)
-          false
-        else
-          true
+        if command == 'upgrade' && !File.exists?(install_path)
+          error("Installation not found")
+          return
         end
+
+        @install_path = File.expand_path(install_path)
+        send(command.to_sym)
       end
 
       def install
@@ -58,21 +42,67 @@ module GameMachine
         FileUtils.cp_r(config_source,path)
         FileUtils.cp_r(games_source,path)
         FileUtils.cp_r(java_source,path)
-        FileUtils.cp_r(script_source,path)
         FileUtils.cp_r(mono_source,path)
-        FileUtils.cp_r(db_source,path)
+
+        FileUtils.cp_r(web_source,path)
+        FileUtils.cp_r(lib_source,path)
+        FileUtils.cp_r(bin_source,path)
+
+        FileUtils.cp(gemfile_source,path)
+        FileUtils.cp(gemlockfile_source,path)
+      end
+
+      def upgrade
+        puts "Upgrading installation at #{install_path}"
+        path = File.expand_path(install_path)
+
+        puts "Upgrading mono"
+        FileUtils.rm_rf(File.join(path,'mono'))
+        FileUtils.cp_r(mono_source,path)
+
+        puts 'Upgrading java'
+        FileUtils.rm_rf(File.join(path,'java','project'))
+        FileUtils.cp_r(java_project_source, File.join(path,'java','project'))
+
+        puts 'Upgrading Gemfile'
+        FileUtils.rm_rf(File.join(path,'Gemfile'))
+        FileUtils.cp(gemfile_source,path)
+
+        FileUtils.rm_rf(File.join(path,'Gemfile.lock'))
+        FileUtils.cp(gemlockfile_source,path)
+
+        puts 'Upgrading lib'
+        FileUtils.rm_rf(File.join(path,'lib'))
+        FileUtils.cp_r(lib_source,path)
+
+        puts 'Upgrading bin'
+        FileUtils.rm_rf(File.join(path,'bin'))
+        FileUtils.cp_r(bin_source,path)
+        
       end
 
-      def db_source
-        File.join(install_source_path,'db')
+      def gemfile_source
+        File.join(install_source_path,'Gemfile')
       end
 
-      def mono_source
-        File.join(install_source_path,'mono')
+      def gemlockfile_source
+        File.join(install_source_path,'Gemfile.lock')
       end
 
-      def script_source
-        File.join(install_source_path,'script')
+      def web_source
+        File.join(install_source_path,'web')
+      end
+
+      def lib_source
+        File.join(install_source_path,'lib')
+      end
+
+      def bin_source
+        File.join(install_source_path,'bin')
+      end
+
+      def mono_source
+        File.join(install_source_path,'mono')
       end
 
       def config_source
@@ -83,6 +113,10 @@ module GameMachine
         File.join(install_source_path,'games')
       end
 
+      def java_project_source
+        File.join(install_source_path,'java','project')
+      end
+
       def java_source
         File.join(install_source_path,'java')
       end