pbmenv 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a7bfc60b36d4c37090e73b0b8ce6e2c0bba454bc15d1eb868a7c79bdbe1bf4
-  data.tar.gz: 7ab067f69450da109588bb69f4fbb5ab4cb928f77335b312988db6bc261aac62
+  metadata.gz: d84d71d3bcf5e7e79a41197911ac54faf9af6dbda23ccedc35975efbb7e6a58b
+  data.tar.gz: 210058e9076ada3295ce82f03b0194c42539d12ae6bc231c004d9d2dbbf94e2d
 SHA512:
-  metadata.gz: 6d8d3cccb07cbaca61a8e677ff49d03ec30025db9855bed03277e0ce7ddb18b15216978250fa6f15503bdff1cb08988eaec84ab15f9d1ad886e047e05f9da0ef
-  data.tar.gz: 4f3d85457dc011d46f05b820b2f145c34e02b5fbe75b9cf6fa91a4c11300e39179d343b5f3a0bb269bd9232713fa0ffaf39d8bbede5d68280799741aecc15fcc
+  metadata.gz: 5f4c9d3ba339adb0c6be98c276eb78e41648735035cf817b02986d8aa1c8c2b5829c3bbbc0bdb716f2cbfae7e25a311282a2af1c52af5990b5876baf91077c7b
+  data.tar.gz: 0352bcc42d5561ca37d6a20554138d1cfffe744adb06700c5443f6068efa5b2a3d77db00c319b147b78f7939e829f51501e86d80b4790ce89e30628a6808a225

data/.gitignore

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

data/CHANGELOG.md

@@ -1,6 +1,21 @@
-## [0.1.5] - 2021-11-16
+## [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を貼るようにしました
 
+## [0.1.6] - 2021-12-01
+- Improve spec
+- installコマンドでcurrentの張り替えをしないようにしました。currentの参照を変えるときはuseコマンドを使ってください
+
+## [0.1.5] - 2021-11-16
 - `/usr/share/pbm/shared/device_id` を作成するようにしました
+
 ## [0.1.4] - 2021-11-15
 
 - `/usr/share/pbm/current/device_id` にシムリンクを作成するようにしました

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pbmenv (0.1.5)
+    pbmenv (0.1.9)
 
 GEM
   remote: https://rubygems.org/
@@ -25,11 +25,12 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
 
 PLATFORMS
   aarch64-linux
   arm64-darwin-20
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -39,4 +40,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.16
+   2.2.31

data/README.md

@@ -17,6 +17,9 @@ gem 'pbmenv'
     * pbmenv available_versions
     * pbmenv versions
     * pbmenv install $version
+      * --use
+        * そのまま/usr/share/pbm/currentディレクトリへのシンボリックリンクを貼ります
+    * pbmenv use $version
     * pbmenv uninstall $version
 * API
     * Pbmenv.available_versions
@@ -26,6 +29,7 @@ gem 'pbmenv'
     * Pbmenv.install(version)
         * https://github.com/splaplapla/procon_bypass_man/archive/refs/tags/v#{version}.tar.gz をダウンロードして、
         * /usr/share/pbm/#{version} に app.rb, pbm.servive, setting.yml を配備する
+    * Pbmenv.use(version)
         * /usr/share/pbm/#{version} を /usr/share/pbm/current へのシムリンクを作成する
     * Pbmenv.uninstall(version)
         * /usr/share/pbm/current が削除対象だったら例外を投げる
@@ -40,6 +44,6 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## Development
-* docker-compose build --no-cache 
+* docker-compose build --no-cache
 * docker-compose run app bash
 * bin/rspec

data/lib/pbmenv/cli.rb

@@ -9,7 +9,21 @@ 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)
       when 'uninstall'
         sub_command_arg = argv[1]
         Pbmenv.uninstall(sub_command_arg)
@@ -18,7 +32,7 @@ module Pbmenv
       else
         puts <<~EOH
           Unknown command:
-            available commands: available_versions, versions, install, uninstall
+            available commands: available_versions, versions, install, use, uninstall
         EOH
       end
     end

data/lib/pbmenv/version.rb

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

data/lib/pbmenv.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "securerandom"
+require "pathname"
 
 require_relative "pbmenv/version"
 require_relative "pbmenv/cli"
@@ -14,10 +15,10 @@ module Pbmenv
   end
 
   def self.versions
-    Pbmenv::PBM.new.versions.map { |name| Pathname.new(name).basename.to_s =~ /^v([\d.]+)/ && $1 }.compact
+    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
@@ -32,6 +33,14 @@ module Pbmenv
       mkdir -p #{PBM_DIR}/v#{version} && cp -r procon_bypass_man-#{version}/project_template/* #{PBM_DIR}/v#{version}/
     SHELL
 
+    if enable_pbm_cloud
+      text = File.read("#{PBM_DIR}/v#{version}/app.rb")
+      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("#{PBM_DIR}/v#{version}/app.rb", text)
+    end
+
     unless File.exists?("#{PBM_DIR}/shared")
       system_and_puts <<~SHELL
         mkdir -p #{PBM_DIR}/shared
@@ -46,7 +55,10 @@ module Pbmenv
       ln -s #{PBM_DIR}/shared/device_id #{PBM_DIR}/v#{version}/device_id
     SHELL
 
-    use version
+    # 初回だけinstall時にcurrentを作成する
+    if !File.exists?("#{PBM_DIR}/current") || use_option
+      use(version)
+    end
   rescue => e
     system_and_puts "rm -rf #{PBM_DIR}/v#{version}"
     raise
@@ -68,15 +80,21 @@ module Pbmenv
 
   def self.use(version)
     raise "Need a version" if version.nil?
+    version = versions.last if version == "latest"
 
-    unless File.exists?("/usr/share/pbm/v#{version}")
+    if !File.exists?("/usr/share/pbm/#{version}") && !File.exists?("/usr/share/pbm/v#{version}")
       return false
     end
 
-    if File.exists?("#{PBM_DIR}/current")
+    if File.symlink?("#{PBM_DIR}/current")
       system_and_puts "unlink #{PBM_DIR}/current"
     end
-    system_and_puts "ln -s #{PBM_DIR}/v#{version} #{PBM_DIR}/current"
+
+    if(version_number = version.match(/v?([\w.]+)/)[1])
+      system_and_puts "ln -s #{PBM_DIR}/v#{version_number} #{PBM_DIR}/current"
+    else
+      raise "mismatch version number!"
+    end
   end
 
   def self.download_src(version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbmenv
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies: []
 description: A package manager of PBM
 email: