git_stats 1.0.5 → 1.0.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWUyMDZmNTY4MTdhMmYwY2Q0ZDY5ZmYyZTNhMTkzY2U5MjU1ODhhZQ==
+  data.tar.gz: !binary |-
+    ZjVkNGNjODZhOTlkZmIxMTZlOTc5ZGNjZjljMzJkNjBlZWIwY2ZkNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YjFkYmJmMDBhMmViMjFlZjAxMzA0NDBiMmFhYTdmZmJiMGE3Y2Q2YjhjMDEx
+    YjI0Y2ZjYWJkYTRkMTZiOTY5NmJhODQ4Nzc3NjdiN2ExNzIzYmM1M2FhZDFh
+    MGNkODc4N2I3YTdlMmJkYmQ3ZmYwYWU3Mjk2Zjk3YTIzZTMwMTI=
+  data.tar.gz: !binary |-
+    NGUyYjVkYzkwMzYyYjIyMTM5MjUwYmJmYzVhMTQwNDEyOGRkMDBmOTUyYjhj
+    OGJjYjBmN2NiOGFmNDFjYjE4YjAzOTUzMTk0ZmY0MTUyMmZmNzcyYzhiZWMy
+    MzBiMTk1Y2NlN2EzY2I2OWZmYWQ4M2QyNTcxY2Y2YTViZTJjZTU=

data/README.md

@@ -20,12 +20,12 @@ It browses the repository and outputs html page with statistics.
 
 ### Generator
 
-    $ git_stats repo_path output_directory
-    $ favorite_browser output_directory/index.html
+    $ git_stats
+    <follow instructions on the screen>
 
 ### API usage example
 
-    > repo = GitStats::GitData::Repo.new(path: '.')
+    > repo = GitStats::GitData::Repo.new(path: '.', first_commit_sha: 'abcd1234', last_commit_sha: 'HEAD')
     > repo.authors
     => [...]
     > repo.commits

data/bin/git_stats

@@ -8,4 +8,4 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 require "git_stats/cli"
 
 cli = GitStats::CLI.new
-cli.start(*ARGV)
+cli.start

data/git_stats.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency('haml')
   gem.add_dependency('lazy_high_charts')
   gem.add_dependency('i18n')
+  gem.add_dependency('highline')
 end

data/lib/git_stats/base.rb

@@ -8,6 +8,7 @@ require 'git_stats/i18n'
 require 'git_stats/by_field_finder'
 require 'git_stats/cli'
 require 'git_stats/generator'
+require 'git_stats/validator'
 
 require 'git_stats/git_data/activity'
 require 'git_stats/git_data/author'

data/lib/git_stats/cli.rb

@@ -1,15 +1,27 @@
 # -*- encoding : utf-8 -*-
 require "git_stats"
+require "highline/import"
 
 class GitStats::CLI
 
-  def start(*args)
-    raise "Wrong number of arguments\nUsage: git_stats repo_path output_path <output_lang>" unless [2, 3].include? args.size
+  def start
 
-    repo_path, out_path, lang = args
-    I18n.locale = lang || :en
+    repo_path = ask("Repo path?  ") { |q|
+      q.default = "."
+      q.validate = lambda { |p| GitStats::Validator.new.valid_repo_path?(p) }
+      q.responses[:not_valid] = "Given path is not a git repository, try again"
+    }
 
