poepod 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc92cfee72702377260c08e2639cf32b789e54be73d3cea7896bde4bf357332
-  data.tar.gz: f79c5a7847f8329c2a1c5ef1718c97b7ce18852df727a5d92c2b58244da2a7c0
+  metadata.gz: 5f3b75d6903698ba37dea1a00b73ff9d6a5672436dadac4cf452fd4d0ed46416
+  data.tar.gz: cfc4055807a6cb01ed40cb685be644e91317bfd6303120fa75410b97eff5e7c1
 SHA512:
-  metadata.gz: 92da41a07f4007489ccba2dacd7a0e0eb194042916a3172d6b62a2e246a8d80eb364816ad0a5721157e1da5367071dfa34e5ca80c3e419ee2a81ddc609f17aa0
-  data.tar.gz: cd07a158aab095842892fbd8dd34154811be5d64d5bed0af27d3a085974a1955217ab7a1d445975c993ee30ffb57e57b679958d870785d98767babb7e18042f9
+  metadata.gz: ecdede017300986e4d1a226f895f232b91a182f6ade3384d804308239b1b252251e8f36fac652667c41a3c2baa05927a98b5f67c779b176e4b4e7a4d939e302f
+  data.tar.gz: aace78fd62422ec85134e79def873f3cc721b26f44b70563741443f3b3de23b8f29f0d7c3d9c0b8933a55ea0a2a80579a0140575539c7d901c7dbe1a77cc313e

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 3.0
 

data/.rubocop_todo.yml

@@ -0,0 +1,122 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-10-28 08:08:05 UTC using RuboCop version 1.67.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ElseAlignment:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'lib/poepod/file_processor.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/poepod/gem_processor.rb'
+    - 'spec/poepod/gem_processor_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 24
+
+# Offense count: 12
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 158
+
+# Offense count: 1
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 105
+
+# Offense count: 5
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 18
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'lib/poepod/file_processor.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+
+# Offense count: 1
+Style/OptionalArguments:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'lib/poepod/cli.rb'
+    - 'lib/poepod/processor.rb'
+    - 'spec/poepod/file_processor_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArrayLiteral:
+  Exclude:
+    - 'lib/poepod/processor.rb'
+    - 'spec/poepod/gem_processor_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Exclude:
+    - 'spec/poepod/gem_processor_spec.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowNamedUnderscoreVariables.
+Style/TrailingUnderscoreVariable:
+  Exclude:
+    - 'lib/poepod/gem_processor.rb'
+    - 'spec/poepod/gem_processor_spec.rb'

data/lib/poepod/cli.rb

@@ -44,7 +44,7 @@ module Poepod
         include_binary: options[:include_binary],
         include_dot_files: options[:include_dot_files],
         base_dir: base_dir,
-        config_file: options[:config],
+        config_file: options[:config]
       )
       success, result, unstaged_files = processor.process(output_file)
       if success
@@ -81,7 +81,7 @@ module Poepod
         include_binary: options[:include_binary],
         include_dot_files: options[:include_dot_files],
         exclude: options[:exclude],
-        base_dir: base_dir,
+        base_dir: base_dir
       )
       total_files, copied_files = processor.process(output_path.to_s)
       print_result(total_files, copied_files, output_path)

data/lib/poepod/file_processor.rb

@@ -1,4 +1,3 @@
-# lib/poepod/file_processor.rb
 # frozen_string_literal: true
 
 require_relative "processor"
@@ -29,9 +28,24 @@ module Poepod
     private
 
     def collect_files_to_process
-      @patterns.flatten.each_with_object([]) do |pattern, files_to_process|
-        files_to_process.concat(collect_files_from_pattern(pattern))
+      files_to_process = []
+
+      @patterns.flatten.each do |pattern|
+        expanded_pattern = File.expand_path(pattern)
+        if File.directory?(expanded_pattern)
+          # If the pattern is a directory, collect all files within it recursively
+          files = collect_files_from_pattern(File.join(expanded_pattern, "**", "*"))
+          files_to_process.concat(files)
+        elsif File.file?(expanded_pattern)
+          files_to_process << expanded_pattern unless should_exclude?(expanded_pattern)
+        else
+          # It's a pattern, collect matching files
+          files = collect_files_from_pattern(expanded_pattern)
+          files_to_process.concat(files)
+        end
       end
