sloc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46653f18fd1c3a549b1a044ab715b906dbbd7c3
-  data.tar.gz: 2a7de9e2d0b267a0236adb70af09c0ea65cae417
+  metadata.gz: e259712548f8143e04fdc705826079d117c2bca8
+  data.tar.gz: 04a88b96d2cee31d9e4e3973efbd97c759f35f40
 SHA512:
-  metadata.gz: 9ebe9dbcd0bce080ce86ac42be5a9f51ac33aab53fa0ead3ad510f5ebd6668c05a6069ef471f1f45d2ba9138447ccd1fce6bb0b4ecdc6b94e56126e68d68da81
-  data.tar.gz: faea9c4ae2e41215832d0ecacb22d0493f208e9b8b2a53b513b3dc3b30d1b2452999aa99fb61b1e838fe73663874e2abd4e8debf792f41d7e4bfc57d9e809bec
+  metadata.gz: 1ca49dea0ba4c645f0760cb1f2955825bb5fc1e03228346bc9a5fe8b8d7a11f5bc7ec5d29f64f2d62e9d5629bfa62c65491da5c967a6a67782f5e40f4192926c
+  data.tar.gz: 98f377612932aab8f82fd8b0bbefa781bf42efbe990ac20bfdf4a30c5b324928f63b9c433e0457832a42827c8013611ecb4b9dda6d12365be0c1cd420f355459

data/.rubocop.yml

@@ -0,0 +1,12 @@
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 104
+
+Style/Documentation:
+  Enabled: false
+
+Style/RegexpLiteral:
+  MaxSlashes: 0
+
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma

data/README.md

@@ -1,4 +1,9 @@
 # Sloc
