git_snip 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20a58119f68056d5761981e0440ba321231416d
-  data.tar.gz: 8c095dc7ee582d109391f0ab07dab8fe0c48fc13
+  metadata.gz: 1821b121c5779025b31a185db88508692503638a
+  data.tar.gz: 325f84bb5bcf7124fc9ce9b3836885813f5b2f22
 SHA512:
-  metadata.gz: bb771326cd8b86b479b7ce7c9ae1a7f23758327445370b65cc682e7537bf10a07ca08df7b0bf7bb2cbcd0be2feaa9e88ec7c5e106b0220d50d79c80d7b7b5b38
-  data.tar.gz: ce9d2f055e48b91d10422ffefcc7cf3983774a72b0c979a014773fb933a831ea1177ae13c61c00ea2dec62e7afe9f84d7b75eaf4d3203faff0409acaf26ab874
+  metadata.gz: 85454425cbcfe23ed00f5c40a07e8157be5ec24181b45fe491deb53c6d8a567dbebf1872a4287fc56d2d572759e564dd57de23b5c4171cccf38084553f9339bb
+  data.tar.gz: d337e1dd14cbc59f54e7191f1c3972744bb325d8697d8e1a354e909f3473b226adae03bf6830d80d4e6e849715950cd02140b17a71bd9943abc668c3bd74f031

data/.travis.yml

@@ -1,14 +1,17 @@
+before_install:
+  - gem update bundler
+
 before_script:
   - git config --global user.email "you@example.com"
   - git config --global user.name "Your Name"
 
-script: CODECLIMATE_REPO_TOKEN=ea0ada8842b47f59715526e88df53a81afff061152ce67bb73a8baa75443ea43 bundle exec rspec
+script: CODECLIMATE_REPO_TOKEN=ea0ada8842b47f59715526e88df53a81afff061152ce67bb73a8baa75443ea43 bundle exec rspec && bundle exec codeclimate-test-reporter
 
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2.0
-  - rbx-2
+  - 2.3.0
+  - 2.4.0
   - ruby-head
 
 cache: bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master (unreleased)
 
