kanrisuru 0.13.0 → 0.16.1

data/lib/kanrisuru/core/mount/commands/mount.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Mount
+      def mount(opts = {})
+        type = opts[:type]
+
+        bind_old = opts[:bind_old]
+        bind_new = opts[:bind_new]
+        rbind_old = opts[:rbind_old]
+        rbind_new = opts[:rbind_new]
+        move_old = opts[:move_old]
+        move_new = opts[:move_new]
+        fs_opts   = opts[:fs_opts]
+
+        command = Kanrisuru::Command.new('mount')
+
+        if Kanrisuru::Util.present?(bind_old) && Kanrisuru::Util.present?(bind_new)
+          command.append_flag('--bind')
+          command << bind_old
+          command << bind_new
+        elsif Kanrisuru::Util.present?(rbind_old) && Kanrisuru::Util.present?(rbind_new)
+          command.append_flag('--rbind')
+          command << rbind_old
+          command << rbind_new
+        elsif Kanrisuru::Util.present?(move_old) && Kanrisuru::Util.present?(move_new)
+          command.append_flag('--move')
+          command << move_old
+          command << move_new
+        else
+          command.append_arg('-L', opts[:label])
+          command.append_arg('-U', opts[:uuid])
+          command.append_flag('-f', opts[:fake])
+          command.append_flag('-i', opts[:internal_only])
+          command.append_flag('-s', opts[:sloppy])
+
+          command.append_flag('--no-mtab', opts[:no_mtab])
+          command.append_flag('--no-canonicalize', opts[:no_canonicalize])
+
+          fs_options = nil
+          if Kanrisuru::Util.present?(type)
+            add_type(command, type)
+            fs_options = Kanrisuru::Remote::Fstab::Options.new(type, fs_opts) if fs_opts
+          elsif fs_opts
+            fs_options = Kanrisuru::Remote::Fstab::Options.new('common', fs_opts)
+          end
+
+          if Kanrisuru::Util.present?(opts[:all])
+            command.append_flag('-a')
+            add_test_opts(command, opts[:test_opts], type)
+          else
+            command.append_arg('-o', fs_options.to_s)
+
+            command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
+            command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
+          end
+        end
+
+        execute_shell(command)
+        Kanrisuru::Result.new(command)
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/mount/commands/umount.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Mount
+      def umount(opts = {})
+        all = opts[:all]
+        type = opts[:type]
+        command = Kanrisuru::Command.new('umount')
+
+        command.append_flag('--fake', opts[:fake])
+        command.append_flag('--no-canonicalize', opts[:no_canonicalize])
+        command.append_flag('-n', opts[:no_mtab])
+        command.append_flag('-r', opts[:fail_remount_readonly])
+        command.append_flag('-d', opts[:free_loopback])
+
+        command.append_flag('-l', opts[:lazy])
+        command.append_flag('-f', opts[:force])
+
+        if Kanrisuru::Util.present?(all)
+          command.append_flag('-a')
+          add_type(command, type)
+          add_test_opts(command, opts[:test_opts], type)
+        else
+          command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
+          command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
+        end
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command)
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/mount/commands.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative 'commands/mount'
+require_relative 'commands/umount'
+
+module Kanrisuru
+  module Core
+    module Mount
+      private
+
+      def add_type(command, type)
+        return unless Kanrisuru::Util.present?(type)
+
+        test_types = nil
+
+        if type.include?(',')
+          if type.include?('no')
+            test_types = type.gsub('no', '')
+            test_types = test_types.split(',')
+          else
+            test_types = type.split(',')
+          end
+        else
+          test_types = [type]
+        end
+
+        test_types.each do |t|
+          device_opts = Kanrisuru::Util::FsMountOpts.get_device(t)
+          raise ArgumentError, "Invalid fstype: #{t}" unless device_opts
+        end
+
+        command.append_arg('-t', type)
+      end
+
+      def add_test_opts(command, test_opts, type)
+        return unless Kanrisuru::Util.present?(test_opts)
+
+        test_options =
+          if Kanrisuru::Util.present?(type)
+            Kanrisuru::Remote::Fstab::Options.new(type, test_opts)
+          else
+            Kanrisuru::Remote::Fstab::Options.new('common', test_opts)
+          end
+
+        command.append_arg('-O', test_options.to_s)
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/mount.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'mount/commands'
+
 module Kanrisuru
   module Core
     module Mount
