hotspots 0.0.11 → 0.0.12

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+WIP
+---
+
+* Make compatible with ruby 1.8.7
+
 v0.0.11
 -------
 

data/hotspots.gemspec

@@ -23,4 +23,5 @@ EOS
   s.require_paths            = ["lib"]
 
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "minitest"
 end

data/lib/hotspots.rb

@@ -7,16 +7,14 @@ require 'hotspots/repository'
 module Hotspots
   class Main
     attr_reader :logger, :options, :repository, :verbose,
-                :exit_code, :exit_message,
-                :driver, :parser, :store
+                :exit_strategy, :driver, :parser, :store
 
     def initialize
-      @options      = Hotspots::OptionsParser.new.parse(*ARGV)
-      @repository   = options[:repository]
-      @verbose      = options[:verbose]
-      @exit_code    = options[:exit][:code]
-      @exit_message = options[:exit][:message]
-      @logger       = Hotspots::Logger.new
+      @options       = Hotspots::OptionsParser.new.parse(*ARGV)
+      @repository    = options[:repository]
+      @verbose       = options[:verbose]
+      @exit_strategy = options[:exit_strategy]
+      @logger        = Hotspots::Logger.new
     end
 
     def execute!
@@ -26,7 +24,7 @@ module Hotspots
     end
 
     def validate!
-      validate_exit_code!
+      validate_early_exit!
       validate_git_repository!
     end
 
@@ -42,11 +40,8 @@ module Hotspots
 
     private
 
-    def validate_exit_code!
-      if exit_code
-        puts exit_message
-        exit exit_code
-      end
+    def validate_early_exit!
+      exit_strategy.perform
     end
 
     def validate_git_repository!

data/lib/hotspots/exit_strategy.rb

@@ -0,0 +1,41 @@
+module Hotspots
+  class ExitStrategy
+    attr_reader :code, :message
+
+    def initialize(options)
+      @message = options[:message]
+      @code    = options[:code]
+    end
+
+    def perform
+      puts @message
+      exit @code
+    end
+
+    class Safe
+      attr_reader :code, :message
+
+      def initialize(options)
+        @message = options[:message]
+        @code    = 0
+      end
+
+      def perform
+        puts @message
+        exit @code
+      end
+    end
+
+    class Null
+      attr_reader :code, :message
+
+      def initialize(options = {})
+        @message = ""
+        @code    = nil
+      end
+
+      def perform
+      end
+    end
+  end
+end

data/lib/hotspots/options_parser.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 
 require 'hotspots/version'
+require 'hotspots/exit_strategy'
 
 module Hotspots
   class OptionsParser
@@ -12,7 +13,7 @@ module Hotspots
         :message_filters => [""],
         :cutoff          => 0,
         :verbose         => false,
-        :exit            => { :code => nil, :message => "" }
+        :exit_strategy   => ExitStrategy::Null.new
       }
     end
 
@@ -21,7 +22,7 @@ module Hotspots
       begin
         parser.parse args
       rescue ::OptionParser::InvalidOption, ::OptionParser::InvalidArgument => ex
-        @options[:exit] = { :code => 1, :message => (ex.to_s << "\nUse -h for help\n") }
+        @options[:exit_strategy] = ExitStrategy.new(:code => 1, :message => (ex.to_s << "\nUse -h for help\n"))
       end
       @options
     end
@@ -105,7 +106,7 @@ module Hotspots
     def handle_help_on(opts)
       opts.on_tail("-h", "--help",
                    "Show this message") do
-        @options[:exit] = { :code => 0, :message => opts.to_s }
+        @options[:exit_strategy] = ExitStrategy::Safe.new(:message => opts.to_s)
       end
     end
   end

data/lib/hotspots/repository/driver/git.rb

@@ -10,17 +10,17 @@ module Hotspots
 
         def pretty_log(options)
           grep_clause = options[:message_filter].empty? ? "" : " --grep \"#{options[:message_filter]}\""
