woyo-server 0.0.1 → 0.0.2

data/spec/woyo/server/1_server_spec.rb

@@ -8,6 +8,7 @@ describe Woyo::Server, :type => :feature do
       location :small
     end
     @home_world = Woyo::World.new do
+      start :home
       location :home do
         name 'Home'
         description 'Where the heart is.'
@@ -53,21 +54,44 @@ describe Woyo::Server, :type => :feature do
     end
   end
 
-  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
+  # these must be the first tests so that Woyo::Server.setting.world is not set
+  # that is why this file is name 1_server_spec.rb
+
+  it 'welcome page is displayed if there is no world' do
+    visit '/'
+    status_code.should eq 200
+    page.should have_content 'Woyo'
+  end
+
+  it 'welcome page links to github docs' do
+    visit '/'
+    status_code.should eq 200
+    page.should have_link '', href: 'https://github.com/iqeo/woyo-world/wiki'
+    page.should have_link '', href: 'https://github.com/iqeo/woyo-server/wiki'
+  end
+
+  it 'uses foundation framework' do
+    visit '/'
+    status_code.should eq 200
+    page.should have_css 'head link[href="foundation/css/foundation.css"]'
+    page.should have_css 'head script[src="foundation/js/vendor/modernizr.js"]'
+  end
+
+  it 'accepts a world (without start - display welcome)' do
+    Woyo::Server.set :world, @small_world
     visit '/'
     status_code.should eq 200
-    page.should have_content 'Welcome'
+    page.should have_content 'Woyo'
   end
 
-  it 'accepts a world' do
+  it 'accepts a world (with start)' do
+    @small_world.start = :small
     Woyo::Server.set :world, @small_world
     visit '/'
     status_code.should eq 200
   end
 
-  it 'describes a location' do 
+  it 'describes the start location' do 
     Woyo::Server.set :world, @home_world
     visit '/'
     page.should have_selector '.location#location_home'

data/spec/woyo/server/runner_spec.rb

@@ -3,6 +3,9 @@ require 'fileutils'
 require 'stringio'
 require 'open-uri'
 
+STDERR.sync = true
+STDERR.sync = true
+
 describe Woyo::Runner do
 
   before :each do
@@ -11,6 +14,17 @@ describe Woyo::Runner do
   end
 
   before :all do
+    @expected_entries = [ 'public', 'views', 'world' ]
+    @contents = {
+      '.'             => %w( . .. world views public ),
+      'world'         => %w( . .. ),
+      'views'         => %w( . .. app server ),
+      'views/app'     => %w( . .. ),
+      'views/server'  => %w( . .. layout.haml location.haml ),
+      'public'        => %w( . .. app server ),
+      'public/app'    => %w( . .. html images js css ),
+      'public/server' => %w( . .. default.html foundation foundation-5.2.2 jquery jquery-2.1.1 ),
+    }
     @original_path = Dir.pwd
     File.basename(@original_path).should eq 'woyo-server'
     @test_dir = 'tmp/test'
@@ -34,10 +48,6 @@ describe Woyo::Runner do
 
   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
@@ -56,21 +66,18 @@ describe Woyo::Runner do
     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
+      [['new','testworld'],['new','test/testworld']].each do |cmd,dir|
+        Woyo::Runner.run( [cmd,dir], out: @output, err: @error ).should eq 0
+        Dir.should exist dir
+        Dir.entries(dir).sort.should eq @contents['.'].sort
       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
+      Woyo::Runner.run( ['new','testworld'], out: @output, err: @error ).should eq 0
+      @contents.each do |dir,contents|
+        Dir.entries(File.join('testworld',dir)).sort.should eq contents.sort
+      end
     end
 
     it 'requires force (-f/--force) for existing directory' do
@@ -84,12 +91,22 @@ describe Woyo::Runner do
           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
+          (Dir.entries(dir) & @expected_entries).sort.should eq @expected_entries
           FileUtils.rm_rf dir
         end                                     
       end
     end
 
+    it 'refuses for existing file' do
+      [['new','testworld'],['new','test/testworld']].each do |args|
+        dir = args[1]
+        FileUtils.mkdir_p File.dirname(dir)
+        FileUtils.touch dir 
+        File.should exist dir
+        Woyo::Runner.run( args, out: @output, err: @error ).should eq -3
+      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
@@ -109,7 +126,13 @@ describe Woyo::Runner do
       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' )
