carbonmu 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53974bdbf1c1b7b9098bd891531def0b0a163fe1
-  data.tar.gz: 0ba17a6b68dc0090370ee7be96d6125ea4ceac12
+  metadata.gz: 4b4d4a83001aaf98215282b5a850822d56915f89
+  data.tar.gz: b2844a5cefe2228312075bb0702e726866e61733
 SHA512:
-  metadata.gz: 7e8de6c21cf3e0e225bcfbd2f004b3ada12b6caa7ee598e62860d4b659e7f09bebd7777cc3fc0cda2748e7cc6cc791b3b2db1edfa8aa7b2e87f61c1b1754030d
-  data.tar.gz: 28f1428f645166759d57d55a9efee5777c6526e5fd25fd41372114d28418c603aeada747e6c8d00b79d0e6439382cdb7cd757d3f5e6a42902018414c0c47c88d
+  metadata.gz: 061181719392b61fb2a05dce2de3de5d95b60bfbca03673ed17153fcb37bb3d1b064b52933f3a5358361582b62da896e6cf638a8660f5e711455791f5bba8269
+  data.tar.gz: e5ee87d82e8f7ba9d3f742aff2eab23413cdf1fa8794255befc15c6980bca1f4abb7fd9b4b61f8abdda770ffeb86a67543c7ef4f63932be8dd0e4ab951b1cfd2

data/.gitignore

@@ -1,3 +1,4 @@
 .yardoc
 .*.swp
 coverage
+*.gem

data/Gemfile.lock

@@ -44,7 +44,6 @@ GEM
       thread
       thread_safe
     erubis (2.7.0)
-    fakefs (0.6.7)
     ffi (1.9.6)
     ffi-rzmq (2.0.4)
       ffi-rzmq-core (>= 1.0.1)
@@ -150,7 +149,6 @@ DEPENDENCIES
   awesome_print
   carbonmu!
   database_cleaner (~> 1.3.0)
-  fakefs
   guard (~> 2.12.4)
   guard-rspec (~> 4.5.0)
   i18n-tasks (~> 0.7.12)

data/Rakefile

@@ -1,3 +1,5 @@
+$:.push('lib')
+require 'version'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
@@ -8,3 +10,24 @@ desc "Run I18n specs (check for missing & unused keys)."
 RSpec::Core::RakeTask.new('spec:i18n') do |task|
   task.rspec_opts = "--tag i18n"
 end
+
+desc "Launch console"
+task :console do
+  require 'carbonmu'
+  require 'awesome_print'
+  require 'pry'
+  CarbonMU::Server.initialize_database
+  Pry.start CarbonMU
+end
+
+namespace :gem do
+  desc "Build new gem."
+  task :build do
+    system "gem build carbonmu.gemspec"
+  end
+
+  desc "Release new gem."
+  task :release => :build do
+    system "gem push carbonmu-#{CarbonMU::VERSION}.gem"
+  end
+end

data/bin/carbonmu

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift("../lib")
+require 'carbonmu'
+
+CarbonMU::CLI.new(ARGV).execute

data/carbonmu.gemspec

@@ -36,29 +36,14 @@ EOF
   s.add_development_dependency "timecop"
   s.add_development_dependency "database_cleaner", "~> 1.3.0"
   s.add_development_dependency "i18n-tasks", "~> 0.7.12"
-  s.add_development_dependency "fakefs"
-
-  dependencies = [
-    # Examples:
-    # [:runtime,     "rack",  "~> 1.1"],
-    # [:development, "rspec", "~> 2.1"],
-  ]
 
   s.files         = `git ls-files`.split
   s.test_files    = Dir['spec/**/*']
-  #s.executables   = Dir['bin/*'].map { |f| File.basename(f) }
+  s.executables   = Dir['bin/*'].map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   ## Make sure you can build the s.add_dependency on older versions of RubyGems too:
   s.rubygems_version = "2.2.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.specification_version = 3 if s.respond_to? :specification_version
-
-  dependencies.each do |type, name, version|
-    if s.respond_to?("add_#{type}_dependency")
-      s.send("add_#{type}_dependency", name, version)
-    else
-      s.add_dependency(name, version)
-    end
-  end
 end

data/lib/carbonmu.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 
 require 'require_all'
 require 'colorize' # An exception to our require-where-used rule, since it's likely to be used many places.
-require_all 'lib'
+require_all File.dirname(__FILE__)
 
 Celluloid::ZMQ.init
 

data/lib/cli/cli.rb

