pbmenv 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3ac7d44e0f095598e3a3a80728d61cf0fc8f8bd363c50a37beaa1bc08537bc
-  data.tar.gz: 929ccd1944970ee956efe39855a17aa4c488462725ab7cf7c7f5b89dcca014bf
+  metadata.gz: b0ac717a799d7bd7e906bfbf74fc721311ddc684f65c9c3b21e0e57219bce68c
+  data.tar.gz: 0631ccea4cd5ea8141f903b75373b669c6456fe87e9868e1b74b7f76c67ab4bd
 SHA512:
-  metadata.gz: af65fec992aeaaff02bf3ca0abc7f3f2c92f0deb5f065e4bce53b0169d1030f2f5f39cd0758bb630c016c0d66a53f6174ab1cd85b8017b7522d621c174493048
-  data.tar.gz: 9716ea9f4f06624680d5169bf7f2f36a36957fbf960966dfbab279708006f40ac6855ccaa8df93abd27bfa67b077c4c4ffb766eefee9a3b11816ae38ff29746a
+  metadata.gz: bafd95cda10189f3ccd5403e979d4405017134a828c78aeed8ff95f712f4b71476a054eb7fd04d447c7964dcf231b092ff0054e0cd9047476ee44028e316a2dc
+  data.tar.gz: e928f94b5cfaa01892084b057d0dc5aebbb0c2f3782822cd72b7fc83a0441cac45c500cd4e922ecbabd4cd81818ca09611566ffba8ee32e7253a5f6c6f349d25

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+procon_bypass_man-*

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.1.10] - 2022-06-05
+- project_template/app.rb.erbを評価してapp.rbを生成するようになりました
+
+## [0.1.9] - 2022-02-18
+- Pbmenv.installにenable_pbm_cloudオプションを追加しました
+- Pbmenv.installにuse_optionオプションを追加しました
+  - また、 `pbmenv intall xxx --use` が使えるようになりました
+
+## [0.1.8] - 2022-02-08
+- 不具合修正
+
 ## [0.1.7] - 2022-01-11
 - currentが存在しないときに、installを実行するとcurrentを貼るようにしました
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pbmenv (0.1.7)
+    pbmenv (0.1.10)
 
 GEM
   remote: https://rubygems.org/
@@ -40,4 +40,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.31
+   2.3.7

data/README.md

@@ -17,6 +17,8 @@ gem 'pbmenv'
     * pbmenv available_versions
     * pbmenv versions
     * pbmenv install $version
+      * --use
+        * そのまま/usr/share/pbm/currentディレクトリへのシンボリックリンクを貼ります
     * pbmenv use $version
     * pbmenv uninstall $version
 * API
@@ -45,3 +47,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 * docker-compose build --no-cache
 * docker-compose run app bash
 * bin/rspec
+  * also `DISABLE_DEBUG_LOG=1 bin/rspec`

data/lib/pbmenv/cli.rb

@@ -9,7 +9,18 @@ module Pbmenv
         Pbmenv.versions.each { |x| puts x }
       when 'install', 'i'
         sub_command_arg = argv[1]
-        Pbmenv.install(sub_command_arg)
+        case argv[2]
+        when "--use"
+          use_option = true
+        when nil
+          use_option = false
+        else
+          puts <<~EOH
+            Unknown option:
+              available options: --use
+          EOH
+        end
+        Pbmenv.install(sub_command_arg, use_option: use_option)
       when 'use', 'u'
         sub_command_arg = argv[1]
         Pbmenv.use(sub_command_arg)

