swoop_report 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7347316477eae37b04d727c1a56b84d2c160d41e
-  data.tar.gz: ec21145456ea9849ebfe6170eb9c648b237fbcd7
+  metadata.gz: b0922a69f3164be892c109b44061f09ac31f06c8
+  data.tar.gz: bebe25bb3b4ec903c1aee78797f6cf8f3a119337
 SHA512:
-  metadata.gz: dee8793eb6f7ef23b45690861fbc47a37e2a336c278817a9dd27e5d588568b89eaf8bc4b325c0cbf22a80177f3fda6677fa69372a54b6c0c7b640271c9cd3d6b
-  data.tar.gz: 4ed060ce4993d921243e34c03b945cd0b31b54b4c3b07d8ea0cbfe0cfe636dbd9ffce53a53cf2e7c642b9b327cb423091b7b8f730a5e66fe7abfcc0d3d096790
+  metadata.gz: 8559e7239f34d6ec739ae95b49c130d8587faa5680303fa03c782064a2bbbd62f99e201bce7395c491048eb57cfb7a9634d921d13b8aafd2ee6e4b5bd5ce8460
+  data.tar.gz: 225f1f3ac280592afe588670c2fb2f0f585f6383ff25254ba3e4179963e1e9cdb89f31f90f050c2e38fcfa8f1d2c177ffba13e6da54441d28d98b59dab00dd78

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
-## v0.2.3
+## v0.3.1
+
+* Add line comparison
+* Add file comparison
+
+## v0.3
 
 * Fix path for chart template file
 * Checkout to active branch when error happens

data/Guardfile

@@ -0,0 +1,14 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  watch(ruby.lib_files) { rspec.spec_dir }
+end

data/lib/swoop.rb

@@ -1,7 +1,8 @@
 require "swoop/version"
 require "swoop/project"
 require "swoop/entity"
-require "swoop/entity_parser"
+require "swoop/file_parser"
+require "swoop/file_info"
 require "swoop/report"
 require "swoop/time_machine"
 
@@ -57,8 +58,8 @@ module Swoop
         project = Project.new(@project_path, @dir_path)
         delorean = TimeMachine.new(project, time_machine_options)
         delorean.travel do |proj, name, date|
-          entities = EntityParser.parse_files(proj.filepaths)
-          reports << Report.new(entities, name, date)
+          file_infos = FileParser.parse(proj.filepaths)
+          reports << Report.new(file_infos, name, date)
         end
 
         reports

data/lib/swoop/file_info.rb

@@ -0,0 +1,50 @@
+module Swoop
+
+  module Lang
+    NONE = 0
+    OBJC = 1
+    SWIFT = 2
+  end
+
+  class FileInfo
+
+    attr_reader :filepath, :language, :line_count, :classes, :structs, :extensions
+
+    def initialize(filepath, language, line_count, classes, structs, extensions)
+      @filepath = filepath
+      @language = language
+      @line_count = line_count
+      @classes = classes
+      @structs = structs
+      @extensions = extensions
+    end
+
+    def swift?
+      language == Lang::SWIFT
+    end
+
+    def objc?
+      language == Lang::OBJC
+    end
+
+    def entities
+      @entities ||= begin
+        [ *classes, *structs, *extensions ]
+      end
+    end
+
+    def hash
+      filepath.hash
+    end
+
+    def eql?(comparee)
+      self == comparee
+    end
+
+    def ==(comparee)
+      self.filepath == comparee.filepath
+    end
+
+  end
+
+end

data/lib/swoop/{entity_parser.rb → file_parser.rb}

@@ -2,31 +2,44 @@ require 'json'
 
 module Swoop
 
-  class EntityParser
+  class FileParser
 
-    attr_reader :entities
+    attr_reader :entityInfos
 
-    def self.parse_files(filepaths)
-      filepaths
-        .map { |p| self.new(p).entities }
-        .flatten
-        .uniq
+    def self.parse(filepaths)
+      filepaths.map { |p| self.new(p).entityInfos }.compact.uniq
     end
 
     def initialize(filepath)
       @filepath = filepath
     end
 
-    def entities
-      @entitites ||= begin
-        return parse_swift if File.extname(@filepath) == ".swift"
-        return parse_objc if File.extname(@filepath) == ".h"
-        []
+    def entityInfos
+      @entityInfos ||= begin
+        return parse_swift if swift_file?
+        return parse_objc if objc_header_file? || objc_implementation_file?
+        nil
       end
     end
 
     private
 
