gemat 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fff413b0bfd43a7b693a244946e15ede730a479ec4be7260605e71d4001cc72a
-  data.tar.gz: 325d18312000d035eda2c45c96feeab44245515e75de9ff6139e7f72661114e8
+  metadata.gz: d8aaec3acaf9aba89e198cf7077ea42527378af2ed240a2afd9569a463ffb11c
+  data.tar.gz: b1848af9dd9395a6a1e8b10615758da31fbbb8273fe08780c00d55393445cc6f
 SHA512:
-  metadata.gz: bfff75358ea7333d62a15ea928c3d2e4e65742097cde1282ae2f8e1c3113e7480773d0f51dfc9b4619fd75f5c4d332d945313b6b170144be6444a9d3ac23dc86
-  data.tar.gz: ae0556e9407890301bcd97692aad4008da235ea943a45e5bb9de28768e9ac5de2628b42498e7f46fe3cf2e0d982f16d212331a30e4c74e622084694f8f17b992
+  metadata.gz: c1ba3ce74b81c32c70ced331101bc9345eebd57b1481f8f28743c021076499cc136d3dae6b1aeb5fd79355f860a18b6ffaa5bfa6b065fb5a6fd59295c1fcd1f4
+  data.tar.gz: 7d780cfafb27dafd2becf3043337f4779aac46a9d17364179b9f15c9e20d47f505ed7067a05a7171d085c23a2144b6eb824586641ba280c90a048b02fe99f8d5

data/lib/csv_formatter.rb

@@ -1,33 +1,13 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 module Gemat
-  class CsvFormatter
-    def initialize(gems, output = nil)
-      @gems = gems
-      @output = output
-      @rows = []
-      gen_rows
-    end
-
-    def to_csv
-      if @output
-        CSV.open(@output, 'w') do |csv|
-          @rows.each { |row| csv << row }
-        end
-      else
-        print "\n\n"
-        @rows.each { |row| print row.to_csv }
-      end
-    end
-
+  class CsvFormatter < Formatter
     private
 
     def gen_rows
-      @rows << ['gem', 'Repo URL']
+      @rows << @columns.map(&:column_name).join(',')
       @gems.each do |gem|
-        @rows << [gem.name, gem.repo_url]
+        @rows << @columns.map { |dsl| dsl.call(gem) }.join(',')
       end
     end
   end

data/lib/fetcher.rb

@@ -11,14 +11,16 @@ module Gemat
 
     def run
       pb = ProgressBar.create(total: @dsl.dependencies.length)
-      @dsl.dependencies.each do |gem|
+      @dsl.dependencies.each_with_index do |gem, idx|
         sleep 0.1
         pb.increment
 
         response = fetch(gem)
         next unless response
 
-        @gems << Gem.new(response)
+        gem = Gem.new(response)
+        gem.index = idx
+        @gems << gem
       end
     end
 

data/lib/formatter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Gemat
+  class Formatter
+    def initialize(gems, columns, write_path: nil)
+      @gems = gems
+      @columns = columns
+      @write_path = write_path
+      @rows = []
+      gen_rows
+    end
+
+    def run
+      if @write_path
+        File.open(@write_path, 'w') do |file|
+          each_write(@rows) { |string| file << string }
+        end
+      else
+        print "\n\n"
+        each_write(@rows) { |string| print string }
+        print "\n"
+      end
+    end
+
+    private
+
+    def each_write(rows, &proc)
+      rows.each do |row|
+        proc.call(row)
+        proc.call("\n")
+      end
+    end
+  end
+end

data/lib/gem.rb

@@ -2,8 +2,11 @@
 
 module Gemat
   class Gem
+    attr_accessor :index
+
     def initialize(response)
       @response = response
+      @index = 0
     end
 
     def name

data/lib/gemat/cli.rb

@@ -1,19 +1,26 @@
 # frozen_string_literal: true
 
-require 'thor'
-
 module Gemat
   class Cli < Thor
     desc 'csv', 'export Gemfile to CSV file'
-    method_options input: :string, output: :string
+    method_options input: :string, output: :string, columns: :array
     def csv
-      Gemat.run(options) { |gems| CsvFormatter.new(gems, options[:output]).to_csv }
+      command(options, __method__)
     end
 
     desc 'md', 'export Gemfile to markdown'
-    method_options input: :string, output: :string
+    method_options input: :string, output: :string, columns: :array
     def md
