poepod 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b205fe50c5830d75893fbfa378b81984bf8a2b73fa8d104509fbbf698e0001fc
-  data.tar.gz: d4e87cef72c92cdcfaadd6bcf5a452bc1a05b13c4927cce10b6c81250ff99c9c
+  metadata.gz: 3bc92cfee72702377260c08e2639cf32b789e54be73d3cea7896bde4bf357332
+  data.tar.gz: f79c5a7847f8329c2a1c5ef1718c97b7ce18852df727a5d92c2b58244da2a7c0
 SHA512:
-  metadata.gz: c32f1ffb23fcf86f8cd1625c1deab4dc3599a0baf7b4ad80618f1e37a23f7b8e815b6065d628bf138f0e8ca9c2c849d1a08c31599737bee85711a6b4cd3e88f0
-  data.tar.gz: bdc4de92b51c89cfbeb484a119ce829e8a5c0a7768a032f4ec4299b06f2b35724038b13a2093827fbe839c650c0a18902c544ddd85f842e47ab4e633089edb38
+  metadata.gz: 92da41a07f4007489ccba2dacd7a0e0eb194042916a3172d6b62a2e246a8d80eb364816ad0a5721157e1da5367071dfa34e5ca80c3e419ee2a81ddc609f17aa0
+  data.tar.gz: cd07a158aab095842892fbd8dd34154811be5d64d5bed0af27d3a085974a1955217ab7a1d445975c993ee30ffb57e57b679958d870785d98767babb7e18042f9

data/lib/poepod/cli.rb

@@ -1,6 +1,6 @@
+# lib/poepod/cli.rb
 # frozen_string_literal: true
 
-# lib/poepod/cli.rb
 require "thor"
 require_relative "file_processor"
 require_relative "gem_processor"
@@ -10,7 +10,7 @@ module Poepod
   class Cli < Thor
     # Define shared options
     def self.shared_options
-      option :exclude, type: :array, default: Poepod::FileProcessor::EXCLUDE_DEFAULT,
+      option :exclude, type: :array, default: nil,
                        desc: "List of patterns to exclude"
       option :config, type: :string, desc: "Path to configuration file"
       option :include_binary, type: :boolean, default: false, desc: "Include binary files (encoded in MIME format)"
@@ -36,6 +36,7 @@ module Poepod
 
     def wrap(gemspec_path)
       base_dir = options[:base_dir] || File.dirname(gemspec_path)
+      output_file = options[:output_file] || File.join(base_dir, "#{File.basename(gemspec_path, ".*")}_wrapped.txt")
       processor = Poepod::GemProcessor.new(
         gemspec_path,
         include_unstaged: options[:include_unstaged],
@@ -43,9 +44,9 @@ 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
+      success, result, unstaged_files = processor.process(output_file)
       if success
         handle_wrap_result(success, result, unstaged_files)
       else
@@ -80,9 +81,9 @@ 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
+      total_files, copied_files = processor.process(output_path.to_s)
       print_result(total_files, copied_files, output_path)
     end
 
@@ -114,8 +115,7 @@ module Poepod
         if File.directory?(first_item)
           "#{File.basename(first_item)}.txt"
         else
-          "#{File.basename(first_item,
-                           ".*")}_concat.txt"
+          "#{File.basename(first_item, ".*")}_concat.txt"
         end
       else
         "concatenated_output.txt"

data/lib/poepod/file_processor.rb

@@ -1,3 +1,4 @@
+# lib/poepod/file_processor.rb
 # frozen_string_literal: true
 
 require_relative "processor"
@@ -5,17 +6,13 @@ require_relative "processor"
 module Poepod
   # Processes files for concatenation, handling binary and dot files
   class FileProcessor < Processor
-    EXCLUDE_DEFAULT = [
-      %r{node_modules/}, %r{.git/}, /.gitignore$/, /.DS_Store$/, /^\..+/
-    ].freeze
-
     def initialize(
-      files,
+      patterns,
       output_file,
       config_file: nil,
       include_binary: false,
       include_dot_files: false,
-      exclude: [],
+      exclude: nil,
       base_dir: nil
     )
       super(
@@ -25,20 +22,15 @@ module Poepod
         exclude: exclude,
         base_dir: base_dir,
       )
-      @files = files
+      @patterns = patterns
       @output_file = output_file
     end
 
     private
 
     def collect_files_to_process
