flatito 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420f7b09c4eb71cded9e1c3765b1fab02d0385bcb7e51cebed2d6f8945e8b182
-  data.tar.gz: 3bddb748de4716a151ccc60590f52c59d55b2506f744d217bb5bd19f05818dc7
+  metadata.gz: aaba984e7f2dd508d7f81eba275c575e3b256e394fbe513ea4620e1ec3631c3b
+  data.tar.gz: 6614248f57ed83e1e96cc633eca53a0ce5bddb7fe2248173ed0fad2daa64472d
 SHA512:
-  metadata.gz: dde72b5db32e1d4da64f60127ce0fe0fb0072bba6db06e8a5888df3aec4839eb5ae46954f7dc5b31f819d4752c98937957d4d1082eee2b552dfff6647c9940dd
-  data.tar.gz: 690ccabd218f757b9282d5e02c9c0f76f98ae8e5b14dde543b148888bf7b8d9489e848659dba4c888c04c7661d38c13abe1bde0a8f87dfcac5743dab62e2c1c4
+  metadata.gz: 9ab83eef1a77f864dff343f33c7570357dae4562be62707f375371e5fb48172357d293420eebeee123927f99ac1ebf54014293824768c2cb4401cbbd9612a864
+  data.tar.gz: b3013f55f89da75acc3cbc387f97522dc0ebb8082ef40c0d044f395f901207d84fb767fd1ff57dd545c41e246bb8b745f20d996cddf26586ff5efe2122a0e6b6

data/README.md