-      Gemat.run(options) { |gems| MdFormatter.new(gems, options[:output]).to_md }
+      command(options, __method__)
+    end
+
+    no_tasks do
+      def command(options, method_name)
+        klass = "Gemat::#{method_name.capitalize}Formatter"
+        Gemat.run(options) do |gems, columns|
+          Object.const_get(klass).new(gems, columns, write_path: options[:output]).run
+        end
+      end
     end
   end
 end

data/lib/gemat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gemat
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/gemat.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'httpclient'
 require 'json'
 require 'ruby-progressbar'
+require 'thor'
 
 require_relative 'in_dsl'
+require_relative 'out_dsl'
 require_relative 'fetcher'
 require_relative 'gem'
+require_relative 'formatter'
 require_relative 'csv_formatter'
 require_relative 'md_formatter'
 require_relative 'gemat/version'
@@ -18,9 +22,10 @@ module Gemat
   class Gemat
     def self.run(options = {}, &block)
       dsl = InDsl.new(options[:input])
+      outdsls = OutDsl.create(options[:columns])
       fetcher = Fetcher.new(dsl)
       fetcher.run
-      block.call(fetcher.gems)
+      block.call(fetcher.gems, outdsls)
     end
   end
 end

data/lib/in_dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'bundler'
-
 module Gemat
   class InDsl
     attr_accessor :dependencies, :sources, :git_sources, :groups, :gemfiles

data/lib/md_formatter.rb

@@ -1,39 +1,14 @@
 # frozen_string_literal: true
 
-require 'logger'
-
 module Gemat
-  class MdFormatter
-    def initialize(gems, output = nil)
-      @gems = gems
-      @output = output
-      @rows = []
-      gen_rows
-    end
-
-    def to_md
-      if @output
-        File.open(@output, 'w') { |file| each_write(@rows) { |string| file.<< string } }
-      else
-        print "\n\n"
-        each_write(@rows) { |string| print string }
-      end
-    end
-
+  class MdFormatter < Formatter
     private
 
     def gen_rows
-      @rows << '| gem | Repo URL |'
-      @rows << '| ---- | ---- |'
+      @rows << "| #{@columns.map(&:column_name).join(' | ')} |"
+      @rows << "| #{Array.new(@columns.length, '----').join(' | ')} |"
       @gems.each do |gem|
-        @rows << "| #{gem.name} | #{gem.repo_url} |"
-      end
-    end
-
-    def each_write(rows, &proc)
-      rows.each do |row|
-        proc.call(row)
-        proc.call("\n")
+        @rows << "| #{@columns.map { |dsl| dsl.call(gem) }.join(' | ')} |"
       end
     end
   end

data/lib/out_dsl.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gemat
+  class OutDsl
+    INDEX = 'index'
+    NAME = 'name'
+    REPO_URL = 'repo_url'
+    DEFAULT_COLUMNS = [INDEX, NAME, REPO_URL].freeze
+
+    attr_accessor :column_name
+
+    def self.new_by_array(columns)
+      columns.map { |column| new(column) }
+    end
+
+    def self.create(columns)
+      if columns
+        new_by_array(columns)
+      else
+        new_by_array(DEFAULT_COLUMNS)
+      end
+    end
+
+    def initialize(column_name)
+      @column_name = column_name
+
+      set_lambda
+    end
+
+    def call(gem)
+      @lambda.call(gem)
+    end
+
+    def set_lambda
+      case @column_name
+      when NAME
+        @lambda = name
+      when REPO_URL
+        @lambda = repo_url
+      when INDEX
+        @lambda = index
+      end
+    end
+
+    def name
+      ->(gem) { gem.name }
+    end
+
+    def repo_url
+      ->(gem) { gem.repo_url }
+    end
+
+    def index
+      ->(gem) { gem.index }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemat
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kijimaD
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -63,12 +63,14 @@ files:
 - exe/gemat
 - lib/csv_formatter.rb
 - lib/fetcher.rb
+- lib/formatter.rb
 - lib/gem.rb
 - lib/gemat.rb
 - lib/gemat/cli.rb
 - lib/gemat/version.rb
 - lib/in_dsl.rb
 - lib/md_formatter.rb
+- lib/out_dsl.rb
 homepage: https://github.com/kijimaD/gemat
 licenses:
 - GPL3