bigtiger-rolex 0.1.2 → 0.2.0

data/Rakefile

@@ -9,6 +9,9 @@ begin
     gem.email = "dev+bigtiger+sandro@hashrocket.com"
     gem.homepage = "http://github.com/bigtiger/rolex"
     gem.authors = ["bigtiger", "sandro"]
+    gem.add_dependency('mojombo-grit', '>= 1.1.1')
+    gem.add_dependency('mojombo-chronic', '>= 0.3.0')
+    gem.add_dependency('trollop', '>= 1.14')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/rolex

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__) + "/../lib"))
+require 'rolex'
+
+opts = Trollop.options do
+  banner <<-EOS
+Rolex is awesome
+Examples:
+    rolex --author 'Sandro Turriate' --project '.' --date 'two days ago'
+    rolex --author 'sandro' --project '.' last week
+    rolex --author 'sandro' --project '.' this week
+
+Usage:
+    rolex [options]
+where [options] are:
+EOS
+
+  opt :author, "Name of the git author", :type => String, :required => true
+  opt :project, "Directory with the git repo", :type => String, :default => Dir.pwd
+  opt :date, "The day you want to report", :type => String, :default => "today"
+end
+
+rolex = Rolex.new(opts[:project], opts[:author])
+
+case ARGV.join(" ").downcase
+when "last week"
+  rolex.last_week
+when "this week"
+  rolex.this_week
+else
+  rolex.report_for(opts[:date])
+end
+

data/lib/rolex.rb

@@ -2,12 +2,17 @@ $:.unshift(File.dirname(__FILE__))
 
 begin; require 'rubygems'; rescue LoadError; end
 require 'grit'
+require 'trollop'
+require 'chronic'
+
 require 'float_ext'
+require 'time_ext'
 
 class Rolex
   autoload :Report, 'rolex/report'
   autoload :LineItem, 'rolex/line_item'
-  
+
+  attr_reader :repo
   attr_accessor :who
 
   def initialize(repo_location, who)
@@ -15,9 +20,42 @@ class Rolex
     @repo = Grit::Repo.new(repo_location)
   end
 
+  def last_week
+    report_range("last week monday", "last week sunday")
+  end
+
+  def report_for(date)
+    date = date_for(date)
+    commits = repo.commits_since nil, date, :until => date + 1, :author => who
+    Report.new(commits).run
+  end
+
+  def report_range(starting, ending)
+    starting = date_for starting
+    ending = date_for ending
+    (starting..ending).each do |date|
+      report_for date
+    end
+  end
+
+  def this_week
+    report_range("last monday", "today")
+  end
+
   def today
-    commits = Grit::Commit.find_all(@repo, nil, :since => Time.today)
-    Report.new(commits, who).run
+    report_for Date.today
   end
-end
 
+  private
+
+  def date_for(time)
+    case time
+    when String
+      Chronic.parse(time).to_date
+    when Time
+      time.to_date
+    when Date
+      time
+    end
+  end
+end

data/lib/rolex/line_item.rb

@@ -1,18 +1,25 @@
 class Rolex
   class LineItem
-    attr_accessor :message, :elapsed
+    attr_reader :commit_message, :elapsed
 
-    def initialize(message, elapsed)
-      @message = message
+    def initialize(commit_message, elapsed)
+      @commit_message = commit_message
       @elapsed = elapsed
     end
 
-    def to_s
-      "#{message} - #{elapsed_time_in_hours}"
-    end
-
     def elapsed_time_in_hours
       elapsed.nil? ? 0 : (elapsed / 60 / 60).round_to(2)
     end
+
+    def message
+      commit_message.map do |line|
+        new_line = line.strip.gsub(/^- /,'')
+        new_line unless new_line.empty?
+      end.compact.join "; "
+    end
+
+    def to_s
+      sprintf "%-4s - %s", elapsed_time_in_hours, message
+    end
   end
-end
+end

data/lib/rolex/report.rb

