pbmenv 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c1836c83f6b1324c9bfc14479d1a633cb9a61983bc63ac506a11317f7d30cd5
-  data.tar.gz: 39256579dd73802f3ba9cbebc0c881ae3dd456ff18991385fc3cdc0af8472339
+  metadata.gz: 7f3ac7d44e0f095598e3a3a80728d61cf0fc8f8bd363c50a37beaa1bc08537bc
+  data.tar.gz: 929ccd1944970ee956efe39855a17aa4c488462725ab7cf7c7f5b89dcca014bf
 SHA512:
-  metadata.gz: ba1130d7ed07a4ee7efe76620bcc8315526d207bf9ee1644ccede776f76236d9fd8a28e1dc4841ad73fdb70f470d1b8dfa82305ce34e672beea312cdcaf82701
-  data.tar.gz: aa59fe03426ef508147376f3c32681d254824e18316fd7f5be784b360e0259dab493c47a45e3b308e7571d5033712f58a544280d34d0099ab087cb1913b611fa
+  metadata.gz: af65fec992aeaaff02bf3ca0abc7f3f2c92f0deb5f065e4bce53b0169d1030f2f5f39cd0758bb630c016c0d66a53f6174ab1cd85b8017b7522d621c174493048
+  data.tar.gz: 9716ea9f4f06624680d5169bf7f2f36a36957fbf960966dfbab279708006f40ac6855ccaa8df93abd27bfa67b077c4c4ffb766eefee9a3b11816ae38ff29746a

data/.rspec

@@ -1 +1,2 @@
 --require spec_helper
+-f d

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## [0.1.3] - 2021-10:22
+## [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` にシムリンクを作成するようにしました
+
+## [0.1.3] - 2021-10-22
 
 - help的な出力をする
 

data/Dockerfile

@@ -2,5 +2,6 @@ FROM ruby:2.5
 
 WORKDIR /pbmenv
 
+ENV CI=1
 ADD docker/Gemfile .
-RUN apt-get update && apt-get install vim && gem i bundler && bundle install
+RUN apt-get update && apt-get install vim -y && gem i bundler && bundle install

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pbmenv (0.1.3)
+    pbmenv (0.1.7)
 
 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,5 +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/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "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.3"
+  VERSION = "0.1.7"
 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)
@@ -26,15 +29,35 @@ module Pbmenv
     end
 
     download_src(version)
-    system_with_puts <<~SHELL
+    system_and_puts <<~SHELL
       mkdir -p #{PBM_DIR}/v#{version} && cp -r procon_bypass_man-#{version}/project_template/* #{PBM_DIR}/v#{version}/
     SHELL
-    use version
+
+    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_with_puts "rm -rf #{PBM_DIR}/v#{version}"
+    system_and_puts "rm -rf #{PBM_DIR}/v#{version}"
     raise
   ensure
-    system_with_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が挿しているバージョンはどうする？
@@ -44,20 +67,21 @@ module Pbmenv
     unless File.exists?("/usr/share/pbm/v#{version}")
       return false
     end
-    system_with_puts "rm -rf #{PBM_DIR}/v#{version}"
+    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"
 
-    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")
-      system_with_puts "unlink #{PBM_DIR}/current"
+      system_and_puts "unlink #{PBM_DIR}/current"
     end
-    system_with_puts "ln -s #{PBM_DIR}/v#{version} #{PBM_DIR}/current"
+    system_and_puts "ln -s #{PBM_DIR}/v#{version} #{PBM_DIR}/current"
   end
 
   def self.download_src(version)
@@ -66,17 +90,18 @@ 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
     end
-    system_with_puts(shell)
+    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_with_puts(shell)
+  def self.system_and_puts(shell)
     puts "[SHELL] #{shell}"
     system(shell)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbmenv
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies: []
 description: A package manager of PBM
 email:
@@ -32,6 +32,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - docker-compose.yml
 - docker/Gemfile