pbmenv 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07327b53425fcdc6569f0cc2de6725f6486c155fc7dad8620651815981036289
-  data.tar.gz: 03c119a0cd846d2a5014ff9888b506c2e2a96d698dd2dd7b2f60d003547443b2
+  metadata.gz: 3f35552c2117ced3c7790caeea1c4e588e062752629b5cdcd8fde239cb09d86a
+  data.tar.gz: b1d3093ba6707e79d9a5a557060a5c5be92b2b59131b452f48b920d445675db9
 SHA512:
-  metadata.gz: 250a607a5dfe95f4268b08aa82a9ae22476b8c46491ab512a2bed6a05701b59b110797ca12b1769dd9bbd42e91408ec5323731bf3a11eb281b6c834545259f60
-  data.tar.gz: 18b2dddb83005547baeadf03a3ff736aca95b675ac5dbff6c7945f72f5224cc54ea8cafaa698dc2f874373c6ce996af45e8446d0e5ea31f1640164fb1f705076
+  metadata.gz: 5e4e5410b064dfe5f1cc9dcb7aae805d30d8df71d2921f46583705251fd2b7fd677627781098e097ddffe71c84944dbf509bc948a08c465fe5fec244149ba5fa
+  data.tar.gz: 121d0ae161dc0d6ad9146e6fccc8c92a5fbcc3f17a2f1a2ef0ef89e0c9096c84f09686354a87769496b2635cd2603995f18f2ed361163521e7f1021b34fc2f65

data/.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Publish to RubyGems
 
 on:
-  [workflow_dispatch]
+  workflow_dispatch:
 
 jobs:
   release:
@@ -14,10 +14,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.1
         bundler-cache: true
     - name: Publish to RubyGems
       run: |

data/.github/workflows/ruby.yml

@@ -8,15 +8,20 @@
 name: Ruby
 
 on:
-  [push, workflow_dispatch]
+  schedule:
+    - cron: '0 0 */1 * *' # runs daily
+  push:
 
 jobs:
   test:
+    env:
+      BUNDLE_WITHOUT: :typecheck
     runs-on: ubuntu-latest
     timeout-minutes: 5
     strategy:
+      max-parallel: 2
       matrix:
-        ruby-version: ['2.5', '3.0', '3.1', '3.2']
+        ruby-version: ['2.5', '2.7', '3.0', '3.1', '3.2']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
@@ -26,3 +31,18 @@ jobs:
         bundler-cache: true
     - name: Run tests
       run: bundle exec rake
+  typecheck:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: typecheck
+      run: bundle exec steep check

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.13] - 2023-07-16
+- listコマンドの出力でactiveなバージョンがわかるようになりました
+
 ## [0.1.12] - 2023-04-16
 - Support ruby3.2
 

data/Gemfile

@@ -8,3 +8,9 @@ gemspec
 gem "rake"
 gem "rspec"
 gem "pry"
+
+
+group :typecheck do
+  gem 'rbs', require: false
+  gem "steep", require: false
+end

data/Gemfile.lock

@@ -1,18 +1,44 @@
 PATH
   remote: .
   specs:
-    pbmenv (0.1.12)
+    pbmenv (0.1.13)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
     coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    csv (3.2.6)
     diff-lcs (1.4.4)
+    ffi (1.15.5)
+    fileutils (1.7.1)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.5.3)
     method_source (1.0.0)
+    minitest (5.18.0)
+    parser (3.2.2.1)
+      ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    rainbow (3.1.1)
     rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rbs (3.1.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -26,6 +52,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
+    securerandom (0.2.2)
+    steep (1.4.0)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.2.2)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (>= 2.8.0)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 4)
+    strscan (3.0.6)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   aarch64-linux
@@ -37,7 +85,6 @@ DEPENDENCIES
   pbmenv!
   pry
   rake
+  rbs
   rspec
-
-BUNDLED WITH
-   2.3.7
+  steep

data/Steepfile

@@ -0,0 +1,26 @@
+# D = Steep::Diagnostic
+#
+target :lib do
+  signature "sig"
+
+  check "lib"                       # Directory name
+  # check "Gemfile"                   # File name
+  # check "app/models/**/*.rb"        # Glob
+  # ignore "lib/templates/*.rb"
+
+  library "json", "uri", "pathname", "securerandom", "logger"
+
+  # library "strong_json"           # Gems
+  
+  # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
+  # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
+  # configure_code_diagnostics do |hash|             # You can setup everything yourself
+  #   hash[D::Ruby::NoMethod] = :information
+  # end
+end
+
+# target :test do
+#   signature "sig", "sig-private"
+#
+#   check "test"
+# end

data/docker-compose.yml

