woyo-server 0.0.1.pre2 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873173214680c79536ffbcc4bd9d46c898cd5c80
-  data.tar.gz: 942fe515cd22eb4ecfe1497841aed756a3fc7ea3
+  metadata.gz: 463090a5a8f8f70bc5b6de114d5d1f57f26f08ac
+  data.tar.gz: 56378db7ab92e7fe2c062930987953fb7ec1da0b
 SHA512:
-  metadata.gz: 4e7d1535fd0656c8212b391a2a2c6e9b91c49d43f169337236ad2baec51df3c657162a803fe628a993c520fe69880e936c128b45ae07688b6b69ae31e23f8b3f
-  data.tar.gz: 585777572bccd1a4cdcecb19d19acc16a0c3646d662138cb6de55716ed6cb3ee319642e2a0d494ea115a88bda2715698fc77bed7bc0a0668bb3f33201d2a7e4f
+  metadata.gz: 8d37fed73e100523edaa6a37019f62587549513cd7f2e2a4075bec8d0eff183a58ef23ed8fdf9f9c8c42c67e665b27d969007a0a0c5bc55a137bb7c48cab5fd6
+  data.tar.gz: 88d03ad3e5d1f022d655bdfa448c76dccc0a4755c3cf9f25db6d1f4c8a6a740d9c52c5ac5ef3da7a230a4817037ca1753a8b9ee971227f904305a0d17617cf57

data/bin/{woyo.rb → woyo}

@@ -1,7 +1,10 @@
 #! /usr/bin/env ruby
 
-require 'woyo/world'
-require 'woyo/server'
+require_relative '../lib/woyo/runner'
+
+exit Woyo::Runner.run ARGV
+
+=begin
 
 @home_world = Woyo::World.new do
   location :home do
@@ -50,4 +53,6 @@ end
 
 Woyo::Server.set :world, @home_world
 Woyo::Server.run!
+ 
+=end
 

data/lib/woyo/runner.rb

@@ -0,0 +1,129 @@
+require_relative 'server'
+require 'logger'
+
+module Woyo
+
+class Runner
+
+  def self.run args, out: $stdout, err: $stderr
+
+    @args = args.dup
+    @out = out
+    @err = err
+    $stderr = @err if @err
+    $stdout = @out if @out
+
+    code = case @args.first
+      when 'new'     then mode_new
+      when 'server'  then mode_server
+      when 'console' then mode_console
+      end
+    return code if code
+      
+    if @args.empty? || @args.include?('-h') || @args.include?('--help')
+      print_help
+      return 0
+    end
+
+    if @args.include?('-v') || @args.include?('--version')
+      print_version
+      return 0
+    end
+
+  end
+
+  def self.fail msg, code
+    print_error msg
+    return code
+  end
+
+  def self.mode_new
+    if @args.include?('-h') || @args.include?('--help')
+      print_help_new
+      return 0
+    end
+    mode, dir = @args.shift 2
+    if dir.nil?
+      print_error 'No directory provided'
+      return -1
+    end
+    if Dir.exists? dir
+      unless @args.include?('-f') || @args.include?('--force')
+        print_error 'Directory already exists'
+        return -2 
+      end
+    end
+    if File.exists? dir
+      unless @args.include?('-f') || @args.include?('--force')
+        print_error 'File exists with same name'
+        return -3 
+      end
+    end
+    FileUtils.mkdir_p dir
+    [ 'public', 'views', 'world' ].each do |subdir|
+      FileUtils.cp_r File.join( __dir__, '../../', subdir ), dir
+    end
+    return 0
+  end
+
+  def self.mode_server
+    if @args.include?('-h') || @args.include?('--help')
+      print_help_server
+      return 0
+    end
+    Woyo::Server.run!
+    return 0
+  end
+
+  def self.mode_console
+    if @args.include?('-h') || @args.include?('--help')
+      print_help_console
+      return 0
+    end
+  end
+
+  def self.print_help
+    @err.puts "Usage: woyo ..."
+    @err.puts
+    @err.puts "............."
+    @err.puts "............."
+    @err.puts "............."
+  end
+
+  def self.print_help_new
+    @err.puts "Usage: woyo new ..."
+    @err.puts
+    @err.puts "............."
+    @err.puts "............."
+    @err.puts "............."
+  end
+
+  def self.print_help_server
+    @err.puts "Usage: woyo server ..."
+    @err.puts
+    @err.puts "............."
+    @err.puts "............."
+    @err.puts "............."
+  end
+
+  def self.print_help_console
+    @err.puts "Usage: woyo console ..."
+    @err.puts
+    @err.puts "............."
+    @err.puts "............."
+    @err.puts "............."
+  end
+
+  def self.print_error msg
+    @err.puts "Error: #{msg}"
+  end
+
+  def self.print_version
+    @err.puts "woyo server version #{Woyo::SERVER_VERSION}"
+    @err.puts "woyo world  version #{Woyo::WORLD_VERSION}"
+  end
+
+end
+
+end
+

