eac_tools 0.84.0 → 0.84.2

data/sub/eac_git/lib/eac_git/local.rb

@@ -38,7 +38,7 @@ module EacGit
       ::EacGit::Local::Branch.new(self, name)
     end
 
-    def commit(ref, required = false)
+    def commit(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
@@ -71,7 +71,7 @@ module EacGit
     end
 
     # @return [EacGit::Local::Commit
-    def head(required = true)
+    def head(required = true) # rubocop:disable Style/OptionalBooleanParameter
       commit(HEAD_REFERENCE, required)
     end
 
@@ -94,7 +94,7 @@ module EacGit
       raise "#{root_path}: #{message}"
     end
 
-    def rev_parse(ref, required = false)
+    def rev_parse(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
       r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
       r.strip! if r.is_a?(String)
       return r if r.present?

data/sub/eac_git/lib/eac_git/remote.rb

@@ -12,8 +12,8 @@ module EacGit
     common_constructor :uri
 
     # @return [EacRubyUtils::Envs::Command
-    def git_command(*args, &block)
-      ::EacGit::Executables.git.command(*args, &block)
+    def git_command(...)
+      ::EacGit::Executables.git.command(...)
     end
 
     # @return [String]

data/sub/eac_git/lib/eac_git/remote_like/ls_result.rb

@@ -8,13 +8,13 @@ module EacGit
       class << self
         def by_ls_remote_command_output(output)
           new(
-            output.each_line.map { |line| line.strip.split(/\s+/) }.map { |x| [x[1], x[0]] }.to_h
+            output.each_line.map { |line| line.strip.split(/\s+/) }.to_h { |x| [x[1], x[0]] } # rubocop:disable Style/MapToHash
           )
         end
       end
 
       common_constructor :hashes
-      delegate :fetch, :'[]', :count, :any?, :empty?, to: :hashes
+      delegate :fetch, :[], :count, :any?, :empty?, to: :hashes
     end
   end
 end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/directory.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_git/rspec/stubbed_git_local_repo/fs_object'
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Directory < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        # @return [self]
+        def create
+          ::FileUtils.mkdir_p(path)
+          self
+        end
+
+        # @return [self]
+        def delete
+          ::FileUtils.rm_rf(path)
+          self
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          git.directory(*self.subpath, *subpath)
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::File]
+        def file(*subpath)
+          git.file(*self.subpath, *subpath)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/file.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_git/rspec/stubbed_git_local_repo/fs_object'
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class File < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        def touch
+          ::FileUtils.touch(path.to_path)
+        end
+
+        def delete
+          path.unlink
+        end
+
+        delegate :write, to: :path
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/fs_object.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class FsObject
+        # @!attribute [r] git
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+
+        # @!attribute [r] subpath
+        #   @param git [Array<String>]
+
+        # @!method initialize(git, subpath)
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+        #   @param subpath [Array<String>
+        common_constructor :git, :subpath
+
+        # @return [Pathname]
+        def path
+          git.root_path.join(*subpath)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/repository.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_git/rspec/stubbed_git_local_repo/directory'
+require 'eac_git/rspec/stubbed_git_local_repo/file'
+require 'eac_ruby_utils/core_ext'
+require 'securerandom'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Repository < ::EacGit::Local
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::Directory.new(self, subpath)
+        end
+
+        def file(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::File.new(self, subpath)
+        end
+
+        # @return [EacGit::Local::Commit
+        def random_commit
+          content = ::SecureRandom.hex
+          file = "#{content}.txt"
+          file(file).write(content)
+          command('add', file).execute!
+          command('commit', '-m', "Random commit: #{file}.").execute!
+          head
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_git/local'
 require 'eac_ruby_utils/envs'
-require 'fileutils'
-require 'securerandom'
 require 'tmpdir'
 
 module EacGit
   module Rspec
     module StubbedGitLocalRepo
-      def stubbed_git_local_repo(bare = false)
+      def stubbed_git_local_repo(bare = false) # rubocop:disable Style/OptionalBooleanParameter
         path = ::Dir.mktmpdir
         ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
-        repo = StubbedGitRepository.new(path)
+        repo = ::EacGit::Rspec::StubbedGitLocalRepo::Repository.new(path)
         repo.command('config', 'user.email', 'theuser@example.net').execute!
         repo.command('config', 'user.name', 'The User').execute!
         repo
@@ -26,46 +23,7 @@ module EacGit
         r + [path]
       end
 
-      class StubbedGitRepository < ::EacGit::Local
-        def file(*subpath)
-          StubbedGitRepositoryFile.new(self, subpath)
-        end
-
-        # @return [EacGit::Local::Commit
-        def random_commit
-          content = ::SecureRandom.hex
-          file = "#{content}.txt"
-          file(file).write(content)
-          command('add', file).execute!
-          command('commit', '-m', "Random commit: #{file}.").execute!
-          head
-        end
-      end
-
-      class StubbedGitRepositoryFile
-        attr_reader :git, :subpath
-
-        def initialize(git, subpath)
-          @git = git
-          @subpath = subpath
-        end
-
-        def path
-          git.root_path.join(*subpath)
-        end
-
-        def touch
-          ::FileUtils.touch(path.to_path)
-        end
-
-        def delete
-          path.unlink
-        end
-
-        def write(content)
-          path.write(content)
-        end
-      end
+      require_sub __FILE__
     end
   end
 end

data/sub/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.14.1'
+  VERSION = '0.15.0'
 end

data/sub/eac_git/spec/lib/eac_git/executables_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_git/executables'
 
-RSpec.describe(::EacGit::Executables, git: true) do
+RSpec.describe(EacGit::Executables, :git) do
   it 'output version' do
     expect(described_class.git.command('--version').execute!).to be_present
   end

data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec.rb

@@ -2,10 +2,10 @@
 
 require 'eac_git/local/commit/diff_tree_line'
 
-RSpec.describe ::EacGit::Local::Commit::DiffTreeLine, git: true do
+RSpec.describe EacGit::Local::Commit::DiffTreeLine, :git do
   include_examples 'source_target_fixtures', __FILE__ do
     def source_data(source_file)
-      ::File.read(source_file).each_line.map do |line|
+      File.read(source_file).each_line.map do |line|
         described_class.new(line).fields
       end
     end

data/sub/eac_git/spec/lib/eac_git/local/commit_spec.rb

@@ -4,7 +4,7 @@ require 'eac_git/local'
 require 'eac_git/local/commit'
 require 'tmpdir'
 
-RSpec.describe ::EacGit::Local::Commit, git: true do
+RSpec.describe EacGit::Local::Commit, :git do
   let(:git) { stubbed_git_local_repo }
 
   let(:first_commit_sha1) do
@@ -40,7 +40,7 @@ RSpec.describe ::EacGit::Local::Commit, git: true do
         it "find file \"#{filename}\" in commit \"#{commit_name}\"" do
           commit = send(commit_name)
           file = commit.changed_files.find { |f| f.path == filename }
-          expect(file).to be_a(::EacGit::Local::Commit::ChangedFile)
+          expect(file).to be_a(EacGit::Local::Commit::ChangedFile)
         end
       end
     end
@@ -52,7 +52,7 @@ RSpec.describe ::EacGit::Local::Commit, git: true do
   end
 
   describe '#root_child?' do
-    it { expect(first_commit.root_child?).to eq(true) }
-    it { expect(second_commit.root_child?).to eq(false) }
+    it { expect(first_commit.root_child?).to be(true) }
+    it { expect(second_commit.root_child?).to be(false) }
   end
 end

data/sub/eac_git/spec/lib/eac_git/local/dirty_files_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_git/local/commit'
+require 'tmpdir'
+
+RSpec.describe EacGit::Local, '#dirty_files', :git do
+  let(:repo) { stubbed_git_local_repo }
+  let(:dirty_files_paths) { Set.new(repo.dirty_files.lazy.map(&:path).map(&:to_path)) }
+
+  before do
+    repo.file('a_file').touch
+    repo.directory('b_directory').create.file('c_file').touch
+    repo.file('d file').touch
+  end
+
+  it do
+    expect(dirty_files_paths).to eq(Set.new(['a_file', 'b_directory/c_file', 'd file']))
+  end
+end

data/sub/eac_git/spec/rubocop_spec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyUtils::Rspec.default_setup.describe_rubocop
+EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/eac_git/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))