+## 0.0.5
+
+* Fix: --full option does not work for some (#1).
+
 ## 0.0.4
 
 * Add config file.

data/Gemfile

@@ -10,5 +10,6 @@ group :dev do
 end
 
 group :test do
-  gem 'codeclimate-test-reporter', require: nil
+  gem 'simplecov'
+  gem 'codeclimate-test-reporter', '~> 1.0.0', require: nil
 end

data/README.md

@@ -12,6 +12,8 @@ deleted and will build up, making it harder to find your relevant branches.
 This gem aims to fix that by doing using [`git cherry`][git-cherry] to find
 local branches which have been merged and delete them.
 
+[![asciicast](https://asciinema.org/a/32614.png)](https://asciinema.org/a/32614)
+
 ## Installation
 
 Install using RubyGems:
@@ -30,6 +32,21 @@ And then execute:
 
 ## Usage
 
+You can list the available options from command line:
+
+    $ git snip help
+    Usage:
+      git-snip
+    Options:
+      -f, [--force]                    # Will refuse to run unless given -f or -n.
+      -n, [--dry-run], [--no-dry-run]  # Show branches which would be deleted.
+          [--repo=<path>]              # Path to git repository.
+                                       # Default: .
+          [--target=<branch>]          # Branch to compare equivalence against.
+                                       # Default: master
+          [--ignore=one two three]     # List of branches to ignore.
+          [--full], [--no-full]        # Show most branch information without cropping.
+
 Show branches which would be deleted (accepts the same arguments as `-f`):
 
     $ git snip -n
@@ -55,10 +72,6 @@ Delete branches already merged to `branch_a`:
 
     $ git snip -f --target=branch_a
 
-You can also list the available options from command line:
-
-    $ git snip help
-
 ## Config file
 
 If you want some arguments to always be set, add a file to the root of the

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require "bundler/gem_tasks"

data/bin/git-snip

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'git_snip/cli'
 

data/lib/git_snip/branch.rb

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

data/lib/git_snip/cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 
 module GitSnip

data/lib/git_snip/cli.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'git_snip/cleaner'
 require 'git_snip/branch'
 require 'git_snip/config'
+require 'git_snip/printer'
+require 'git_snip/options'
 
 module GitSnip
   class CLI < Thor
@@ -17,7 +21,7 @@ module GitSnip
       desc: 'Will refuse to run unless given -f or -n.'
 
     option :dry_run, type: :boolean, aliases: '-n',
-      desc: "Show branches which would be deleted."
+      desc: 'Show branches which would be deleted.'
 
     option :repo, default: '.', banner: '<path>',
       desc: 'Path to git repository.'
@@ -38,23 +42,23 @@ module GitSnip
       end
 
       if !opts[:force]
-        say '-f option is needed to delete branches.', :red
+        printer.force_option_needed
         exit 64
       end
 
       cleaner = GitSnip::Cleaner.new(*cleaner_args)
 
-      say "Deleting the following branches...\n\n", :green
+      printer.deleting_branches
 
       deleted_branches = cleaner.delete_merged_branches do |branch|
-        say_branch_info(branch)
+        printer.branch_info(branch_row(branch))
         true
       end
 
       if deleted_branches.empty?
-        say 'No branches were deleted.', :green
+        printer.no_branches_deleted
       else
-        say "\nDone.", :green
+        printer.done
       end
     end
     default_task :snip
@@ -64,54 +68,35 @@ module GitSnip
     def dry_run
       cleaner = GitSnip::Cleaner.new(*cleaner_args)
 
-      say "Would delete the following branches...\n\n", :green
+      printer.will_delete_branches
 
       merged_branches = cleaner.merged_branches
 
       merged_branches.each do |branch|
-        say_branch_info(branch)
+        printer.branch_info(branch_row(branch))
       end
 
       if merged_branches.any?
-        say "\nDone.", :green
+        printer.done
       else
-        say 'No branches would be deleted.', :green
+        printer.no_branches_to_delete
       end
     end
 
-    def say_branch_info(branch, full = false)
-      row = opts[:full] ? Branch.full_row(branch) : Branch.row(branch)
-
-      say row.sha + ' ', :yellow
-      say row.name + ' ', :magenta
-      say row.date + ' ', :green
-      say row.author + ' ', [:blue, :bold]
-      say row.message.strip + "\n"
-    end
-
     def cleaner_args
       opts.values_at(:repo, :target, :ignore)
     end
 
     def opts
-      @opts ||= begin
-        config = Config.new(options[:repo])
-
-        options_dup = options.dup
-
-        options_dup.each_pair do |k, v|
-          if v.is_a?(Array) && v.empty?
-            config_value = config.options[k]
+      @opts ||= Options.merge(options, Config.new(options[:repo]).options)
+    end
 
-            if config_value.is_a?(Array) && config_value.any?
-              options_dup[k] = config_value
-            end
-          end
-        end
+    def printer
+      @printer ||= Printer.new(self)
+    end
 
-        Thor::CoreExt::HashWithIndifferentAccess.new(
-          config.options.merge(options_dup)).freeze
-      end
+    def branch_row(branch)
+      opts[:full] ? Branch.full_row(branch) : Branch.row(branch)
     end
   end
 end

data/lib/git_snip/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module GitSnip

data/lib/git_snip/options.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'thor'
+
+module GitSnip
+  module Options
+    def self.merge(primary = {}, secondary = {})
+      primary = primary.dup
+
+      primary.each_pair do |k, v|
+        if v.is_a?(Array) && v.empty?
+          secondary_value = secondary[k]
+
+          if secondary_value.is_a?(Array) && secondary_value.any?
+            primary[k] = secondary_value
+          end
+        end
+      end
+
+      Thor::CoreExt::HashWithIndifferentAccess.new(
+        secondary.merge(primary)).freeze
+    end
+  end
+end

data/lib/git_snip/printer.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module GitSnip
+  class Printer
+    def initialize(cli)
+      @cli = cli
+    end
+
+    def force_option_needed
+      @cli.say '-f option is needed to delete branches.', :red
+    end
+
+    def deleting_branches
+      @cli.say "Deleting the following branches...\n\n", :green
+    end
+
+    def no_branches_deleted
+      @cli.say 'No branches were deleted.', :green
+    end
+
+    def will_delete_branches
+      @cli.say "Would delete the following branches...\n\n", :green
+    end
+
+    def no_branches_to_delete
+      @cli.say 'No branches would be deleted.', :green
+    end
+
+    def done
+      @cli.say "\nDone.", :green
+    end
+
+    def branch_info(row)
+      @cli.say row.sha + ' ', :yellow
+      @cli.say row.name + ' ', :magenta
+      @cli.say row.date + ' ', :green
+      @cli.say row.author + ' ', [:blue, :bold]
+      @cli.say row.message.strip + "\n"
+    end
+  end
+end

data/lib/git_snip/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitSnip
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/git_snip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "git_snip/version"
 
 require "git_snip/cleaner"

data/spec/lib/git_snip/branch_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/branch'
 
 RSpec.describe GitSnip::Branch do
@@ -58,5 +60,4 @@ RSpec.describe GitSnip::Branch do
       row.message = attrs[:message] || 'Hello, my name is Inigo Montoya.'
     end
   end
-
 end

data/spec/lib/git_snip/cleaner_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/cleaner'
 
 RSpec.describe GitSnip::Cleaner do

data/spec/lib/git_snip/cli_help_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/cli'
 
 RSpec.describe GitSnip::CLI, 'help' do

data/spec/lib/git_snip/cli_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/cli'
 
 RSpec.describe GitSnip::CLI do

data/spec/lib/git_snip/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/config'
 
 RSpec.describe GitSnip::Config do

data/spec/lib/git_snip/options_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'git_snip/options'
+
+RSpec.describe GitSnip::Options do
+  describe '#merge' do
+    it 'should return HashWithIndifferentAccess' do
+      expect(described_class.merge)
+        .to be_a(Thor::CoreExt::HashWithIndifferentAccess)
+    end
+
+    it 'should return a frozen object' do
+      expect(described_class.merge).to be_frozen
+    end
+
+    it 'should prioritize primary' do
+      expect(described_class.merge({ a: 1 }, { a: 2 })).to eq('a' => 1)
+    end
+
+    specify 'false on primary should override true on secondary' do
+      expect(described_class.merge({ a: false }, { a: true })).to eq('a' => false)
+    end
+
+    specify 'empty array on secondary should not override' do
+      expect(described_class.merge({ a: [1] }, { a: [] })).to eq('a' => [1])
+    end
+
+    specify 'empty array on primary should be overridden' do
+      expect(described_class.merge({ a: [] }, { a: [2] })).to eq('a' => [2])
+    end
+  end
+end

data/spec/lib/git_snip/printer_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'git_snip/printer'
+
+RSpec.describe GitSnip::Printer do
+  [
+    [:force_option_needed, '-f option is needed to delete branches.', :red],
+    [:deleting_branches, "Deleting the following branches...\n\n", :green],
+    [:no_branches_deleted, 'No branches were deleted.', :green],
+    [:will_delete_branches, "Would delete the following branches...\n\n", :green],
+    [:no_branches_to_delete, 'No branches would be deleted.', :green],
+    [:done, "\nDone.", :green]
+  ].each do |method, text, color|
+    describe "##{method}" do
+      let(:sayer) { spy('sayer') }
+      let(:printer) { described_class.new(sayer) }
+
+      it "should print #{text.inspect} in #{color}" do
+        printer.send(method)
+        expect(sayer).to have_received(:say).with(text, color)
+      end
+    end
+  end
+
+  describe '#branch_info' do
+    let(:sayer) { spy('sayer') }
+    let(:printer) { described_class.new(sayer) }
+
+    it 'should print a row of branch info' do
+      printer.branch_info(row_double)
+
+      expect(sayer).to have_received(:say).with('sha ', :yellow).ordered
+      expect(sayer).to have_received(:say).with('name ', :magenta).ordered
+      expect(sayer).to have_received(:say).with('date ', :green).ordered
+      expect(sayer).to have_received(:say).with('author ', [:blue, :bold]).ordered
+      expect(sayer).to have_received(:say).with("hello world\n").ordered
+    end
+
+    it 'should strip the last row and append new line' do
+      printer.branch_info(row_double(message: " hello world \n\n\n"))
+
+      expect(sayer).to have_received(:say).with("hello world\n")
+    end
+
+    def row_double(attrs = {})
+      instance_double('GitSnip::Branch::Row', {
+        sha: 'sha',
+        name: 'name',
+        date: 'date',
+        author: 'author',
+        message: 'hello world'
+      }.merge(attrs))
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start
 
 Dir['spec/support/**/*.rb'].each { |f| require f.sub(/\Aspec\//, '') }
 

data/spec/support/cli_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/cli'
 require_relative 'cli_runner'
 

data/spec/support/cli_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_snip/cli'
 
 # https://github.com/erikhuda/thor/wiki/Integrating-with-Aruba-In-Process-Runs
@@ -28,7 +30,7 @@ module GitSnip
         # of an unhandled exception.
         b = e.backtrace
         @stderr.puts("#{b.shift}: #{e.message} (#{e.class})")
-        @stderr.puts(b.map{|s| "\tfrom #{s}"}.join("\n"))
+        @stderr.puts(b.map { |s| "\tfrom #{s}" }.join("\n"))
         1
       rescue SystemExit => e
         e.status

data/spec/support/config_shared_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 shared_context 'config' do

data/spec/support/repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 
 class Repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_snip
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hendy Tanata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -103,12 +103,16 @@ files:
 - lib/git_snip/cleaner.rb
 - lib/git_snip/cli.rb
 - lib/git_snip/config.rb
+- lib/git_snip/options.rb
+- lib/git_snip/printer.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_help_spec.rb
 - spec/lib/git_snip/cli_spec.rb
 - spec/lib/git_snip/config_spec.rb
+- spec/lib/git_snip/options_spec.rb
+- spec/lib/git_snip/printer_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/cli_runner.rb
@@ -134,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Clean obsolete branches on your local git repository safely
@@ -144,6 +148,8 @@ test_files:
 - spec/lib/git_snip/cli_help_spec.rb
 - spec/lib/git_snip/cli_spec.rb
 - spec/lib/git_snip/config_spec.rb
+- spec/lib/git_snip/options_spec.rb
+- spec/lib/git_snip/printer_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/cli_runner.rb