@@ -22,7 +22,8 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ```sh
 Usage:    flatito PATH [options]
-Example:  flatito . -k hello
+Example:  flatito . -k "search string" -e "json,yaml"
+Example:  cat file.yaml | flatito -k "search string"
 
     -h, --help                       Prints this help
     -V, --version                    Show version

data/exe/flatito

@@ -6,14 +6,15 @@ require "flatito"
 require "optparse"
 
 # If no arguments are given, print help
-ARGV << "-h" if ARGV.empty?
+stdin = $stdin.read unless $stdin.tty?
+ARGV << "-h" if ARGV.empty? && !stdin
 
 options = {}
 OptionParser.new do |opts|
   opts.banner = <<~HEREDOC
     Usage:    flatito PATH [options]
-    Example:  flatito . -k hello
-
+    Example:  flatito . -k "search string" -e "json,yaml"
+    Example:  cat file.yaml | flatito -k "search string"
   HEREDOC
 
   opts.on("-h", "--help", "Prints this help") do
@@ -43,8 +44,10 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-begin
+Flatito::Config.prepare_with_options(options)
+
+if stdin
+  Flatito.flat_content(stdin, options)
+else
   Flatito.search(ARGV, options)
-rescue Interrupt
-  warn "\nInterrupted"
 end

data/lib/flatito/config.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Flatito
+  module Config
+    @stdout = $stdout
+    @stderr = $stderr
+    @stdin  = $stdin
+
+    class << self
+      attr_accessor :renderer, :stdout, :stder, :stdin
+
+      def prepare_with_options(options)
+        self.renderer = Renderer.build(options)
+      end
+    end
+  end
+end

data/lib/flatito/finder.rb

@@ -8,14 +8,14 @@ module Flatito
 
     DEFAULT_EXTENSIONS = %w[json yml yaml].freeze
 
-    attr_reader :paths, :search, :extensions, :options, :renderer
+    attr_reader :paths, :search, :extensions, :options, :print_items
 
     def initialize(paths, options = {})
       @paths = paths
       @search = options[:search]
       @extensions = prepare_extensions(options[:extensions] || DEFAULT_EXTENSIONS)
       @options = options
-      @renderer = Renderer.build(options)
+      @print_items = PrintItems.new(search)
     end
 
     def call
@@ -36,14 +36,13 @@ module Flatito
 
     private
 
-    def flat_and_filter(pathname)
-      items = FlattenYaml.new(pathname).items
-      items = filter_by_search(items) if search
-
-      return unless items.any?
+    def renderer
+      Config.renderer
+    end
 
-      renderer.print_pathname(pathname)
-      renderer.print_items(items)
+    def flat_and_filter(pathname)
+      items = FlattenYaml.items_from_path(pathname)
+      print_items.print(items, pathname)
     end
 
     def prepare_extensions(extensions)
@@ -51,11 +50,5 @@ module Flatito
         ext.start_with?(".") ? ext : ".#{ext}"
       end
     end
-
-    def filter_by_search(items)
-      items.select do |item|
-        regex.match?(item.key)
-      end
-    end
   end
 end

data/lib/flatito/flatten_yaml.rb

@@ -1,9 +1,26 @@
 # frozen_string_literal: true
 
+require_relative "utils"
 module Flatito
   class FlattenYaml
+    include Utils
+
     Item = Struct.new(:key, :value, :line, keyword_init: true)
-    def initialize(pathname)
+    class << self
+      def items_from_path(pathname)
+        content = File.read(pathname)
+        new(content, pathname: pathname).items
+      end
+
+      def items_from_content(content)
+        new(content).items
+      end
+    end
+
+    attr_reader :content, :pathname
+
+    def initialize(content, pathname: nil)
+      @content = content
       @pathname = pathname
     end
 
@@ -23,28 +40,20 @@ module Flatito
           end
         end
       end
-    rescue StandardError => e
-      warn "Error parsing #{@pathname}, #{e.message}"
     end
 
     def with_line_numbers
       handler = YAMLWithLineNumber::TreeBuilder.new
       handler.parser = Psych::Parser.new(handler)
 
-      handler.parser.parse(File.read(@pathname))
+      handler.parser.parse(content)
       YAMLWithLineNumber::VisitorsToRuby.create.accept(handler.root)
     rescue Psych::SyntaxError
-      warn "Invalid YAML #{@pathname}"
-
+      warn "Invalid format #{pathname}"
       []
-    rescue StandardError => e
-      warn "Error parsing #{@pathname}, #{e.message}"
-
+    rescue StandardError
+      warn "Error parsing #{pathname}"
       []
     end
-
-    def truncate(string, max = 50)
-      string.length > max ? "#{string[0...max]}..." : string
-    end
   end
 end

data/lib/flatito/print_items.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Flatito
+  class PrintItems
+    include RegexFromSearch
+    attr_reader :search
+
+    def initialize(search)
+      @search = search
+    end
+
+    def print(items, pathname = nil)
+      items = filter_by_search(items) if search
+      return unless items.any?
+
+      renderer.print_pathname(pathname) if pathname
+      renderer.print_items(items)
+    end
+
+    def filter_by_search(items)
+      items.select do |item|
+        regex.match?(item.key)
+      end
+    end
+
+    def renderer
+      Config.renderer
+    end
+  end
+end

data/lib/flatito/renderer.rb

@@ -2,25 +2,23 @@
 
 require "io/console"
 require_relative "regex_from_search"
+require_relative "utils"
 
 module Flatito
   class Renderer
-    include RegexFromSearch
-
     def self.build(options)
-      if tty?
+      if Config.stdout.tty?
         Renderer::TTY.new(options)
       else
         Renderer::Plain.new(options)
       end
     end
-
-    def self.tty?
-      $stdout.tty?
-    end
   end
 
   class Base
+    include Utils
+    include RegexFromSearch
+
     attr_reader :search, :no_color
 
     def initialize(options)
@@ -33,7 +31,7 @@ module Flatito
     def ending; end
 
     def print_pathname(pathname)
-      puts colorize(pathname.to_s, :light_blue)
+      stdout.puts colorize(pathname.to_s, :light_blue)
     end
 
     def print_items(items)
@@ -42,8 +40,8 @@ module Flatito
       items.each do |item|
         print_item(item, line_number_padding)
       end
-      puts
-      flush
+      stdout.puts
+      stdout.flush
     end
 
     def print_item(item, line_number_padding)
@@ -54,19 +52,11 @@ module Flatito
                 ""
               end
 
-      puts "#{line_number} #{matched_string(item.key)} #{value}"
+      stdout.puts "#{line_number} #{matched_string(item.key)} #{value}"
     end
 
     private
 
-    def flush
-      stdout.flush
-    end
-
-    def regex
-      @regex ||= Regexp.new(search)
-    end
-
     def matched_string(string)
       return string if search.nil? || no_color?
 
@@ -80,12 +70,8 @@ module Flatito
       ENV["TERM"] == "dumb" || ENV["NO_COLOR"] == "true" || no_color == true
     end
 
-    def truncate(string, max = 50)
-      string.length > max ? "#{string[0...max]}..." : string
-    end
-
     def stdout
-      $stdout
+      Config.stdout
     end
 
     def colorize(string, color)
@@ -95,7 +81,7 @@ module Flatito
 
   class Renderer::Plain < Base
     def ending
-      puts
+      stdout.puts
     end
   end
 
@@ -128,19 +114,19 @@ module Flatito
     def ending
       clear_line
       show_cursor
-      puts
+      stdout.puts
     end
 
     def hide_cursor
-      print HIDE_CURSOR
+      stdout.print HIDE_CURSOR
     end
 
     def show_cursor
-      print SHOW_CURSOR
+      stdout.print SHOW_CURSOR
     end
 
     def clear_line
-      print CLEAR_LINE
+      stdout.print CLEAR_LINE
     end
 
     private

data/lib/flatito/utils.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Flatito
+  module Utils
+    def truncate(string, max = 50)
+      string.length > max ? "#{string[0...max]}..." : string
+    end
+  end
+end

data/lib/flatito/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flatito
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/flatito/yaml_with_line_number.rb

@@ -30,8 +30,6 @@ module Flatito
 
     class ClassLoader < Psych::ClassLoader
       def find(klassname)
-        @cache[klassname] ||= resolve(klassname)
-      rescue ArgumentError
         Whatever.new(klassname)
       end
     end
@@ -56,9 +54,9 @@ module Flatito
     end
 
     class VisitorsToRuby < Psych::Visitors::ToRuby
-      def self.create(symbolize_names: false, freeze: false, strict_integer: false)
+      def self.create(symbolize_names: false, freeze: false)
         class_loader = ClassLoader.new
-        scanner      = Psych::ScalarScanner.new(class_loader, strict_integer: strict_integer)
+        scanner      = Psych::ScalarScanner.new(class_loader)
         new(scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze)
       end
 

data/lib/flatito.rb

@@ -9,9 +9,20 @@ require_relative "flatito/finder"
 require_relative "flatito/yaml_with_line_number"
 require_relative "flatito/renderer"
 require_relative "flatito/regex_from_search"
+require_relative "flatito/print_items"
+require_relative "flatito/config"
 
 module Flatito
-  def self.search(paths, options)
-    Finder.new(paths, options).call
+  class << self
+    def search(paths, options = {})
+      Finder.new(paths, options).call
+    rescue Interrupt
+      warn "\nInterrupted"
+    end
+
+    def flat_content(content, options = {})
+      items = FlattenYaml.items_from_content(content)
+      PrintItems.new(options[:search]).print(items)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatito
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - José Galisteo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -41,11 +41,14 @@ files:
 - docs/screenshot.png
 - exe/flatito
 - lib/flatito.rb
+- lib/flatito/config.rb
 - lib/flatito/finder.rb
 - lib/flatito/flatten_yaml.rb
+- lib/flatito/print_items.rb
 - lib/flatito/regex_from_search.rb
 - lib/flatito/renderer.rb
 - lib/flatito/tree_iterator.rb
+- lib/flatito/utils.rb
 - lib/flatito/version.rb
 - lib/flatito/yaml_with_line_number.rb
 homepage: https://github.com/ceritium/flatito
@@ -70,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Grep for YAML and JSON files