data/lib/woyo/server/server.rb

@@ -6,18 +6,27 @@ module Woyo
 
 class Server < Sinatra::Application
 
+  def self.load_world
+    world = Woyo::World.new
+    Dir['world/*.rb'].each do |filename|
+      world.instance_eval File.read filename
+    end
+    world
+  end
+
   configure do
-    set root: '.'
     enable :sessions
+    set root: '.'
+    set world: self.load_world
   end
 
   def world
-    raise 'No world provided' unless settings.respond_to? :world
     settings.world
   end
 
   get '/' do
-    @location = world.location :home
+    redirect to '/default.html' if world.locations.empty?
+    @location ||= world.locations[:home] || world.locations.values.first
     session[:location] = @location
     haml :location
   end

data/lib/woyo/server/version.rb

@@ -1,3 +1,3 @@
 module Woyo
-  SERVER_VERSION = "0.0.1.pre2"
+  SERVER_VERSION = "0.0.1"
 end

data/public/default.html

@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Welcome to WOYO - World Of Your Own</title>
+  </head>
+  <body>
+    <h1>Welcome to WOYO - World Of Your Own</h1>
+    <p>This is the default page on a Woyo server. You are seeing this page because the Woyo World has not been created yet.</p>
+    <p>To create the World, create and edit .rb files in the world/ directory.</p>
+    <h2>Links</h2>
+    <ul>
+      <li><a href='http://github.com/iqeo/woyo'>Woyo on github</a></li>
+      <li>...</li>
+    </ul>
+  </body>
+</html>                        

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'woyo/server'
 require 'rack/test'
 require 'capybara/rspec'
 Capybara.app = Woyo::Server

data/spec/woyo/server/{server_spec.rb → 1_server_spec.rb}

@@ -1,5 +1,5 @@
+require_relative '../../../lib/woyo/server'
 require 'spec_helper.rb'
-require 'woyo/server'
 
 describe Woyo::Server, :type => :feature do
 
@@ -53,9 +53,12 @@ describe Woyo::Server, :type => :feature do
     end
   end
 
-  it 'requires a world' do
+  it 'displays a welcome page if there is no world' do
+    # this must be the first test so that Woyo::Server.setting.world is not set
+    # that is why this file is name 1_server_spec.rb
     visit '/'
-    status_code.should eq 500
+    status_code.should eq 200
+    page.should have_content 'Welcome'
   end
 
   it 'accepts a world' do

data/spec/woyo/server/runner_spec.rb