+
+      files_to_process.uniq
     end
   end
 end

data/lib/poepod/gem_processor.rb

@@ -3,6 +3,7 @@
 require_relative "processor"
 require "rubygems/specification"
 require "git"
+require "pathname"
 
 module Poepod
   # Processes gem files for wrapping, handling unstaged files
@@ -35,7 +36,7 @@ module Poepod
 
       unstaged_files = check_unstaged_files
 
-      total_files, copied_files = super(output_file)
+      super(output_file)
 
       [true, output_file, unstaged_files]
     end
@@ -46,11 +47,26 @@ module Poepod
       files_to_include = find_gemspec_files
       files_to_include += check_unstaged_files if @include_unstaged
 
-      files_to_include.sort.uniq.reject do |relative_path|
-        should_exclude?(File.join(@base_dir, relative_path))
-      end.map do |relative_path|
-        File.join(@base_dir, relative_path)
+      files_to_collect = []
+
+      files_to_include.sort.uniq.each do |relative_path|
+        full_path = File.join(@base_dir, relative_path)
+
+        next if should_exclude?(full_path)
+
+        if File.directory?(full_path)
+          # Recursively collect all files under the directory
+          files = collect_files_from_pattern(full_path)
+          files_to_collect.concat(files)
+        elsif File.file?(full_path)
+          files_to_collect << full_path
+        else
+          # Skip if neither file nor directory
+          next
+        end
       end
+
+      files_to_collect
     end
 
     def find_gemspec_files

data/lib/poepod/processor.rb

@@ -10,7 +10,7 @@ module Poepod
   # Base processor class
   class Processor
     EXCLUDE_DEFAULT = [
-      %r{node_modules/}, %r{.git/}, /.gitignore$/, /.DS_Store$/,
+      %r{node_modules/}, %r{.git/}, /.gitignore$/, /.DS_Store$/
     ].freeze
 
     def initialize(
@@ -56,9 +56,7 @@ module Poepod
 
     def collect_files_from_pattern(pattern)
       expanded_pattern = File.expand_path(pattern)
-      if File.directory?(expanded_pattern)
-        expanded_pattern = File.join(expanded_pattern, "**", "*")
-      end
+      expanded_pattern = File.join(expanded_pattern, "**", "*") if File.directory?(expanded_pattern)
 
       Dir.glob(expanded_pattern, File::FNM_DOTMATCH).each_with_object([]) do |file_path, acc|
         next unless File.file?(file_path)
@@ -82,7 +80,7 @@ module Poepod
         mime_type = Marcel::MimeType.for(
           content,
           name: File.basename(file_path),
-          declared_type: "text/plain",
+          declared_type: "text/plain"
         )
 
         !mime_type.start_with?("text/") && mime_type != "application/json"
@@ -93,10 +91,10 @@ module Poepod
       output ||= StringIO.new
 
       relative_path = if @base_dir
-          Pathname.new(file_path).relative_path_from(@base_dir).to_s
-        else
-          file_path
-        end
+                        Pathname.new(file_path).relative_path_from(@base_dir).to_s
+                      else
+                        file_path
+                      end
 
       puts "Adding to bundle: #{relative_path}"
 

data/lib/poepod/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Poepod
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/poepod/file_processor_spec.rb

@@ -147,4 +147,38 @@ RSpec.describe Poepod::FileProcessor do
       end.to raise_error(Encoding::InvalidByteSequenceError)
     end
   end
+
+  context "when directories are included in the file patterns (e.g., git submodules)" do
+    let(:submodule_dir) { File.join(temp_dir, "vendor", "submodule_project") }
+    let(:submodule_file) { File.join(submodule_dir, "submodule_file.rb") }
+
+    before do
+      # Simulate a submodule directory with a file
+      FileUtils.mkdir_p(submodule_dir)
+      File.write(submodule_file, "puts 'Hello from submodule'")
+
+      # Include the submodule directory in the patterns
+      @processor = described_class.new(
+        [text_file1, text_file2, submodule_dir],
+        output_file.path,
+        include_binary: false,
+        include_dot_files: false,
+        exclude: nil,
+        base_dir: temp_dir
+      )
+    end
+
+    it "includes files from directories specified in the patterns" do
+      total_files, copied_files = @processor.process(output_file.path)
+      expect(total_files).to eq(3) # text_file1, text_file2, submodule_file
+      expect(copied_files).to eq(3)
+
+      output_content = File.read(output_file.path, encoding: "utf-8")
+      expect(output_content).to include("Content of file1.\n")
+      expect(output_content).to include("Content of file2.\n")
+      expect(output_content).to include("puts 'Hello from submodule'")
+
+      expect(output_content).to include("--- START FILE: vendor/submodule_project/submodule_file.rb ---")
+    end
+  end
 end

data/spec/poepod/gem_processor_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# spec/poepod/gem_processor_spec.rb
 require "spec_helper"
 require "poepod/gem_processor"
 require "tempfile"
@@ -42,7 +41,7 @@ RSpec.describe Poepod::GemProcessor do
     end
 
     it "processes the gem files, includes README files, and spec files in sorted order" do
-      success, result, _ = processor.process(output_file)
+      success, = processor.process(output_file)
       expect(success).to be true
       expect(File.exist?(output_file)).to be true
 
@@ -53,7 +52,7 @@ RSpec.describe Poepod::GemProcessor do
         "README.md",
         "README.txt",
         "lib/test_gem.rb",
-        "spec/test_gem_spec.rb",
+        "spec/test_gem_spec.rb"
       ]
       expect(file_order).to eq(expected_order)
 