data/lib/pbmenv/create_version_service.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module Pbmenv
+  class CreateVersionService
+    class AlreadyCreatedError < StandardError; end
+    class NotSupportVersionError < StandardError; end
+
+    attr_accessor :version, :use_option, :enable_pbm_cloud
+
+    def initialize(version: , use_option: , enable_pbm_cloud: )
+      self.version = version
+      self.use_option = use_option
+      self.enable_pbm_cloud = enable_pbm_cloud
+    end
+
+    def execute!
+      if File.exists?("/usr/share/pbm/v#{version}")
+        raise AlreadyCreatedError
+      end
+
+      begin
+        source_path = download_src(version)
+        build_app_file(source_path: source_path)
+        create_if_miss_shared_dir
+        create_if_miss_device_id_file
+        link_device_id_file(version: version)
+        create_if_miss_current_dir(version: version)
+      rescue DownloadSrcService::DownloadError
+        puts "Download failed. Check the version name."
+        raise NotSupportVersionError
+      rescue => e
+        Helper.system_and_puts "rm -rf #{VersionPathname.new(version).version_path}"
+        raise
+      ensure
+        if source_path && Dir.exists?(source_path)
+          Helper.system_and_puts "rm -rf #{source_path}"
+        end
+      end
+
+      return true
+    end
+
+    private
+
+    # @return [String]
+    def download_src(version)
+      Pbmenv::DownloadSrcService.new(version).execute!
+      return "procon_bypass_man-#{version}"
+    end
+
+    def build_app_file(source_path: )
+      pathname = VersionPathname.new(version)
+
+      if File.exists?(File.join(source_path, "project_template/app.rb.erb"))
+        Helper.system_and_puts <<~SHELL
+          mkdir -p #{pathname.version_path} &&
+            cp procon_bypass_man-#{version}/project_template/app.rb.erb #{pathname.version_path}/
+            cp procon_bypass_man-#{version}/project_template/README.md #{pathname.version_path}/
+            cp procon_bypass_man-#{version}/project_template/setting.yml #{pathname.version_path}/
+            cp -r procon_bypass_man-#{version}/project_template/systemd_units #{pathname.version_path}/
+        SHELL
+        require "./procon_bypass_man-#{version}/project_template/lib/app_generator"
+        AppGenerator.new(
+          prefix_path: pathname.version_path,
+          enable_integration_with_pbm_cloud: enable_pbm_cloud,
+        ).generate
+        Helper.system_and_puts "rm #{pathname.app_rb_erb_path}"
+      else
+        Helper.system_and_puts <<~SHELL
+          mkdir -p #{pathname.version_path} &&
+            cp procon_bypass_man-#{version}/project_template/app.rb #{pathname.version_path}/
+            cp procon_bypass_man-#{version}/project_template/README.md #{pathname.version_path}/
+            cp procon_bypass_man-#{version}/project_template/setting.yml #{pathname.version_path}/
+            cp -r procon_bypass_man-#{version}/project_template/systemd_units #{pathname.version_path}/
+        SHELL
+      end
+
+      # 旧実装バージョン
+      if enable_pbm_cloud
+        text = File.read(pathname.app_rb_path)
+        if text =~ /config\.api_servers\s+=\s+\['(https:\/\/.+)'\]/ && (url = $1)
+          text.gsub!(/#\s+config\.api_servers\s+=\s+.+$/, "config.api_servers = '#{url}'")
+        end
+        File.write(pathname.app_rb_path, text)
+      end
+    end
+
+    def create_if_miss_shared_dir
+      unless File.exists?(VersionPathname.shared)
+        Helper.system_and_puts <<~SHELL
+          mkdir -p #{VersionPathname.shared}
+        SHELL
+      end
+    end
+
+    def create_if_miss_device_id_file
+      device_id_path_in_shared = VersionPathname.device_id_path_in_shared
+      unless File.exists?(device_id_path_in_shared)
+        File.write(device_id_path_in_shared, "d_#{SecureRandom.uuid}")
+      end
+    end
+
+    def link_device_id_file(version: )
+      pathname = VersionPathname.new(version)
+      Helper.system_and_puts <<~SHELL
+        ln -s #{pathname.device_id_path_in_shared} #{pathname.device_id_path_in_version}
+      SHELL
+    end
+
+    def create_if_miss_current_dir(version: )
+      # 初回だけinstall時にcurrentを作成する
+      if !File.exists?(VersionPathname.current) || use_option
+        UseVersionService.new(version: version).execute!
+      end
+    end
+  end
+end

data/lib/pbmenv/destroy_version_service.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Pbmenv
+  class DestroyVersionService
+    class VersionNotFoundError < StandardError; end
+
+    attr_accessor :version
+
+    def initialize(version: )
+      @version = version
+    end
+
+    def execute!
+      version_pathname = VersionPathname.new(version)
+
+      unless File.exists?(version_pathname.version_path)
+        raise VersionNotFoundError
+      end
+      Helper.system_and_puts "rm -rf #{version_pathname.version_path}"
+    end
+  end
+end

data/lib/pbmenv/download_src_service.rb

@@ -0,0 +1,32 @@
+module Pbmenv
+  class DownloadSrcService
+    class DownloadError < StandardError; end
+
+    attr_accessor :version
+
+    def initialize(version)
+      self.version = version
+    end
+
+    def execute!
+      if ENV["DEBUG_INSTALL"]
+        shell = <<~SHELL
+        git clone https://github.com/splaplapla/procon_bypass_man.git procon_bypass_man-#{version}
+        SHELL
+      else
+        # TODO cache for testing
+        shell = <<~SHELL
+        curl -L https://github.com/splaplapla/procon_bypass_man/archive/refs/tags/v#{version}.tar.gz | tar xvz > /dev/null
+        SHELL
+      end
+
+      if Helper.system_and_puts(shell)
+        unless File.exists?("procon_bypass_man-#{version}/project_template")
+          raise NotSupportVersionError, "This version is not support by pbmenv"
+        end
+      else
+        raise DownloadError
+      end
+    end
+  end
+end

data/lib/pbmenv/helper.rb

@@ -0,0 +1,16 @@
+module Pbmenv
+  class Helper
+    def self.system_and_puts(shell)
+      to_stdout "[SHELL] #{shell}"
+      system(shell)
+    end
+
+    def self.to_stdout(text)
+      puts text
+    end
+
+    def self.normalize_version(version)
+      /\Av?([\w.]*)\z/ =~ version && $1
+    end
+  end
+end

data/lib/pbmenv/use_version_service.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Pbmenv
+  class UseVersionService
+    class VersionNotFoundError < StandardError; end
+
+    attr_accessor :version
+
+    def initialize(version: )
+      self.version = version
+    end
+
+    def execute!
+      throw_error_if_has_not_version
+      relink_current_path
+    end
+
+    private
+
+    def throw_error_if_has_not_version
+      version_pathname = VersionPathname.new(version)
+
+      if !File.exists?(version_pathname.version_path_without_v) && !File.exists?(version_pathname.version_path)
+        raise UseVersionService::VersionNotFoundError
+      end
+    end
+
+    def relink_current_path
+      version_pathname = VersionPathname.new(version)
+
+      if File.symlink?(VersionPathname.current)
+        Helper.system_and_puts "unlink #{VersionPathname.current}"
+      end
+
+      Helper.system_and_puts "ln -s #{version_pathname.version_path} #{VersionPathname.current}"
+    end
+  end
+end

data/lib/pbmenv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pbmenv
-  VERSION = "0.1.7"
+  VERSION = "0.1.10"
 end

data/lib/pbmenv/version_pathname.rb

@@ -0,0 +1,45 @@
+module Pbmenv
+  class VersionPathname
+    PBM_DIR = "/usr/share/pbm"
+
+    def initialize(version)
+      @version = version
+    end
+
+    def version_path
+      File.join(PBM_DIR, "/v#{@version}")
+    end
+
+    def version_path_without_v
+      File.join(PBM_DIR, "/#{@version}")
+    end
+
+    def app_rb_path
+      File.join(version_path, "app.rb")
+    end
+
+    def app_rb_erb_path
+      File.join(version_path, "app.rb.erb")
+    end
+
+    def device_id_path_in_version
+      File.join(version_path, "/device_id")
+    end
+
+    def device_id_path_in_shared
+      File.join(self.class.shared, "/device_id")
+    end
+
+    def self.device_id_path_in_shared
+      File.join(shared, "/device_id")
+    end
+
+    def self.current
+      File.join(PBM_DIR, "/current")
+    end
+
+    def self.shared
+      File.join(PBM_DIR, "/shared")
+    end
+  end
+end

data/lib/pbmenv.rb

@@ -6,6 +6,12 @@ require "pathname"
 require_relative "pbmenv/version"
 require_relative "pbmenv/cli"
 require_relative "pbmenv/pbm"
+require_relative "pbmenv/helper"
+require_relative "pbmenv/version_pathname"
+require_relative "pbmenv/create_version_service"
+require_relative "pbmenv/destroy_version_service"
+require_relative "pbmenv/use_version_service"
+require_relative "pbmenv/download_src_service"
 
 module Pbmenv
   PBM_DIR = "/usr/share/pbm"
@@ -18,91 +24,49 @@ module Pbmenv
     Pbmenv::PBM.new.versions.map { |name| Pathname.new(name).basename.to_s =~ /^v([\d.]+)/ && $1 }.compact.sort_by {|x| Gem::Version.new(x) }.compact
   end
 
-  def self.install(version)
+  def self.install(version, use_option: false, enable_pbm_cloud: false)
     raise "Need a version" if version.nil?
-    if version == 'latest'
-      version = available_versions.first
-    end
-
-    if File.exists?("/usr/share/pbm/v#{version}")
+    version =
+      if version == 'latest'
+        available_versions.first
+      else
+        Helper.normalize_version(version) or raise "mismatch version number!"
+      end
+
+    begin
+      CreateVersionService.new(version: version, use_option: use_option, enable_pbm_cloud: enable_pbm_cloud).execute!
+    rescue CreateVersionService::AlreadyCreatedError
+      return false
+    rescue CreateVersionService::NotSupportVersionError
       return false
-    end
-
-    download_src(version)
-    system_and_puts <<~SHELL
-      mkdir -p #{PBM_DIR}/v#{version} && cp -r procon_bypass_man-#{version}/project_template/* #{PBM_DIR}/v#{version}/
-    SHELL
-
-    unless File.exists?("#{PBM_DIR}/shared")
-      system_and_puts <<~SHELL
-        mkdir -p #{PBM_DIR}/shared
-      SHELL
-    end
-
-    unless File.exists?("#{PBM_DIR}/shared/device_id")
-      File.write("#{PBM_DIR}/shared/device_id", "d_#{SecureRandom.uuid}")
-    end
-
-    system_and_puts <<~SHELL
-      ln -s #{PBM_DIR}/shared/device_id #{PBM_DIR}/v#{version}/device_id
-    SHELL
-
-    # 初回だけinstall時にcurrentを作成する
-    if not File.exists?("#{PBM_DIR}/current")
-      use(version)
-    end
-  rescue => e
-    system_and_puts "rm -rf #{PBM_DIR}/v#{version}"
-    raise
-  ensure
-    if Dir.exists?("./procon_bypass_man-#{version}")
-      system_and_puts "rm -rf ./procon_bypass_man-#{version}"
     end
   end
 
   # TODO currentが挿しているバージョンはどうする？
   def self.uninstall(version)
     raise "Need a version" if version.nil?
+    version = Helper.normalize_version(version) or raise "mismatch version number!"
 
-    unless File.exists?("/usr/share/pbm/v#{version}")
+    begin
+      DestroyVersionService.new(version: version).execute!
+    rescue DestroyVersionService::VersionNotFoundError
       return false
     end
-    system_and_puts "rm -rf #{PBM_DIR}/v#{version}"
   end
 
   def self.use(version)
     raise "Need a version" if version.nil?
-    version = versions.last if version == "latest"
-
-    if !File.exists?("/usr/share/pbm/#{version}") && !File.exists?("/usr/share/pbm/v#{version}")
+    version =
+      if version == 'latest'
+        versions.last
+      else
+        Helper.normalize_version(version) or raise "mismatch version number!"
+      end
+
+    begin
+      UseVersionService.new(version: version).execute!
+    rescue UseVersionService::VersionNotFoundError
       return false
     end
-
-    if File.exists?("#{PBM_DIR}/current")
-      system_and_puts "unlink #{PBM_DIR}/current"
-    end
-    system_and_puts "ln -s #{PBM_DIR}/v#{version} #{PBM_DIR}/current"
-  end
-
-  def self.download_src(version)
-    if ENV["DEBUG_INSTALL"]
-      shell = <<~SHELL
-        git clone https://github.com/splaplapla/procon_bypass_man.git procon_bypass_man-#{version}
-      SHELL
-    else
-      # TODO cache for testing
-      shell = <<~SHELL
-        curl -L https://github.com/splaplapla/procon_bypass_man/archive/refs/tags/v#{version}.tar.gz | tar xvz
-      SHELL
-    end
-    system_and_puts(shell)
-    unless File.exists?("procon_bypass_man-#{version}/project_template")
-      raise "This version is not support by pbmenv"
-    end
-  end
-
-  def self.system_and_puts(shell)
-    puts "[SHELL] #{shell}"
-    system(shell)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbmenv
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies: []
 description: A package manager of PBM
 email:
@@ -39,8 +39,14 @@ files:
 - exe/pbmenv
 - lib/pbmenv.rb
 - lib/pbmenv/cli.rb
+- lib/pbmenv/create_version_service.rb
+- lib/pbmenv/destroy_version_service.rb
+- lib/pbmenv/download_src_service.rb
+- lib/pbmenv/helper.rb
 - lib/pbmenv/pbm.rb
+- lib/pbmenv/use_version_service.rb
 - lib/pbmenv/version.rb
+- lib/pbmenv/version_pathname.rb
 - pbmenv.gemspec
 homepage: https://github.com/splaplapla/pbmenv
 licenses: