fastlane-plugin-number_of_swift_lines 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b382290da720cf8a505bcbff1b3fbf47b837af
-  data.tar.gz: f4301c68b87479423ab6de9e323cddc7de18b5af
+  metadata.gz: 0b0114eb4e4903ff288f3fc97fd64953ee9837db
+  data.tar.gz: b527d7b88ce41afe9ae19a8b61c584f679552bcf
 SHA512:
-  metadata.gz: '08f5fe5d19b25030c86e81eb8170d56fe07b881bfbc3432e44c0c5b1c27868c60e1b54b382c00fb2e425e520180b73173e34965ad3c3fec43d81b5298d68a9e6'
-  data.tar.gz: d8519282f2f3119a6224a18b8991489187a1ff8d0ae39a3f4031b794a90470fb7f8e6e3e8750160847f70bf82dc2a2e32bcc36118cc19d942783adc585e31167
+  metadata.gz: b15bc5040c379739bda57986da6302af4281d78f63eb3a943d287ccbc7c515c666e21c2840f539cb377f9290e1db0a33d80b535b73d7a3df9ff9e13d4dd57ccd
+  data.tar.gz: 30b0e8a2952b06ba0baf08ff294d6450080b99c88d363ee85fadd5abf7c3701b25bab495736753deafe3a23078eda980a056c6b3616b0be45d46eea2674e5ee5

data/lib/fastlane/plugin/number_of_swift_lines/actions/number_of_swift_lines_action.rb

@@ -4,6 +4,8 @@ module Fastlane
       NUMBER_OF_SWIFT_LINES_IN_LARGEST_FILES = :NUMBER_OF_SWIFT_LINES_IN_LARGEST_FILES
       NUMBER_OF_SWIFT_FILES = :NUMBER_OF_SWIFT_FILES
       NUMBER_OF_SWIFT_LINES = :NUMBER_OF_SWIFT_LINES
+      NUMBER_OF_SWIFT_TEST_FILES_LINES = :NUMBER_OF_SWIFT_TEST_FILES_LINES
+      TEST_PROD_CODE_RATIO = :TEST_PROD_CODE_RATIO
     end
 
     class NumberOfSwiftLinesAction < Action
@@ -13,10 +15,14 @@ module Fastlane
         number_of_largest_files = params[:largest_files_cap]
         show_ascii = params[:enable_ascii_art]
         exclude_regex = params[:files_exclude_regex]
+        include_regex = params[:test_files_include_regex]
+        #skip_empty = params[:skip_empty_lines]
 
         find_command = "find . -name \"*.swift\" | egrep -v \"#{exclude_regex}\""
+        find_command_tests = "find . -name \"*.swift\" | egrep \"#{include_regex}\""
         #find_command = "find . -name '*.swift' -not -path '*/Tests/*' -not -path '*/Pods/*' -not -path '*/Carthage/*' -print0"
         UI.message(find_command)
+        UI.message(find_command_tests)
 
         swift_files = `#{find_command}`
         if swift_files.empty?
@@ -24,33 +30,52 @@ module Fastlane
           exit 1
         end
 
+        test_files = `#{find_command_tests}`
+        number_of_lines_test_files   = "0\n"
+        if test_files.empty?
+          UI.message("WARNING: No test files found :(")
+        else
+          number_of_lines_test_files = `echo '#{test_files}' | tr '\\n' '\\0' | xargs -0 wc -l | tail -1 | awk '{print $1}'`
+        end
+
+        # | xargs -0 awk 'NF > 0'  | wc -l
         number_of_files              = `echo '#{swift_files}' | wc -l | awk '{print $1}'`
         number_of_lines              = `echo '#{swift_files}' | tr '\\n' '\\0' | xargs -0 wc -l | tail -1 | awk '{print $1}'`
         largest_files                = `echo '#{swift_files}' | tr '\\n' '\\0' | xargs -0 wc -l | sort -n | tail -'#{number_of_largest_files.to_s}' | head -'#{(number_of_largest_files-1).to_s}'`
         number_of_lines_largest_file = `echo '#{swift_files}' | tr '\\n' '\\0' | xargs -0 wc -l | sort -n | tail -2 | head -1 | awk '{print $1}'`
 
+        test_production_code_ratio   = number_of_lines_test_files.to_f / number_of_lines.to_f
+        test_production_code_ratio_str = test_production_code_ratio.round(2).to_s
+
         ascii_message = ""
         if  show_ascii == true then
           a = Artii::Base.new :font => 'univers'
-          ascii_message = a.asciify(number_of_lines_largest_file)
+          ascii_message = ""
+          ascii_message += a.asciify(number_of_lines_largest_file)
           ascii_message += a.asciify(number_of_files)
           ascii_message += a.asciify(number_of_lines)