@@ -0,0 +1,34 @@
+module CarbonMU
+  class CLI
+    attr_reader :argv
+
+    def initialize(argv)
+      @argv = argv
+    end
+
+    def execute
+      if @argv.length == 0 || !COMMAND_WHITELIST.include?(@argv[0])
+        puts USAGE
+        exit(1)
+      end
+
+      command = @argv.shift
+      send(command, *@argv)
+    end
+
+    def start
+      CarbonMU.start
+    end
+
+    def start_server_only(port)
+      CarbonMU.edge_router_receive_port = port
+      CarbonMU.start_server
+    end
+
+    COMMAND_WHITELIST = ["start", "start_server_only"]
+
+    USAGE = <<-USAGE
+Usage: carbonmu start
+USAGE
+  end
+end

data/lib/core/internationalization.rb

@@ -6,7 +6,8 @@ module CarbonMU
 
     def self.setup
       I18n.enforce_available_locales = false
-      I18n.load_path = Dir["config/locales/**/*.yml"] # TODO support for plugins too.
+      core_locales_dir = File.expand_path("../../../config/locales", __FILE__)
+      I18n.load_path = Dir["#{core_locales_dir}/*.yml"] # TODO Check support for plugins too.
     end
 
     def self.translate(str, *opts)

data/lib/core/server.rb

@@ -101,7 +101,7 @@ module CarbonMU
 
     def self.initialize_database
       Mongoid.logger.level = ::Logger::DEBUG
-      Mongoid.load!("mongoid.yml", ENV["MONGOID_ENV"] || :production)
+      Mongoid.load!("config/database.yml", ENV["MONGOID_ENV"] || :production)
       ::Mongoid::Tasks::Database.create_indexes
     end
 

data/lib/edge_router/edge_router.rb

@@ -25,7 +25,7 @@ module CarbonMU
     end
 
     def start_server
-      spawn("/usr/bin/env ruby start-server-only #{@ipc_reader.port_number}")
+      spawn("bundle exec carbonmu start_server_only #{@ipc_reader.port_number}")
     end
 
     def handle_server_started(pid, port)

data/lib/version.rb

@@ -1,7 +1,7 @@
 module CarbonMU
   VERSION_MAJOR = 0
   VERSION_MINOR = 0
-  VERSION_TINY = 1
+  VERSION_TINY = 2
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_TINY}"
 end

data/spec/lib/core/internationalization_spec.rb

@@ -3,13 +3,11 @@ require "spec_helper"
 describe Internationalization do
 
   context ".setup" do
-    include FakeFS::SpecHelpers
-
-    it "loads the right loadpath" do
-      FileUtils.mkdir_p("config/locales")
-      FileUtils.touch("config/locales/boo.yml")
+    it "loads the core locale files" do
       CarbonMU::Internationalization.setup
-      expect(I18n.load_path).to eq(["/config/locales/boo.yml"])
+      core_locales_dir = File.expand_path("../../../../config/locales", __FILE__)
+
+      expect(I18n.load_path).to include("#{core_locales_dir}/en.yml")
     end
   end
 

data/spec/spec_helper.rb

@@ -23,7 +23,6 @@ require_relative '../lib/carbonmu.rb'
 require 'pry'
 require 'mongoid-rspec'
 require 'database_cleaner'
-require 'fakefs/spec_helpers'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carbonmu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tim Krajcar
@@ -248,25 +248,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.12
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   CarbonMU is a general-purpose, extendable MUD/MUSH server written in Ruby. CarbonMU is still
   under active development and not yet ready for general use.
 email: allegro@conmolto.org
-executables: []
+executables:
+- carbonmu
 extensions: []
 extra_rdoc_files: []
 files:
@@ -281,13 +268,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/carbonmu
 - carbonmu.gemspec
+- config/database.yml
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/locales/nl.yml
-- console
 - doc/architecture.png
 - lib/carbonmu.rb
+- lib/cli/cli.rb
 - lib/commands/locale_command.rb
 - lib/commands/ping_command.rb
 - lib/commands/reboot_command.rb
@@ -323,7 +312,6 @@ files:
 - lib/ipc/read_socket.rb
 - lib/ipc/write_socket.rb
 - lib/version.rb
-- mongoid.yml
 - spec/carbonmu_spec.rb
 - spec/i18n_spec.rb
 - spec/lib/commands/say_command_spec.rb
@@ -355,8 +343,6 @@ files:
 - spec/support/shared_examples/container.rb
 - spec/support/shared_examples/game_object.rb
 - spec/support/shared_examples/movable.rb
-- start
-- start-server-only
 homepage: http://github.com/tkrajcar/carbonmu
 licenses:
 - MIT

data/console

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# Console for testing. TODO replace me with a proper cli.
-
-require './lib/carbonmu.rb'
-require 'awesome_print'
-require 'pry'
-
-CarbonMU::Server.initialize_database
-Pry.start CarbonMU

data/start

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require './lib/carbonmu.rb'
-
-CarbonMU.start

data/start-server-only

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-#TODO - Replace this when the real CLI comes around.
-
-require './lib/carbonmu.rb'
-
-CarbonMU.edge_router_receive_port = ARGV[0]
-CarbonMU.start_server