+      @this_world_path = File.join( @original_path, @test_dir, 'testworld' )
+      Dir.pwd.should eq @this_world_path
+    end
+
+    before :each do
+      Dir.chdir @this_world_path
+      Dir.pwd.should eq @this_world_path
     end
 
     after :all do
@@ -117,12 +140,17 @@ describe Woyo::Runner do
       Dir.pwd.should eq @original_path
     end
 
+    it 'must be run within a world application directory' do
+      Dir.chdir '..'
+      Woyo::Runner.run( ['server'], out: @output, err: @error ).should eq -4  
+    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' } }
+      Woyo::Server.set :world, Woyo::World.new { start :home ; location(:home) { name 'Home' } }
       page = ''
       expect { page = open("http://127.0.0.1:4567/").read }.to_not raise_error
       page.should include 'Home'
@@ -141,15 +169,117 @@ describe Woyo::Runner do
 
   context 'console' do
 
-    it 'starts a world application console'
+    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 'must be run within a world application directory' do
+      Dir.chdir '..'
+      Woyo::Runner.run( ['console'], out: @output, err: @error ).should eq -4
+    end
+    
+    # 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
 
-    it 'help (-h/--help) explains console command' do
+  end
+
+  context 'update' 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'
+      @this_world_path = File.join( @original_path, @test_dir, 'testworld' )
+      Dir.pwd.should eq @this_world_path
+    end
+
+    before :each do
+      Dir.chdir @this_world_path
+      Dir.pwd.should eq @this_world_path
+    end
+
+    after :all do
+      Dir.chdir @original_path
+      Dir.pwd.should eq @original_path
+    end
+
+    it 'runs in a world application directory' do
+      Woyo::Runner.run( ['update'], out: @output, err: @error ).should eq 0
+    end
+
+    it 'updates existing standard files and directories' do
+      before = Time.now - 30 # new directory was deployed within last 60 seconds
+      Woyo::Runner.run( ['update'], out: @output, err: @error ).should eq 0
+      @contents.each do |dir,contents|
+        contents.each do |file|
+          unless ['.','..'].include?( file ) || File.symlink?( File.join(dir,file) )
+            File.mtime(File.join(dir,file)).should be < before 
+          end
+        end
+      end
+    end
+
+    it 'replaces missing standard files and directories' do
+      FileUtils.rm_rf 'views/server'
+      FileUtils.rm_rf 'public/server'
+      Woyo::Runner.run( ['update'], out: @output, err: @error ).should eq 0
+      @contents.each do |dir,contents|
+        contents.each do |file|
+          File.should exist File.join(dir,file)
+        end
+      end
+    end
+
+    it 'preserves custom files and directories' do
+      custom = %w( world/custom.rb views/app/custom.haml public/app/html/custom.html public/app/images/custom.png public/app/js/custom.js public/app/css/custom.css )
+      custom.each { |f| FileUtils.touch f }
+      Woyo::Runner.run( ['update'], out: @output, err: @error ).should eq 0
+      custom.each { |f| File.should exist f } 
+    end
+
+    it 'must be run within a world application directory' do
+      FileUtils.mkdir_p '../not-a-server'
+      Dir.chdir '../not-a-server'
+      Woyo::Runner.run( ['update'], out: @output, err: @error ).should eq -4
+    end
+
+    it 'requires force (-f/--force) to run in incomplete or non world application directory' do
+      FileUtils.mkdir_p '../not-a-server'
+      Dir.chdir '../not-a-server'
+      Woyo::Runner.run( ['update','--force'], out: @output, err: @error ).should eq 0
+      FileUtils.mkdir_p '../also-not-a-server'
+      Dir.chdir '../also-not-a-server'
+      Woyo::Runner.run( ['update','-f'], out: @output, err: @error ).should eq 0
+    end
+
+    it 'help (-h/--help) explains update 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'
+        Woyo::Runner.run( ['update'] + help, out: @output, err: @error ).should eq 0
+        @error.string.should include 'woyo update'
       end
     end
 
   end
-
 end

data/views/server/layout.haml

