git_snip 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb29f4ae9f8cbad6ba7e9b712f462a1ff4868f6
-  data.tar.gz: 2fd15eef40fac8e8d4ca021f72b5ab13ac49b72b
+  metadata.gz: 971bfdab966edf6e8d0f147bd19f85eb0f72c8ac
+  data.tar.gz: c8c3db3af432f657a11ff0e4bde9d292b26a10b3
 SHA512:
-  metadata.gz: bbfd6dfce8772031e32020ec52c16462360a1e4173c9d339e9f07e9142907fec8f0dfd6be210d2dc80efed8a6268986b51633ce59b492184a67ff37858281166
-  data.tar.gz: e8273c8d9267ed225c84ba0c503fed2aca6275703746fe96a43a7d27ce701a889b5a6b78ee1ea076be4007b7a6aa67b3e1cb9c4017a9caea6438532395f0b898
+  metadata.gz: b5d5cff6b4b5e2ba9b495925283b30d16e042a8c7b81e94ccc0f81b96acb71035fdf030927871593d69744ca2f2719c5edc08c569e0f454d72bdd57e0da511a0
+  data.tar.gz: c55e1e8fbe97572c4b8b858c65f4509170d87ac4d5f6e59c6c8899756cbca9650d05fc1679d900e5a9c9d349359c8ed152e99ea1e515398ee52c90dae6a3dfff

data/.travis.yml

@@ -2,7 +2,7 @@ before_script:
   - git config --global user.email "you@example.com"
   - git config --global user.name "Your Name"
 
-script: bundle exec rspec
+script: CODECLIMATE_REPO_TOKEN=ea0ada8842b47f59715526e88df53a81afff061152ce67bb73a8baa75443ea43 bundle exec rspec
 
 rvm:
   - 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master (unreleased)
 
+## 0.0.3
+
+* Fix missing new line after each branch line.
+* Fix bad formatting of multiline commit message.
+
 ## 0.0.2
 
 * Fix: dry-run doesn't take ignore argument.

data/Gemfile

@@ -8,3 +8,7 @@ group :dev do
   gem 'guard', '~> 2.11.1'
   gem 'guard-rspec', '~> 4.5.0'
 end
+
+group :test do
+  gem 'codeclimate-test-reporter', require: nil
+end

data/README.md

