procon_bypass_man-web 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced49c040a2859f7fe714c4df7f08ce0d511f255d54413dd15cefd3f055286ad
-  data.tar.gz: 3516d63341da7e7f407151f9c44709c634216766b2c5256bb035c43d99587ecb
+  metadata.gz: d69459407ff4abf005338cd5447a8a2a6df4bdb240c2273d85176e72cfce349b
+  data.tar.gz: a544b0c479257a03fee1d25634a4acdd9c3455e62664e5e0ce1ff7aceb333a45
 SHA512:
-  metadata.gz: cfe6ee8972cda2d2b17673f6250402b097b70041242bc6423b35a9720c9dd9b1f80d7fa2ee5749180d02370f0b745d8fc731b226060d48b3964a30c5c37519f5
-  data.tar.gz: 6bffd759f6645cebd10e0885081990c4e82981fa07aff575f6d9fbcdc5fbe1d6055b89957b26f3ebdb90460fb76d7509bfc19dc9efe6ef8c980b1424602b0431
+  metadata.gz: 100a91a2309523d7cce59f02cd41a18c02120200fdc02489fa093157a103b37a5f2556c710215f1e4784200e0c08bf628ed4713799bbbf74b25e83e3b9024cd2
+  data.tar.gz: ef4ec836a6b1ccbb8a07c214b00ff41888da89656016cae8c6ed2806d5c613c3c892bc4ffc56830965ed3546f4d417dcf79839da495b010abd724ebac7f651f7

data/.node-version

@@ -0,0 +1 @@
+16.13.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.2] - 2021-
+- 設定ファイルに書いている未定義のDSLがあった時に無視する
+
 ## [0.1.1] - 2021-10-16
 - bugfix setting edtior
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man-web (0.1.1)
+    procon_bypass_man-web (0.1.2)
       sinatra
       sqlite3
       webrick

data/README.md

@@ -28,8 +28,11 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ### 開発用のサーバを起動する
 `bundle exec foreman s`
 
-### frontend側のビルド方法
+## How to Release
 * `yarn run release-build` を実行してgit commit
+* `lib/procon_bypass_man/web/version.rb` をインクリメント
+* `CHANGELOG.md` に追記
+* `bundle exec rake release`
 
 ## TODO
 * server

data/bin/pbm_web

@@ -4,4 +4,9 @@
 require "bundler/setup"
 require "procon_bypass_man/web"
 
+ProconBypassMan::Web.configure do |config|
+  config.root = File.expand_path('..', __dir__).freeze
+  # config.logger = Logger.new("#{ProconBypassMan::Web.root}/web.log", 1, 1024 * 1024 * 10)
+end
+
 ProconBypassMan::Web::Server.start

data/lib/procon_bypass_man/web/configuration.rb

@@ -0,0 +1,40 @@
+module ProconBypassMan
+  module Web
+    class Configuration
+      module ClassAttributes
+        # @return [Logger]
+        def logger
+          config.logger
+        end
+
+        # @return [String]
+        def root
+          config.root
+        end
+      end
+
+      # @return [Logger]
+      def logger
+        @logger || Logger.new(nil)
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
+
+      # @return [String]
+      def root
+        @root || File.expand_path('../..', __dir__).freeze
+      end
+
+      def root=(path)
+        @root = path
+      end
+
+      # @return [String]
+      def db_path
+        @db_path ||= ENV["DB_PATH"] || File.join(root, "pbm_web.db")
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/web/db.rb

@@ -3,15 +3,15 @@ module ProconBypassMan
     class Db
       def self.db
         # TODO connection cache
-        SQLite3::Database.new(ProconBypassMan::Web.config[:db_path])
+        SQLite3::Database.new(ProconBypassMan::Web.config.db_path)
       end
 
       def self.recreate!
-        FileUtils.rm_rf(ProconBypassMan::Web.config[:db_path])
-        SQLite3::Database.new(ProconBypassMan::Web.config[:db_path])
+        FileUtils.rm_rf(ProconBypassMan::Web.config.db_path)
+        SQLite3::Database.new(ProconBypassMan::Web.config.db_path)
       end
 
-      def self.migrate_if_pending_migration(migrations_path: File.join(ProconBypassMan::Web.root, 'lib', 'procon_bypass_man/web', 'migration', "/*.sql"))
+      def self.migrate_if_pending_migration(migrations_path: File.join(ProconBypassMan::Web.gem_root, 'lib', 'procon_bypass_man/web', 'migration', "/*.sql"))
         db.execute <<~SQL
           create table if not exists "schema_migrations" ("version" varchar not null primary key)
         SQL

data/lib/procon_bypass_man/web/migration/002_insert_default_settings_rows.sql

@@ -0,0 +1,3 @@
+insert into settings (root_path, setting_path) values (
+  "/usr/share/pbm/current", "/usr/share/pbm/current/setting.yml"
+)

data/lib/procon_bypass_man/web/models/setting.rb

@@ -8,7 +8,7 @@ module ProconBypassMan
 
       attr_accessor(*column_names)
 
-      def self.find_or_create_by(*)
+      def self.find_or_create(*)
         rows = db.execute("select * from #{table_name}")
         if rows.size.zero?
           db.execute("insert into #{table_name} (#{column_names.join(", ")}) values (?, ?)", ['', ''])