sandi_meter 1.1.5 → 1.1.6

data/README.md

@@ -17,6 +17,7 @@ gem install sandi_meter
 sandi_meter --help
     -d, --details                    CLI mode. Show details (path, line number)
     -g, --graph                      HTML mode. Create folder, log data and output stats to HTML file.
+        --json                       Output as JSON
     -l, --log                        Show syntax error and indentation log output
     -p, --path PATH                  Path to folder or file to analyze (default is ".")
     -r, --rules                      Show rules
@@ -37,7 +38,7 @@ Classes with 100+ lines
   SandiMeter::HtmlGenerator  | 135   | ./lib/sandi_meter/html_generator.rb:5
   Valera                     | 109   | ./spec/test_classes/12.rb:1
 
-Missindented classes
+Misindented classes
   Class name        | Path
   MyApp::TestClass  | ./spec/test_classes/1.rb:2
   OneLinerClass     | ./spec/test_classes/5.rb:1
@@ -47,7 +48,7 @@ Methods with 5+ lines
   SandiMeter::Analyzer                | initialize                    | 10    | ./lib/sandi_meter/analyzer.rb:10
   SandiMeter::Analyzer                | analyze                       | 13    | ./lib/sandi_meter/analyzer.rb:22
 
-Missindented methods
+Misindented methods
   Class name        | Method name  | Path
   MyApp::TestClass  | blah         | ./spec/test_classes/1.rb:3
 

data/Rakefile

@@ -10,3 +10,9 @@ Rake::TestTask.new do |test|
 end
 
 task default: :test
+
+task :debug do
+  require "sandi_meter/cli"
+
+  SandiMeter::CLI.execute
+end

data/html/index.html

@@ -27,31 +27,43 @@
       <div class="clearfix"></div>
     </section>
     <nav class="main-menu">
-      <a href="#" class="main-menu-active js-menu-item" data-rel=".js-charts">Charts</a><a href="#" class="js-menu-item" data-rel=".js-details">Details</a>
+      <a href="#" class="main-menu-active js-menu-item" data-rel=".js-charts">Rules</a>
+      <a href="#" class="js-menu-item" data-rel=".js-charts-percentage">Rules %</a>
+      <a href="#" class="js-menu-item" data-rel=".js-progress">Progress %</a>
+      <a href="#" class="js-menu-item" data-rel=".js-details">Details</a>
     </nav>
     <section class="plot-charts js-charts js-tab-item">
       <div class="plot-charts-item">
         <div class="plot-charts-item-caption">Number of 100 line classes vs time</div>
-        <div class="plot-charts-item-graph" id="plot1"></div>
+        <div class="plot-charts-item-graph plot1"></div>
       </div>
       <div class="plot-charts-item">
         <div class="plot-charts-item-caption">Number of 5 line methods vs time</div>
-        <div class="plot-charts-item-graph" id="plot2"></div>
+        <div class="plot-charts-item-graph plot2"></div>
       </div>
       <div class="clearfix"></div>
       <div class="plot-charts-item">
         <div class="plot-charts-item-caption">Number of methods calls with 4 params vs time</div>
-        <div class="plot-charts-item-graph" id="plot3"></div>
+        <div class="plot-charts-item-graph plot3"></div>
       </div>
       <div class="plot-charts-item">
         <div class="plot-charts-item-caption">Number of controllers with 1 instance variable vs time</div>
-        <div class="plot-charts-item-graph" id="plot4"></div>
+        <div class="plot-charts-item-graph plot4"></div>
       </div>
       <div class="clearfix"></div>
     </section>
     <section class="details js-details js-tab-item">
       <% details %>
     </section>
+    <section class="charts-percentage js-charts-percentage js-tab-item">
+    </section>
+    <section class="progress js-progress js-tab-item">
+      <div class="plot-charts-item">
+        <div class="plot-charts-item-caption">Overall progress</div>
+        <div class="plot-charts-item-graph plot"></div>
+        <div class="clearfix"></div>
+      </div>
+    </section>
     <footer class="main-footer">
       Scanned with love by <a href="https://github.com/makaroni4/sandi_meter">sandi_meter</a> gem.
       Please, <a href="https://github.com/makaroni4/sandi_meter/issues/new">leave an issue</a> or

data/html/script.js

@@ -9,7 +9,6 @@ function plotDonut(value1, value2, label1, label2, id) {
     data.push({ value: value2, label: label2 });
   }
 
-  console.log(data);
   Morris.Donut({
     element: id,
     data: data,
@@ -20,18 +19,22 @@ function plotDonut(value1, value2, label1, label2, id) {
   })
 }
 