@@ -1,9 +1,9 @@
 class Rolex
   class Report
-    attr_reader :commits, :who
+    attr_reader :commits, :lines
+    private :lines
 
-    def initialize(commits, who)
-      @who = who
+    def initialize(commits)
       @commits = commits.reverse
       @lines = []
     end
@@ -13,25 +13,26 @@ class Rolex
         elapsed = nil
         if c != commits.first
           previous = commits[i-1]
-          elapsed = c.committed_date - previous.committed_date
+          elapsed = c.authored_date - previous.authored_date
         end
 
-        if c.author.email.include?(who)
-          @lines << LineItem.new(c.message, elapsed)
-        end
+        lines << LineItem.new(c.message, elapsed)
+      end
+
+      if lines.any?
+        lines << "Total time: #{total_elapsed_time}\n\n"
+        lines.unshift "Commits on #{commits.first.authored_date.to_date}"
+        puts lines.join("\n")
       end
-      @lines << "Total time: #{total_elapsed_time}"
-      @lines.join("\n")
     end
 
     def total_elapsed_time
       total = 0
-      @lines.each do |l|
+      lines.each do |l|
         total += l.elapsed_time_in_hours
       end
 
       total
     end
-
   end
-end
+end

data/lib/time_ext.rb

@@ -0,0 +1,5 @@
+class Time
+  def to_date
+    ::Date.new(year, month, day)
+  end
+end