@@ -7,131 +9,6 @@ module Kanrisuru
 
       os_define :linux, :mount
       os_define :linux, :umount
-
-      def mount(opts = {})
-        type = opts[:type]
-
-        bind_old = opts[:bind_old]
-        bind_new = opts[:bind_new]
-        rbind_old = opts[:rbind_old]
-        rbind_new = opts[:rbind_new]
-        move_old = opts[:move_old]
-        move_new = opts[:move_new]
-        fs_opts   = opts[:fs_opts]
-
-        command = Kanrisuru::Command.new('mount')
-
-        if Kanrisuru::Util.present?(bind_old) && Kanrisuru::Util.present?(bind_new)
-          command.append_flag('--bind')
-          command << bind_old
-          command << bind_new
-        elsif Kanrisuru::Util.present?(rbind_old) && Kanrisuru::Util.present?(rbind_new)
-          command.append_flag('--rbind')
-          command << rbind_old
-          command << rbind_new
-        elsif Kanrisuru::Util.present?(move_old) && Kanrisuru::Util.present?(move_new)
-          command.append_flag('--move')
-          command << move_old
-          command << move_new
-        else
-          command.append_arg('-L', opts[:label])
-          command.append_arg('-U', opts[:uuid])
-          command.append_flag('-f', opts[:fake])
-          command.append_flag('-i', opts[:internal_only])
-          command.append_flag('-s', opts[:sloppy])
-
-          command.append_flag('--no-mtab', opts[:no_mtab])
-          command.append_flag('--no-canonicalize', opts[:no_canonicalize])
-
-          fs_options = nil
-          if Kanrisuru::Util.present?(type)
-            add_type(command, type)
-            fs_options = Kanrisuru::Remote::Fstab::Options.new(type, fs_opts) if fs_opts
-          elsif fs_opts
-            fs_options = Kanrisuru::Remote::Fstab::Options.new('common', fs_opts)
-          end
-
-          if Kanrisuru::Util.present?(opts[:all])
-            command.append_flag('-a')
-            add_test_opts(command, opts[:test_opts], type)
-          else
-            command.append_arg('-o', fs_options.to_s)
-
-            command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
-            command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
-          end
-        end
-
-        execute_shell(command)
-        Kanrisuru::Result.new(command)
-      end
-
-      def umount(opts = {})
-        all = opts[:all]
-        type = opts[:type]
-        command = Kanrisuru::Command.new('umount')
-
-        command.append_flag('--fake', opts[:fake])
-        command.append_flag('--no-canonicalize', opts[:no_canonicalize])
-        command.append_flag('-n', opts[:no_mtab])
-        command.append_flag('-r', opts[:fail_remount_readonly])
-        command.append_flag('-d', opts[:free_loopback])
-
-        command.append_flag('-l', opts[:lazy])
-        command.append_flag('-f', opts[:force])
-
-        if Kanrisuru::Util.present?(all)
-          command.append_flag('-a')
-          add_type(command, type)
-          add_test_opts(command, opts[:test_opts], type)
-        else
-          command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
-          command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
-        end
-
-        execute_shell(command)
-
-        Kanrisuru::Result.new(command)
-      end
-
-      private
-
-      def add_type(command, type)
-        return unless Kanrisuru::Util.present?(type)
-
-        test_types = nil
-
-        if type.include?(',')
-          if type.include?('no')
-            test_types = type.gsub('no', '')
-            test_types = test_types.split(',')
-          else
-            test_types = type.split(',')
-          end
-        else
-          test_types = [type]
-        end
-
-        test_types.each do |t|
-          device_opts = Kanrisuru::Util::FsMountOpts.get_device(t)
-          raise ArgumentError, "Invalid fstype: #{t}" unless device_opts
-        end
-
-        command.append_arg('-t', type)
-      end
-
-      def add_test_opts(command, test_opts, type)
-        return unless Kanrisuru::Util.present?(test_opts)
-
-        test_options =
-          if Kanrisuru::Util.present?(type)
-            Kanrisuru::Remote::Fstab::Options.new(type, test_opts)
-          else
-            Kanrisuru::Remote::Fstab::Options.new('common', test_opts)
-          end
-
-        command.append_arg('-O', test_options.to_s)
-      end
     end
   end
 end