-      @files.flatten.each_with_object([]) do |file, files_to_process|
-        Dir.glob(file, File::FNM_DOTMATCH).each do |matched_file|
-          next unless File.file?(matched_file)
-          next if should_exclude?(matched_file)
-
-          files_to_process << matched_file
-        end
+      @patterns.flatten.each_with_object([]) do |pattern, files_to_process|
+        files_to_process.concat(collect_files_from_pattern(pattern))
       end
     end
   end

data/lib/poepod/gem_processor.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# lib/poepod/gem_processor.rb
 require_relative "processor"
 require "rubygems/specification"
 require "git"
@@ -11,7 +10,7 @@ module Poepod
     def initialize(
       gemspec_path,
       include_unstaged: false,
-      exclude: [],
+      exclude: nil,
       include_binary: false,
       include_dot_files: false,
       base_dir: nil,
@@ -28,29 +27,23 @@ module Poepod
       @include_unstaged = include_unstaged
     end
 
-    def process
+    def process(output_file)
       return error_no_gemspec unless File.exist?(@gemspec_path)
 
       spec = load_gemspec
       return spec unless spec.is_a?(Gem::Specification)
 
-      gem_name = spec.name
-      @output_file = "#{gem_name}_wrapped.txt"
       unstaged_files = check_unstaged_files
 
-      super()
+      total_files, copied_files = super(output_file)
 
-      [true, @output_file, unstaged_files]
+      [true, output_file, unstaged_files]
     end
 
     private
 
     def collect_files_to_process
-      spec = load_gemspec
-      files_to_include = (spec.files +
-                          spec.test_files +
-                          find_readme_files).uniq
-
+      files_to_include = find_gemspec_files
       files_to_include += check_unstaged_files if @include_unstaged
 
       files_to_include.sort.uniq.reject do |relative_path|
@@ -60,6 +53,13 @@ module Poepod
       end
     end
 
+    def find_gemspec_files
+      spec = load_gemspec
+      executables = spec.bindir ? collect_files_from_pattern(File.join(@base_dir, spec.bindir, "*")) : []
+
+      (spec.files + spec.test_files + find_readme_files + executables).uniq
+    end
+
     def error_no_gemspec
       [false, "Error: The specified gemspec file '#{@gemspec_path}' does not exist."]
     end
@@ -71,10 +71,9 @@ module Poepod
     end
 
     def find_readme_files
-      Dir.glob(File.join(File.dirname(@gemspec_path), "README*")).map do |path|
-        Pathname.new(path).relative_path_from(
-          Pathname.new(File.dirname(@gemspec_path))
-        ).to_s
+      gemspec_dir = Pathname.new(File.dirname(@gemspec_path))
+      Dir.glob(gemspec_dir.join("README*")).map do |path|
+        Pathname.new(path).relative_path_from(gemspec_dir).to_s
       end
     end
 
@@ -86,7 +85,7 @@ module Poepod
       modified_files = git.status.changed.keys
 
       (untracked_files + modified_files).select do |file|
-        file.start_with?("lib/", "spec/", "test/")
+        file.start_with?("bin/", "exe/", "lib/", "spec/", "test/")
       end
     rescue Git::GitExecuteError => e
       warn "Git error: #{e.message}. Assuming no unstaged files."

data/lib/poepod/processor.rb

@@ -1,3 +1,4 @@
+# lib/poepod/processor.rb
 # frozen_string_literal: true
 
 require "yaml"
@@ -8,33 +9,65 @@ require "stringio"
 module Poepod
   # Base processor class
   class Processor
+    EXCLUDE_DEFAULT = [
+      %r{node_modules/}, %r{.git/}, /.gitignore$/, /.DS_Store$/,
+    ].freeze
+
     def initialize(
       config_file = nil,
       include_binary: false,
       include_dot_files: false,
-      exclude: [],
+      exclude: nil,
       base_dir: nil
     )
       @config = load_config(config_file)
       @include_binary = include_binary
       @include_dot_files = include_dot_files
-      @exclude = exclude || []
+      @exclude = exclude || EXCLUDE_DEFAULT
       @base_dir = base_dir
       @failed_files = []
     end
 
-    def process
+    def process(output_file)
       files_to_process = collect_files_to_process
-      total_files, copied_files = process_files(files_to_process)
+      total_files, copied_files = process_files(files_to_process, output_file)
       [total_files, copied_files]
     end
 
     private
 
+    def process_files(files, output_file)
+      total_files = files.size
+      copied_files = 0
+
+      File.open(output_file, "w", encoding: "utf-8") do |output|
+        files.sort.each do |file_path|
+          process_file(output, file_path)
+          copied_files += 1
+        end
+      end
+
+      [total_files, copied_files]
+    end
+
     def collect_files_to_process
       raise NotImplementedError, "Subclasses must implement collect_files_to_process"
     end
 
+    def collect_files_from_pattern(pattern)
+      expanded_pattern = File.expand_path(pattern)
+      if File.directory?(expanded_pattern)
+        expanded_pattern = File.join(expanded_pattern, "**", "*")
+      end
+
+      Dir.glob(expanded_pattern, File::FNM_DOTMATCH).each_with_object([]) do |file_path, acc|
+        next unless File.file?(file_path)
+        next if should_exclude?(file_path)
+
+        acc << file_path
+      end
+    end
+
     def load_config(config_file)
       return {} unless config_file && File.exist?(config_file)
 
@@ -46,33 +79,26 @@ module Poepod
 
       File.open(file_path, "rb") do |file|
         content = file.read(8192) # Read first 8KB for magic byte detection
-        mime_type = Marcel::MimeType.for(content, name: File.basename(file_path), declared_type: "text/plain")
-        !mime_type.start_with?("text/") && mime_type != "application/json"
-      end
-    end
+        mime_type = Marcel::MimeType.for(
+          content,
+          name: File.basename(file_path),
+          declared_type: "text/plain",
+        )
 
-    def process_files(files)
-      total_files = files.size
-      copied_files = 0
-
-      File.open(@output_file, "w", encoding: "utf-8") do |output|
-        files.sort.each do |file_path|
-          process_file(output, file_path)
-          copied_files += 1
-        end
+        !mime_type.start_with?("text/") && mime_type != "application/json"
       end
-
-      [total_files, copied_files]
     end
 
     def process_file(output = nil, file_path)
       output ||= StringIO.new
 
       relative_path = if @base_dir
-                        Pathname.new(file_path).relative_path_from(Pathname.new(@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}"
 
       output.puts "--- START FILE: #{relative_path} ---"
 

data/lib/poepod/version.rb

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

data/poepod.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
       f.match(%r{^(test|spec|features)/})

data/spec/poepod/cli_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Poepod::Cli do
     it "concatenates text files and excludes binary and dot files by default" do
       output_file = File.join(temp_dir, "output.txt")
       expect do
-        cli.invoke(:concat, [File.join(temp_dir, "*")], { output_file: output_file })
+        cli.invoke(:concat, [text_file], { output_file: output_file })
       end.to output(/1 files detected\.\n.*1 files have been concatenated/).to_stdout
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
@@ -36,7 +36,7 @@ RSpec.describe Poepod::Cli do
     it "includes binary files when specified" do
       output_file = File.join(temp_dir, "output.txt")
       expect do
-        cli.invoke(:concat, [File.join(temp_dir, "*")], { output_file: output_file, include_binary: true })
+        cli.invoke(:concat, [text_file, binary_file], { output_file: output_file, include_binary: true })
       end.to output(/2 files detected\.\n.*2 files have been concatenated/).to_stdout
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
@@ -47,7 +47,7 @@ RSpec.describe Poepod::Cli do
     it "includes dot files when specified" do
       output_file = File.join(temp_dir, "output.txt")
       expect do
-        cli.invoke(:concat, [File.join(temp_dir, "*")], { output_file: output_file, include_dot_files: true })
+        cli.invoke(:concat, [text_file, dot_file], { output_file: output_file, include_dot_files: true })
       end.to output(/2 files detected\.\n.*2 files have been concatenated/).to_stdout
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
@@ -57,9 +57,8 @@ RSpec.describe Poepod::Cli do
 
     it "uses the specified base directory for relative paths" do
       output_file = File.join(temp_dir, "output.txt")
-      base_dir = File.dirname(text_file)
       expect do
-        cli.invoke(:concat, [File.join(temp_dir, "*")], { output_file: output_file, base_dir: base_dir })
+        cli.invoke(:concat, [text_file], { output_file: output_file, base_dir: temp_dir })
       end.to output(/1 files detected\.\n.*1 files have been concatenated/).to_stdout
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
@@ -95,8 +94,8 @@ RSpec.describe Poepod::Cli do
     end
 
     it "wraps a gem" do
+      output_file = File.join(temp_dir, "test_gem_wrapped.txt")
       expect { cli.wrap(gemspec_file) }.to output(/The gem has been wrapped into/).to_stdout
-      output_file = File.join(Dir.pwd, "test_gem_wrapped.txt")
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
       expect(content).to include("--- START FILE: lib/test_gem.rb ---")
@@ -112,10 +111,10 @@ RSpec.describe Poepod::Cli do
 
     it "uses the specified base directory for relative paths" do
       base_dir = File.dirname(gemspec_file)
+      output_file = File.join(base_dir, "test_gem_wrapped.txt")
       expect do
-        cli.invoke(:wrap, [gemspec_file], { base_dir: base_dir })
+        cli.invoke(:wrap, [gemspec_file], { base_dir: base_dir, output_file: output_file })
       end.to output(/The gem has been wrapped into/).to_stdout
-      output_file = File.join(Dir.pwd, "test_gem_wrapped.txt")
       expect(File.exist?(output_file)).to be true
       content = File.read(output_file)
       expect(content).to include("--- START FILE: lib/test_gem.rb ---")

data/spec/poepod/file_processor_spec.rb

@@ -27,10 +27,10 @@ RSpec.describe Poepod::FileProcessor do
 
   describe "#process" do
     context "with default options" do
-      let(:processor) { described_class.new([File.join(temp_dir, "*")], output_file.path) }
+      let(:processor) { described_class.new([text_file1, text_file2], output_file.path) }
 
       it "processes text files and excludes binary and dot files" do
-        total_files, copied_files = processor.process
+        total_files, copied_files = processor.process(output_file.path)
         expect(total_files).to eq(2)
         expect(copied_files).to eq(2)
 
@@ -51,7 +51,7 @@ RSpec.describe Poepod::FileProcessor do
       let(:processor) { described_class.new([File.join(temp_dir, "*")], output_file.path, include_binary: true) }
 
       it "includes binary files" do
-        total_files, copied_files = processor.process
+        total_files, copied_files = processor.process(output_file.path)
         expect(total_files).to eq(3)
         expect(copied_files).to eq(3)
 
@@ -78,7 +78,7 @@ RSpec.describe Poepod::FileProcessor do
       let(:processor) { described_class.new([File.join(temp_dir, "*")], output_file.path, include_dot_files: true) }
 
       it "includes dot files" do
-        total_files, copied_files = processor.process
+        total_files, copied_files = processor.process(output_file.path)
         expect(total_files).to eq(3)
         expect(copied_files).to eq(3)
 
@@ -104,7 +104,7 @@ RSpec.describe Poepod::FileProcessor do
       end
 
       it "includes all files in sorted order" do
-        total_files, copied_files = processor.process
+        total_files, copied_files = processor.process(output_file.path)
         expect(total_files).to eq(4)
         expect(copied_files).to eq(4)
 

data/spec/poepod/gem_processor_spec.rb

@@ -34,6 +34,7 @@ RSpec.describe Poepod::GemProcessor do
 
   describe "#process" do
     let(:processor) { described_class.new(gemspec_file) }
+    let(:output_file) { File.join(temp_dir, "test_gem_wrapped.txt") }
 
     before do
       # Mock Git operations
@@ -41,7 +42,7 @@ RSpec.describe Poepod::GemProcessor do
     end
 
     it "processes the gem files, includes README files, and spec files in sorted order" do
-      success, output_file = processor.process
+      success, result, _ = processor.process(output_file)
       expect(success).to be true
       expect(File.exist?(output_file)).to be true
 
@@ -52,7 +53,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)
 
@@ -82,7 +83,7 @@ RSpec.describe Poepod::GemProcessor do
       let(:processor) { described_class.new("non_existent.gemspec") }
 
       it "returns an error" do
-        success, error_message = processor.process
+        success, error_message, _ = processor.process(output_file)
         expect(success).to be false
         expect(error_message).to include("Error: The specified gemspec file")
       end
@@ -104,6 +105,7 @@ RSpec.describe Poepod::GemProcessor do
 
       context "with include_unstaged option" do
         let(:processor) { described_class.new(gemspec_file, include_unstaged: true) }
+        let(:output_file) { File.join(temp_dir, "test_gem_wrapped.txt") }
 
         it "includes unstaged files" do
           allow(File).to receive(:file?).and_return(true)
@@ -114,7 +116,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
@@ -136,7 +138,7 @@ RSpec.describe Poepod::GemProcessor do
             end
           end
 
-          success, output_file, unstaged_files = processor.process
+          success, result, unstaged_files = processor.process(output_file)
           expect(success).to be true
           expect(unstaged_files).to eq(["lib/unstaged_file.rb"])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poepod
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git