Browse Source

Amendments to get crystal-raw and moonshine ready for merge

Zane Kansil 10 years ago
parent
commit
d7084401b4

+ 2 - 1
frameworks/Crystal/crystal-raw/benchmark_config.json

@@ -17,7 +17,8 @@
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "Crystal",
       "display_name": "Crystal",
-      "notes": ""
+      "notes": "",
+      "versus": "ruby"
     }
     }
   }]
   }]
 }
 }

+ 1 - 1
frameworks/Crystal/crystal-raw/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 #!/bin/bash
 
 
-fw_depends crystal
+fw_depends crystal-0.7.1

+ 2 - 0
frameworks/Crystal/crystal-raw/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 #!/bin/bash
+source ${IROOT}/crystal-0.7.1.installed
 
 
 crystal build --release server.cr -o server.out
 crystal build --release server.cr -o server.out
+
 ./server.out
 ./server.out

+ 1 - 1
frameworks/Crystal/moonshine/install.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 #!/bin/bash
 
 
-fw_depends crystal
+fw_depends crystal-0.7.1
 
 

+ 3 - 4
frameworks/Crystal/moonshine/server.cr

@@ -3,14 +3,14 @@ require "redis"
 require "html/builder"
 require "html/builder"
 
 
 include Moonshine
 include Moonshine
-include Moonshine::Shortcuts
-include Moonshine::Http
+include Moonshine::Utils::Shortcuts
+include Moonshine::Base
 
 
 # Compose Objects (like Hash) to have a to_json method
 # Compose Objects (like Hash) to have a to_json method
 require "json/to_json"
 require "json/to_json"
 
 
 REDIS = Redis.new
 REDIS = Redis.new
-app = Moonshine::App.new
+app = App.new
 
 
 class CONTENT
 class CONTENT
   UTF8 = "; charset=UTF-8"
   UTF8 = "; charset=UTF-8"
@@ -30,7 +30,6 @@ end
 private def randomWorld
 private def randomWorld
   id = rand(1..ID_MAXIMUM)
   id = rand(1..ID_MAXIMUM)
   num = REDIS.get("world:" + id.to_s)
   num = REDIS.get("world:" + id.to_s)
-  puts num
   {
   {
     :id => id
     :id => id
     :randomNumber => num
     :randomNumber => num

+ 3 - 3
frameworks/Crystal/moonshine/setup.sh

@@ -1,5 +1,5 @@
-source ${IROOT}/crystal.installed
+source ${IROOT}/crystal-0.7.1.installed
 
 
-$crystal deps install
+crystal deps install
 
 
-$crystal server.cr &
+crystal server.cr &

+ 3 - 3
toolset/setup/linux/languages/crystal.sh → toolset/setup/linux/languages/crystal-0.7.1.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 #!/bin/bash
-REDCODE=$(fw_exists ${IROOT}/crystal.installed)
+REDCODE=$(fw_exists ${IROOT}/crystal-0.7.1.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 
 SAVE_AS=crystal-0.7.1-1-linux-x86_64.tar.gz
 SAVE_AS=crystal-0.7.1-1-linux-x86_64.tar.gz
 URL=https://github.com/manastech/crystal/releases/download/0.7.1/crystal-0.7.1-1-linux-x86_64.tar.gz
 URL=https://github.com/manastech/crystal/releases/download/0.7.1/crystal-0.7.1-1-linux-x86_64.tar.gz
 
 
-# Default filename is too long an causes problems
+# Default filename is too long, causing problems
 # Use -O to specify
 # Use -O to specify
 fw_get -O $SAVE_AS $URL
 fw_get -O $SAVE_AS $URL
 
 
 fw_untar crystal-0.7.1-1-linux-x86_64.tar.gz
 fw_untar crystal-0.7.1-1-linux-x86_64.tar.gz
 
 
-echo "crystal=${IROOT}/crystal-0.7.1-1/bin/crystal" >> ${IROOT}/crystal.installed
+echo "export PATH=$IROOT/crystal-0.7.1-1/bin/:$PATH" >> ${IROOT}/crystal-0.7.1.installed