@@ -1,6 +1,8 @@
 # git-snip
 
 [![Build Status](https://travis-ci.org/htanata/git_snip.svg?branch=master)](https://travis-ci.org/htanata/git_snip)
+[![Code Climate](https://codeclimate.com/github/htanata/git_snip/badges/gpa.svg)](https://codeclimate.com/github/htanata/git_snip)
+[![Test Coverage](https://codeclimate.com/github/htanata/git_snip/badges/coverage.svg)](https://codeclimate.com/github/htanata/git_snip)
 
 Clean obsolete branches on your git repository safely.
 
@@ -28,7 +30,7 @@ And then execute:
 
 ## Usage
 
-Show branches which would be deleted:
+Show branches which would be deleted (accepts the same arguments as `-f`):
 
     $ git snip -n
 

data/git_snip.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Hendy Tanata"]
   spec.email         = ["htanata@gmail.com"]
   spec.summary       = %q{Clean obsolete branches on your local git repository safely}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/htanata/git_snip"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0") - %w(Guardfile)
@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_runtime_dependency "git"
   spec.add_runtime_dependency "thor"
 

data/lib/git_snip/branch.rb

@@ -0,0 +1,26 @@
+module GitSnip
+  module Branch
+    class Column < Struct.new(:sha, :name, :date, :author, :message)
+    end
+
+    def self.columnize(branch)
+      Column.new.tap do |column|
+        column.sha = column(branch.gcommit.sha, 7)
+        column.name = column(branch.name, 12)
+        column.date = column(branch.gcommit.date.strftime('%F'), 10)
+        column.author = column(branch.gcommit.author.email.sub(/@.*/, ''), 8)
+        column.message = column(first_line(branch.gcommit.message), 39)
+      end
+    end
+
+    private
+
+    def self.column(string, width)
+      string[0, width].ljust(width)
+    end
+
+    def self.first_line(string)
+      string.gsub(/[\r\n].*/, '')
+    end
+  end
+end

data/lib/git_snip/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'git_snip/cleaner'
+require 'git_snip/branch'
 
 module GitSnip
   class CLI < Thor
@@ -33,8 +34,7 @@ module GitSnip
 
       cleaner = GitSnip::Cleaner.new(*cleaner_args)
 
-      say 'Deleting the following branches...', :green
-      say
+      say "Deleting the following branches...\n\n", :green
 
       deleted_branches = cleaner.delete_merged_branches do |branch|
         say_branch_info(branch)
@@ -44,7 +44,7 @@ module GitSnip
       if deleted_branches.empty?
         say 'No branches were deleted.', :green
       else
-        say "\n\nDone.", :green
+        say "\nDone.", :green
       end
     end
     default_task :snip
@@ -54,8 +54,7 @@ module GitSnip
     def dry_run
       cleaner = GitSnip::Cleaner.new(*cleaner_args)
 
-      say 'Would delete the following branches...', :green
-      say
+      say "Would delete the following branches...\n\n", :green
 
       merged_branches = cleaner.merged_branches
 
@@ -64,22 +63,20 @@ module GitSnip
       end
 
       if merged_branches.any?
-        say "\n\nDone.", :green
+        say "\nDone.", :green
       else
         say 'No branches would be deleted.', :green
       end
     end
 
     def say_branch_info(branch)
-      say column(branch.gcommit.sha, 7), :yellow
-      say column(branch.name, 12), :magenta
-      say column(branch.gcommit.date.strftime('%F'), 10), :green
-      say column(branch.gcommit.author.email.sub(/@.*/, ''), 8), [:blue, :bold]
-      say column(branch.gcommit.message, 39, last: true)
-    end
-
-    def column(string, width, last: false)
-      string[0, width].ljust(last ? width : width + 1)
+      Branch.columnize(branch).tap do |column|
+        say column.sha + ' ', :yellow
+        say column.name + ' ', :magenta
+        say column.date + ' ', :green
+        say column.author + ' ', [:blue, :bold]
+        say column.message.strip + "\n"
+      end
     end
 
     def cleaner_args

data/lib/git_snip/version.rb

@@ -1,3 +1,3 @@
 module GitSnip
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/git_snip/branch_spec.rb

@@ -0,0 +1,43 @@
+require 'git_snip/branch'
+
+RSpec.describe GitSnip::Branch do
+  it 'should return values with number of characters within 80' do
+    result = described_class.columnize(build_branch(build_column))
+
+    expect([
+      result.sha, result.name, result.author, result.date, result.message
+    ].join(' ').size).to eq(80)
+  end
+
+  it 'should remove message starting from the first new line' do
+    column = build_column(message: "First line\n\nThird line")
+    result = described_class.columnize(build_branch(column))
+
+    expect(result.message).to eq('First line' + (' ' * 29))
+  end
+
+  def build_branch(column)
+    author = instance_double('Git::Author', email: column.author)
+
+    gcommit = instance_double(
+      'Git::Gcommit',
+      sha: column.sha,
+      date: column.date,
+      message: column.message,
+      author: author
+    )
+
+    instance_double('Git::Branch', name: column.name, gcommit: gcommit)
+  end
+
+  def build_column(attrs = {})
+    described_class::Column.new.tap do |column|
+      column.sha = attrs[:sha] || '28720606978a7257f735ce67df50bc55ccf1c138'
+      column.name = attrs[:name] || 'a_pretty_long_branch_name'
+      column.author = attrs[:author] || 'inigo_montoya@example.com'
+      column.date = attrs[:date] || Time.now
+      column.message = attrs[:message] || 'Hello, my name is Inigo Montoya.'
+    end
+  end
+
+end

data/spec/lib/git_snip/cli_spec.rb

@@ -129,4 +129,14 @@ RSpec.describe GitSnip::CLI do
       expect(exitstatus).to eq(0)
     end
   end
+
+  describe 'branch formatting' do
+    it 'should add new line after each branch line' do
+      setup_basic_repo
+
+      stdout, _, _ = git_snip('--dry-run')
+
+      expect(stdout).to match(/merged.+Version 2\n/)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 Dir['spec/support/**/*.rb'].each { |f| require f.sub(/\Aspec\//, '') }
 
 # This file was generated by the `rspec --init` command. Conventionally, all

data/spec/support/cli_helper.rb

@@ -1,12 +1,31 @@
-require 'open3'
+require 'git_snip/cli'
+require_relative 'cli_runner'
 
 module CliHelper
+  class FakeKernel
+    attr_reader :exitstatus
+
+    def initialize
+      @exitstatus = 0
+    end
+
+    def exit(exitstatus)
+      @exitstatus = exitstatus
+    end
+  end
+
   def git_snip(args = '')
-    cmd = "#{Gem.ruby} -I#{lib} #{bin} #{cmd} #{args} --repo=#{repo.path}"
+    stdin, stdout, stderr = Array.new(3) { StringIO.new }
+
+    runner =
+      GitSnip::CLIRunner.new("#{args} --repo=#{repo.path}".split(' '),
+        stdin, stdout, stderr, FakeKernel.new)
+
+    exitstatus = runner.execute!
 
-    stdout, stderr, status = Open3.capture3(cmd)
+    [stdin, stdout, stderr].each(&:rewind)
 
-    [stdout, stderr, status.exitstatus]
+    [stdout.read, stderr.read, exitstatus]
   end
 
   def setup_basic_repo

data/spec/support/cli_runner.rb

@@ -0,0 +1,54 @@
+require 'git_snip/cli'
+
+# https://github.com/erikhuda/thor/wiki/Integrating-with-Aruba-In-Process-Runs
+module GitSnip
+  class CLIRunner
+    # Allow everything fun to be injected from the outside while defaulting to
+    # normal implementations.
+    def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+      @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    end
+
+    def execute!
+      exit_code = begin
+        # Thor accesses these streams directly rather than letting them be
+        # injected, so replace them.
+        $stderr = @stderr
+        $stderr = @stderr
+        $stdin = @stdin
+        $stdout = @stdout
+
+        GitSnip::CLI.start(@argv)
+
+        # Thor::Base#start does not have a return value, assume success if no
+        # exception is raised.
+        0
+      rescue StandardError => e
+        # The ruby interpreter would pipe this to STDERR and exit 1 in the case
+        # of an unhandled exception.
+        b = e.backtrace
+        @stderr.puts("#{b.shift}: #{e.message} (#{e.class})")
+        @stderr.puts(b.map{|s| "\tfrom #{s}"}.join("\n"))
+        1
+      rescue SystemExit => e
+        e.status
+      ensure
+        # Reset your app here, free up resources, etc.
+        # Examples:
+        # MyApp.logger.flush
+        # MyApp.logger.close
+        # MyApp.logger = nil
+        #
+        # MyApp.reset_singleton_instance_variables
+
+        # Then we put the streams back.
+        $stderr = STDERR
+        $stdin = STDIN
+        $stdout = STDOUT
+      end
+
+      # Proxy our exit code back to the injected kernel.
+      @kernel.exit(exit_code)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_snip
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hendy Tanata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -99,15 +99,18 @@ files:
 - bin/git-snip
 - git_snip.gemspec
 - lib/git_snip.rb
+- lib/git_snip/branch.rb
 - lib/git_snip/cleaner.rb
 - lib/git_snip/cli.rb
 - lib/git_snip/version.rb
+- spec/lib/git_snip/branch_spec.rb
 - spec/lib/git_snip/cleaner_spec.rb
 - spec/lib/git_snip/cli_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
+- spec/support/cli_runner.rb
 - spec/support/repo.rb
-homepage: ''
+homepage: https://github.com/htanata/git_snip
 licenses:
 - MIT
 metadata: {}
@@ -119,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,8 +135,10 @@ signing_key:
 specification_version: 4
 summary: Clean obsolete branches on your local git repository safely
 test_files:
+- spec/lib/git_snip/branch_spec.rb
 - spec/lib/git_snip/cleaner_spec.rb
 - spec/lib/git_snip/cli_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
+- spec/support/cli_runner.rb
 - spec/support/repo.rb