@@ -0,0 +1,155 @@
+require_relative '../../../lib/woyo/runner'
+require 'fileutils'
+require 'stringio'
+require 'open-uri'
+
+describe Woyo::Runner do
+
+  before :each do
+    @output = StringIO.new
+    @error  = StringIO.new
+  end
+
+  before :all do
+    @original_path = Dir.pwd
+    File.basename(@original_path).should eq 'woyo-server'
+    @test_dir = 'tmp/test'
+  end
+
+  it 'prints a helpful message to stderr for help (-h/--help) switch' do
+    [['-h'],['--help']].each do |args|
+      Woyo::Runner.run( args, out: @output, err: @error ).should eq 0
+      @error.string.should include 'woyo'
+    end
+  end
+
+  it 'prints version info to stderr for version (-v/--version) switch' do
+    [['-v'],['--version']].each do |args|
+      Woyo::Runner.run( args, out: @output, err: @error ).should eq 0
+      @error.string.should include 'woyo'
+      @error.string.should include Woyo::SERVER_VERSION 
+      @error.string.should include Woyo::WORLD_VERSION 
+    end
+  end
+
+  context 'new' do
+
+    before :all do
+      @expected_entries = [ 'public', 'views', 'world' ]
+    end
+
+    before :each do
+      Dir.pwd.should eq @original_path
+      FileUtils.rm_rf @test_dir
+      FileUtils.mkdir_p @test_dir
+      Dir.chdir @test_dir
+      Dir.pwd.should eq File.join( @original_path, @test_dir )
+    end
+
+    after :each do
+      Dir.chdir @original_path
+      Dir.pwd.should eq @original_path
+    end
+
+    it 'requires a directory be specified' do
+      Woyo::Runner.run( ['new'], out: @output, err: @error ).should eq -1
+    end
+
+    it 'creates a world application directory' do
+      [['new','testworld'],['new','test/testworld']].each do |args|
+        Woyo::Runner.run( args, out: @output, err: @error ).should eq 0
+        Dir.should exist args[1]
+        (Dir.entries(args[1]) & @expected_entries).sort.should eq @expected_entries
+      end
+    end
+
+    it 'populates directories' do
+        Woyo::Runner.run( ['new','testworld'], out: @output, err: @error ).should eq 0
+        @expected_entries.each do |dir|
+          dir_entries = Dir.entries(File.join('testworld',dir)).sort
+          dir_entries.count.should be > 2
+          original_entries = Dir.entries(File.join(@original_path,dir)).sort
+          (dir_entries & original_entries).should eq original_entries 
+        end
+    end
+
+    it 'requires force (-f/--force) for existing directory' do
+      [['new','testworld'],['new','test/testworld'],['new','.']].each do |args|
+        dir = args[1]
+        FileUtils.mkdir_p dir
+        Dir.should exist dir
+        Woyo::Runner.run( args, out: @output, err: @error ).should eq -2
+        [['--force'],['-f']].each do |force|
+          FileUtils.mkdir_p dir
+          Dir.should exist dir
+          Woyo::Runner.run( args + force, out: @output, err: @error ).should eq 0
+          Dir.should exist dir
+          (Dir.entries(dir) & @expected_entries).sort.should eq @expected_entries      # subset
+          FileUtils.rm_rf dir
+        end                                     
+      end
+    end
+
+    it 'help (-h/--help) explains new command' do
+      [['-h'],['--help']].each do |help|
+        Woyo::Runner.run( ['new'] + help, out: @output, err: @error ).should eq 0
+        @error.string.should include 'woyo new'
+      end
+    end
+
+  end
+
+  context 'server' do
+
+    before :all do
+      Dir.pwd.should eq @original_path
+      FileUtils.rm_rf @test_dir
+      FileUtils.mkdir_p @test_dir
+      Dir.chdir @test_dir
+      Dir.pwd.should eq File.join( @original_path, @test_dir )
+      Woyo::Runner.run( ['new','testworld'], out: @output, err: @error ).should eq 0
+      Dir.chdir 'testworld'
+      Dir.pwd.should eq File.join( @original_path, @test_dir, 'testworld' )
+    end
+
+    after :all do
+      Dir.chdir @original_path
+      Dir.pwd.should eq @original_path
+    end
+
+    it 'starts a world application server' do
+      thread = Thread.new { Woyo::Runner.run( ['server'], out: @output, err: @error ) }
+      thread.should be_alive
+      sleep 2 
+      @error.string.should include 'has taken the stage'
+      Woyo::Server.set :world, Woyo::World.new { location(:home) { name 'Home' } }
+      page = ''
+      expect { page = open("http://127.0.0.1:4567/").read }.to_not raise_error
+      page.should include 'Home'
+      Woyo::Server.stop!
+      thread.join
+    end
+
+    it 'help (-h/--help) explains server command' do
+      [['-h'],['--help']].each do |help|
+        Woyo::Runner.run( ['server'] + help, out: @output, err: @error ).should eq 0
+        @error.string.should include 'woyo server'
+      end
+    end
+
+  end
+
+  context 'console' do
+
+    it 'starts a world application console'
+
+    it 'help (-h/--help) explains console command' do
+      [['-h'],['--help']].each do |help|
+        Woyo::Runner.run( ['console'] + help, out: @output, err: @error ).should eq 0
+        @error.string.should include 'woyo console'
+      end
+    end
+
+  end
+
+end