-          command = %Q(git log --pretty="%H" --since #{options[:since_days]}.days.ago#{grep_clause})
-            .tap {|raw| logger.log "<Input> #{raw}"}
-          %x(#{command})
-            .tap {|raw| logger.log raw}
+          command = %Q(git log --pretty="%H" --since #{options[:since_days]}.days.ago#{grep_clause}).
+            tap {|raw| logger.log "<Input> #{raw}"}
+          %x(#{command}).
+            tap {|raw| logger.log raw}
         end
 
         def show_one_line_names(options)
-          command = %Q(git show --oneline --name-only #{options[:commit_hash]})
-            .tap {|raw| logger.log "<Input> #{raw}"}
-          %x(#{command})
-            .tap {|raw| logger.log "<Output> #{raw}"}
+          command = %Q(git show --oneline --name-only #{options[:commit_hash]}).
+            tap {|raw| logger.log "<Input> #{raw}"}
+          %x(#{command}).
+            tap {|raw| logger.log "<Output> #{raw}"}
         end
       end
     end

data/lib/hotspots/repository/parser/git.rb

@@ -10,19 +10,19 @@ module Hotspots
 
         def files
           filtered_commit_hashes.map do |commit_hash|
-            @driver.show_one_line_names(:commit_hash => commit_hash)
-              .gsub("\r\n", "\n")
-              .gsub("\r", "\n")
-              .split("\n")[1..-1]
+            @driver.show_one_line_names(:commit_hash => commit_hash).
+              gsub("\r\n", "\n").
+              gsub("\r", "\n").
+              split("\n")[1..-1]
           end.flatten
         end
 
         def filtered_commit_hashes
           @message_filters.map do |filter|
-            @driver.pretty_log(:since_days => @time, :message_filter => filter)
-              .gsub("\r\n", "\n")
-              .gsub("\r", "\n")
-              .split("\n")
+            @driver.pretty_log(:since_days => @time, :message_filter => filter).
+              gsub("\r\n", "\n").
+              gsub("\r", "\n").
+              split("\n")
           end.flatten.uniq
         end
       end

data/lib/hotspots/store.rb

@@ -6,9 +6,9 @@ module Hotspots
       @cutoff = options[:cutoff]      || 0
       @filter = options[:file_filter] || ""
 
-      @lines.map   { |line| line.strip }
-            .select{ |line| not line.empty? and line =~ Regexp.new(@filter) }
-            .each  { |line| @store[line] += 1 }
+      @lines.map   { |line| line.strip }.
+             select{ |line| not line.empty? and line =~ Regexp.new(@filter) }.
+             each  { |line| @store[line] += 1 }
     end
 
     def on(line)
@@ -16,8 +16,8 @@ module Hotspots
     end
 
     def to_s
-      sorted_array.select     { |key, value| value >= @cutoff }
-                  .reduce("") { |acc, (key, value)| acc << "#{key},#{value}\n" }
+      sorted_array.select     { |key, value| value >= @cutoff }.
+                   reduce("") { |acc, (key, value)| acc << "#{key},#{value}\n" }
     end
 
     private

data/lib/hotspots/version.rb

@@ -1,3 +1,3 @@
 module Hotspots
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/hotspots/options_parser_test.rb

@@ -1,4 +1,5 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib', 'hotspots', 'options_parser')
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib', 'hotspots', 'exit_strategy')
 
 module Hotspots
   describe "OptionsParser" do
@@ -32,11 +33,11 @@ module Hotspots
       end
 
       it "exit code to nil" do
-        @parser.parse[:exit][:code].must_equal nil
+        @parser.parse[:exit_strategy].code.must_equal nil
       end
 
       it "exit message to empty string" do
-        @parser.parse[:exit][:message].must_equal ""
+        @parser.parse[:exit_strategy].message.must_equal ""
       end
     end
 
@@ -111,11 +112,11 @@ module Hotspots
     ["--help", "-h"].each do |option|
       describe option do
         it "sets exit code to zero" do
-          @parser.parse(option)[:exit][:code].must_equal 0
+          @parser.parse(option)[:exit_strategy].code.must_equal 0
         end
 
         it "sets an exit message" do
-          @parser.parse(option)[:exit][:message].wont_be_empty
+          @parser.parse(option)[:exit_strategy].message.wont_be_empty
         end
       end
     end
@@ -126,11 +127,11 @@ module Hotspots
       end
 
       it "sets an exit code" do
-        @options[:exit][:code].must_equal 1
+        @options[:exit_strategy].code.must_equal 1
       end
 
       it "sets an exit message" do
-        @options[:exit][:message].wont_be_empty
+        @options[:exit_strategy].message.wont_be_empty
       end
     end
 
@@ -140,11 +141,11 @@ module Hotspots
       end
 
       it "sets an exit code" do
-        @options[:exit][:code].must_equal 1
+        @options[:exit_strategy].code.must_equal 1
       end
 
       it "sets an exit message" do
-        @options[:exit][:message].wont_be_empty
+        @options[:exit_strategy].message.wont_be_empty
       end
     end
   end

data/test/hotspots/repository/parser/git_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', '..', 'lib', 'hotspots', 'repository', 'parser', 'git')
 
 module Hotspots::Repository
-  describe "Parser::Git test" do
+  describe "Parser::Git" do
     it "fetches a commit hash based on filter and time" do
       mock_git_driver = MiniTest::Mock.new
       options         = {:time => 10, :message_filters => ["Foo"]}
@@ -66,10 +66,10 @@ module Hotspots::Repository
     end
 
     it "has a sane show one line names" do
-      StubGitDriver.new.show_one_line_names(:commit_hash => "SHA2")
-          .must_equal "SHA1 commit message\nfile2\nfile3\nfile5"
-      StubGitDriver.new(:line_ending => "\r\n").show_one_line_names(:commit_hash => "SHA2")
-          .must_equal "SHA1 commit message\r\nfile2\r\nfile3\r\nfile5"
+      StubGitDriver.new.show_one_line_names(:commit_hash => "SHA2").
+          must_equal "SHA1 commit message\nfile2\nfile3\nfile5"
+      StubGitDriver.new(:line_ending => "\r\n").show_one_line_names(:commit_hash => "SHA2").
+          must_equal "SHA1 commit message\r\nfile2\r\nfile3\r\nfile5"
     end
   end
 

data/test/hotspots/store_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib', 'hotspots', 'store')
 
 module Hotspots
-  describe "Store test" do
+  describe "Store" do
     it "counts occurances of a line present once" do
       lines = [
         "abc.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotspots
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16193160 !ruby/object:Gem::Requirement
+  requirement: &16854320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16193160
+  version_requirements: *16854320
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &16853500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *16853500
 description: ! 'Find all files that changed over the past days for a git repository.
   If the same file is modified over
 
@@ -47,6 +58,7 @@ files:
 - bin/hotspots
 - hotspots.gemspec
 - lib/hotspots.rb
+- lib/hotspots/exit_strategy.rb
 - lib/hotspots/logger.rb
 - lib/hotspots/options_parser.rb
 - lib/hotspots/repository.rb