@@ -8,7 +8,5 @@ services:
     volumes:
       - './:/pbmenv'
       - bundle_path:/bundle
-    environment:
-      - BUNDLE_PATH=/bundle
 volumes:
   bundle_path:

data/exe/pbmenv

@@ -4,4 +4,8 @@
 require "bundler/setup"
 require "pbmenv"
 
-Pbmenv::CLI.run ARGV
+begin
+  Pbmenv::CLI.run(ARGV)
+rescue Pbmenv::CLI::CLIError
+  exit 1
+end

data/lib/pbmenv/cli.rb

@@ -1,25 +1,29 @@
 module Pbmenv
   class CLI
+    class CLIError < StandardError; end
+
     def self.run(argv)
       sub_command = argv[0]
       case sub_command
       when 'available_versions', 'av'
         Pbmenv.available_versions.each { |x| puts x }
       when 'versions', 'list'
-        Pbmenv.versions.each { |x| puts x }
+        Pbmenv.command_versions.each { |x| puts x }
       when 'install', 'i'
         sub_command_arg = argv[1]
+        use_option = false
         case argv[2]
         when "--use"
           use_option = true
         when nil
-          use_option = false
         else
           puts <<~EOH
             Unknown option:
               available options: --use
           EOH
+          raise CLIError
         end
+
         Pbmenv.install(sub_command_arg, use_option: use_option)
       when 'use', 'u'
         sub_command_arg = argv[1]
@@ -37,9 +41,17 @@ module Pbmenv
         puts Pbmenv::VERSION
       else
         puts <<~EOH
-          Unknown command:
-            available commands: available_versions, versions, install, use, uninstall, clean
+          Usage: pbmenv [command]
+
+          Available commands:
+            available_versions    Display the available versions of pbmenv
+            versions              List the installed versions of pbmenv
+            install               Install a specific version of pbmenv
+            use                   Set a specific version of pbmenv as the active version
+            uninstall             Uninstall a specific version of pbmenv
+            clean                 Remove old installed versions of pbmenv
         EOH
+        raise CLIError
       end
     end
   end

data/lib/pbmenv/helper.rb

@@ -6,7 +6,7 @@ module Pbmenv
     end
 
     def self.to_stdout(text)
-      puts text
+      Pbmenv.logger.info(text)
     end
 
     def self.normalize_version(version)

data/lib/pbmenv/services/create_version_service.rb

@@ -50,7 +50,10 @@ module Pbmenv
 
     def build_app_file
       pathname = VersionPathname.new(version)
-      Helper.system_and_puts "mkdir -p #{pathname.version_path}"
+      unless Helper.system_and_puts "mkdir -p #{pathname.version_path}"
+        raise "Insufficient permissions..."
+      end
+
       Helper.system_and_puts "cp -r #{pathname.src_project_template_systemd_units} #{pathname.version_path}/"
 
       if File.exist?(pathname.src_pbm_project_template_app_rb_erb_path)

data/lib/pbmenv/services/download_src_service.rb

@@ -18,13 +18,13 @@ module Pbmenv
       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 -C /tmp > /dev/null
+          curl -L https://github.com/splaplapla/procon_bypass_man/archive/refs/tags/v#{version}.tar.gz | tar xvz -C /tmp > /dev/null 2>&1
         SHELL
       end
 
       if Helper.system_and_puts(shell)
         unless File.exist?(pathname.src_pbm_project_template_path)
-          raise NotSupportVersionError, "This version is not support by pbmenv"
+          raise Pbmenv::CreateVersionService::NotSupportVersionError, "This version is not support by pbmenv"
         end
       else
         raise DownloadError

data/lib/pbmenv/version.rb

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

data/lib/pbmenv/version_pathname.rb

@@ -7,11 +7,11 @@ module Pbmenv
     end
 
     def version_path
-      File.join(PBM_DIR, "v#{version}")
+      File.join(Pbmenv.pbm_dir, "v#{version}")
     end
 
     def version_path_without_v
-      File.join(PBM_DIR, "#{version}")
+      File.join(Pbmenv.pbm_dir, "#{version}")
     end
 
     def app_rb_path
@@ -65,11 +65,11 @@ module Pbmenv
     end
 
     def self.current
-      File.join(PBM_DIR, "current")
+      File.join(Pbmenv.pbm_dir, "current")
     end
 
     def self.shared
-      File.join(PBM_DIR, "shared")
+      File.join(Pbmenv.pbm_dir, "shared")
     end
   end
 end

data/lib/pbmenv.rb

@@ -2,6 +2,7 @@
 
 require "securerandom"
 require "pathname"
+require "logger"
 
 require_relative "pbmenv/version"
 require_relative "pbmenv/cli"
@@ -16,7 +17,40 @@ require_relative "pbmenv/services/use_version_service"
 require_relative "pbmenv/services/download_src_service"
 
 module Pbmenv