@@ -0,0 +1,17 @@
+%html
+
+  %head
+    %meta{ :charset => "utf-8" }
+    %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }
+    %link{ :rel => "stylesheet", :href => "/foundation/css/foundation.css" }
+    %script{ :src => "/foundation/js/vendor/modernizr.js" }
+    %title WOYO - World of Your Own
+
+  %body
+
+    = yield
+
+    %script{ :src => "/foundation/js/vendor/jquery.js" }
+    %script{ :src => "/foundation/js/foundation.min.js" }
+    %script $(document).foundation();
+ 

data/woyo-server.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "capybara"
 
-  spec.add_runtime_dependency "woyo-world"
+  spec.add_runtime_dependency "woyo-world", Woyo::SERVER_VERSION
   spec.add_runtime_dependency "sinatra", "~> 1.4.5"
   spec.add_runtime_dependency "sinatra-contrib", "~> 1.4.2"
   spec.add_runtime_dependency "haml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woyo-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gerard Fowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: woyo-world
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,46 @@ files:
 - lib/woyo/server.rb
 - lib/woyo/server/server.rb
 - lib/woyo/server/version.rb
-- public/default.html
+- public/server/default.html
+- public/server/foundation-5.2.2/css/foundation.css
+- public/server/foundation-5.2.2/css/foundation.min.css
+- public/server/foundation-5.2.2/css/normalize.css
+- public/server/foundation-5.2.2/humans.txt
+- public/server/foundation-5.2.2/img/.gitkeep
+- public/server/foundation-5.2.2/index.html
+- public/server/foundation-5.2.2/js/foundation.min.js
+- public/server/foundation-5.2.2/js/foundation/foundation.abide.js
+- public/server/foundation-5.2.2/js/foundation/foundation.accordion.js
+- public/server/foundation-5.2.2/js/foundation/foundation.alert.js
+- public/server/foundation-5.2.2/js/foundation/foundation.clearing.js
+- public/server/foundation-5.2.2/js/foundation/foundation.dropdown.js
+- public/server/foundation-5.2.2/js/foundation/foundation.equalizer.js
+- public/server/foundation-5.2.2/js/foundation/foundation.interchange.js
+- public/server/foundation-5.2.2/js/foundation/foundation.joyride.js
+- public/server/foundation-5.2.2/js/foundation/foundation.js
+- public/server/foundation-5.2.2/js/foundation/foundation.magellan.js
+- public/server/foundation-5.2.2/js/foundation/foundation.offcanvas.js
+- public/server/foundation-5.2.2/js/foundation/foundation.orbit.js
+- public/server/foundation-5.2.2/js/foundation/foundation.reveal.js
+- public/server/foundation-5.2.2/js/foundation/foundation.slider.js
+- public/server/foundation-5.2.2/js/foundation/foundation.tab.js
+- public/server/foundation-5.2.2/js/foundation/foundation.tooltip.js
+- public/server/foundation-5.2.2/js/foundation/foundation.topbar.js
+- public/server/foundation-5.2.2/js/vendor/fastclick.js
+- public/server/foundation-5.2.2/js/vendor/jquery.cookie.js
+- public/server/foundation-5.2.2/js/vendor/jquery.js
+- public/server/foundation-5.2.2/js/vendor/modernizr.js
+- public/server/foundation-5.2.2/js/vendor/placeholder.js
+- public/server/foundation-5.2.2/robots.txt
+- public/server/jquery-2.1.1/jquery.js
+- public/server/jquery-2.1.1/jquery.min.js
+- public/server/jquery-2.1.1/jquery.min.map
 - spec/spec_helper.rb
 - spec/woyo/server/1_server_spec.rb
 - spec/woyo/server/runner_spec.rb
 - tmux
-- views/layout.haml
-- views/location.haml
-- world/default.rb
+- views/server/layout.haml
+- views/server/location.haml
 - woyo-server.gemspec
 homepage: ''
 licenses:

data/public/default.html

@@ -1,15 +0,0 @@
-<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/views/layout.haml

@@ -1,6 +0,0 @@
-%html
-  %head
-    %title The Title
-  %body
-    = yield
-

data/world/default.rb

@@ -1,76 +0,0 @@
-
-=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
-