RubyGems - browser_app_base - Versions diffs - 0.1.9 → 0.2.0 - Mend

browser_app_base 0.1.9 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

checksums.yaml +4 -4
data/Gemfile +7 -1
data/bin/create_browser_app.rb +5 -5
data/bin/start_sample.rb +12 -11
data/browser_app_base.gemspec +0 -1
data/lib/browser_app_base/version.rb +1 -1
data/lib/browser_app_base.rb +14 -9
data/lib/template/common.rb +13 -0
data/lib/template/config/browser.json +1 -0
data/lib/template/config.ru +10 -7
data/lib/template/css/index.css +1 -1
data/lib/template/history/history.json +0 -5
data/lib/template/js/main.js +98 -89
data/lib/template/my_app_sample.rb +2 -2
data/lib/template/server.rb +29 -15
data/lib/template/server_app_base.rb +15 -18
data/lib/template/start.rb +8 -8
data/lib/template/wsserver.rb +32 -16
metadata +3 -17
data/lib/template/html/test.html +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f5d83ea13920bcfc80e7ecd82c099c5749847535fb593de2f36ff942027555
-  data.tar.gz: 0a692e22ea4182825b0e6dd35c9c483c8e8d41ebbf9387155fcd4b53900b1f29
+  metadata.gz: 9137852eb791f7b49f75aae1dce1fd563a0a7b8c8597793de85eb27b068fcf57
+  data.tar.gz: a7d2f4e61de2b98dd65085590e7daf3a1372cc45856c29805e58533f3e4bd35d
 SHA512:
-  metadata.gz: d2be55260153ca5ea4ff173c72c5a368c5fc020ad426247bb4bdb6d40e875b1a83b56c2d61234a671ed4e650ea79e48bd5bfa0aa3038ba0681405e435d66d721
-  data.tar.gz: 06ba92962030bef3b58a5fb44ea8aa1c6596741fe82a12d40cbcf8bd1d040ddeeaf6e717046714ab76ae7623954b118edaa127ae6cbe0e9a8999770eb0a66db5
+  metadata.gz: 1caf4b5aaadd3f5f3beeb7fa347250f7f50b291ada0192f5a02b03e4dec6078fb71bab45d9025b5429e8e0b0c1778dd1e6f2c9f61138bf1c6fddf86483ac868e
+  data.tar.gz: a7a6e2c5b924a97ea0e1664eb7708890039705073d49e3e680f9f0af6ec80a1f47082bc91fe5465b9b188261cf8853629027498e1db83b2824bb575b9e7f0226

data/Gemfile CHANGED Viewed

@@ -5,6 +5,12 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in browser_app_base.gemspec
 gemspec
+gem "rack", "~> 2.2"
 gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
+gem "rspec", ">= 0"
+gem "rack-test"
+gem "sinatra"

data/bin/create_browser_app.rb CHANGED Viewed

@@ -6,19 +6,19 @@ require "optparse"
 opt = OptionParser.new
 o = {}
-opt.on("-d dir_name", "--dir dir_name", "application directory") { |v| o[:dir] = v }
-opt.on("-a app_name", "--app app_name", "application name") { |v| o[:app] = v }
+opt.on("-d DIR_NAME", "--dir DIR_NAME", "application directory") { |v| o[:dir] = v }
+opt.on("-a APP_NAME", "--app APP_NAME", "application name") { |v| o[:app] = v }
 opt.on("-h", "--help", "command help") { puts opt; exit }
 begin
   opt.parse!(ARGV)
-rescue
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   puts opt
   exit
 end
-if o[:dir] == nil
+if o[:dir].nil? || o[:dir].strip.empty?
   puts opt
   exit
 end
-BrowserAppBase.create o
+BrowserAppBase.create o

data/bin/start_sample.rb CHANGED Viewed

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+$LOAD_PATH << File.dirname(File.expand_path(__FILE__)).gsub(/bin$/, "lib")
 require "fileutils"
-require "facter"
 require "tmpdir"
 require "json"
+require "common"
 # tmpdirディレクトリにコピー
 dir = File.dirname(File.expand_path(__FILE__ + "/../"))
-home_dir = ENV["HOME"] + "/" + dir.split("/")[-1].gsub(/-[0-9\.-]+/,"")
+home_dir = ENV["HOME"] + "/" + dir.split("/")[-1].gsub(/-[0-9\.-]+/, "")
 puts "home_dir=#{home_dir}"
