skap 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16e74f93e2cb2c5bfb6ec42565f0ee3a276f6d134a63418a98328a259141272e
-  data.tar.gz: a00a345fb79bd667ecde44d7b62fc8933f0f6e131185a740a6a6e30afd78e047
+  metadata.gz: f7487b2bdb15b4a94bf5e9f5862eeebaf20f6a23b9e7c3aae850fdf6350283c3
+  data.tar.gz: 55c46f71dd2c1bdf6a04c0160c9cbf378c14ae13dd244606d0c0cd170ff0defb
 SHA512:
-  metadata.gz: '0908fffd649481ec79c9f772585beacf0b327ff6614dd2da60c9090c77876bb67cd0ec0d4f014b2b0eada4ddc1141c43c9f330c38e612fcfd03bcfa35f1d1459'
-  data.tar.gz: 27c06e31d15c05c3b311854f26f0f01eb8adb23487b79b9c8d8d426b09799d75720a5dd9c7bcaf9e11f33ae4f90c92f4b4e812c5c09529935cb2540fa0a7d248
+  metadata.gz: 849759daeaffebc05744d58df836f6a7da9e703c48d3d273a0180449a0bd82fc911782a7ee1f2df1ad9f6694361e364f5bd6b3704a20d85e778100c72cb98e96
+  data.tar.gz: dc7359b30974a0844520c45c858b178319f5d660e0fe5846de49a1c71c9dd30a69a26f6150462e62edeb459b56173a8962c6db1bd887bf0a683db55e8ec7aaa3

data/lib/skap/cli/sources.rb

@@ -32,11 +32,7 @@ module Skap
 
       return unless shell("git submodule add -b #{branch} --depth 3 -- #{repo} #{dir}")
 
-      sources_data = load_file(SOURCES)
-      sources_data[dir] = {"file-extensions" => [], "ignored" => [], "indexed" => []}
-
-      sources_data = sources_data.sort_by(&:first).to_h
-      File.write(SOURCES, Psych.dump(sources_data, line_width: 100))
+      Files::Sources.new.add_source(dir)
     end
 
     # @param dir [String]
@@ -46,6 +42,8 @@ module Skap
       assert_empty_options(rest)
 
       shell("git submodule deinit -f -- #{dir} && git rm -f #{dir} && rm -rf .git/modules/#{dir}")
+
+      Files::Sources.new.delete_source(dir)
     end
 
     # @param dirs [Array<String>]
@@ -53,7 +51,12 @@ module Skap
     def update(*dirs)
       path_arg = dirs.empty? ? "" : "-- #{dirs.join(" ")}"
 
-      shell("git submodule update --checkout --single-branch --recursive #{path_arg}")
+      commands = [
+        "git submodule init",
+        "git submodule update --checkout --single-branch --recursive #{path_arg}",
+      ]
+
+      shell(commands.join(" && "))
     end
   end
 end

data/lib/skap/cli/version.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Skap
+  module CLI::Version
+    include Command
+    extend self
+
+    # @return [void]
+    def start
+      puts "Skap, v#{Skap::VERSION}"
+    end
+  end
+end

data/lib/skap/cli.rb

@@ -21,10 +21,11 @@ module Skap
       section, command, *rest = argv
 
       case section
-      when "works" then CLI::Works.start(command, rest)
       when "help", "--help", "-h", nil then CLI::Help.start
       when "init" then CLI::Init.start(command, rest)
       when "sources" then CLI::Sources.start(command, rest)
+      when "version", "--version", "-v" then CLI::Version.start
+      when "works" then CLI::Works.start(command, rest)
       else
         raise ArgumentError, "Unknown section: #{section}"
       end
@@ -38,4 +39,5 @@ end
 require_relative "cli/help"
 require_relative "cli/init"
 require_relative "cli/sources"
+require_relative "cli/version"
 require_relative "cli/works"

data/lib/skap/files/sources.rb

@@ -5,6 +5,22 @@ module Skap
     class Sources < YAMLFile
       self.file_name = "sources.yaml"
 
+      # @param dir [String]
+      # @return [void]
+      def add_source(dir)
+        file[dir] = {"file-extensions" => [], "ignored" => [], "indexed" => []}
+        @file = file.sort_by(&:first).to_h
+
+        update_file
+      end
+
+      # @param dir [String]
+      # @return [void]
+      def delete_source(dir)
+        file.delete(dir)
+        update_file
+      end
+
       # @param key [String]
       # @param dirs [Array<String>]
       # @return [Hash<String, Array<String>>]

data/lib/skap/files/versions.rb

@@ -12,7 +12,7 @@ module Skap
         file[document_path] = document
         @file = file.sort_by(&:first).to_h
 
-        File.write(self.class.file_name, Psych.dump(file, line_width: 100))
+        update_file
       end
 
       # @return [Set<String>]

data/lib/skap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skap
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/skap/yaml_file.rb

@@ -20,5 +20,10 @@ module Skap
     def load_file
       Psych.load_file(self.class.file_name, symbolize_names: false) || {}
     end
+
+    # @return [void]
+    def update_file
+      File.write(self.class.file_name, Psych.dump(file, line_width: 100))
+    end
   end
 end

data/menu.yaml

@@ -1,5 +1,5 @@
 ---
-- cmd: help
+- cmd: ["help", "--help", "-h"]
   text: "Show help message about supported commands."
 - cmd: ["init", "init DIRECTORY_PATH"]
   text: "Create configuration files in current directory or in DIRECTORY_PATH."
@@ -14,6 +14,8 @@
         Update git submodule from upstream in DIRECTORY or in all git submodules if DIRECTORY
         is not specified. You may pass one or more directory paths (DIRECTORY ...) to update
         their contents.
+- cmd: ["version", "--version", "-v"]
+  text: "Show program version"
 - cmd: works
   children:
     - cmd: ["covered", "covered DIRECTORY ..."]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skap
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Evgeniy Nochevnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -94,6 +94,7 @@ files:
 - lib/skap/cli/help.rb
 - lib/skap/cli/init.rb
 - lib/skap/cli/sources.rb
+- lib/skap/cli/version.rb
 - lib/skap/cli/works.rb
 - lib/skap/command.rb
 - lib/skap/files/menu.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: ''