+    def swift_file?
+      File.extname(@filepath) == ".swift"
+    end
+
+    def objc_header_file?
+      File.extname(@filepath) == ".h"
+    end
+
+    def objc_implementation_file?
+      File.extname(@filepath) == ".m"
+    end
+
+    def lines_count
+      File.new(@filepath).readlines.size
+    end
+
     LANG_SWIFT = 'swift'
     LANG_OBJC = 'objc'
     TYPE_CLASS = 'class'
@@ -42,7 +55,7 @@ module Swoop
       structs = filter(SWIFT_STRUCT).map { |e| Entity.new(e, LANG_SWIFT, TYPE_STRUCT) }
       extensions = filter(SWIFT_EXT).map { |e| Entity.new(e, LANG_SWIFT, TYPE_EXTENSION) }
 
-      [ *classes, *structs, *extensions ]
+      FileInfo.new(@filepath, Lang::SWIFT, lines_count, classes, structs, extensions)
     end
 
     OBJC_CLASS = '@interface\s*(\w+)\s*:'
@@ -50,6 +63,9 @@ module Swoop
     OBJC_STRUCT ='typedef\s*struct\s*{.*?}\s*(\w*)'
     OBJC_STRUCT2 = 'struct\s*(\w+)'
     def parse_objc
+      # Only counting the lines and the file
+      return FileInfo.new(@filepath, Lang::OBJC, lines_count, [], [], []) if objc_implementation_file?
+
       classes = filter(OBJC_CLASS).map { |e| Entity.new(e, LANG_OBJC, TYPE_CLASS) }
       categories = filter(OBJC_CATEGORY, false)
         .map { |exts|
@@ -59,7 +75,7 @@ module Swoop
       structs = (filter(OBJC_STRUCT, true, Regexp::MULTILINE) + filter(OBJC_STRUCT2))
         .map { |e| Entity.new(e, LANG_OBJC, TYPE_STRUCT) }
 
-      [ *classes, *structs, *categories ]
+      FileInfo.new(@filepath, Lang::OBJC, lines_count, classes, structs, categories)
     end
 
     def file_content
@@ -77,6 +93,7 @@ module Swoop
       return filtered unless should_flatten
       filtered.flatten
     end
+
   end
 
 end

data/lib/swoop/renderer/csv_renderer.rb

@@ -22,10 +22,10 @@ module Swoop
     def csv
       @csv ||= begin
         lines = []
-        lines << "name,date,swift class,swift class %,objc class,objc class %,total class,swift struct,swift struct %,objc struct,objc struct %,total struct,swift extension,swift extension %,objc extension,objc extension %,total extension"
+        lines << "name,date,swift lines,swift lines %,objc lines,objc lines %,total lines,swift files,swift files %,objc files,objc files %,total files,swift class,swift class %,objc class,objc class %,total class,swift struct,swift struct %,objc struct,objc struct %,total struct,swift extension,swift extension %,objc extension,objc extension %,total extension"
 
         reports.each do |report|
-          lines << "#{report.name},#{report.date},#{report.swift_classes_count},#{'%.02f' % report.swift_classes_percentage},#{report.objc_classes_count},#{'%.02f' % report.objc_classes_percentage},#{report.classes_count},#{report.swift_structs_count},#{'%.02f' % report.swift_structs_percentage},#{report.objc_structs_count},#{'%.02f' % report.objc_structs_percentage},#{report.structs_count},#{report.swift_extensions_count},#{'%.02f' % report.swift_extensions_percentage},#{report.objc_extensions_count},#{'%.02f' % report.objc_extensions_percentage},#{report.extensions_count}"
+          lines << "#{report.name},#{report.date},#{report.swift_lines_count},#{'%.02f' % report.swift_lines_percentage},#{report.objc_lines_count},#{'%.02f' % report.objc_lines_percentage},#{report.lines_count},#{report.swift_files_count},#{'%.02f' % report.swift_files_percentage},#{report.objc_files_count},#{'%.02f' % report.objc_files_percentage},#{report.files_count},#{report.swift_classes_count},#{'%.02f' % report.swift_classes_percentage},#{report.objc_classes_count},#{'%.02f' % report.objc_classes_percentage},#{report.classes_count},#{report.swift_structs_count},#{'%.02f' % report.swift_structs_percentage},#{report.objc_structs_count},#{'%.02f' % report.objc_structs_percentage},#{report.structs_count},#{report.swift_extensions_count},#{'%.02f' % report.swift_extensions_percentage},#{report.objc_extensions_count},#{'%.02f' % report.objc_extensions_percentage},#{report.extensions_count}"
         end
 
         lines.join("\n")

data/lib/swoop/renderer/table_renderer.rb

@@ -10,10 +10,35 @@ module Swoop
 
     private
 
+    def f(lines)
+      return lines if lines < 1_000
+
+      count_in_thousand = Integer(Float(lines) / Float(1_000))
+      "#{count_in_thousand}K"
+    end
+
     def table
-      headings =  ["name", "date", "swift\nclass", "swift\nclass (%)", "objc\nclass", "objc\nclass (%)", "total\nclass", "swift\nstruct", "swift\nstruct(%)", "objc\nstruct", "objc\nstruct(%)", "total\nstruct", "swift\next", "swift\next(%)", "objc\next", "objc\next(%)", "total\next"]
+      headings =  [
+        "name", "date",
+        "swift\nfiles (%)", "objc\nfiles (%)",
+        "swift\nlines (%)", "objc\nlines (%)",
+        "swift\nclass (%)", "objc\nclass (%)",
+        "swift\nstruct(%)", "objc\nstruct(%)",
+        "swift\next(%)", "objc\next(%)"
+      ]
       rows = reports.map do |r|
-        [r.name,r.date,r.swift_classes_count,"#{'%.02f' % r.swift_classes_percentage}",r.objc_classes_count,"#{'%.02f' % r.objc_classes_percentage}",r.classes_count,r.swift_structs_count,"#{'%.02f' % r.swift_structs_percentage}",r.objc_structs_count,"#{'%.02f' % r.objc_structs_percentage}",r.structs_count,r.swift_extensions_count,"#{'%.02f' % r.swift_extensions_percentage}",r.objc_extensions_count,"#{'%.02f' % r.objc_extensions_percentage}",r.extensions_count]
+        [r.name,r.date,
+          "#{'%.02f' % r.swift_files_percentage} (#{f r.swift_files_count}/#{f r.files_count})",
+          "#{'%.02f' % r.objc_files_percentage} (#{f r.objc_files_count}/#{f r.files_count})",
+          "#{'%.02f' % r.swift_lines_percentage} (#{f r.swift_lines_count}/#{f r.lines_count})",
+          "#{'%.02f' % r.objc_lines_percentage} (#{f r.objc_lines_count}/#{f r.lines_count})",
+          "#{'%.02f' % r.swift_classes_percentage} (#{r.swift_classes_count}/#{r.classes_count})",
+          "#{'%.02f' % r.objc_classes_percentage} (#{r.objc_classes_count}/#{r.classes_count})",
+          "#{'%.02f' % r.swift_structs_percentage} (#{r.swift_structs_count}/#{r.structs_count})",
+          "#{'%.02f' % r.objc_structs_percentage} (#{r.objc_structs_count}/#{r.structs_count})",
+          "#{'%.02f' % r.swift_extensions_percentage} (#{r.swift_extensions_count}/#{r.extensions_count})",
+          "#{'%.02f' % r.objc_extensions_percentage} (#{r.objc_extensions_count}/#{r.extensions_count})",
+        ]
       end
 
       @table ||= Terminal::Table.new(:title => title, :headings => headings, :rows => rows)

data/lib/swoop/report.rb

@@ -4,8 +4,8 @@ module Swoop
 
     attr_reader :name
 
-    def initialize(entities, name = '', date = Time.now)
-      @entities = entities
+    def initialize(file_infos, name = '', date = Time.now)
+      @file_infos = file_infos
       @date = date
 
       if name.nil? || name == ''
@@ -19,6 +19,52 @@ module Swoop
       @date.strftime("%d-%m-%Y")
     end
 
+    # Files
+    def files_count
+      @files_count ||= @file_infos.count
+    end
+
+    def swift_files_count
+      @swift_files_count ||= swift_file_infos.count
+    end
+
+    def objc_files_count
+      @objc_files_count ||= objc_file_infos.count
+    end
+
+    def swift_files_percentage
+      return 0 if files_count == 0
+      (swift_files_count.to_f / files_count) * 100
+    end
+
+    def objc_files_percentage
+      return 0 if files_count == 0
+      (objc_files_count.to_f / files_count) * 100
+    end
+
+    # Lines
+    def lines_count
+      @lines_count ||= @file_infos.map(&:line_count).reduce(:+)
+    end
+
+    def swift_lines_count
+      @swift_lines_count ||= swift_file_infos.map(&:line_count).reduce(:+)
+    end
+
+    def objc_lines_count
+      @objc_lines_count ||= objc_file_infos.map(&:line_count).reduce(:+)
+    end
+
+    def swift_lines_percentage
+      return 0 if lines_count == 0
+      (swift_lines_count.to_f / lines_count) * 100
+    end
+
+    def objc_lines_percentage
+      return 0 if lines_count == 0
+      (objc_lines_count.to_f / lines_count) * 100
+    end
+
     # Classes
     def classes_count
       classes.count
@@ -90,56 +136,50 @@ module Swoop
       (objc_extensions_count.to_f / extensions_count) * 100
     end
 
-    def to_s
-      "Class | swift : #{swift_classes_count} (#{'%.02f' % swift_classes_percentage}%) , objc : #{objc_classes_count} (#{'%.02f' % objc_classes_percentage}%), total: #{classes_count} \n" +
-      "Structs | swift : #{swift_structs_count} (#{'%.02f' % swift_structs_percentage}%) , objc : #{objc_structs_count} (#{'%.02f' % objc_structs_percentage}%), total: #{structs_count} \n" +
-      "Extensions | swift : #{swift_extensions_count} (#{'%.02f' % swift_extensions_percentage}%) , objc : #{objc_extensions_count} (#{'%.02f' % objc_extensions_percentage}%), total: #{extensions_count}"
-    end
-
     private
 
     def classes
-      @classes ||= @entities.select(&:class?)
+      @classes ||= @file_infos.flat_map(&:classes)
     end
 
     def structs
-      @structs ||= @entities.select(&:struct?)
+      @structs ||= @file_infos.flat_map(&:structs)
     end
 
     def extensions
-      @extensions ||= @entities.select(&:extension?)
+      @extensions ||= @file_infos.flat_map(&:extensions).uniq
     end
 
-    def swift_entities
-      @swift_entities ||= @entities.select(&:swift?)
+    def swift_file_infos
+      @swift_file_infos ||= @file_infos.select(&:swift?)
     end
 
     def swift_classes
-      @swift_classes ||= swift_entities.select(&:class?)
+      @swift_classes ||= swift_file_infos.flat_map(&:classes)
     end
 
     def swift_structs
-      @swift_structs ||= swift_entities.select(&:struct?)
+      @swift_structs ||= swift_file_infos.flat_map(&:structs)
     end
 
     def swift_extensions
-      @swift_extensions ||= swift_entities.select(&:extension?)
+      @swift_extensions ||= swift_file_infos.flat_map(&:extensions).uniq
     end
 
-    def objc_entities
-      @objc_entities ||= @entities.select(&:objc?)
+    def objc_file_infos
+      @objc_file_infos ||= @file_infos.select(&:objc?)
     end
 
     def objc_classes
-      @objc_classes ||= objc_entities.select(&:class?)
+      @objc_classes ||= objc_file_infos.flat_map(&:classes)
     end
 
     def objc_structs
-      @objc_structs ||= objc_entities.select(&:struct?)
+      @objc_structs ||= objc_file_infos.flat_map(&:structs)
     end
 
     def objc_extensions
-      @objc_extensions ||= objc_entities.select(&:extension?)
+      @objc_extensions ||= objc_file_infos.flat_map(&:extensions).uniq
     end
   end
 end

data/lib/swoop/version.rb

@@ -1,3 +1,3 @@
 module Swoop
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

data/swoop.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.3"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "guard-rspec"
 
   spec.add_runtime_dependency "thor", "~> 0.19"
   spec.add_runtime_dependency "xcodeproj", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swoop_report
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Ikhsan Assaat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -158,7 +173,8 @@ files:
 - exe/swoop
 - lib/swoop.rb
 - lib/swoop/entity.rb
-- lib/swoop/entity_parser.rb
+- lib/swoop/file_info.rb
+- lib/swoop/file_parser.rb
 - lib/swoop/project.rb
 - lib/swoop/renderer/chart_renderer.rb
 - lib/swoop/renderer/chart_renderer/chart.html.erb