-Dir.mktmpdir { |tmpdir|
+Dir.mktmpdir do |tmpdir|
   outdir = tmpdir + "/" + dir.split("/")[-1]
   FileUtils.mkdir_p outdir
   FileUtils.mkdir_p home_dir
@@ -27,8 +28,8 @@ Dir.mktmpdir { |tmpdir|
     end
   end
   begin
-  json = JSON.parse(File.read("#{home_dir}/config/setting.json"))
-  old_version = json["version"]
+    json = JSON.parse(File.read("#{home_dir}/config/setting.json"))
+    old_version = json["version"]
   rescue
     old_version = ""
   end
@@ -39,14 +40,14 @@ Dir.mktmpdir { |tmpdir|
     FileUtils.cp "#{dir}/lib/config/setting.json", "#{home_dir}/config/setting.json"
   end
-  FileUtils.cd "#{outdir}"
-  kernel = Facter.value(:kernel)
-  if kernel == "windows"
+  FileUtils.cd outdir
+  kernel = get_os_type
+  if kernel.downcase == "windows"
     system "rubyw ./start.rb"
-  elsif kernel == "Linux"
+  elsif kernel.downcase == "linux"
     system "ruby ./start.rb"
   else
     system "ruby ./start.rb"
   end
   FileUtils.cd ENV["HOME"]
-}
+end

data/browser_app_base.gemspec CHANGED Viewed

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra-websocket"
   spec.add_dependency "thin"
   spec.add_dependency "json"
-  spec.add_dependency "facter"
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/browser_app_base/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module BrowserAppBase
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/browser_app_base.rb CHANGED Viewed

@@ -21,8 +21,8 @@ module BrowserAppBase
   def self.get_app_name(app)
     app_name = ""
-    app.each_char do |s|
-      if s =~ /[a-z]/ and app_name.size == 0
+    app.each_char.with_index do |s, i|
+      if s =~ /[a-z]/ && app_name.size == 0
         app_name += s.upcase
       else
         app_name += s
@@ -37,8 +37,8 @@ module BrowserAppBase
     puts "create application base #{dir}"
     FileUtils.mkdir_p dir
-    FileUtils.mkdir_p dir + "/lib/"
-    FileUtils.mkdir_p dir + "/bin/"
+    FileUtils.mkdir_p "#{dir}/lib/"
+    FileUtils.mkdir_p "#{dir}/bin/"
     path = File.dirname(File.expand_path(__FILE__)) + "/../"
     Dir.glob("#{path}/lib/template/*") do |f|
@@ -51,7 +51,7 @@ module BrowserAppBase
       puts "#{path}/bin/start_sample.rb #{dir}/bin/start_#{app_file}"
       FileUtils.cp_r "#{path}/bin/start_sample.rb", "#{dir}/bin/start_#{app_file}"
-      FileUtils.cp_r "#{path}/bin/start_sample.rb", "#{dir}/bin/start_#{app_file.gsub(/rb$/,"rbw")}"
+      FileUtils.cp_r "#{path}/bin/start_sample.rb", "#{dir}/bin/start_#{app_file.gsub(/rb$/, "rbw")}"
       load_app = <<"EOS"
 require '#{app_file}'
@@ -64,9 +64,14 @@ EOS
       puts "create #{app_file}"
       new_file = "#{dir}/lib/#{app_file}"
-      FileUtils.cp("#{dir}/lib/my_app_sample.rb", new_file)
-      buf = File.binread(new_file)
-      File.binwrite(new_file, buf.gsub(/MyApp/, get_app_name(app)))
+      sample_file = "#{dir}/lib/my_app_sample.rb"
+      if File.exist?(sample_file)
+        FileUtils.cp(sample_file, new_file)
+        buf = File.binread(new_file)
+        File.binwrite(new_file, buf.gsub(/MyApp/, get_app_name(app)))
+      else
+        warn "Sample file #{sample_file} does not exist. Skipping app file creation."
+      end
     end
   end
-end
+end

data/lib/template/common.rb ADDED Viewed

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+$LOAD_PATH << File.dirname(File.expand_path(__FILE__))
+# get os type
+def get_os_type
+  if RUBY_PLATFORM =~ /win32|mingw|cygwin/
+    "windows"
+  elsif RUBY_PLATFORM =~ /linux/
+    "linux"
+  else
+    "unknown"
+  end
+end

data/lib/template/config/browser.json CHANGED Viewed

@@ -2,5 +2,6 @@
     "chrome_win": "start msedge",
     "chrome_win_": "start chrome",
     "chrome_linux_": "google-chrome",
+    "chrome_linux_debian": "chromium",
     "chrome_linux": "chromium-browser"
 }

data/lib/template/config.ru CHANGED Viewed

@@ -8,29 +8,32 @@ require "json"
 require "./server"
 require "./wsserver"
+base_dir = File.dirname(File.expand_path(__FILE__))
 access_log = File.new("#{$home_dir}/logs/sinatra.log", "a+")
 access_log.sync = true
 use Rack::CommonLogger, access_log
 get "/" do
-  File.read("html/index.html")
+  puts "base_dir=#{base_dir}"
+  File.read("#{base_dir}/html/index.html")
 end
 get "*.html" do |file|
   content_type "text/html", :charset => "utf-8"
-  File.read "./html/#{file}.html"
+  File.read "#{base_dir}//html/#{file}.html"
 end
 get "/css/:name.css" do
   content_type "text/css", :charset => "utf-8"
-  puts "css/#{params[:name]}.css"
-  File.read "css/#{params[:name]}.css"
+  puts "#{base_dir}/css/#{params[:name]}.css"
+  File.read "#{base_dir}/css/#{params[:name]}.css"
 end
 get "/js/:name.js" do
   content_type "text/javascript", :charset => "utf-8"
-  puts "js/#{params[:name]}.js"
-  File.read "js/#{params[:name]}.js"
+  puts "#{base_dir}/js/#{params[:name]}.js"
+  File.read "#{base_dir}/js/#{params[:name]}.js"
 end
 get "/config/*.*" do |file, ext|
@@ -102,6 +105,6 @@ configure do
 end
-#\ --port 34921
+#\ --port 45739
 run Sinatra::Application

data/lib/template/css/index.css CHANGED Viewed

@@ -432,7 +432,7 @@ hr {
 .inarea {
     /* font-size: 1.13rem; */
     padding: 3px 3px;
-    border: 1.5px soslid #bbb;
+    border: 1.5px solid #bbb;
     border-radius: var(--border-radius);
     width: 85vw;
     max-width: 100vw;

data/lib/template/history/history.json CHANGED Viewed

@@ -1,5 +0,0 @@
-[
-  "/home/kuwayama/tool/docker/android/work/A13/tools/test",
-  "/home/kuwayama/tool/ruby/Gemfile",
-  "/home/kuwayama"
-]

data/lib/template/js/main.js CHANGED Viewed

@@ -8,18 +8,18 @@ var dialog_timeout = null;
 function open_dialog(msg, timeout = 0) {
     console.log("msg=" + msg);
     $("#msg_text").html(msg);
-    d = $("#msg_dialog").dialog({
-        modal: true
-        , show: "slide"         //表示時のアニメーション
-        , hide: "slide"       //閉じた時のアニメーション
-        , title: "Message"   //ダイアログのタイトル
-        , width: 500            //ダイアログの横幅
-        , height: 300           //ダイアログの高さ
-        , resizable: true      //リサイズ可
-        , closeOnEscape: false  //[ESC]キーで閉じられなくする
-        , draggable: true      //ダイアログの移動を可に
-        , buttons: {
-            "OK": function () {  //Cancelボタン
+    var d = $("#msg_dialog").dialog({
+        modal: true,
+        show: "slide",         //表示時のアニメーション
+        hide: "slide",         //閉じた時のアニメーション
+        title: "Message",      //ダイアログのタイトル
+        width: 500,            //ダイアログの横幅
+        height: 300,           //ダイアログの高さ
+        resizable: true,       //リサイズ可
+        closeOnEscape: false,  //[ESC]キーで閉じられなくする
+        draggable: true,       //ダイアログの移動を可に
+        buttons: {
+            "OK": function () {  //OKボタン
                 if (dialog_timeout != null) {
                     clearTimeout(dialog_timeout);
                 }
@@ -40,7 +40,7 @@ function open_dialog_org(msg) {
     if (dialog != null) {
         dialog.close();
     }
-    var dialog = window.open(
+    dialog = window.open(
         "/open_dialog?msg=" + msg,
         "pop",
         "width=300, height=100, left=" + left + ", top=" + top
@@ -80,8 +80,12 @@ function server_connect(url) {
         else if (evt.data.match(/^popup:/)) {
             console.log("str=" + evt.data);
             const timeout_str = evt.data.match(/:(\d+):/);
-            console.log("timeout_str=" + timeout_str[1]);
-            open_dialog(evt.data.replace(/^popup:(\d+):/, ""), Number(timeout_str[1]));
+            if (timeout_str && timeout_str[1]) {
+                console.log("timeout_str=" + timeout_str[1]);
+                open_dialog(evt.data.replace(/^popup:(\d+):/, ""), Number(timeout_str[1]));
+            } else {
+                open_dialog(evt.data.replace(/^popup:/, ""));
+            }
         } else {
             var log = "<li>" + evt.data + "</li>";
             $('#log').append(log);
@@ -179,16 +183,16 @@ function select_file_dialog(search_id, file_kind, dialog_id, select_file, file_n
         console.log("name=" + $("#" + file_name).val());
         $("#" + search_id).val($("#" + file_name).val());
         $("#" + dialog_id).dialog({
-            modal: true
-            , show: "slide"
-            , hide: "explode"
-            , title: "Select File"
-            , width: 580
-            , height: 400
-            , resizable: true
-            , closeOnEscape: false
-            , draggable: true
-            , open: function (event, ui) {
+            modal: true,
+            show: "slide",
+            hide: "explode",
+            title: "Select File",
+            width: 580,
+            height: 400,
+            resizable: true,
+            closeOnEscape: false,
+            draggable: true,
+            open: function (event, ui) {
                 // ダイアログの高さを取得
                 var dialogHeight = $("#" + dialog_id).height();
                 // オートコンプリートリストの高さをダイアログに合わせる
@@ -196,8 +200,8 @@ function select_file_dialog(search_id, file_kind, dialog_id, select_file, file_n
                     "max-height": dialogHeight + "px",
                     "overflow-y": "auto"
                 });
-            }
-            , buttons: {
+            },
+            buttons: {
                 "OK": function () {
                     $("#" + file_name).val($("#" + search_id).val());
                     $(this).dialog("close");
@@ -217,66 +221,64 @@ function setting_dialog(open_id, dialog_id, json_file) {
     var is_error = false;
     $("#" + open_id).click(function () {
-        $("#" + dialog_id).val = $(function () {
-            $("dl#wrap").empty();
-            $.getJSON(json_file, function (s) {
-                version = s["version"];
-                for (var i in s["setting_list"]) {
-                    if (s["setting_list"][i].type == "input") {
-                        var h = "<table><tr>"
-                            + "<td class='setting_name'>" + s["setting_list"][i].description + "</td>"
-                            + "<td><input class='setting_value' type='text' " + "id=" + s["setting_list"][i].name + "_value " + "value=" + "'" + s["setting_list"][i].value + "'" + ">"
-                            + "</td></tr></table>"
-                        $("dl#wrap").append(h);
-                    } else if (s["setting_list"][i].type == "textarea") {
-                        var h = "<table><tr>"
-                            + "<td class='setting_name'>" + s["setting_list"][i].description + "</td>"
-                            + "<td><textarea class='setting_value' rows='5' " + "id=" + s["setting_list"][i].name + "_value " + "value=" + ">"
-                            + "" + JSON.stringify(s["setting_list"][i].value, null, 2)
-                            + "</textarea>"
-                            + "</td></tr></table>"
-                        $("dl#wrap").append(h);
-                    } else if (s["setting_list"][i].type == "checkbox") {
-                        var h = "<table><tr>";
-                        h += "<td class='setting_name'>" + s["setting_list"][i].description + "</td>";
-                        if (s["setting_list"][i].value == true) {
-                            h += "<td><input class='setting_checkbox'  type='checkbox' " + "id=" + s["setting_list"][i].name + "_value checked ></td>";
-                        } else {
-                            h += "<td><input class='setting_checkbox'  type='checkbox' " + "id=" + s["setting_list"][i].name + "_value ></td>";
-                        }
-                        h += "</tr></table>";
-                        $("dl#wrap").append(h);
-                    } else if (s["setting_list"][i].type == "select") {
-                        var h = "<table><tr>";
-                        h += "<td class='setting_name'>" + s["setting_list"][i].description + "</td>";
-                        h += "<td> <select class='setting_value'  id=" + s["setting_list"][i].name + "_value " + ">";
-                        s["setting_list"][i].select.forEach(e => {
-                            if (e == s["setting_list"][i].value) {
-                                h += "<option value=" + e + " selected >" + e + "</option>";
-                            } else {
-                                h += "<option value=" + e + ">" + e + "</option>";
-                            }
-                        });
-                        h += "</select></td>";
-                        h += "</tr></table>";
-                        $("dl#wrap").append(h);
+        $("dl#wrap").empty();
+        $.getJSON(json_file, function (s) {
+            version = s["version"];
+            for (var i in s["setting_list"]) {
+                if (s["setting_list"][i].type == "input") {
+                    var h = "<table><tr>"
+                        + "<td class='setting_name'>" + s["setting_list"][i].description + "</td>"
+                        + "<td><input class='setting_value' type='text' " + "id=" + s["setting_list"][i].name + "_value " + "value='" + s["setting_list"][i].value + "'>"
+                        + "</td></tr></table>";
+                    $("dl#wrap").append(h);
+                } else if (s["setting_list"][i].type == "textarea") {
+                    var h = "<table><tr>"
+                        + "<td class='setting_name'>" + s["setting_list"][i].description + "</td>"
+                        + "<td><textarea class='setting_value' rows='5' " + "id=" + s["setting_list"][i].name + "_value" + ">"
+                        + JSON.stringify(s["setting_list"][i].value, null, 2)
+                        + "</textarea>"
+                        + "</td></tr></table>";
+                    $("dl#wrap").append(h);
+                } else if (s["setting_list"][i].type == "checkbox") {
+                    var h = "<table><tr>";
+                    h += "<td class='setting_name'>" + s["setting_list"][i].description + "</td>";
+                    if (s["setting_list"][i].value == true) {
+                        h += "<td><input class='setting_checkbox'  type='checkbox' " + "id=" + s["setting_list"][i].name + "_value checked ></td>";
                     } else {
-                        //console.log("type=" + s["setting_list"][i].type);
+                        h += "<td><input class='setting_checkbox'  type='checkbox' " + "id=" + s["setting_list"][i].name + "_value ></td>";
                     }
+                    h += "</tr></table>";
+                    $("dl#wrap").append(h);
+                } else if (s["setting_list"][i].type == "select") {
+                    var h = "<table><tr>";
+                    h += "<td class='setting_name'>" + s["setting_list"][i].description + "</td>";
+                    h += "<td> <select class='setting_value'  id=" + s["setting_list"][i].name + "_value" + ">";
+                    s["setting_list"][i].select.forEach(e => {
+                        if (e == s["setting_list"][i].value) {
+                            h += "<option value=" + e + " selected >" + e + "</option>";
+                        } else {
+                            h += "<option value=" + e + ">" + e + "</option>";
+                        }
+                    });
+                    h += "</select></td>";
+                    h += "</tr></table>";
+                    $("dl#wrap").append(h);
+                } else {
+                    //console.log("type=" + s["setting_list"][i].type);
                 }
-            });
+            }
         });
         $("#" + dialog_id).dialog({
-            modal: true
-            , show: "slide"         //表示時のアニメーション
-            , hide: "explode"       //閉じた時のアニメーション
-            , title: "Setting"   //ダイアログのタイトル
-            , width: 650            //ダイアログの横幅
-            , height: 600           //ダイアログの高さ
-            , resizable: true      //リサイズ可
-            , closeOnEscape: false  //[ESC]キーで閉じられなくする
-            , draggable: true      //ダイアログの移動を可に
-            , buttons: {
+            modal: true,
+            show: "slide",         //表示時のアニメーション
+            hide: "explode",       //閉じた時のアニメーション
+            title: "Setting",      //ダイアログのタイトル
+            width: 650,            //ダイアログの横幅
+            height: 600,           //ダイアログの高さ
+            resizable: true,       //リサイズ可
+            closeOnEscape: false,  //[ESC]キーで閉じられなくする
+            draggable: true,       //ダイアログの移動を可に
+            buttons: {
                 "OK": function () {  //OKボタン
                     var json_obj = {};
                     var json_data = [];
@@ -334,10 +336,18 @@ function setting_dialog(open_id, dialog_id, json_file) {
                         }
                         console.log("OK Button " + is_error);
                         // Jsonデータをサーバに送信
-                        json_obj["setting_list"] = json_data;
-                        $ws.send("setting:" + JSON.stringify(json_obj));
-                    });
-                    $(this).dialog("close");
+                        if (is_error == false) {
+                            json_obj["setting_list"] = json_data;
+                            var json_string = JSON.stringify(json_obj);
+                            console.log("json_string:" + json_string);
+                            $ws.send("setting:" + json_string);
+                        }
+                    })
+                        .done(function () {
+                            if (is_error == false) {
+                                $("#" + dialog_id).dialog("close");
+                            }
+                        });
                 },
                 "Cancel": function () {  //Cancelボタン
                     console.log("Cancel Button");
@@ -420,10 +430,10 @@ function openFile(file) {
 $(document).ready(function () {
     // サーバに接続
-    server_connect("ws://localhost:34921/wsserver")
+    server_connect("ws://localhost:45739/wsserver")
     window.onload = function (e) {
         // サーバに接続
-        //server_connect("ws://localhost:34921/wsserver")
+        //server_connect("ws://localhost:45739/wsserver")
     }
     // menu
@@ -495,4 +505,3 @@ $(document).ready(function () {
     autocomp_history("upFile", "history.json")
 });

data/lib/template/my_app_sample.rb CHANGED Viewed

@@ -11,8 +11,8 @@ class MyApp < AppMainBase
         yield v if block_given?
       end
-      # Browserにメッセージ送信
-      app_send("popup:start app #{argv[0]}")
+      # Browserにメッセージ送信(3秒表示)
+      app_send("popup:3000:start app #{argv[0]}")
       # 履歴の保存
       add_history("history.json", argv[0])

data/lib/template/server.rb CHANGED Viewed

@@ -1,23 +1,40 @@
+# -*- coding: utf-8 -*-
+$LOAD_PATH << File.dirname(File.expand_path(__FILE__))
+require "sinatra"
+require "sinatra/contrib"
+require "sinatra-websocket"
+require "thin"
 require "json"
 require "kconv"
+require "cgi"
+require "pathname"
+require "common"
 class Search < Sinatra::Base
   helpers Sinatra::Streaming
-  get "" do
+  get "/" do
+    content_type "application/json", :charset => "utf-8"
     q_hash = {}
     puts request.query_string
     request.query_string.split("&").each do |q|
       work = q.split("=")
       if work[1] != nil
-        q_hash[work[0]] = CGI.unescape work[1].toutf8
+        q_hash[work[0]] = CGI.unescape(work[1].toutf8)
       else
         q_hash[work[0]] = ""
       end
     end
-    str = q_hash["path"].gsub(/\\/, "/")
+    begin
+      str = q_hash["path"].gsub(/\\/, "/")
+    rescue
+      str = "/"
+    end
     puts "str=#{str}"
+    str = "/" if str.to_s == ""
     kind = q_hash["kind"].gsub(/\\/, "/")
     puts "kind=#{kind}"
+    kind = "file" if kind.to_s == ""
     res = []
     str = str.gsub(/\\/, "/")
     dir = File.dirname(str)
@@ -25,15 +42,13 @@ class Search < Sinatra::Base
     puts "dir=#{dir}"
     puts "file=#{file}"
-    kernel = Facter.value(:kernel)
-    if kernel == "windows"
-      dir = "c:/" if dir == nil
-      dir = "c:/" if dir == "/"
-    elsif kernel == "Linux"
-      dir = "/" if dir == nil
+    kernel = get_os_type
+    if kernel.downcase == "windows"
+      dir = "c:/" if dir.nil? || dir == "/"
+    elsif kernel.downcase == "linux"
+      dir = "/" if dir.nil?
     else
-      dir = "c:/" if dir == nil
-      dir = "c:/" if dir == "/"
+      dir = "c:/" if dir.nil? || dir == "/"
     end
     path = "#{dir}/#{file}"
@@ -43,13 +58,13 @@ class Search < Sinatra::Base
       path = path + "*"
     end
     path.gsub!(/[\/]+/, "/")
-    puts path
+    puts "path=#{path}"
     Dir.glob(path, File::FNM_DOTMATCH).each do |file|
       data = {}
       next if File.basename(file) == "."
       next if kind == "dir" and !File.directory?(file)
       data["label"] = File.basename(file)
-      data["label"] += "/" if (File.directory?(file))
+      data["label"] += "/" if File.directory?(file)
       data["value"] = File.expand_path(file)
       res.push data
     end
@@ -57,10 +72,9 @@ class Search < Sinatra::Base
       data = {}
       pp = Pathname(File.expand_path("#{dir}/#{file}"))
       data["label"] = "../"
-      data["label"] += "/" if pp.parent == "/"
+      data["label"] += "/" if pp.parent.to_s == "/"
       data["value"] = pp.parent.to_s
       data["value"] = "/" if data["value"] =~ /^[\/]+$/
-      #puts "value = #{pp.parent.to_s}"
       res.push data
     end
     JSON.generate res.sort { |a, b| a["value"] <=> b["value"] }

data/lib/template/server_app_base.rb CHANGED Viewed

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
+require "json"
 class AppMainBase
   def initialize
     @config = nil
-    @aboet = false
+    @abort = false
     @exec = false
     @suspend = false
     @ws = nil
   end
   def app_send(str)
-    if @ws != nil
-      @ws.send(str)
-    end
+    @ws&.send(str)
   end
   def set_ws(ws)
@@ -26,38 +26,35 @@ class AppMainBase
     @exec = true
   end
-  def stop()
+  def stop
     @abort = true
     @exec = false
   end
-  def suspend()
+  def suspend
     @suspend = true
   end
-  def resume()
+  def resume
     @suspend = false
   end
   # 履歴の保存
   def add_history(file, history_data, max = 10)
+    history_dir = @config&.fetch(:home_dir, "./") + "history/"
+    path = File.join(history_dir, file)
     begin
-      buf = File.read "#{$home_dir}history/#{file}"
+      buf = File.read(path)
+      data = JSON.parse(buf)
     rescue
-      buf = ""
-    end
-    data = eval(buf)
-    if data == nil
       data = []
     end
     if history_data.to_s != ""
-      data.prepend history_data
-    end
-    data = data.uniq[0..max - 1]
-    File.open("#{$home_dir}history/#{file}", "w") do |f|
-      f.write JSON.pretty_generate data
+      data.unshift(history_data)
     end
+    data = data.uniq[0, max]
+    File.write(path, JSON.pretty_generate(data))
   end
 end
-require "app_load.rb"
+require_relative "app_load"

data/lib/template/start.rb CHANGED Viewed

@@ -8,7 +8,7 @@ require "daemons"
 require "fileutils"
 require "kconv"
 require "json"
-require "facter"
+require "common"
 # ログ出力
 module Output
@@ -24,7 +24,7 @@ module Output
       alias_method :write_org, :write
       def initialize(stdout)
-        @stdout = false
+        @stdout = stdout
       end
       attr_accessor :stdout
@@ -54,9 +54,9 @@ FileUtils.cd dir
 pp ARGV
 if ARGV[0] == "test"
   $home_dir = "./"
-  ARGV = []
+  ARGV.clear
 else
-  $home_dir = ENV["HOME"] + "/" + dir.split("/")[-1].gsub(/-[0-9\.-]+/,"") + "/"
+  $home_dir = ENV["HOME"] + "/" + dir.split("/")[-1].gsub(/-[0-9\.-]+/, "") + "/"
 end
 puts "home_dir=#{$home_dir}"
 FileUtils.mkdir_p("#{$home_dir}/logs")
@@ -85,7 +85,7 @@ buf = File.binread("js/main.js").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
 File.binwrite("js/main.js", buf)
-# index.htaの編集
+# index.htmlの編集
 buf = File.binread("html/index.html").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
 File.binwrite("html/index.html", buf)
@@ -108,10 +108,10 @@ begin
     json_file = "#{$home_dir}/config/browser.json"
     json = JSON.parse(File.read json_file)
     puts json
-    kernel = Facter.value(:kernel)
-    if kernel == "windows"
+    kernel = get_os_type
+    if kernel.downcase == "windows"
       browser = json["chrome_win"]
-    elsif kernel == "Linux"
+    elsif kernel.downcase == "linux"
       browser = json["chrome_linux"]
     else
       browser = json["chrome_win"]

data/lib/template/wsserver.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-require "./server_app_base"
+$LOAD_PATH << File.dirname(File.expand_path(__FILE__))
+require "server_app_base"
 require "json"
 require "cgi"
 require "thread"
@@ -18,6 +20,8 @@ class WsServer < Sinatra::Base
     super
     @ws_list = []
     @ws_lock = Mutex.new
+    @json_config = nil
+    @exec_thread = nil
   end
   def ws_send(str)
@@ -28,8 +32,8 @@ class WsServer < Sinatra::Base
     end
   end
-  json_config = nil
-  exec_thread = nil
+  public :ws_send
   get "" do
     if !request.websocket?
       "no supported"
@@ -47,17 +51,24 @@ class WsServer < Sinatra::Base
           if $ws_exit_thread != nil
             puts "ws_exit_thread kill"
             Thread.kill $ws_exit_thread
+            $ws_exit_thread = nil
           end
         end
         ws.onmessage do |msg|
           puts msg
-          json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
-          json_config = config_json_hash(json)
-          $app.set_config(json_config)
+          begin
+            json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
+            @json_config = config_json_hash(json)
+            $app.set_config(@json_config)
+          rescue
+            puts "Failed to load config/setting.json"
+            @json_config = {}
+          end
           if msg =~ /^exec:/
-            if exec_thread == nil
+            if @exec_thread == nil
               argv = msg.gsub(/^exec:/, "")
-              exec_thread = Thread.new {
+              @exec_thread = Thread.new {
                 begin
                   $app.start(argv.split(",")) do |out|
                     ws_send(out)
@@ -70,7 +81,7 @@ class WsServer < Sinatra::Base
                   ws_send("app_end:error")
                 ensure
                   puts "exit thread"
-                  exec_thread = nil
+                  @exec_thread = nil
                 end
               }
             else
@@ -79,19 +90,20 @@ class WsServer < Sinatra::Base
             end
           end
           if msg =~ /^stop/
-            if exec_thread
-              Thread.kill exec_thread
+            if @exec_thread
+              Thread.kill @exec_thread
               ws_send("app_end:stop")
               $app.stop
+              @exec_thread = nil
             end
           end
           if msg =~ /^suspend/
-            if exec_thread
+            if @exec_thread
               $app.suspend
             end
           end
           if msg =~ /^resume/
-            if exec_thread
+            if @exec_thread
               $app.resume
             end
           end
@@ -102,8 +114,8 @@ class WsServer < Sinatra::Base
               File.open("#{$home_dir}/config/setting.json", "w") do |w|
                 w.puts JSON.pretty_generate(json)
               end
-              json_config = config_json_hash(json)
-              $app.set_config(json_config)
+              @json_config = config_json_hash(json)
+              $app.set_config(@json_config)
             rescue
               # jsonファイルではない
               ws_send("app_end:error")
@@ -112,7 +124,11 @@ class WsServer < Sinatra::Base
           if msg =~ /^openfile:/
             file = msg.gsub(/^openfile:/, "")
             Thread.new {
-              system "#{json_config["editor"]} #{CGI.unescapeHTML(file)}"
+              if @json_config && @json_config["editor"]
+                system "#{@json_config["editor"]} #{CGI.unescapeHTML(file)}"
+              else
+                puts "Editor not set in config"
+              end
             }
           end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_app_base
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - masataka kuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-17 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: browser application template
 email:
 - masataka.kuwayama@gmail.com
@@ -119,13 +105,13 @@ files:
 - lib/browser_app_base.rb
 - lib/browser_app_base/version.rb
 - lib/template/app_load.rb
+- lib/template/common.rb
 - lib/template/config.ru
 - lib/template/config/browser.json
 - lib/template/config/setting.json
 - lib/template/css/index.css
 - lib/template/history/history.json
 - lib/template/html/index.html
-- lib/template/html/test.html
 - lib/template/js/main.js
 - lib/template/my_app_sample.rb
 - lib/template/server.rb

data/lib/template/html/test.html DELETED Viewed

File without changes