-  PBM_DIR = "/usr/share/pbm"
+  PBM_DIR = "/usr/share/pbm" # NOTE: pbmから参照している
+  DEFAULT_PBM_DIR = PBM_DIR
+
+  class << self
+    attr_accessor :logger
+  end
+
+  @current_pbm_dir = DEFAULT_PBM_DIR
+
+  self.logger = Logger.new($stdout)
+  self.logger.formatter = proc do |severity, datetime, progname, message|
+    "#{message}\n"
+  end
+
+  # @param [String] to_dir
+  # @return [void]
+  # NOTE: テスト用
+  def self.chdir(to_dir)
+    raise(ArgumentError, 'テスト以外では実行できません') unless defined?(RSpec)
+    @current_pbm_dir = to_dir
+  end
+
+  # @return [String]
+  def self.pbm_dir
+    @current_pbm_dir
+  end
+
+  # @return [void]
+  def self.slice_logger
+    previous_logger = self.logger
+    self.logger = Logger.new(File.open(File::NULL, "w"))
+    yield
+    self.logger = previous_logger
+  end
 
   # @return [Pbmenv::DirectoryObject]
   def self.current_directory
@@ -29,7 +63,7 @@ module Pbmenv
 
   # @return [Array<Pbmenv::VersionObject>]
   def self.installed_versions
