From ba34c510c3689a9c193f1f8c9063efce8d1ec5cf Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Thu, 22 Dec 2016 21:18:10 +0200 Subject: [PATCH] update gems, remove older unused stuff --- Gemfile | 12 +++---- Gemfile.lock | 71 +++++++++++++++++------------------------- config.ru | 25 +++------------ config/dependencies.rb | 2 -- 4 files changed, 38 insertions(+), 72 deletions(-) diff --git a/Gemfile b/Gemfile index b525f3a..34a0071 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,14 @@ source 'https://rubygems.org' -gem "opal" , :github => "opal/opal" +gem "opal" +gem 'opal-sprockets' gem 'opal-browser' #gem "ast" , :path => "../ast" -gem "ast" , :github => "whitequark/ast" +gem "ast" , :github => "whitequark/ast" , branch: :master -gem "salama" , "0.3" , :path => "../salama" +gem "salama" , "0.5" , :path => "../salama" #gem "salama" , github: "salama/salama" -gem "parslet" -gem "salama-reader" , github: "salama/salama-reader" -gem "salama-arm" , github: "salama/salama-arm" gem "salama-object-file" , github: "salama/salama-object-file" gem "sass" gem "susy" @@ -19,7 +17,7 @@ group :test do # Testing dependencies gem "minitest" gem 'rspec', '~> 3.2.0' - gem 'opal-rspec', '~> 0.4.2' + gem 'opal-rspec' gem 'capybara', '~> 2.4.2' gem 'selenium-webdriver', '~> 2.43.0' gem 'chromedriver2-helper', '~> 0.0.8' diff --git a/Gemfile.lock b/Gemfile.lock index a101f51..50ae6c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,50 +1,26 @@ -GIT - remote: git://github.com/opal/opal.git - revision: 959da7babe9dfb0ac47934451a5930e4412e3dce - specs: - opal (0.9.0.beta1) - hike (~> 1.2) - sourcemap (~> 0.1.0) - sprockets (~> 3.1) - tilt (>= 1.4) - -GIT - remote: git://github.com/salama/salama-arm.git - revision: 9b011ee365ea0312568ba858662023747154c59f - specs: - salama-arm (0.3.0) - GIT remote: git://github.com/salama/salama-object-file.git revision: aab01b23108f10063433b1ef9f703ff2927d0b80 specs: salama-object-file (0.3.0) -GIT - remote: git://github.com/salama/salama-reader.git - revision: 6ae4b624b07bb86ceb24acb27ad0ac83be2ecc1e - specs: - salama-reader (0.4.0) - ast (~> 2.1.0) - parslet (~> 1.7.1) - GIT remote: git://github.com/whitequark/ast.git - revision: 63db4686b33228e8f703cb7328e5e5c62aa3cd92 + revision: 93c43433ec4d4344485eb4ea6f8948925f092af1 + branch: master specs: - ast (2.1.0) + ast (2.3.0) PATH remote: ../salama specs: - salama (0.3.0) + salama (0.5.0) + parser (~> 2.2.0) salama-object-file (~> 0.3) - salama-reader (~> 0.3) GEM remote: https://rubygems.org/ specs: - blankslate (3.1.3) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -56,6 +32,7 @@ GEM chromedriver2-helper (0.0.8) nokogiri cliver (0.3.2) + concurrent-ruby (1.0.3) diff-lcs (1.2.5) ffi (1.9.10) hike (1.2.3) @@ -65,20 +42,29 @@ GEM multi_json (1.11.2) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + opal (0.10.3) + hike (~> 1.2) + sourcemap (~> 0.1.0) + sprockets (~> 3.1) + tilt (>= 1.4) opal-browser (0.2.0) opal paggio - opal-rspec (0.4.3) - opal (>= 0.7.0, < 0.9) + opal-rspec (0.6.0) + opal (>= 0.10.0, < 0.11) + opal-sprockets (0.4.0.0.10.0.3.0.0) + opal (~> 0.10.0) + sprockets (~> 3.0) + tilt (>= 1.4) paggio (0.2.5) - parslet (1.7.1) - blankslate (>= 2.0, <= 4.0) + parser (2.2.3.0) + ast (>= 1.1, < 3.0) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - rack (1.6.4) + rack (2.0.1) rack-test (0.6.3) rack (>= 1.0) rspec (3.2.0) @@ -102,11 +88,12 @@ GEM rubyzip (~> 1.0) websocket (~> 1.0) sourcemap (0.1.1) - sprockets (3.4.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) rack (> 1, < 3) susy (2.2.6) sass (>= 3.3.0, < 3.5) - tilt (2.0.1) + tilt (2.0.5) websocket (1.2.2) websocket-driver (0.6.2) websocket-extensions (>= 0.1.0) @@ -122,19 +109,17 @@ DEPENDENCIES capybara (~> 2.4.2) chromedriver2-helper (~> 0.0.8) minitest - opal! + opal opal-browser - opal-rspec (~> 0.4.2) - parslet + opal-rspec + opal-sprockets poltergeist (~> 1.5.0) rspec (~> 3.2.0) - salama (= 0.3)! - salama-arm! + salama (= 0.5)! salama-object-file! - salama-reader! sass selenium-webdriver (~> 2.43.0) susy BUNDLED WITH - 1.10.6 + 1.13.5 diff --git a/config.ru b/config.ru index e16ef5e..1384c70 100644 --- a/config.ru +++ b/config.ru @@ -7,32 +7,16 @@ require 'opal-browser' Opal.use_gem("salama") Opal.use_gem("ast") -Opal.use_gem("salama-arm") Register.machine.boot class DebugServer < Opal::Server - def call(env) + def ball(env) path = env["REQUEST_PATH"] return super(env) unless path.include?("json") route = path[1 .. path.index(".") - 1] - if( route == "codes") - [200, { 'Content-Type' => 'text/json' }, codes ] - elsif( route == "parfait") - [200, { 'Content-Type' => 'text/json' }, parfait ] - else - [200, { 'Content-Type' => 'text/json' }, code(route) ] - end - end - def codes - [Dir["codes/*.soml"].collect{|f| f.sub("codes/","").sub(".soml","")}.join("----")] - end - def parfait - all = [] - Soml::Compiler.each_parfait do |part| - all << part - end - [all.inspect] + [200, { 'Content-Type' => 'text/json' }, code(route) ] end + def code at soml = File.new("codes/#{at}.soml").read syntax = Parser::Salama.new.parse_with_debug(soml) @@ -40,12 +24,13 @@ class DebugServer < Opal::Server [parts.inspect] end end + run DebugServer.new { |s| s.main = 'debugger' s.append_path 'lib' s.append_path 'assets' s.debug = !ENV["DEBUG"].nil? - + s.source_map = true s.index_path = "index.html.erb" s.sprockets.cache = Sprockets::Cache::MemoryStore.new(5000) } diff --git a/config/dependencies.rb b/config/dependencies.rb index b1a682d..4416cad 100644 --- a/config/dependencies.rb +++ b/config/dependencies.rb @@ -1,6 +1,4 @@ # Specify which components you wish to include when # the "home" component loads. - -Opal.use_gem("salama-reader") Opal.use_gem("salama-object-file")