data/world/default.rb

@@ -0,0 +1,76 @@
+
+=begin
+
+# there may be multiple files in this world/ directory
+# this is a Woyo world file
+# it describe objects in a Woyo world
+# it has an .rb extension
+# it is just Ruby 
+# it is evaluated in the context of a Woyo::World instance
+# methods avalable for World object creation include
+#   location
+#   character
+#   item
+#   etc...
+
+# to see this example world in action delete the =begin and =end lines at the top and bottom of this file
+
+location :home do
+
+  name 'Home'
+  description 'Where the heart is.'
+
+  way :out do
+    name 'Door'
+    description 'A sturdy wooden door, old fashioned farmhouse style of a bygone era.'
+    to :garden
+  end
+
+  way :down do
+    name 'Stairs'
+    description 'Rickety stairs lead down into darkness. A dank smell emanates from the darkness below'
+    to :cellar
+  end
+
+end
+
+location :garden do
+
+  name 'Garden'
+  description 'A peaceful green oasis of life in the midst of a gray city'
+
+  way :in do
+    name 'Door'
+    description 'Door leads inside a cute cottage'
+    to :home
+  end
+
+  way :down do
+    name 'Bulkhead'
+    description 'Rusty bulkhead door and stairs'
+    to :cellar
+  end
+
+end
+
+location :cellar do
+
+  name 'Cellar'
+  description 'Dark and damp, full of shadows and strange sounds'
+
+  way :out do
+    name 'Bulkhead'
+    description 'Rusty bulkhead stairs and door'
+    to :garden
+  end
+
+  way :up do
+    name 'Stairs'
+    description 'Rickety stairs lead up into light'
+    to :home
+  end
+
+end
+
+=end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woyo-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1
 platform: ruby
 authors:
 - Gerard Fowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,7 @@ description: Game world server
 email:
 - gerard.fowley@iqeo.net
 executables:
-- woyo.rb
+- woyo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -151,15 +151,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/woyo.rb
+- bin/woyo
+- lib/woyo/runner.rb
 - lib/woyo/server.rb
 - lib/woyo/server/server.rb
 - lib/woyo/server/version.rb
+- public/default.html
 - spec/spec_helper.rb
-- spec/woyo/server/server_spec.rb
+- spec/woyo/server/1_server_spec.rb
+- spec/woyo/server/runner_spec.rb
 - tmux
 - views/layout.haml
 - views/location.haml
+- world/default.rb
 - woyo-server.gemspec
 homepage: ''
 licenses:
@@ -176,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -187,4 +191,5 @@ specification_version: 4
 summary: World of Your Own
 test_files:
 - spec/spec_helper.rb
-- spec/woyo/server/server_spec.rb
+- spec/woyo/server/1_server_spec.rb
+- spec/woyo/server/runner_spec.rb