-    unsorted_dirs = Dir.glob("#{Pbmenv::PBM_DIR}/v*")
+    unsorted_dirs = Dir.glob("#{Pbmenv.pbm_dir}/v*")
     sorted_version_names = unsorted_dirs.map { |name| Pathname.new(name).basename.to_s =~ /^v([\d.]+)/ && $1 }.compact.sort_by {|x| Gem::Version.new(x) }
     sorted_version_names.map do |version_name|
       VersionObject.new(
@@ -40,10 +74,10 @@ module Pbmenv
     end
   end
 
-  # @deprecated
-  def self.versions
-    unsorted_dirs = Dir.glob("#{Pbmenv::PBM_DIR}/v*")
-    unsorted_dirs.map { |name| Pathname.new(name).basename.to_s =~ /^v([\d.]+)/ && $1 }.compact.sort_by {|x| Gem::Version.new(x) }.compact
+  def self.command_versions
+    self.installed_versions.map do |version|
+      version.current_version? ? "* #{version.name}" : "  #{version.name}"
+    end
   end
 
   def self.install(version, use_option: false, enable_pbm_cloud: false)
@@ -80,7 +114,7 @@ module Pbmenv
     raise "Need a version" if version.nil?
     version =
       if version == 'latest'
-        self.versions.last
+        self.installed_versions.last.name
       else
         Helper.normalize_version(version) or raise "mismatch version number!"
       end

data/sig/main.rbs

@@ -0,0 +1,253 @@
+module Pbmenv
+  PBM_DIR: "/usr/share/pbm"
+
+  DEFAULT_PBM_DIR: untyped
+
+  self.@current_pbm_dir: String
+
+  @logger: Logger
+
+  def self.logger: () -> Logger
+  def self.logger=: (Logger) -> void
+
+  # @param [String] to_dir
+  # @return [void]
+  # NOTE: テスト用
+  def self.chdir: (String to_dir) -> untyped
+
+  # @return [String]
+  def self.pbm_dir: () -> untyped
+
+  # @return [Pbmenv::DirectoryObject]
+  def self.current_directory: () -> untyped
+
+  def self.available_versions: () -> untyped
+
+  # @return [Array<Pbmenv::VersionObject>]
+  def self.installed_versions: () -> untyped
+
+  def self.command_versions: () -> untyped
+
+  def self.install: (untyped version, ?use_option: bool, ?enable_pbm_cloud: bool) -> (false | untyped)
+
+  # TODO: 引数がcurrentを指しているバージョンはどうする？
+  def self.uninstall: (untyped version) -> (false | untyped)
+
+  def self.use: (untyped version) -> (false | untyped)
+
+  # @param [Integer] keep_versions_size
+  # @return [void]
+  def self.clean: (untyped keep_versions_size) -> (nil | untyped)
+end
+
+module Pbmenv
+  class CLI
+    class CLIError < StandardError
+    end
+
+    def self.run: (untyped argv) -> untyped
+  end
+end
+
+module Pbmenv
+  class DirectoryObject
+    @path: String
+
+    class NonSymlinkError < StandardError
+    end
+
+    def initialize: (path: untyped) -> void
+
+    def path: () -> untyped
+
+    # @return [String]
+    def readlink!: () -> untyped
+
+    # @return [String, NilClass]
+    def readlink: () -> untyped
+
+    private
+
+    # @return [Boolean]
+    def symlink?: () -> untyped
+  end
+end
+
+module Pbmenv
+  class Helper
+    def self.system_and_puts: (untyped shell) -> untyped
+
+    def self.to_stdout: (untyped text) -> untyped
+
+    def self.normalize_version: (untyped version) -> untyped
+  end
+end
+
+module Pbmenv
+  class PBM
+    # @return [Array<String>] githubに問い合わせて、利用可能なバージョンのリストを返す
+    def available_versions: () -> untyped
+  end
+end
+
+module Pbmenv
+  class CreateVersionService
+    class AlreadyCreatedError < StandardError
+    end
+
+    class NotSupportVersionError < StandardError
+    end
+
+    attr_accessor version: untyped
+
+    attr_accessor use_option: untyped
+
+    attr_accessor enable_pbm_cloud: untyped
+
+    def initialize: (version: untyped, use_option: untyped, enable_pbm_cloud: untyped) -> void
+
+    def execute!: () -> true
+
+    private
+
+    # @return [String]
+    def download_src: (untyped version) -> untyped
+
+    def build_app_file: () -> untyped
+
+    def create_if_miss_shared_dir: () -> (nil | untyped)
+
+    def create_if_miss_device_id_file: () -> (nil | untyped)
+
+    def link_device_id_file: (version: untyped) -> untyped
+
+    def create_if_miss_current_dir: (version: untyped) -> (untyped | nil)
+  end
+end
+
+module Pbmenv
+  class DestroyVersionService
+    class VersionNotFoundError < StandardError
+    end
+
+    attr_accessor version: untyped
+
+    def initialize: (version: untyped) -> void
+
+    def execute!: () -> untyped
+  end
+end
+
+module Pbmenv
+  class DownloadSrcService
+    class DownloadError < StandardError
+    end
+
+    attr_accessor version: untyped
+
+    def initialize: (untyped version) -> void
+
+    def execute!: () -> untyped
+  end
+end
+
+module Pbmenv
+  class UseVersionService
+    class VersionNotFoundError < StandardError
+    end
+
+    attr_accessor version: String
+
+    def initialize: (version: String) -> void
+
+    def execute!: () -> void
+
+    private
+
+    def throw_error_if_has_not_version: () -> untyped
+
+    def relink_current_path: () -> String
+  end
+end
+
+module Pbmenv
+  VERSION: String
+end
+
+module Pbmenv
+  class VersionObject
+    @is_current: bool
+    @is_latest: bool
+    @version_name: String
+
+    # @param [String] version_name
+    # @param [Boolean] is_latest
+    # @param [Boolean] is_current
+    def initialize: (version_name: String, is_latest: bool, is_current: bool) -> void
+
+    # @return [String]
+    def version_name: () -> String
+
+    # alias
+    def name: () -> String
+
+    # @return [Boolean]
+    def current_version?: () -> bool
+
+    # @return [Boolean]
+    def latest_version?: () -> bool
+  end
+end
+
+module Pbmenv
+  class VersionPathname
+    attr_accessor version: untyped
+
+    def initialize: (String version) -> void
+
+    def version_path: () -> untyped
+
+    def version_path_without_v: () -> untyped
+
+    def app_rb_path: () -> untyped
+
+    def app_rb_erb_path: () -> untyped
+
+    def device_id_path_in_version: () -> untyped
+
+    def src_pbm_path: () -> untyped
+
+    def project_template_file_paths: (include_app_erb: untyped) -> untyped
+
+    def device_id_path_in_shared: () -> untyped
+
+    def src_pbm_project_template_path: () -> untyped
+
+    def src_pbm_project_template_app_rb_erb_path: () -> untyped
+
+    def lib_app_generator: () -> untyped
+
+    def src_project_template_systemd_units: () -> untyped
+
+    def self.device_id_path_in_shared: () -> String
+
+    def self.current: () -> String
+
+    def self.shared: () -> String
+  end
+end
+
+
+module URI
+  def self.open: (String url) -> untyped
+end
+
+module RSpec
+end
+
+
+class AppGenerator
+  def initialize: (prefix_path: String, enable_integration_with_pbm_cloud: bool) -> void
+
+  def generate: () -> void
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbmenv
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-07-16 00:00:00.000000000 Z
 dependencies: []
 description: A package manager of PBM
 email:
@@ -31,6 +31,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/rspec
 - bin/setup
@@ -50,6 +51,7 @@ files:
 - lib/pbmenv/version_object.rb
 - lib/pbmenv/version_pathname.rb
 - pbmenv.gemspec
+- sig/main.rbs
 homepage: https://github.com/splaplapla/pbmenv
 licenses:
 - MIT
@@ -70,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: A package manager of PBM