+          ascii_message += a.asciify(number_of_lines_test_files)
+          ascii_message += a.asciify(test_production_code_ratio_str.to_s)
         end
 
         UI.message("\n\n" + "The " + number_of_largest_files.to_s + " largest files in ascending order:\n\n" + largest_files \
           + "\n\nNumber of lines in the largest swift file:\t" + number_of_lines_largest_file \
           + "Total number of swift files:\t\t\t" + number_of_files \
-          + "Total number of swift lines of code:\t\t" + number_of_lines + "\n"\
-          + ascii_message)
+          + "Total number of swift lines of code:\t\t" + number_of_lines \
+          + "Total number of swift lines in test files:\t" + number_of_lines_test_files \
+          + "Testing / Production code ratio:\t\t" + test_production_code_ratio_str.to_s + "\n\n\n"\
+          + ascii_message + "\n")
 
         Actions.lane_context[SharedValues::NUMBER_OF_SWIFT_LINES_IN_LARGEST_FILES] = number_of_lines_largest_file
         Actions.lane_context[SharedValues::NUMBER_OF_SWIFT_FILES] = number_of_files
         Actions.lane_context[SharedValues::NUMBER_OF_SWIFT_LINES] = number_of_lines
+        Actions.lane_context[SharedValues::NUMBER_OF_SWIFT_TEST_FILES_LINES] = number_of_lines_test_files
+        Actions.lane_context[SharedValues::TEST_PROD_CODE_RATIO] = test_production_code_ratio_str.to_s
 
       end
 
       def self.description
-        "Outputs the total number of lines of swift code, number of swift files, and a list of the largest swift files."
+        "Outputs the total number of lines of swift code, number of swift files, and a list of the largest swift files, and some other useful statistics"
       end
 
       def self.authors
@@ -60,15 +85,18 @@ module Fastlane
       def self.return_value
         # If your method provides a return value, you can describe here what it does
         [
-          ['NUMBER_OF_SWIFT_LINES_IN_LARGEST_FILES', 'The number of lines in the largets swift file'],
-          ['NUMBER_OF_SWIFT_FILES', 'The total number of swift files'],
-          ['NUMBER_OF_SWIFT_LINES', 'The total number of swift lines in all swift files']
+          ['NUMBER_OF_SWIFT_LINES_IN_LARGEST_FILES', 'The number of lines in the largets swift file, excluding testing files'],
+          ['NUMBER_OF_SWIFT_FILES', 'The total number of swift files, excluding testing files'],
+          ['NUMBER_OF_SWIFT_LINES', 'The total number of swift lines in all prodcution code swift files'],
+          ['NUMBER_OF_SWIFT_TEST_FILES_LINES', 'The total number of swift lines in all testing swift files'],
+          ['TEST_PROD_CODE_RATIO', 'The ratio between testing and production code in all swift files']
         ]
       end
 
       def self.details
         # Optional:
-        "Using ASCII art to output the total number of code lines written in Swift, excluding all the lines used in unit & UI tests. But also outputs the total number of swift files and a list of the largest swift files."
+        "Outputs the total number of lines of swift code, number of swift files, and a list of the largest swift files, and some other useful statistics. \
+        Default optinos, excludes unit & UI testing swift files and outputs the statistics in ASCII art :)"
       end
 
       def self.available_options
@@ -87,11 +115,25 @@ module Fastlane
             default_value: true,
             type: [TrueClass, FalseClass]),
 
+          # FastlaneCore::ConfigItem.new(key: :skip_empty_lines,
+          #     env_name: "SKIP_EMPTY_LINES",
+          #     description: "If enabled, does not include empty lines in the statistics",
+          #     optional: true,
+          #     default_value: true,
+          #     type: [TrueClass, FalseClass]),
+
           FastlaneCore::ConfigItem.new(key: :files_exclude_regex,
               env_name: "FILES_EXCLUDE_REGEX",
               description: "Regex string used with grep to exclude files from the list of all swift files",
               optional: true,
-              default_value: "(/Tests|/Pods|/Carthage)",
+              default_value: "(/Test|/Pods|/Carthage)",
+              type: String),
+
+          FastlaneCore::ConfigItem.new(key: :test_files_include_regex,
+              env_name: "TEST_FILES_INCLUDE_REGEX",
+              description: "Regex string used with grep when searching for test files",
+              optional: true,
+              default_value: "/Test",
               type: String)
           ]
       end

data/lib/fastlane/plugin/number_of_swift_lines/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module NumberOfSwiftLines
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-number_of_swift_lines
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dennis Charmington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artii
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Outputs the total number of swift lines
+summary: Outputs the total number of swift lines and other useful statistics
 test_files: []