-    GitStats::Generator.new(repo_path, out_path) { |g|
+    out_path = ask("Output dir?  ") { |q| q.default = "./git_stats" }
+    I18n.locale = ask("Language?  ") { |q| q.default = "en"; q.answer_type = Symbol }
+    specify_range = agree("Want to specify commits range?  ") { |q| q.default = "no" }
+
+    if specify_range
+      first_commit_sha = ask("Starting commit sha?  ") { |q| q.default = nil }
+      last_commit_sha = ask("Ending commit sha?  ") { |q| q.default = "HEAD" }
+    end
+
+    GitStats::Generator.new(repo_path, out_path, first_commit_sha, last_commit_sha) { |g|
       g.add_command_observer { |command, result| puts "#{command}" }
     }.render_all
   end

data/lib/git_stats/generator.rb

@@ -4,10 +4,10 @@ module GitStats
     delegate :add_command_observer, to: :@repo
     delegate :render_all, to: :@view
 
-    def initialize(repo_path, out_path)
+    def initialize(repo_path, out_path, first_commit_sha = nil, last_commit_sha = "HEAD")
       validate_repo_path(repo_path)
 
-      @repo = GitData::Repo.new(path: repo_path)
+      @repo = GitData::Repo.new(path: repo_path, first_commit_sha: first_commit_sha, last_commit_sha: last_commit_sha)
       view_data = StatsView::ViewData.new(@repo)
       @view = StatsView::View.new(view_data, out_path)
 
@@ -18,7 +18,7 @@ module GitStats
 
 
     def validate_repo_path(repo_path)
-      raise ArgumentError, "#{repo_path} is not a git repository" unless (Dir.exists?("#{repo_path}/.git") || File.exists?("#{repo_path}/HEAD"))
+      raise ArgumentError, "#{repo_path} is not a git repository" unless Validator.new.valid_repo_path?(repo_path)
     end
 
   end

data/lib/git_stats/git_data/repo.rb

@@ -6,7 +6,7 @@ module GitStats
     class Repo
       include HashInitializable
 
-      attr_reader :path
+      attr_reader :path, :first_commit_sha, :last_commit_sha
 
       delegate :files, :files_by_extension, :files_by_extension_count, :lines_by_extension,
                :files_count, :binary_files, :text_files, :lines_count, to: :last_commit
@@ -68,7 +68,7 @@ module GitStats
       end
 
       def commit_range
-        @first_commit_sha ? "#@first_commit_sha..#{last_commit_sha}" : last_commit_sha
+        @first_commit_sha.blank? ? last_commit_sha : "#@first_commit_sha..#{last_commit_sha}"
       end
 
       def last_commit_sha

data/lib/git_stats/validator.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module GitStats
+  class Validator
+
+    def valid_repo_path?(repo_path)
+      Dir.exists?("#{repo_path}/.git") || File.exists?("#{repo_path}/HEAD")
+    end
+
+  end
+end

data/lib/git_stats/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module GitStats
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/git_data/generator_spec.rb

@@ -15,7 +15,7 @@ describe GitStats::Generator do
 
   it 'should pass command observer to repo' do
     repo = double('repo')
-    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path).and_return(repo)
+    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, first_commit_sha: nil, last_commit_sha: "HEAD").and_return(repo)
 
     generator = GitStats::Generator.new(repo_path, out_path)
 
@@ -27,7 +27,7 @@ describe GitStats::Generator do
 
   it 'should render all templates with view data for this repo' do
     repo = double('repo')
-    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path).and_return(repo)
+    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, first_commit_sha: nil, last_commit_sha: "HEAD").and_return(repo)
 
     view_data = double('view_data')
     GitStats::StatsView::ViewData.should_receive(:new).with(repo).and_return(view_data)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: git_stats
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.0.6
 platform: ruby
 authors:
 - Tomasz Gieniusz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lazy_high_charts
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,13 +154,13 @@ files:
 - lib/git_stats/stats_view/template.rb
 - lib/git_stats/stats_view/view.rb
 - lib/git_stats/stats_view/view_data.rb
+- lib/git_stats/validator.rb
 - lib/git_stats/version.rb
 - spec/by_field_finder_spec.rb
 - spec/factories.rb
 - spec/git_data/activity_spec.rb
 - spec/git_data/author_spec.rb
 - spec/git_data/blob_spec.rb
-- spec/git_data/cli_spec.rb
 - spec/git_data/command_observer_spec.rb
 - spec/git_data/commit_range_spec.rb
 - spec/git_data/commit_spec.rb
@@ -213,27 +214,26 @@ files:
 - templates/static/index.html
 homepage: https://github.com/tomgi/git_stats
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML statistics generator from git repository
 test_files:
 - spec/by_field_finder_spec.rb
@@ -241,7 +241,6 @@ test_files:
 - spec/git_data/activity_spec.rb
 - spec/git_data/author_spec.rb
 - spec/git_data/blob_spec.rb
-- spec/git_data/cli_spec.rb
 - spec/git_data/command_observer_spec.rb
 - spec/git_data/commit_range_spec.rb
 - spec/git_data/commit_spec.rb

data/spec/git_data/cli_spec.rb

@@ -1,20 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe GitStats::CLI do
-  let(:repo_path) { 'repo_path' }
-  let(:out_path) { 'out_path' }
-
-  it 'should invoke generator with console arguments given' do
-    generator = double('generator')
-    GitStats::Generator.should_receive(:new).with(repo_path, out_path).and_return(generator)
-    generator.should_receive(:render_all)
-
-    subject.start(repo_path, out_path)
-  end
-
-  it 'should raise error when 2 arguments are not given' do
-    expect { subject.start("only one argument") }.to raise_error
-    expect { subject.start("too", "much", "arguments") }.to raise_error
-  end
-end