gitloc-marissa 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9581a63ce3be83e4e4655e43c15aef45b9bbe9cc58b2efd4b31d48c383e91a8b
-  data.tar.gz: 1377b5a374c082b687dcbe7ee491fec0ab46ee10ad6c6598085f2bda2641ab96
+  metadata.gz: 1ab9ef37c6d4d357c645035cea12eff17c21a46d200ce254f209775ad794cb89
+  data.tar.gz: b594f3914dc4b6497b61c3b634422b72842002d5d47ba59a9a5d611bd5e54730
 SHA512:
-  metadata.gz: fdc9c010737cf5f365dd13a97b8223cd924006eb2db76e75e9e37edef3479b7b1fe259cd749a61b77093a8e8a9afd632a3160d91bd2aea8bffd4269a9c25f832
-  data.tar.gz: '04788c9756b9662debe56856347fb2ea1c707f703c90925357c189bfcd47d44b76af68ca1a688450bd4aac91a9d02d45771753d837689bfc9f4cbee12e52b96c'
+  metadata.gz: d45da33a4946d516a0d7e140257ee95bfdff28845a624c61fa8059253cf2727e28f392f73164a6140c7c5a210fb56ee49c3b432686fb960d8a5f27337dc17560
+  data.tar.gz: 1a1c577144851179fa93b0346f9f0d7e22df3798f71e8f27fee48aa39531e7f3a1b5d5d1187c40822b80b040384f5721be7b0b7f9d909511af8ebeb5f5104b14

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    gitloc-marissa (0.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gitloc-marissa!
+  pry
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.1.4

data/bin/gitloc

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

data/gitloc-marissa.gemspec

@@ -12,4 +12,6 @@ Gem::Specification.new do |s|
   s.files       = Dir["**/*"].select { |f| File.file? f } - Dir["*.gem"]
   s.homepage    = 'https://github.com/JoshCheek/elective-building-a-gem'
   s.executables << 'gitloc'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'pry'
 end

data/lib/gitloc_marissa.rb

@@ -1,24 +1,26 @@
 require 'tmpdir'
 require 'open3'
 require 'gitloc_marissa/version'
+require 'gitloc_marissa/errors'
+require 'gitloc_marissa/line_counts'
 
 class GitlocMarissa
-  def self.call(argv, outstream, errstream)
-    repo = argv.first
+  def self.call(repo)
+    files_and_bodies = Dir.mktmpdir do |dir|
+      Dir.chdir dir do
+        out, err, status = Open3.capture3 'git', 'clone', repo, 'cloned'
 
-    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
-      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}"
+        raise RepoDoesNotExistError, repo unless status.success?
+
+        Dir.chdir 'cloned' do
+          files = Dir['**/*'].reject { |name| File.directory? name }
+          files.map do |file|
+            body = File.read(file)
+            [file, body]
+          end
+        end
       end
-    }
+    end
+    LineCounts.call(files_and_bodies)
   end
 end

data/lib/gitloc_marissa/binary.rb

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

data/lib/gitloc_marissa/errors.rb

@@ -0,0 +1,4 @@
+class GitlocMarissa
+  Error = Class.new StandardError
+  RepoDoesNotExistError = Class.new Error
+end

data/lib/gitloc_marissa/line_counts.rb

@@ -0,0 +1,12 @@
+class GitlocMarissa
+  module LineCounts
+    def self.call(files_and_bodies)
+      files_and_counts = files_and_bodies.map do |file, body|
+        count = body.lines.count { |line| line !~ /^\s*$/ }
+        [file, count]
+      rescue ArgumentError
+      end
+      files_and_counts.compact
+    end
+  end
+end

data/lib/gitloc_marissa/version.rb

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

data/spec/gitloc_marissa_spec.rb

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

data/spec/line_counts_spec.rb

@@ -0,0 +1,27 @@
+require 'gitloc_marissa/line_counts'
+
+RSpec.describe GitlocMarissa::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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitloc-marissa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marissa Biesecker
@@ -9,7 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-11-17 00:00:00.000000000 Z
-dependencies: []
+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: marissa.biesecker@gmail.com
@@ -18,13 +46,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - README.md
 - bin/gitloc
 - gitloc-marissa.gemspec
 - lib/gitloc_marissa.rb
+- lib/gitloc_marissa/binary.rb
+- lib/gitloc_marissa/errors.rb
+- lib/gitloc_marissa/line_counts.rb
 - lib/gitloc_marissa/version.rb
 - spec/acceptance_spec.rb
 - spec/fixtures/2loc
+- spec/gitloc_marissa_spec.rb
+- spec/line_counts_spec.rb
 homepage: https://github.com/JoshCheek/elective-building-a-gem
 licenses:
 - MIT