git-trend 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1737082fa6fe05f7987fee1930513062cfac740
-  data.tar.gz: 21816ac3c04291ffb636b00a2c362f7a7b16a1b1
+  metadata.gz: 126ab6ca6c31c5071f4b7c5bbf8968af1570783e
+  data.tar.gz: ccfefaa8fef06af6785b7fc69dbe8570545b82fe
 SHA512:
-  metadata.gz: ca7a8ca768daf05888f8a8d65e95fb38decea33325306101055ae17f9aa8b4603dae271dbbd2a2f7b8a2154099c18e5400cdde087bb7611e954808040e84b3a2
-  data.tar.gz: fcd93412836ad53cffe5c67422bdbd2d1bac191f441ab140b572e436e35de636003041b51f477e9493733678c343219449151058bc648c98b278dabf683050c0
+  metadata.gz: 1bce4a42eef223ff8467b60c8d1a2d7ead74044ba8fad675652d55e7d7d61776d73a2198f94d0690c5f7f23ccaf3dd2d5fadb696d97856e4d8711402b6743f70
+  data.tar.gz: 58cd27be8f81940cd3a4882ba642b5cc269e31b6d3aad3822fbdee243be4b1a5a63b8efa7e9579636ce053af3b9fb833f5e073728943a429a9297fd7ab98b010

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.8 (Sat Jul 22 2017)
+
+- Add the format option[f0136a3]
+
 ## v1.1.7 (Tue Jul 18 2017)
 
 - Fix NoMethodError when fork count is nothing #10 [6bdf1f6]

data/lib/git_trend.rb

@@ -1,6 +1,9 @@
 require "mb_string"
 
 require "git_trend/cli"
+require "git_trend/formatter"
+require "git_trend/formatters/text_formatter"
+require "git_trend/formatters/json_formatter"
 require "git_trend/project"
 require "git_trend/scraper"
 require "git_trend/version"

data/lib/git_trend/cli.rb

@@ -1,10 +1,7 @@
 require "thor"
-require "git_trend/rendering"
 
 module GitTrend
   class CLI < Thor
-    include Rendering
-
     map "-v"              => :version,
         "--version"       => :version
 
@@ -19,23 +16,27 @@ module GitTrend
     option :language,    aliases: "-l", required: false, desc: "Specify a language"
     option :since,       aliases: "-s", required: false, desc: "Enable: [d, day, daily, w, week, weekly, m, month, monthly]"
     option :description, aliases: "-d", required: false, default: true, type: :boolean, desc: "\033[32m(DEFAULT OPTION)\e[0m Dislpay descriptions"
+    option :format,      aliases: "-f", required: false, default: "text", desc: "Choose a formatter as text or json. Enable: [t, text, j, json]"
     option :number,      aliases: "-n", required: false, type: :numeric, desc: "Number of lines"
     option :help,        aliases: "-h", required: false, type: :boolean
     def list
       help(:list) && return if options[:help]
       scraper = Scraper.new
       projects = scraper.get(options[:language], options[:since], options[:number])
-      render(projects, !!options[:description])
+      formatter = Formatter.new(options[:format])
+      formatter.print(projects, enable_description: !!options[:description])
     rescue => e
       say "An unexpected #{e.class} has occurred.", :red
       say e.message unless e.class.to_s == e.message
     end
 
     desc :languages, "Show selectable languages"
+    option :format,      aliases: "-f", required: false, default: "text", desc: "Choose a formatter as text or json. Enable: [t, text, j, json]"
     def languages
       scraper = Scraper.new
       languages = scraper.languages
-      render_languages(languages)
+      formatter = Formatter.new(options[:format])
+      formatter.print_languages(languages)
     end
   end
 end

data/lib/git_trend/formatter.rb

@@ -0,0 +1,23 @@
+module GitTrend
+  class Formatter
+    def initialize(key)
+      @formatter = formatter_class(key).new
+    end
+
+    def print(projects, options = nil)
+      @formatter.print(projects, options)
+    end
+
+    def print_languages(languages)
+      @formatter.print_languages(languages)
+    end
+
+    private
+      def formatter_class(key)
+        case key
+        when "j", "json" then Formatters::JsonFormatter
+        else Formatters::TextFormatter
+        end
+      end
+  end
+end

data/lib/git_trend/formatters/json_formatter.rb

@@ -0,0 +1,13 @@
+require "json"
+
+module GitTrend::Formatters
+  class JsonFormatter
+    def print(projects, options)
+      puts projects.map { |project| project.to_h }.to_json
+    end
+
+    def print_languages(languages)
+      puts languages.to_json
+    end
+  end
+end

data/lib/git_trend/{rendering.rb → formatters/text_formatter.rb}

@@ -1,20 +1,17 @@
-module GitTrend
-  module Rendering
-    def self.included(base)
-      base.extend(self)
-    end
+module GitTrend::Formatters
+  class TextFormatter
     HEADER_COLUMNS = %w(no. name lang star description)
     DEFAULT_COLUMNS_SIZES = [3, 40, 10, 6, 20]
 
-    def render(projects, enable_description = false)
-      @enable_description = enable_description
+    def print(projects, options)
+      @enable_description = options[:enable_description]
       rule_columns_sizes(projects)
       render_header
       render_body(projects)
       render_footer
     end
 
-    def render_languages(languages)
+    def print_languages(languages)
       puts languages
       puts
       puts "#{languages.size} languages"
@@ -69,7 +66,7 @@ module GitTrend
         fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
         description_fmt = ""
         projects.each_with_index do |project, i|
-          data = [i + 1, project.to_a].flatten
+          data = [i + 1, [project.name, project.lang, project.star_count.to_s]].flatten
           if @enable_description
             description = project.description.mb_truncate(f.last)
             data << description

data/lib/git_trend/project.rb

@@ -11,8 +11,15 @@ module GitTrend
       self.star_count = star_count
     end
 
-    def to_a
-      [@name, @lang, @star_count.to_s]
+    def to_h
+      {
+        name: name,
+        description: description,
+        lang: lang,
+        all_star_count: all_star_count,
+        fork_count: fork_count,
+        star_count: star_count,
+      }
     end
   end
 end

data/lib/git_trend/version.rb

@@ -1,3 +1,3 @@
 module GitTrend
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-trend
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - rochefort
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -217,8 +217,10 @@ files:
 - lib/git-trend.rb
 - lib/git_trend.rb
 - lib/git_trend/cli.rb
+- lib/git_trend/formatter.rb
+- lib/git_trend/formatters/json_formatter.rb
+- lib/git_trend/formatters/text_formatter.rb
 - lib/git_trend/project.rb
-- lib/git_trend/rendering.rb
 - lib/git_trend/scraper.rb
 - lib/git_trend/version.rb
 - note.txt