pbmenv 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a9101c515824a7260f8b7fa580f1ed510170115d2181defc5f45883bf5eccc
-  data.tar.gz: 6e90fafc2894fc95d6ace3a63864117fbeaf2da18527f0748f7bb41a6240813a
+  metadata.gz: 963376cad2db3fdeb567e333e980a9fd37769d2fcb63be03a9292a49fc6934e6
+  data.tar.gz: 855f53dd708ff941bf4cae896eb87861a9c2f5aacb9e3bcc42c445633065a8eb
 SHA512:
-  metadata.gz: 1d880d194e32cd5070a8b4eb871a6ac7ef05a9aa4803532b9dcc8c95ad81358b0b18e763a77cd86d6fb93b46c3b12b2e1bca468ea7bb04a0bf7e097c65a93933
-  data.tar.gz: a82362de51b9910c13876938cbb4ea31b03ec9709bbae00785b989a13520f243da40d9fa4698d5e4c29ab5a8679af9846e046dc6ede8eefb974be4d2ba59c913
+  metadata.gz: 4764912ad9754c55a89406b4540dd1ce9f31e1148d0b40bc8ef4db48c16ef559e3be12cb329253eebb4c4b1bd40dba069d8b2dfcb68cfc4c68531cc34e06ddf8
+  data.tar.gz: a729bf9fa4dafab651e7b84e9243cdb509857be8f7fdcc2c9bde2973fefc91503a7b738183d8cc083751643ae71703a20584a031c74c80f066d9a259e2ff1fc9

data/.github/workflows/ruby.yml

@@ -24,7 +24,7 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.rspec

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

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [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的な出力をする
+
 ## [0.1.2] - 2021-09-19
 
 - Github Actionsを使う

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.2)
+    pbmenv (0.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -25,7 +25,7 @@ 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
@@ -39,4 +39,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,9 +10,19 @@ 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)
+      when '--version'
+        puts Pbmenv::VERSION
+      else
+        puts <<~EOH
+          Unknown command:
+            available commands: available_versions, versions, install, use, uninstall
+        EOH
       end
     end
   end

data/lib/pbmenv/version.rb

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

data/lib/pbmenv.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "securerandom"
+
 require_relative "pbmenv/version"
 require_relative "pbmenv/cli"
 require_relative "pbmenv/pbm"
@@ -26,15 +28,30 @@ 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
   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,7 +61,7 @@ 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)
@@ -55,9 +72,9 @@ module Pbmenv
     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 +83,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.2
+  version: 0.1.6
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-12-01 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