-function plotLine(id, data, ykeys, labels) {
-  Morris.Line({
-    element: id,
+function plotLine(selector, data, ykeys, labels, ymax_value) {
+  var ymax_value = typeof ymax_value !== 'undefined' ? ymax_value : 'auto';
+  var graph = Morris.Line({
+    element: $(selector),
     data: data,
     xkey: 'timestamp',
     ykeys: ykeys,
+    ymax: ymax_value,
     labels: labels,
     lineColors: [
       '#0C0',
       '#F00'
     ],
-    dateFormat: function (x) { return new Date(x).toDateString(); }
+    dateFormat: function (x) {
+      return new Date(x).toDateString();
+    }
   });
 }
 
@@ -56,8 +59,28 @@ function setHeader(last_report) {
   $('.js-report-date').text("Latest report from " + dateHeader(last_report));
 }
 
+function calculate_percentage(row) {
+  [1,2,3,4].forEach(function(rule) {
+    var green_index = "r" + rule + "0";
+    var red_index = "r" + rule + "1";
+    var total = row[green_index] + row[red_index];
+    row[green_index + "p"] = total == 0 ? 0 : Math.round(100 * row[green_index] / total, 0);
+    row[red_index + "p"] = total == 0 ? 0 : Math.round(100 * row[red_index] / total, 0);
+  })
+}
+
+function calculate_percentage_data(data) {
+  data.forEach(function(row){
+    calculate_percentage(row);
+    row["overall"] = Math.round((row["r10p"] + row["r20p"] + row["r30p"] + row["r40p"]) / 4, 0);
+  })
+}
+
 $(document).ready(function(){
   last_report = lastReport(data);
+  calculate_percentage_data(data);
+
+  $(".charts-percentage").html($(".plot-charts").html());
 
   setHeader(last_report);
 
@@ -66,10 +89,20 @@ $(document).ready(function(){
   plotDonut(last_report.r30, last_report.r31, '3. Method calls with less than 4 params', '3. Method calls with more than 4 params', 'pie3');
   plotDonut(last_report.r40, last_report.r41, '4. Controllers with one instance variable', '4. Controllers with many instance variables', 'pie4');
 
-  plotLine('plot1', data, ['r10', 'r11'], ['under 100 lines', 'more than 100 lines.']);
-  plotLine('plot2', data, ['r20', 'r21'], ['under 5 lines', 'more than 5 lines']);
-  plotLine('plot3', data, ['r30', 'r31'], ['less than 4 params', 'more than 4 params']);
-  plotLine('plot4', data, ['r40', 'r41'], ['one instance variable', 'many instance variables']);
+  plotLine('.plot-charts .plot1', data, ['r10', 'r11'], ['under 100 lines', 'more than 100 lines.'], 'auto');
+  plotLine('.plot-charts .plot2', data, ['r20', 'r21'], ['under 5 lines', 'more than 5 lines'], 'auto');
+  plotLine('.plot-charts .plot3', data, ['r30', 'r31'], ['less than 4 params', 'more than 4 params'], 'auto');
+  plotLine('.plot-charts .plot4', data, ['r40', 'r41'], ['one instance variable', 'many instance variables'], 'auto');
+
+  plotLine('.charts-percentage .plot1', data, ['r10p'], ['under 100 lines'], 100);
+  plotLine('.charts-percentage .plot2', data, ['r20p'], ['under 5 lines'], 100);
+  plotLine('.charts-percentage .plot3', data, ['r30p'], ['less than 4 params'], 100);
+  plotLine('.charts-percentage .plot4', data, ['r40p'], ['one instance variable'], 100);
+
+  plotLine('.progress .plot', data, ['overall'], ['Overall progress'], 100);
+
+  $(".charts-percentage").hide();
+  $(".progress").hide();
 
   var $tabs = $(".js-tab-item");
   var $menuItems = $(".js-menu-item")

data/html/style.css

@@ -36,9 +36,9 @@ body {
 }
 
 .plot-charts-item {
-  width: 480px;
-  float: left;
+  width: 470px;
   height: 298px;
+  float: left;
   margin-bottom: 40px;
 }
 
@@ -49,9 +49,19 @@ body {
 }
 
 .plot-charts-item-graph {
+  width: 470px;
   height: 280px;
 }
 
+.progress {
+  text-align: center;
+}
+
+.progress .plot-charts-item {
+  float: none;
+  margin: 0 auto;
+}
+
 .toggle_report.current_tab {
   text-decoration: none;
   cursor: default;
@@ -91,6 +101,7 @@ body {
 .main-menu a {
   display: inline-block;
   padding: 4px 16px;
+  margin-left: -5px;
   font-size: 18px;
   text-decoration: none;
   color: black;

data/lib/sandi_meter/calculator.rb

@@ -96,7 +96,7 @@ module SandiMeter
       total_classes_amount = @data[:classes].size
       small_classes_amount = @data[:classes].select(&:small?).size
 
-      misindented_classes_amount = @data[:classes].select { |c| c.last_line.nil? }
+      misindented_classes_amount = @data[:classes].select { |c| c.last_line.nil? }.size
 
       @output[:first_rule] ||= {}
       @output[:first_rule][:small_classes_amount] = small_classes_amount

data/lib/sandi_meter/cli.rb

@@ -2,11 +2,13 @@
 require 'mixlib/cli'
 require 'sandi_meter/file_scanner'
 require 'sandi_meter/formatter'
+require 'sandi_meter/json_formatter'
 require 'sandi_meter/rules_checker'
 require 'sandi_meter/logger'
 require 'sandi_meter/version'
 require 'sandi_meter/html_generator'
 require 'yaml'
+require 'json'
 
 module SandiMeter
   class CommandParser
@@ -56,6 +58,11 @@ module SandiMeter
       long: "--rules",
       description: "Show rules",
       boolean: 0
+
+    option :json,
+      long: "--json",
+      description: "Output as JSON",
+      boolean: false
   end
 
   class CLI
@@ -85,7 +92,12 @@ module SandiMeter
         scanner = SandiMeter::FileScanner.new(cli.config[:log])
         data = scanner.scan(cli.config[:path], cli.config[:details] || cli.config[:graph])
 
-        formatter = SandiMeter::Formatter.new
+        if cli.config[:json]
+          formatter = SandiMeter::JsonFormatter.new
+        else
+          formatter = SandiMeter::Formatter.new
+        end
+
         formatter.print_data(data)
 
         if cli.config[:graph]

data/lib/sandi_meter/formatter.rb

@@ -37,7 +37,7 @@ module SandiMeter
       end
 
       if data[:first_rule][:log][:misindented_classes].any?
-        puts "\nMissindented classes"
+        puts "\nMisindented classes"
         print_array_of_arrays [["Class name", "Path"]] + data[:first_rule][:log][:misindented_classes].map { |row| row.delete_at(1); row } # 1 – size, which nil for misindented_classes
       end
 
@@ -47,7 +47,7 @@ module SandiMeter
       end
 
       if data[:second_rule][:log][:misindented_methods].any?
-        puts "\nMissindented methods"
+        puts "\nMisindented methods"
         print_array_of_arrays [["Class name", "Method name", "Path"]] + data[:second_rule][:log][:misindented_methods].map { |row| row.delete_at(2); row } # 2 – size, which nil for misindented_methods
       end
 

data/lib/sandi_meter/json_formatter.rb

@@ -0,0 +1,11 @@
+module SandiMeter
+  class JsonFormatter
+    def print_data(data)
+      puts JSON.dump(data)
+    end
+
+    def print_log(data)
+      puts JSON.dump(data)
+    end
+  end
+end

data/lib/sandi_meter/version.rb

@@ -1,3 +1,3 @@
 module SandiMeter
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/sandi_meter.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_runtime_dependency "mixlib-cli"
+  spec.add_runtime_dependency "json"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: sandi_meter
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
+  prerelease: 
 platform: ruby
 authors:
 - Anatoli Makarevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,23 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,6 +102,7 @@ files:
 - lib/sandi_meter/file_scanner.rb
 - lib/sandi_meter/formatter.rb
 - lib/sandi_meter/html_generator.rb
+- lib/sandi_meter/json_formatter.rb
 - lib/sandi_meter/loc_checker.rb
 - lib/sandi_meter/logger.rb
 - lib/sandi_meter/method_arguments_counter.rb
@@ -120,25 +144,29 @@ files:
 homepage: https://github.com/makaroni4/sandi_meter
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3255714450703413671
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Sandi Metz rules checker
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTM2ZjcwMzM2NmQ5ZTliOGU5OGY0ZGY0Zjg1NjRhMzM1ZmJhNTVkNw==
-  data.tar.gz: !binary |-
-    ZTYzNDVjNmM1NDcxOGE2MmVlZjZlYjMzMTI2N2Y0YTRmNzdiYjBmNg==
-SHA512:
-  metadata.gz: !binary |-
-    YTgwMTUwZmQ3ZjEwNTBlYmExM2ExMjU5NzU1YTkxZmZlNWU2MTc5YTRkODE4
-    YjU5N2JkMGQyYzUyMGQwMTFhYWJiMTIyNjUzYTg1YjhhMDRjMjM5OTQwNzlk
-    NmJiZWJlZDZiZDZlNGNhZTI5OGRhMzlkMTJiMzMxN2JkMzY1NGM=
-  data.tar.gz: !binary |-
-    ZjA4YTQzNWVhMDZhZThkZjg4NjdmZTFjYmQ1MDZiNzc0ZjQzOTY2ODQ4NTMw
-    MWE2YTdjZWQyY2VhZDliMmFlZTlmMDI4ZmUzM2I1ZTQwMzVkY2EzOGViM2Zj
-    ZDE1NmY2ZDM4ZGQyOWQyZmExM2VhMGFkZmU3MGEyOTE4MDg1ZmI=