browser_app_base 0.1.9 → 0.2.1

data/lib/browser_app_base.rb

@@ -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

@@ -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

@@ -1,6 +1,7 @@
 {
     "chrome_win": "start msedge",
     "chrome_win_": "start chrome",
-    "chrome_linux_": "google-chrome",
-    "chrome_linux": "chromium-browser"
+    "chrome_linux": "google-chrome",
+    "chrome_linux_debian": "chromium",
+    "chrome_linux_": "chromium-browser"
 }

data/lib/template/config.ru

@@ -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,4 @@ configure do
 
 end
 
-#\ --port 34921
-
 run Sinatra::Application

data/lib/template/css/index.css

@@ -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

@@ -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

@@ -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:36539/wsserver")
     window.onload = function (e) {
         // サーバに接続
-        //server_connect("ws://localhost:34921/wsserver")
+        //server_connect("ws://localhost:36539/wsserver")
     }
 
     // menu
@@ -495,4 +505,3 @@ $(document).ready(function () {
     autocomp_history("upFile", "history.json")
 
 });
-

data/lib/template/my_app_sample.rb

@@ -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

@@ -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

@@ -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,36 @@ 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)
+    home_dir = @config&.key?(:home_dir) ? @config[:home_dir] : ($home_dir || "./")
+    history_dir = 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

@@ -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")
@@ -75,17 +75,14 @@ end
 port = get_unused_port
 puts "port=#{port}"
 
-# config.ruの編集
-buf = File.binread("config.ru").toutf8
-buf.gsub!(/port [0-9]+/, "port #{port}")
-File.binwrite("config.ru", buf)
+# config.ruの編集は不要(port引数で渡すように変更)
 
 # main.jsの編集
 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 +105,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"]
@@ -122,7 +119,12 @@ begin
   }
 
   # start web server
-  Rack::Server.start
+  if Rack.release >= "3"
+    require "rackup"
+    Rackup::Server.start(:Port => port, :config => "config.ru", :server => "thin")
+  else
+    Rack::Server.start(:Port => port, :config => "config.ru", :server => "thin")
+  end
 rescue
   puts $!
   puts $@