woyo-server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463090a5a8f8f70bc5b6de114d5d1f57f26f08ac
-  data.tar.gz: 56378db7ab92e7fe2c062930987953fb7ec1da0b
+  metadata.gz: d631fff970708970e8c666a81ad35a2c2ede9004
+  data.tar.gz: 9f29d92c99ec739eb5dd4dc50107537aeca7bdf4
 SHA512:
-  metadata.gz: 8d37fed73e100523edaa6a37019f62587549513cd7f2e2a4075bec8d0eff183a58ef23ed8fdf9f9c8c42c67e665b27d969007a0a0c5bc55a137bb7c48cab5fd6
-  data.tar.gz: 88d03ad3e5d1f022d655bdfa448c76dccc0a4755c3cf9f25db6d1f4c8a6a740d9c52c5ac5ef3da7a230a4817037ca1753a8b9ee971227f904305a0d17617cf57
+  metadata.gz: 7066e24c44ef560cbc484c1ecff89de388b70796b9ce033e845bb9a49d61a1ffc1f4bc81f9c697210fa0092eea6e309f8d5ffe89ef60486e35e3390d7289a072
+  data.tar.gz: f9aef1c1096177eb60b57a73dc19796ed933b3ec364c12023db956e2a7052a9481a98005ef640d190c784de3ebe06cff59f6dc55072bd13ea3fa7f362f4a3195

data/lib/woyo/runner.rb

@@ -15,6 +15,7 @@ class Runner
 
     code = case @args.first
       when 'new'     then mode_new
+      when 'update'  then mode_update
       when 'server'  then mode_server
       when 'console' then mode_console
       end
@@ -32,11 +33,6 @@ class Runner
 
   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
@@ -47,22 +43,42 @@ class Runner
       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')
+      if Dir.exists? dir
+        unless @args.include?('-f') || @args.include?('--force')
+          print_error 'Directory already exists'
+          return -2 
+        end
+      else
         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
+      FileUtils.cp_r File.join( __dir__, '../../', subdir ), dir, preserve: true
     end
+    FileUtils.ln_s 'foundation-5.2.2', File.join(dir,'public/server/foundation')
+    FileUtils.ln_s 'jquery-2.1.1', File.join(dir,'public/server/jquery')
+    return 0
+  end
+
+  def self.mode_update
+    if @args.include?('-h') || @args.include?('--help')
+      print_help_update
+      return 0
+    end
+    unless in_server_directory?
+      unless @args.include?('-f') || @args.include?('--force')
+        print_error 'This is not a Woyo::Server directory'
+        return -4
+      end
+    end
+    [ 'public', 'views', 'world' ].each do |subdir|
+      FileUtils.cp_r File.join( __dir__, '../../', subdir ), '.', preserve: true
+    end
+    FileUtils.ln_s 'foundation-5.2.2', 'public/server/foundation' unless File.exists? 'public/server/foundation'
+    FileUtils.ln_s 'jquery-2.1.1', 'public/server/jquery' unless File.exists? 'public/server/jquery'
     return 0
   end
 
@@ -71,6 +87,10 @@ class Runner
       print_help_server
       return 0
     end
+    unless in_server_directory?
+      print_error 'This is not a Woyo::Server directory'
+      return -4
+    end
     Woyo::Server.run!
     return 0
   end
@@ -80,6 +100,14 @@ class Runner
       print_help_console
       return 0
     end
+    unless in_server_directory?
+      print_error 'This is not a Woyo::Server directory'
+      return -4
+    end
+  end
+
+  def self.in_server_directory?
+    Dir['{public,views,world}'] == %w( public views world )
   end
 
   def self.print_help
@@ -98,6 +126,14 @@ class Runner
     @err.puts "............."
   end
 
+  def self.print_help_update
+    @err.puts "Usage: woyo update ..."
+    @err.puts
+    @err.puts "............."
+    @err.puts "............."
+    @err.puts "............."
+  end
+
   def self.print_help_server
     @err.puts "Usage: woyo server ..."
     @err.puts

data/lib/woyo/server/server.rb

@@ -17,6 +17,8 @@ class Server < Sinatra::Application
   configure do
     enable :sessions
     set root: '.'
+    set views: Proc.new { File.join(root, "views/server") }
+    set public_folder: Proc.new { File.join(root, "public/server") }
     set world: self.load_world
   end
 
@@ -25,8 +27,8 @@ class Server < Sinatra::Application
   end
 
   get '/' do
-    redirect to '/default.html' if world.locations.empty?
-    @location ||= world.locations[:home] || world.locations.values.first
+    redirect to 'default.html' if world.locations.empty? || ( !@location && !world.start )
+    @location ||= world.locations[world.start]
     session[:location] = @location
     haml :location
   end

data/lib/woyo/server/version.rb

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

data/public/server/default.html

@@ -0,0 +1,42 @@
+<!doctype html>
+<html class="no-js" lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>WOYO - World Of Your Own</title>
+    <link rel="stylesheet" href="foundation/css/foundation.css" />
+    <script src="foundation/js/vendor/modernizr.js"></script>
+  </head>
+  <body>
+
+    <div class="row">
+      <div class="large-12 columns">
+        <h1>WOYO - World Of Your Own</h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="large-12 columns">
+        <div class="panel">
+          <h3>Welcome to your Woyo::Server</h3>
+          <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>
+        </div>
+        <div class="panel">
+          <h3>Links</h3>
+          <ul>
+            <li><a href='https://github.com/iqeo/woyo-world/wiki'>Woyo-World documentation</a></li>
+            <li><a href='https://github.com/iqeo/woyo-server/wiki'>Woyo-Server documentation</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+
+    <script src="foundation/js/vendor/jquery.js"></script>
+    <script src="foundation/js/foundation.min.js"></script>
+    <script>
+      $(document).foundation();
+    </script>
+  </body>
+</html>                        
+