+[![Gem Version](https://badge.fury.io/rb/sloc.svg)](http://badge.fury.io/rb/sloc)
+[![Circle CI](https://img.shields.io/circleci/project/meganemura/sloc/master.svg)](https://circleci.com/gh/meganemura/sloc)
+[![Coverage Status](https://coveralls.io/repos/meganemura/sloc/badge.svg)](https://coveralls.io/r/meganemura/sloc)
+[![Code Climate](https://codeclimate.com/github/meganemura/sloc/badges/gpa.svg)](https://codeclimate.com/github/meganemura/sloc)
+[![Dependency Status](https://gemnasium.com/meganemura/sloc.svg)](https://gemnasium.com/meganemura/sloc)
 
 ## Usage
 

data/Rakefile

@@ -1,2 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:style)
+
+task default: :spec
+task ci: [:spec, :style]

data/bin/console

@@ -1,14 +1,10 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "sloc"
+require 'bundler/setup'
+require 'sloc'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require 'pry'
+Pry.start

data/circle.yml

@@ -0,0 +1,9 @@
+machine:
+  ruby:
+    version: 2.1.4
+dependencies:
+  pre:
+    - gem install bundler
+test:
+  override:
+    - bundle exec rake ci

data/lib/sloc.rb

@@ -1,5 +1,3 @@
-require "sloc/version"
-
-module Sloc
-  # Your code goes here...
-end
+require 'sloc/analyzer'
+require 'sloc/runner'
+require 'sloc/version'

data/lib/sloc/analyzer.rb

@@ -1,19 +1,47 @@
 module Sloc
   class Analyzer
-    def initialize(options)
+    def initialize(options = {})
       @options = options
     end
 
+    REPORT_KEYS = [:total, :empty_lines, :single_comment]
+
     def analyze(code, extension)
       result = {}
 
-      code.gsub!(/\r\n|\r/, "\n")
+      code.scrub!.gsub!(/\r\n|\r/, "\n")
+
+      result[:total]          = code.scan("\n").size
+      result[:empty_lines]    = code.scan(/^\s*$/).size
 
-      result[:total]       = code.scan("\n").size
-      result[:empty_lines] = code.scan(/^\s*$/).size
-      result[:comments]    = 'N/A'  # FIXME
+      regexp = single_comment_expression(extension)
+      result[:single_comment] = regexp ? code.scan(regexp).size : 0
 
       result
     end
+
+    def comment_expressions(extension)
+      start, stop = block_comment_expression(extension)
+
+      {
+        single: single_comment_expression(extension),
+        start: start,
+        stop: stop,
+      }
+    end
+
+    def single_comment_expression(extension)
+      case extension
+      when '.rb' then /#/
+      when '.vim' then /"/
+      end
+    end
+
+    def block_comment_expression(extension)
+      case extension
+      when '.rb' then [/=begin/, /=end/]
+      else [nil, nil]
+      end
+    end
   end
 end

data/lib/sloc/cli.rb

@@ -10,9 +10,7 @@ module Sloc
     def run(args = ARGV)
       @options, paths = parse_options(args)
 
-      if paths.empty?
-        return help
-      end
+      return help if paths.empty? || @options[:help]
 
       runner = Runner.new(@options)
 
@@ -20,8 +18,11 @@ module Sloc
     end
 
     def parse_options(args)
-      opts = Slop.parse! do |o|
+      opts = Slop.parse!(args) do |o|
         o.on('-h', '--help', 'Display this help message.')
+        o.on('-o', '--order=', 'Specify key to order by.')
+        o.on('--desc', 'Reverse order if specified')
+        o.on('-l', '--limit=', 'Specify key to set limitation of displaying file number.')
       end
 
       [opts, args]

data/lib/sloc/runner.rb

@@ -2,41 +2,74 @@ require 'sloc/analyzer'
 
 module Sloc
   class Runner
-    def initialize(options)
+    def initialize(options = {})
       @options = options
+      @analyzer = Analyzer.new(@options)
     end
 
     def run(paths)
+      # TODO: formatted output
+      require 'pp'
+      pp report(paths)
+
+      nil
+    end
+
+    def report(paths)
       target_files = find_target_files(paths)
 
       # TODO: count sloc
-      analyzer = Analyzer.new(@options)
       report = target_files.each_with_object({}) do |path, h|
         code      = File.read(path)
         extension = File.extname(path)
 
-        h[path] = analyzer.analyze(code, extension)
+        h[path] = @analyzer.analyze(code, extension)
       end
 
-      # TODO: formatted output
-      require 'pp'
-      pp report
-
-      nil
+      process_options(report)
     end
 
     private
 
+    def process_options(report)
+      r = report
+          .sort_by { |_key, value| value[order] }   # --order=
+          .tap { |hash| hash.reverse! if desc? }    # --desc
+
+      if limit?
+        Hash[r.first(limitation)]
+      else
+        Hash[r]
+      end
+    end
+
+    def order
+      key = @options[:order] ? @options[:order].to_sym : nil
+      Analyzer::REPORT_KEYS.include?(key) ? key : Analyzer::REPORT_KEYS.first
+    end
+
+    def desc?
+      @options[:desc]
+    end
+
+    def limit?
+      !limitation.nil?
+    end
+
+    def limitation
+      @options[:limit] ? [@options[:limit].to_i, 0].max : nil
+    end
+
     def find_target_files(paths)
       files = paths.uniq.flat_map do |path|
         if File.directory?(path)
-          Dir.glob("#{path}/**/*").select {|f| File.file?(f) }
+          Dir.glob("#{path}/**/*").select { |f| File.file?(f) }
         else
-          path
+          File.exist?(path) ? path : nil
         end
       end
 
-      files.map {|f| File.expand_path(f) }.uniq
+      files.compact.map { |f| File.expand_path(f) }.uniq
     end
   end
 end

data/lib/sloc/version.rb

@@ -1,3 +1,3 @@
 module Sloc
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

data/sloc.gemspec

@@ -4,24 +4,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sloc/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sloc"
+  spec.name          = 'sloc'
   spec.version       = Sloc::VERSION
-  spec.authors       = ["meganemura"]
-  spec.email         = ["meganemura@users.noreply.github.com"]
+  spec.authors       = ['meganemura']
+  spec.email         = ['meganemura@users.noreply.github.com']
 
-  spec.summary       = "A tool for counting source lines of code"
+  spec.summary       = 'A tool for counting source lines of code'
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/meganemura/sloc"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/meganemura/sloc'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "slop", "~> 3.0"
+  spec.add_dependency 'slop', '~> 3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '>= 1.7'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sloc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - meganemura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -28,16 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: 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: rubocop
+  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'
 description: A tool for counting source lines of code
 email:
 - meganemura@users.noreply.github.com
@@ -76,13 +118,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- circle.yml
 - exe/sloc
 - lib/sloc.rb
 - lib/sloc/analyzer.rb

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.4