weekly_commits 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e78ccbd42e1701cc41a936e07973e61c11318b86
-  data.tar.gz: ef667d7c3fb3404be594a17f44a6d361cff23027
+SHA256:
+  metadata.gz: e675ecdad9d744598bf5130689f18e3e4bbd456fa9c03a0dc27850fda1568ae5
+  data.tar.gz: 4533e14f2e66fe685599a99e31ee07abf45b46a4d21e0ebcb1326dcab65659dd
 SHA512:
-  metadata.gz: 3216a4f3db74910bea407af5eb559d583475eac519dae682471e8056250b17ecb6f52601e26ba7aeb8550b5f8ceb91397fa77b30ca70b0c012d59fa5761398dc
-  data.tar.gz: 64bcf59f6136427ce0439bf24276074f4343e3f3accde23145a6cf143325261611c1d7485a273325efaa97371656a533164b5fab29a43a203fbd07bc349326a0
+  metadata.gz: 8d55256b26a929b9bb52069c7d23f4f1f9adafc9048f6b78342d83ec1d7b7ee7c9c686f5de235331ef578c791419ed47a489755700ec5df8541652af471b3b12
+  data.tar.gz: 658b7a2c95db0610a148c2461fa110ae04ece70ad7215a57c6ab306d59836d5e61df8927e5974070aaf21b7ca5e245f5779494d716e1692e7b90deac4a61902f

data/README.md

@@ -1,4 +1,6 @@
-# WeeklyCommits
+![WeeklyCommits](weekly_commits.png)
+
+[![Build Status](https://travis-ci.org/dkarter/weekly_commits.svg?branch=master)](https://travis-ci.org/dkarter/weekly_commits)
 
 WeeklyCommits is a command line tool for getting a bird's eye view of your
 commits on a branch for a specific week.
@@ -39,16 +41,21 @@ Usage:
 Options:
   -w, [--week=N]                                 # Relative week number. e.g. -w=1 for last week. 0 = current week.
                                                  # Default: 0
-      [--show-author], [--no-show-author]        # Display author(s) with each commit message. e.g. Did stuff (Dorian Karter)
+      [--show-author], [--no-show-author]        # Display author(s) with each commit message. e.g. Did stuff (Ghost Ninja)
+      [--no-merge]                               # Omit merge commit messages
       [--sort=SORT]                              # Show commits in ascending/descending order. Default: older commits on top, newer on bottom.
                                                  # Default: desc
                                                  # Possible values: asc, desc
 ```
 
-### Example
+To use the gem, navigate to a repo and make sure you have the WeeklyCommits gem
+installed for that version of ruby in that directory.
+
+Make sure you are on the correct branch.
 
-First navigate to a repo and make sure you have the WeeklyCommits gem installed
-for that version of ruby in that directory.
+By default WeeklyCommits will only show commits on the current branch.
+
+### Example
 
 Show me this week's commits:
 
@@ -56,33 +63,25 @@ Show me this week's commits:
 wcomm
 ```
 
-Show me last weeks commits:
+Show me last week's commits:
 
 ```sh
 wcomm -w=1
 ```
 
-Show me commits from two weeks ago including committer
+Show me commits from two weeks ago including author
 
 ```sh
 wcomm -w=2 --show-author
 ```
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run
-`rake spec` to run the tests. You can also run `bin/console` for an interactive
-prompt that will allow you to experiment.
+### Screenshots
 
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+![tilex](screenshots/tilex.png)
 
 ## TODO
 
-- [ ] Add support for multiple branches
+- [ ] Add support for specifying a branch explicitly
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "weekly_commits"
+require 'bundler/setup'
+require 'weekly_commits'
 
 # 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.
@@ -10,5 +10,5 @@ require "weekly_commits"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/weekly_commits.rb

@@ -2,5 +2,4 @@ require 'weekly_commits/version'
 require 'weekly_commits/cli'
 
 module WeeklyCommits
-
 end

data/lib/weekly_commits/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'colorize'
 require 'active_support/all'
@@ -8,25 +10,27 @@ module WeeklyCommits
     default_task :weekly_commits
 
     desc 'weekly_commits', '[DEFAULT] Lists commits for a specified week'
-    method_option :week, {
-      type: :numeric,
-      desc: 'Relative week number. e.g. -w=1 for last week. 0 = current week.',
-      aliases: '-w',
-      default: 0,
-    }
-
-    method_option :show_author, {
-      type: :boolean,
-      desc: 'Display author(s) with each commit message. e.g. Did stuff (Dorian Karter)',
-      default: false,
-    }
-
-    method_option :sort, {
-      type: :string,
-      desc: 'Show commits in ascending/descending order. Default: older commits on top, newer on bottom.',
-      default: 'asc',
-      enum: ['asc','desc'],
-    }
+    method_option :week,
+                  type: :numeric,
+                  desc: 'Relative week number. e.g. -w=1 for last week. 0 = current week.',
+                  aliases: '-w',
+                  default: 0
+
+    method_option :show_author,
+                  type: :boolean,
+                  desc: 'Display author(s) with each commit message. e.g. Did stuff (Ghost Ninja)',
+                  default: false
+
+    method_option :sort,
+                  type: :string,
+                  desc: 'Show commits in ascending/descending order. Default: older commits on top, newer on bottom.',
+                  default: 'asc',
+                  enum: %w[asc desc]
+
+    method_option :no_merge,
+                  type: :boolean,
+                  desc: 'Exclude merge commits',
+                  default: false
 
     def weekly_commits
       relative_week = options[:week]
@@ -39,8 +43,9 @@ module WeeklyCommits
         committer = options[:show_author] ? ' (%cn)'.magenta : ''
 
         commits = `git --no-pager log --after='#{git_date_format} 00:00' --before='#{git_date_format} 23:59' --pretty=format:'%s#{committer}'`
+        commits += ' --no-merges' if options[:no_merge]
 
-        commits = commits.lines.reverse if options[:sort].downcase == 'asc'
+        commits = commits.lines.reverse if options[:sort].casecmp('asc').zero?
 
         puts week_title.yellow
         puts commits

data/lib/weekly_commits/version.rb

@@ -1,3 +1,3 @@
 module WeeklyCommits
-  VERSION = "1.1.0"
+  VERSION = '1.2.0'.freeze
 end

data/weekly_commits.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'weekly_commits/version'
 
@@ -9,22 +8,22 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Dorian Karter']
   spec.email         = ['jobs@doriankarter.com']
 
-  spec.summary       = %q{List your commits on a project for every day of a specified week}
+  spec.summary       = 'List your commits on a project for every day of a specified week'
   spec.homepage      = 'http://doriankarter.com'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|screenshots)/}) }
   spec.bindir        = 'bin'
   spec.executables   = ['wcomm']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', "~> 1.11"
-  spec.add_development_dependency 'rake', "~> 10.0"
-  spec.add_development_dependency 'rspec', "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
   # runtime dependencies
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weekly_commits
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dorian Karter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +130,7 @@ files:
 - lib/weekly_commits/cli.rb
 - lib/weekly_commits/version.rb
 - weekly_commits.gemspec
+- weekly_commits.png
 homepage: http://doriankarter.com
 licenses:
 - MIT
@@ -149,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: List your commits on a project for every day of a specified week