gitloc-matthewswan 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03111984ba5bf6b5cc7021c25319be615d53993
-  data.tar.gz: f58cccf412c93dead7ef99dd48120248fac73e28
+  metadata.gz: 055df75ec3be7abd221b94efd9964fab7cf21e51
+  data.tar.gz: 393ff28f6c5d3ad01b8a3289ae22db253246614d
 SHA512:
-  metadata.gz: 918c4d4b835777bb53f64e5b0164f752790e591397a0aeb23d459567554fc66af1b9a2ed2927fe35178621480e154fa360c030f5b150864f2623b1aca1121a71
-  data.tar.gz: 58cc4321c4fa9bb83a0af76e221f52b504226d1219815e2ba6c43f154d993392c3d696ff9b44043c8e6b9e2426ab4a34209da858c00080d03ea14370da556ceb
+  metadata.gz: ffbf4aacbb9288cf1063327960535e59edb74e8a3c73e59bf902a3573b1c818018c333acfcf4f0c3bcc9ffc77fe52085f0da754fb1ac41091dd5ace570c5b8e3
+  data.tar.gz: d6a87b96ad72daddaf6ddf9fc721d6ab98f2a954e3b6e2b314e294618c5790ad664033b71fd0fba28616c5d465ad476d0aee9d830646a6d17d07550a09514e93

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,40 @@
+PATH
+  remote: .
+  specs:
+    gitloc-matthewswan (0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    method_source (0.8.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gitloc-matthewswan!
+  pry
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.11.2

data/bin/gitloc

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'gitloc'
-Gitloc.call(ARGV, $stdout, $stderr)
+require 'gitloc/binary'
+Gitloc::Binary.call(ARGV, $stdout, $stderr)

data/gitloc.gemspec

@@ -10,7 +10,9 @@ Gem::Specification.new do |s|
   s.description = "Example project for the Turing School of Software and Design, see https://github.com/JoshCheek/elective-building-a-gem -- gives lines-of-code information for a git repo."
   s.authors     = ["Matthew Swan"]
   s.email       = 'swanm86@gmail.com'
-  s.files       = Dir["**/*"].select { |f| File.file? f }
+  s.files       = Dir["**/*"].select { |f| File.file? f } - Dir['*.gem']
   s.homepage    = 'https://github.com/MatthewSwan/gitloc'
   s.executables << 'gitloc'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'pry'
 end

data/lib/gitloc.rb

@@ -1,24 +1,21 @@
 require 'tmpdir'
 require 'open3'
 
+require 'gitloc/errors'
 require 'gitloc/version'
+require 'gitloc/line_counts'
 
 class Gitloc
-  def self.call(argv, outstream, errstream)
-    repo = argv.first
-    Dir.mktmpdir { |dir|
+  def self.call(repo)
+    names_to_bodies = Dir.mktmpdir { |dir|
       Dir.chdir dir
       out, err, status = Open3.capture3 'git', 'clone', repo, 'cloned'
-      unless status.success?
-        errstream.puts out, err
-        exit "Failed somehow >.<"
-      end
+      raise RepoDoesNotExistError, repo unless status.success?
       Dir.chdir 'cloned'
-      files = Dir['**/*'].reject { |name| File.directory? name }
-      files.each do |filename|
-        loc = File.readlines(filename).count { |line| line !~ /^\s*$/ }
-        outstream.puts "#{loc}\t#{filename}"
-      end
+      Dir['**/*'].reject { |name| File.directory? name }
+        .map    { |name| [name, File.read(name) ] }
     }
+
+    LineCounts.call(names_to_bodies)
   end
 end

data/lib/gitloc/binary.rb

@@ -0,0 +1,13 @@
+require 'gitloc'
+
+class Gitloc
+  class Binary
+    def self.call(argv, outstream, errstream)
+      repo = argv.first
+      files_to_lines = Gitloc.call(repo)
+      files_to_lines.each do |filename, loc|
+        outstream.puts "#{loc}\t#{filename}"
+      end
+    end
+  end
+end

data/lib/gitloc/errors.rb

@@ -0,0 +1,9 @@
+class Gitloc
+  Error = Class.new StandardError
+
+  class RepoDoesNotExistError < Error
+    def initialize(repo_name)
+      super "#{repo_name} does not exist"
+    end
+  end
+end

data/lib/gitloc/line_counts.rb

@@ -0,0 +1,15 @@
+class Gitloc
+  module LineCounts
+    def self.call(names_to_bodies)
+      names_to_bodies
+        .map    { |name, body| [name, count_lines(body)] }
+        .select { |name, body| body }
+    end
+
+    def self.count_lines(body)
+      body.lines.count { |line| line !~ /^\s*$/ }
+    rescue ArgumentError
+      nil
+    end
+  end
+end

data/lib/gitloc/version.rb

@@ -1,3 +1,3 @@
 class Gitloc
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/gitloc_spec.rb

@@ -0,0 +1,8 @@
+require 'gitloc'
+
+RSpec.describe Gitloc do
+  it 'raises RepoDoesNotExistError when the repo does not exist' do
+    expect { Gitloc.call("not-a-repo") }
+      .to raise_error Gitloc::RepoDoesNotExistError, /not-a-repo/
+  end
+end

data/spec/line_counts_spec.rb

@@ -0,0 +1,27 @@
+require 'gitloc/line_counts'
+
+RSpec.describe Gitloc::LineCounts do
+  it 'returns the counts for each file' do
+    counts = described_class.call([["file1", "l1"],
+                                   ["file2", "l1\nl2\nl3"]])
+    expect(counts).to eq [["file1", 1], ["file2", 3]]
+  end
+
+  it 'does not count empty lines' do
+    counts = described_class.call([["file1", ""]])
+    expect(counts).to eq [["file1", 0]]
+
+    counts = described_class.call([["file1", "\n"]])
+    expect(counts).to eq [["file1", 0]]
+
+    counts = described_class.call([["file1", "\nline1\nline2\n"]])
+    expect(counts).to eq [["file1", 2]]
+  end
+
+  it 'omits files of binary data' do
+    counts = described_class.call([["keep1", ""],
+                                   ["binary", "GIF89a\u0000\u0002\u0000\u0001\xD5\u0000\u0000\xCD\xCF\xCF\u00135A/IR\x89\x91\u0017\x85\x92\x93rx{\xBA\xBC\xBD\n"],
+                                   ["keep2", ""]])
+    expect(counts).to eq [["keep1", 0], ["keep2", 0]]
+  end
+end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gitloc-matthewswan
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Swan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
-dependencies: []
+date: 2016-02-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: Example project for the Turing School of Software and Design, see https://github.com/JoshCheek/elective-building-a-gem
   -- gives lines-of-code information for a git repo.
 email: swanm86@gmail.com
@@ -18,14 +46,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - Readme.md
 - bin/gitloc
 - gitloc.gemspec
 - lib/gitloc.rb
+- lib/gitloc/binary.rb
+- lib/gitloc/errors.rb
+- lib/gitloc/line_counts.rb
 - lib/gitloc/version.rb
-- seeing_is_believing-2.2.0.gem
 - spec/acceptance_spec.rb
 - spec/fixtures/2loc
+- spec/gitloc_spec.rb
+- spec/line_counts_spec.rb
 homepage: https://github.com/MatthewSwan/gitloc
 licenses:
 - MIT