data/lib/kanrisuru/core/path/commands/ls.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def ls(opts = {})
+        path = opts[:path]
+        all  = opts[:all]
+        id   = opts[:id]
+
+        command = Kanrisuru::Command.new('ls')
+        command.append_flag('-i')
+        command.append_flag('-l')
+        command.append_flag('-a', all)
+        command.append_flag('-n', id)
+
+        command << (path || pwd.path)
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          Parser::Ls.parse(cmd, id)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands/pwd.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def pwd
+        command = Kanrisuru::Command.new('pwd')
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          FilePath.new(cmd.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands/readlink.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def readlink(path, opts = {})
+        command = Kanrisuru::Command.new('readlink')
+        command.append_flag('-f', opts[:canonicalize])
+        command.append_flag('-e', opts[:canonicalize_existing])
+        command.append_flag('-m', opts[:canonicalize_missing])
+
+        command << path
+
+        execute(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          FilePath.new(cmd.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands/realpath.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def realpath(path, opts = {})
+        command = Kanrisuru::Command.new("realpath #{path}")
+        command.append_flag('-s', opts[:strip])
+
+        execute(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          FilePath.new(cmd.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands/which.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def which(program, opts = {})
+        command = Kanrisuru::Command.new('which')
+        command.append_flag('-a', opts[:all])
+        command << program
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          Parser::Which.parse(cmd)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands/whoami.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      def whoami
+        command = Kanrisuru::Command.new('whoami')
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          UserName.new(cmd.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/commands.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require_relative 'commands/ls'
+require_relative 'commands/pwd'
+require_relative 'commands/readlink'
+require_relative 'commands/realpath'
+require_relative 'commands/which'
+require_relative 'commands/whoami'

data/lib/kanrisuru/core/path/parser.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative 'parsers/ls'
+require_relative 'parsers/which'

data/lib/kanrisuru/core/path/parsers/ls.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      module Parser
+        class Ls
+          def self.parse(command, id)
+            items = []
+            rows = command.to_a
+
+            rows.each.with_index do |row, index|
+              next if index.zero?
+
+              values = row.split
+              date = DateTime.parse("#{values[6]} #{values[7]} #{values[8]}")
+
+              type = values[1].include?('d') ? 'directory' : 'file'
+              items <<
+                if id
+                  Kanrisuru::Core::Path::FileInfo.new(
+                    values[0].to_i,
+                    Kanrisuru::Mode.new(values[1]),
+                    values[2].to_i,
+                    values[3].to_i,
+                    values[4].to_i,
+                    values[5].to_i,
+                    date,
+                    values[9],
+                    type
+                  )
+                else
+                  Kanrisuru::Core::Path::FileInfo.new(
+                    values[0].to_i,
+                    Kanrisuru::Mode.new(values[1]),
+                    values[2].to_i,
+                    values[3],
+                    values[4],
+                    values[5].to_i,
+                    date,
+                    values[9],
+                    type
+                  )
+                end
+            end
+
+            items
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/parsers/which.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      module Parser
+        class Which
+          def self.parse(command)
+            rows = command.to_a
+            rows.map do |row|
+              FilePath.new(row)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/core/path/types.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module Path
+      FilePath = Struct.new(:path)
+      FileInfoId = Struct.new(:inode, :mode, :hard_links, :uid, :gid, :fsize, :date, :path, :type)
+      FileInfo = Struct.new(:inode, :mode, :hard_links, :owner, :group, :fsize, :date, :path, :type)
+      UserName = Struct.new(:user)
+    end
+  end
+end

data/lib/kanrisuru/core/path.rb

@@ -2,6 +2,10 @@
 
 require 'date'
 
+require_relative 'path/types'
+require_relative 'path/parser'
+require_relative 'path/commands'
+
 module Kanrisuru
   module Core
     module Path
@@ -13,127 +17,6 @@ module Kanrisuru
       os_define :linux, :readlink
       os_define :linux, :whoami
       os_define :linux, :which
-
-      FilePath = Struct.new(:path)
-      FileInfoId = Struct.new(:inode, :mode, :hard_links, :uid, :gid, :fsize, :date, :path, :type)
-      FileInfo = Struct.new(:inode, :mode, :hard_links, :owner, :group, :fsize, :date, :path, :type)
-      UserName = Struct.new(:user)
-
-      def ls(opts = {})
-        path = opts[:path]
-        all  = opts[:all]
-        id   = opts[:id]
-
-        command = Kanrisuru::Command.new('ls')
-        command.append_flag('-i')
-        command.append_flag('-l')
-        command.append_flag('-a', all)
-        command.append_flag('-n', id)
-
-        command << (path || pwd.path)
-        execute_shell(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          items = []
-          rows = cmd.to_a
-
-          rows.each.with_index do |row, index|
-            next if index.zero?
-
-            values = row.split
-            date = DateTime.parse("#{values[6]} #{values[7]} #{values[8]}")
-
-            type = values[1].include?('d') ? 'directory' : 'file'
-            items <<
-              if id
-                FileInfo.new(
-                  values[0].to_i,
-                  Kanrisuru::Mode.new(values[1]),
-                  values[2].to_i,
-                  values[3].to_i,
-                  values[4].to_i,
-                  values[5].to_i,
-                  date,
-                  values[9],
-                  type
-                )
-              else
-                FileInfo.new(
-                  values[0].to_i,
-                  Kanrisuru::Mode.new(values[1]),
-                  values[2].to_i,
-                  values[3],
-                  values[4],
-                  values[5].to_i,
-                  date,
-                  values[9],
-                  type
-                )
-              end
-          end
-
-          items
-        end
-      end
-
-      def whoami
-        command = Kanrisuru::Command.new('whoami')
-        execute_shell(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          UserName.new(cmd.to_s)
-        end
-      end
-
-      def pwd
-        command = Kanrisuru::Command.new('pwd')
-        execute_shell(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          FilePath.new(cmd.to_s)
-        end
-      end
-
-      def which(program, opts = {})
-        command = Kanrisuru::Command.new('which')
-        command.append_flag('-a', opts[:all])
-        command << program
-
-        execute_shell(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          rows = cmd.to_a
-          rows.map do |row|
-            FilePath.new(row)
-          end
-        end
-      end
-
-      def realpath(path, opts = {})
-        command = Kanrisuru::Command.new("realpath #{path}")
-        command.append_flag('-s', opts[:strip])
-
-        execute(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          FilePath.new(cmd.to_s)
-        end
-      end
-
-      def readlink(path, opts = {})
-        command = Kanrisuru::Command.new('readlink')
-        command.append_flag('-f', opts[:canonicalize])
-        command.append_flag('-e', opts[:canonicalize_existing])
-        command.append_flag('-m', opts[:canonicalize_missing])
-
-        command << path
-
-        execute(command)
-
-        Kanrisuru::Result.new(command) do |cmd|
-          FilePath.new(cmd.to_s)
-        end
-      end
     end
   end
 end