data/rolex.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rolex}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jim Remsik", "Sandro Turriate"]
-  s.date = %q{2009-06-12}
-  s.email = %q{bigtiger+rolex@hashrocket.com}
+  s.authors = ["bigtiger", "sandro"]
+  s.date = %q{2009-07-17}
+  s.default_executable = %q{rolex}
+  s.email = %q{dev+bigtiger+sandro@hashrocket.com}
+  s.executables = ["rolex"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -19,11 +21,14 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/rolex",
      "lib/float_ext.rb",
      "lib/rolex.rb",
      "lib/rolex/line_item.rb",
      "lib/rolex/report.rb",
+     "lib/time_ext.rb",
      "rolex.gemspec",
+     "spec/rolex/line_item_spec.rb",
      "spec/rolex_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -34,7 +39,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{TODO}
   s.test_files = [
-    "spec/rolex_spec.rb",
+    "spec/rolex/line_item_spec.rb",
+     "spec/rolex_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -43,10 +49,17 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mojombo-grit>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<mojombo-chronic>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<trollop>, [">= 1.14"])
     else
+      s.add_dependency(%q<mojombo-grit>, [">= 1.1.1"])
+      s.add_dependency(%q<mojombo-chronic>, [">= 0.3.0"])
+      s.add_dependency(%q<trollop>, [">= 1.14"])
     end
   else
+    s.add_dependency(%q<mojombo-grit>, [">= 1.1.1"])
+    s.add_dependency(%q<mojombo-chronic>, [">= 0.3.0"])
+    s.add_dependency(%q<trollop>, [">= 1.14"])
   end
-
-  s.add_dependency("grit", [">= 1.1.1"])
 end

data/spec/rolex/line_item_spec.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Rolex::LineItem do
+  describe "#message" do
+    it "replaces new lines with semi-colons" do
+      line = Rolex::LineItem.new("refactored\nthing 1\nthing 2", 500)
+      line.message.should == "refactored; thing 1; thing 2"
+    end
+
+    it "gets rid of multiple new lines" do
+      line = Rolex::LineItem.new("refactored\n\n\n\nthing 1", 500)
+      line.message.should == "refactored; thing 1"
+    end
+
+    it "doesn't add semi-colons when there is only one new line" do
+      line = Rolex::LineItem.new("refactored\n", 500)
+      line.message.should == "refactored"
+    end
+
+    it "doesn't add semi-colons when there is no new line" do
+      line = Rolex::LineItem.new("refactored", 500)
+      line.message.should == "refactored"
+    end
+
+    it "removes hyphens at the beginning of a new line" do
+      line = Rolex::LineItem.new("refactored\n- thing 1\n- thing 2", 500)
+      line.message.should == "refactored; thing 1; thing 2"
+    end
+
+    it "removes leading and trailing whitespace" do
+      line = Rolex::LineItem.new("  refactored\n  - thing 1\n- thing 2    ", 500)
+      line.message.should == "refactored; thing 1; thing 2"
+    end
+  end
+end

data/spec/rolex_spec.rb

@@ -3,24 +3,50 @@ require File.join(File.dirname(__FILE__),'spec_helper')
 describe "Rolex" do
   before do
     @commits = ["commit1", "commit2"]
-    @repo = Grit::Repo.stub!(:new).and_return('/some/path')
-    @rolex = Rolex.new(@repo, "someuser")
+    @rolex = Rolex.new('.', "someuser")
     @report = stub('report', :run => true)
+    @now = Time.now
   end
 
-  describe '#today' do 
-    it "retrieves today's commits" do
-      Grit::Commit.should_receive(:find_all).with('/some/path', nil, :since => anything).and_return(@commits)
-      Rolex::Report.should_receive(:new).with(@commits, "someuser").and_return(@report)
-      @rolex.today
+  it "reports on today" do
+    @rolex.should_receive(:report_for).with(Date.today)
+    @rolex.today
+  end
+
+  it "reports on last week" do
+    @rolex.should_receive(:report_range).with("last week monday", "last week sunday")
+    @rolex.last_week
+  end
+
+  it "reports on this week" do
+    @rolex.should_receive(:report_range).with("last monday", "today")
+    @rolex.this_week
+  end
+
+  describe "#report_for" do
+    it "parses strings with Chronic" do
+      Chronic.should_receive(:parse).with("yesterday").and_return(Time.now)
+      @rolex.report_for("yesterday")
+    end
+
+    it "retrieves commits" do
+      @rolex.repo.should_receive(:commits_since).with(nil, @now.to_date, :until => @now.to_date + 1, :author => @rolex.who).and_return(@commits)
+      Rolex::Report.should_receive(:new).with(@commits).and_return(@report)
+      @rolex.report_for(@now)
     end
-    
+
     it "runs a report" do
-      Grit::Commit.should_receive(:find_all).and_return(@commits)
+      @rolex.repo.stub!(:commits_since => @commits)
       Rolex::Report.stub!(:new).and_return(@report)
       @report.should_receive(:run)
       @rolex.today
     end
   end
 
+  describe "#report_range" do
+    it "finds the commits for the given time period" do
+      @rolex.should_receive(:report_for).at_least(2).times
+      @rolex.report_range("yesterday", "today")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-require 'spec'
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rolex'
+require 'spec'
+require 'spec/autorun'
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: bigtiger-rolex
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
-- Jim Remsik
-- Sandro Turriate
+- bigtiger
+- sandro
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
-default_executable: 
+date: 2009-07-17 00:00:00 -07:00
+default_executable: rolex
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: grit
+  name: mojombo-grit
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -23,10 +23,30 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mojombo-chronic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.14"
+    version: 
 description: 
-email: bigtiger+rolex@hashrocket.com
-executables: []
-
+email: dev+bigtiger+sandro@hashrocket.com
+executables: 
+- rolex
 extensions: []
 
 extra_rdoc_files: 
@@ -39,11 +59,14 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/rolex
 - lib/float_ext.rb
 - lib/rolex.rb
 - lib/rolex/line_item.rb
 - lib/rolex/report.rb
+- lib/time_ext.rb
 - rolex.gemspec
+- spec/rolex/line_item_spec.rb
 - spec/rolex_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -73,5 +96,6 @@ signing_key:
 specification_version: 2
 summary: TODO
 test_files: 
+- spec/rolex/line_item_spec.rb
 - spec/rolex_spec.rb
 - spec/spec_helper.rb