pbmenv 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf5ef3a99a0d05aefe181d42dacabc84929a659205d2af7e315c0deea135fac9
-  data.tar.gz: 63992a7e432f7c185b06dd2d5346bdc0e33500bd167b7b121a99c3b9681c9474
+  metadata.gz: 03103c7de7428f2c8c92aabd221463bed7ec8f5017f119feeb9204673afec788
+  data.tar.gz: 30ac40f3e940ef3599a14bf5b27ef1973221955b8bf2d2c0a351da197af40374
 SHA512:
-  metadata.gz: 6de90267f2b5501986d8325ef530a943a19933c85c8e28eba7eed879177e479999e65ba2bcddab73d59f61f78397d65bf72e92a256a24e357b7ce1880a0f4777
-  data.tar.gz: 56487c5af4ce175ec4cda01ca46800ec5b5d586fab88793f37d506a6ed818ce50e67f78952efd12a60d929c573a3ad57178d8e41618c207fe854907bcea9844d
+  metadata.gz: 4bf0ffcd4cf070c467363b510cf9239653582e433ce8f2e17d155f226615097520839ed99ab91afd316bb5f3b5c73f73d2219decaf40e923df96f59c6dcfc376
+  data.tar.gz: 35015b260bd3721b8d5e2b26541498c7d3e91ea09b970c3140cc8f3c26f1424a53bdf0510cedea325a062f504c94023b3f695b42f1a512dfec79c9dba841f731

data/CHANGELOG.md

@@ -1,6 +1,19 @@
+## [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/shared/device_id` へのシムリンクを作成するようにしました
+- `/usr/share/pbm/current/device_id` にシムリンクを作成するようにしました
 
 ## [0.1.3] - 2021-10-22
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pbmenv (0.1.4)
+    pbmenv (0.1.8)
 
 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,7 @@ gem 'pbmenv'
     * pbmenv available_versions
     * pbmenv versions
     * pbmenv install $version
+    * pbmenv use $version
     * pbmenv uninstall $version
 * API
     * Pbmenv.available_versions
@@ -26,6 +27,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 +42,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

@@ -10,6 +10,9 @@ module Pbmenv
       when 'install', 'i'
         sub_command_arg = argv[1]
         Pbmenv.install(sub_command_arg)
+      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 +21,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.4"
+  VERSION = "0.1.8"
 end

data/lib/pbmenv.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "securerandom"
+require "pathname"
+
 require_relative "pbmenv/version"
 require_relative "pbmenv/cli"
 require_relative "pbmenv/pbm"
@@ -12,7 +15,7 @@ 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)
@@ -30,22 +33,31 @@ module Pbmenv
       mkdir -p #{PBM_DIR}/v#{version} && cp -r procon_bypass_man-#{version}/project_template/* #{PBM_DIR}/v#{version}/
     SHELL
 
-    # sharedディレクトリを作成して、device_idへのシムリンクを作成する. device_idの中身はpbmで行う
     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
-    use version
+
+    # 初回だけ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
-    system_and_puts "rm -rf ./procon_bypass_man-#{version}"
+    if Dir.exists?("./procon_bypass_man-#{version}")
+      system_and_puts "rm -rf ./procon_bypass_man-#{version}"
+    end
   end
 
   # TODO currentが挿しているバージョンはどうする？
@@ -60,15 +72,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)
@@ -77,6 +95,7 @@ module Pbmenv
         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

metadata

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