@@ -83,7 +82,7 @@ RSpec.describe Poepod::GemProcessor do
       let(:processor) { described_class.new("non_existent.gemspec") }
 
       it "returns an error" do
-        success, error_message, _ = processor.process(output_file)
+        success, error_message, = processor.process(output_file)
         expect(success).to be false
         expect(error_message).to include("Error: The specified gemspec file")
       end
@@ -116,7 +115,7 @@ RSpec.describe Poepod::GemProcessor do
             "spec/test_gem_spec.rb" => "RSpec.describe TestGem do\nend",
             "README.md" => "# Test Gem\n\nThis is a test gem.",
             "README.txt" => "Test Gem\n\nThis is a test gem in plain text.",
-            "lib/unstaged_file.rb" => "Unstaged content",
+            "lib/unstaged_file.rb" => "Unstaged content"
           }
 
           # Mock File.read
@@ -138,7 +137,7 @@ RSpec.describe Poepod::GemProcessor do
             end
           end
 
-          success, result, unstaged_files = processor.process(output_file)
+          success, _, unstaged_files = processor.process(output_file)
           expect(success).to be true
           expect(unstaged_files).to eq(["lib/unstaged_file.rb"])
 
@@ -168,6 +167,36 @@ RSpec.describe Poepod::GemProcessor do
           expect(content).to eq(expected)
         end
       end
+
+      context "when gem includes directories in spec.files (e.g., git submodules)" do
+        let(:submodule_dir) { File.join(temp_dir, "vendor", "submodule_project") }
+        before do
+          # Simulate a submodule directory with a file
+          FileUtils.mkdir_p(submodule_dir)
+          File.write(File.join(submodule_dir, "submodule_file.rb"), "puts 'Hello from submodule'")
+
+          # Update gemspec to include the submodule directory
+          File.write(gemspec_file, <<~GEMSPEC)
+            Gem::Specification.new do |spec|
+              spec.name = "test_gem"
+              spec.version = "0.1.0"
+              spec.authors = ["Test Author"]
+              spec.files = ["lib/test_gem.rb", "vendor/submodule_project"]
+              spec.test_files = ["spec/test_gem_spec.rb"]
+            end
+          GEMSPEC
+        end
+
+        it "includes files from directories listed in spec.files" do
+          success, = processor.process(output_file)
+          expect(success).to be true
+          expect(File.exist?(output_file)).to be true
+
+          content = File.read(output_file)
+          expect(content).to include("--- START FILE: vendor/submodule_project/submodule_file.rb ---")
+          expect(content).to include("puts 'Hello from submodule'")
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poepod
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -165,6 +165,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.adoc